--- template_db_oracle_agent2.yaml	2025-06-13 11:51:21.464110500 +0200
+++ zbx_export_templates.yaml	2025-06-16 12:10:14.148471000 +0200
@@ -1689,7 +1689,7 @@
           item_prototypes:
             - uuid: ca4452418d2641bd87fa75e946c2bf98
               name: 'Database ''{#DBNAME}'': Get PDB info'
-              key: 'oracle.pdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#CON_ID}"]'
+              key: 'oracle.pdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#DBNAME}"]'
               history: '0'
               value_type: TEXT
               trends: '0'
@@ -1702,7 +1702,7 @@
             - uuid: c52e96105cea45cea1b18201b325ba53
               name: 'Database ''{#DBNAME}'': Open status'
               type: DEPENDENT
-              key: 'oracle.pdb_open_mode["{#CON_ID}"]'
+              key: 'oracle.pdb_open_mode["{#DBNAME}"]'
               delay: '0'
               description: |
                 1 - MOUNTED;
@@ -1719,7 +1719,7 @@
                   parameters:
                     - 15m
               master_item:
-                key: 'oracle.pdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#CON_ID}"]'
+                key: 'oracle.pdb.info["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#DBNAME}"]'
               tags:
                 - tag: component
                   value: database
@@ -1729,7 +1729,7 @@
                   value: pdb
               trigger_prototypes:
                 - uuid: 61f48e1d858f4e95a603b32ee1c409dc
-                  expression: 'last(/Oracle by Zabbix agent 2/oracle.pdb_open_mode["{#CON_ID}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.pdb_open_mode["{#CON_ID}"],#2)'
+                  expression: 'last(/Oracle by Zabbix agent 2/oracle.pdb_open_mode["{#DBNAME}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.pdb_open_mode["{#DBNAME}"],#2)'
                   name: 'Oracle: Database ''{#DBNAME}'': Open status has changed'
                   event_name: 'Oracle: Database ''{#DBNAME}'': Open status has changed (new value received: {ITEM.VALUE})'
                   priority: INFO
@@ -1739,7 +1739,7 @@
                     - tag: scope
                       value: notice
                 - uuid: a6921cc3b42843dcb5624b3bb172f996
-                  expression: 'last(/Oracle by Zabbix agent 2/oracle.pdb_open_mode["{#CON_ID}"])=1'
+                  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 Database is in a mounted state.'
@@ -1772,7 +1772,7 @@
             - uuid: 14a26a84cfe947089843ed93cd7707c8
               name: '''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace allocated, bytes'
               type: DEPENDENT
-              key: 'oracle.tbs_alloc_bytes["{#CON_ID}","{#TABLESPACE}"]'
+              key: 'oracle.tbs_alloc_bytes["{#CON_NAME}","{#TABLESPACE}"]'
               delay: '0'
               units: B
               description: 'Currently allocated bytes for the tablespace (sum of the current size of datafiles).'
@@ -1781,7 +1781,7 @@
                   parameters:
                     - '$..[''{#TABLESPACE}''].file_bytes.first()'
               master_item:
-                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_ID}"]'
+                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_NAME}"]'
               tags:
                 - tag: component
                   value: tablespaces
@@ -1794,7 +1794,7 @@
             - uuid: d7263b6da6c04c7798909a8448f526ab
               name: '''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace free, bytes'
               type: DEPENDENT
-              key: 'oracle.tbs_free_bytes["{#CON_ID}","{#TABLESPACE}"]'
+              key: 'oracle.tbs_free_bytes["{#CON_NAME}","{#TABLESPACE}"]'
               delay: '0'
               units: B
               description: 'Free bytes of the allocated space.'
@@ -1803,7 +1803,7 @@
                   parameters:
                     - '$..[''{#TABLESPACE}''].free_bytes.first()'
               master_item:
-                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_ID}"]'
+                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_NAME}"]'
               tags:
                 - tag: component
                   value: tablespaces
@@ -1816,7 +1816,7 @@
             - uuid: d2d919d303b244829c797245e08c2fe5
               name: '''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace MAX size, bytes'
               type: DEPENDENT
-              key: 'oracle.tbs_max_bytes["{#CON_ID}","{#TABLESPACE}"]'
+              key: 'oracle.tbs_max_bytes["{#CON_NAME}","{#TABLESPACE}"]'
               delay: '0'
               units: B
               description: 'The maximum size of the tablespace.'
@@ -1825,7 +1825,7 @@
                   parameters:
                     - '$..[''{#TABLESPACE}''].max_bytes.first()'
               master_item:
-                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_ID}"]'
+                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_NAME}"]'
               tags:
                 - tag: component
                   value: tablespaces
@@ -1838,7 +1838,7 @@
             - uuid: de6892ac5ca4499db01dd02c0444aafc
               name: '''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Open status'
               type: DEPENDENT
-              key: 'oracle.tbs_status["{#CON_ID}","{#TABLESPACE}"]'
+              key: 'oracle.tbs_status["{#CON_NAME}","{#TABLESPACE}"]'
               delay: '0'
               description: |
                 The tablespace status where:
@@ -1852,7 +1852,7 @@
                   parameters:
                     - '$..[''{#TABLESPACE}''].status.first()'
               master_item:
-                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_ID}"]'
+                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_NAME}"]'
               tags:
                 - tag: component
                   value: tablespaces
@@ -1864,7 +1864,7 @@
                   value: '{#TABLESPACE}'
               trigger_prototypes:
                 - uuid: 832f908ca3b84a3c9a030b5d33b96016
-                  expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#CON_ID}","{#TABLESPACE}"])=2'
+                  expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#CON_NAME}","{#TABLESPACE}"])=2'
                   name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
                   priority: WARNING
                   description: 'The tablespace is in the offline state.'
@@ -1872,7 +1872,7 @@
                     - tag: scope
                       value: availability
                 - uuid: 2e84836974b340b5b916eed08e1fcdf4
-                  expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#CON_ID}","{#TABLESPACE}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#CON_ID}","{#TABLESPACE}"],#2)'
+                  expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#CON_NAME}","{#TABLESPACE}"],#1)<>last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#CON_NAME}","{#TABLESPACE}"],#2)'
                   name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace status has changed'
                   event_name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace status has changed (new value received: {ITEM.VALUE})'
                   priority: INFO
@@ -1880,14 +1880,14 @@
                   manual_close: 'YES'
                   dependencies:
                     - name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace is OFFLINE'
-                      expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#CON_ID}","{#TABLESPACE}"])=2'
+                      expression: 'last(/Oracle by Zabbix agent 2/oracle.tbs_status["{#CON_NAME}","{#TABLESPACE}"])=2'
                   tags:
                     - tag: scope
                       value: notice
             - uuid: ab56fee407e143db912dffcf24fb0106
               name: '''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace used, bytes'
               type: DEPENDENT
-              key: 'oracle.tbs_used_bytes["{#CON_ID}","{#TABLESPACE}"]'
+              key: 'oracle.tbs_used_bytes["{#CON_NAME}","{#TABLESPACE}"]'
               delay: '0'
               units: B
               description: 'Currently used bytes for the tablespace (current size of datafiles minus the free space).'
@@ -1896,7 +1896,7 @@
                   parameters:
                     - '$..[''{#TABLESPACE}''].used_bytes.first()'
               master_item:
-                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_ID}"]'
+                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_NAME}"]'
               tags:
                 - tag: component
                   value: tablespaces
@@ -1909,7 +1909,7 @@
             - uuid: 358615a3e372462e9cec05df1df22743
               name: '''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage, percent'
               type: DEPENDENT
-              key: 'oracle.tbs_used_file_pct["{#CON_ID}","{#TABLESPACE}"]'
+              key: 'oracle.tbs_used_file_pct["{#CON_NAME}","{#TABLESPACE}"]'
               delay: '0'
               value_type: FLOAT
               units: '%'
@@ -1919,7 +1919,7 @@
                   parameters:
                     - '$..[''{#TABLESPACE}''].used_file_pct.first()'
               master_item:
-                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_ID}"]'
+                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_NAME}"]'
               tags:
                 - tag: component
                   value: tablespaces
@@ -1929,32 +1929,10 @@
                   value: '{#CON_NAME}'
                 - tag: tablespace
                   value: '{#TABLESPACE}'
-              trigger_prototypes:
-                - uuid: bbc86236064348ee9150dfdd07623061
-                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_file_pct["{#CON_ID}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}'
-                  name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high'
-                  event_name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).'
-                  priority: HIGH
-                  description: 'The usage of the tablespace `{#TABLESPACE}` exceeds `{$ORACLE.TBS.USED.PCT.MAX.HIGH}`%'
-                  tags:
-                    - tag: scope
-                      value: capacity
-                - uuid: ba298d35aaaa4386b4f03914dcf1cb27
-                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_file_pct["{#CON_ID}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}'
-                  name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high'
-                  event_name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m).'
-                  priority: WARNING
-                  description: 'The usage of the tablespace `{#TABLESPACE}` exceeds `{$ORACLE.TBS.USED.PCT.MAX.WARN}`%'
-                  dependencies:
-                    - name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high'
-                      expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_file_pct["{#CON_ID}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}'
-                  tags:
-                    - tag: scope
-                      value: capacity
             - uuid: 93f6abb8363e4ee2ad2801090cf006b0
               name: '''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage from MAX, percent'
               type: DEPENDENT
-              key: 'oracle.tbs_used_from_max_pct["{#CON_ID}","{#TABLESPACE}"]'
+              key: 'oracle.tbs_used_from_max_pct["{#CON_NAME}","{#TABLESPACE}"]'
               delay: '0'
               value_type: FLOAT
               units: '%'
@@ -1964,7 +1942,7 @@
                   parameters:
                     - '$..[''{#TABLESPACE}''].used_from_max_pct.first()'
               master_item:
-                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_ID}"]'
+                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_NAME}"]'
               tags:
                 - tag: component
                   value: tablespaces
@@ -1976,19 +1954,40 @@
                   value: '{#TABLESPACE}'
               trigger_prototypes:
                 - uuid: dd246e51d0b343f0b18b18dc802dfbc2
-                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_from_max_pct["{#CON_ID}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.FROM.MAX.WARN}'
+                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_from_max_pct["{#CON_NAME}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.FROM.MAX.WARN}'
                   name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage from MAX is too high'
                   event_name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace utilization from MAX is too high (over {$ORACLE.TBS.USED.PCT.FROM.MAX.WARN}% for 5m).'
                   priority: WARNING
                   description: 'The usage of the tablespace `{#TABLESPACE}` from MAX exceeds `{$ORACLE.TBS.USED.PCT.FROM.MAX.WARN}`%'
                   dependencies:
                     - name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace utilization from MAX is too high'
-                      expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_from_max_pct["{#CON_ID}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.FROM.MAX.HIGH}'
+                      expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_from_max_pct["{#CON_NAME}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.FROM.MAX.HIGH}'
+                  tags:
+                    - tag: scope
+                      value: capacity
+                - uuid: bbc86236064348ee9150dfdd07623061
+                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_from_max_pct["{#CON_NAME}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}'
+                  name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high'
+                  event_name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).'
+                  priority: HIGH
+                  description: 'The usage of the tablespace `{#TABLESPACE}` exceeds `{$ORACLE.TBS.USED.PCT.MAX.HIGH}`%'
+                  tags:
+                    - tag: scope
+                      value: capacity
+                - uuid: ba298d35aaaa4386b4f03914dcf1cb27
+                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_from_max_pct["{#CON_NAME}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}'
+                  name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high'
+                  event_name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m).'
+                  priority: WARNING
+                  description: 'The usage of the tablespace `{#TABLESPACE}` exceeds `{$ORACLE.TBS.USED.PCT.MAX.WARN}`%'
+                  dependencies:
+                    - name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace usage is too high'
+                      expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_from_max_pct["{#CON_NAME}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}'
                   tags:
                     - tag: scope
                       value: capacity
                 - uuid: a82c07893e04440ea9c0e5e7f8f79602
-                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_from_max_pct["{#CON_ID}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.FROM.MAX.HIGH}'
+                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_from_max_pct["{#CON_NAME}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.FROM.MAX.HIGH}'
                   name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace utilization from MAX is too high'
                   event_name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace utilization from MAX is too high (over {$ORACLE.TBS.USED.PCT.FROM.MAX.HIGH}% for 5m).'
                   priority: HIGH
@@ -1999,7 +1998,7 @@
             - uuid: 5d6293b33a46488c88a75dc898bf7059
               name: '''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace allocated, percent'
               type: DEPENDENT
-              key: 'oracle.tbs_used_pct["{#CON_ID}","{#TABLESPACE}"]'
+              key: 'oracle.tbs_used_pct["{#CON_NAME}","{#TABLESPACE}"]'
               delay: '0'
               value_type: FLOAT
               units: '%'
@@ -2009,7 +2008,7 @@
                   parameters:
                     - '$..[''{#TABLESPACE}''].used_pct_max.first()'
               master_item:
-                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_ID}"]'
+                key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_NAME}"]'
               tags:
                 - tag: component
                   value: tablespaces
@@ -2021,7 +2020,7 @@
                   value: '{#TABLESPACE}'
               trigger_prototypes:
                 - uuid: 451108a2251848ea8719378d5c0abb42
-                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#CON_ID}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}'
+                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#CON_NAME}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}'
                   name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace utilization is too high'
                   event_name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).'
                   priority: HIGH
@@ -2030,20 +2029,20 @@
                     - tag: scope
                       value: capacity
                 - uuid: 2530cb03fb4e4e728396834f0db89466
-                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#CON_ID}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.WARN}'
+                  expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#CON_NAME}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.WARN}'
                   name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace utilization is too high'
                   event_name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.WARN}% for 5m).'
                   priority: WARNING
                   description: 'The utilization of the tablespace `{#TABLESPACE}` exceeds `{$ORACLE.TBS.UTIL.PCT.MAX.WARN}`%'
                   dependencies:
                     - name: 'Oracle: ''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Tablespace utilization is too high'
-                      expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#CON_ID}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}'
+                      expression: 'min(/Oracle by Zabbix agent 2/oracle.tbs_used_pct["{#CON_NAME}","{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}'
                   tags:
                     - tag: scope
                       value: capacity
             - uuid: 97ac4acedcde465b8d004a8ac476dd99
               name: '''{#CON_NAME}'' TBS ''{#TABLESPACE}'': Get tablespaces stats'
-              key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_ID}"]'
+              key: 'oracle.ts.stats["{$ORACLE.CONNSTRING}","{$ORACLE.USER}","{$ORACLE.PASSWORD}","{$ORACLE.SERVICE}","{#TABLESPACE}","{#CONTENTS}","{#CON_NAME}"]'
               history: '0'
               value_type: TEXT
               trends: '0'
@@ -2060,17 +2059,17 @@
                 - color: 199C0D
                   item:
                     host: 'Oracle by Zabbix agent 2'
-                    key: 'oracle.tbs_alloc_bytes["{#CON_ID}","{#TABLESPACE}"]'
+                    key: 'oracle.tbs_alloc_bytes["{#CON_NAME}","{#TABLESPACE}"]'
                 - sortorder: '1'
                   color: F63100
                   item:
                     host: 'Oracle by Zabbix agent 2'
-                    key: 'oracle.tbs_max_bytes["{#CON_ID}","{#TABLESPACE}"]'
+                    key: 'oracle.tbs_max_bytes["{#CON_NAME}","{#TABLESPACE}"]'
                 - sortorder: '2'
                   color: 00611C
                   item:
                     host: 'Oracle by Zabbix agent 2'
-                    key: 'oracle.tbs_used_bytes["{#CON_ID}","{#TABLESPACE}"]'
+                    key: 'oracle.tbs_used_bytes["{#CON_NAME}","{#TABLESPACE}"]'
       tags:
         - tag: class
           value: database