[#ZBXNEXT-786] Key net.tcp.service[ntp] does not work with UDP

         public function __construct() {
                 $this->functionMacroParser = new CFunctionMacroParser();
                 $this->lldMacroParser = new CMacroParser('#');
                 $this->itemKeyConverter = new C20ItemKeyConverter();
-                $this->triggerExpressionParser = new CTriggerExpression();
         }

         /**
          * Convert a trigger expression from 2.2 format to 2.4.
          *
          * The method will replace old operators with their analogues: "&" with "and", "|" - "or" and "#" - "<>".
          *
          * @param string $expression
          *
          * @return string
          */
        public function convert($expression) {
-                // don't try to parse the expression if there's nothing to replace
-                if (strpos($expression, '#') === false
-                                && strpos($expression, '&') === false
-                                && strpos($expression, '|') === false) {
-
-                        $this->triggerExpressionParser->parse($expression);
-
-                        $expression = '{'.
-                                $this->triggerExpressionParser->expressions[0]['host'].':'.
-                                $this->itemKeyConverter->convert($this->triggerExpressionParser->expressions[0]['item']).'.'.
-                                $this->triggerExpressionParser->expressions[0]['function'].
-                        '}';
-
-                        return $expression;
-                }
-
                 // find all the operators that need to be replaced
                 $found_operators = [];
                 $pos = 0;
                 while (isset($expression[$pos])) {

Input: {host:log["/вар/лог/заббикс/заббикс_сервер.лог"].regexp("\<системная ошибка\>")}#0 Output: {host:log["/вар/лог/заббикс/заббикс_сервер.лог"].regexp("\<системная ошибка\>")}#0

12877:20150528:122944.319 starting automatic database upgrade 12877:20150528:122944.319 query [txnlev:1] [begin;] 12877:20150528:122944.320 query [txnlev:1] [select itemid,key_ from items where type in (0,3,7) and key_ like 'net.tcp.service%[%ntp%'] 12877:20150528:122944.327 query [txnlev:1] [update items set key_='net.udp.service[ntp]' where itemid=23650] 12877:20150528:122944.328 query [txnlev:1] [update items set key_='net.udp.service[ntp]' where itemid=25414] 12877:20150528:122944.329 query [txnlev:1] [update items set key_='net.udp.service[ntp,1]' where itemid=29842] 12877:20150528:122944.330 [Z3005] query failed: [1062] Duplicate entry '10362-net.udp.service[ntp,1]' for key 2 [update items set key_='net.udp.service[ntp,1]' where itemid=29842] 12877:20150528:122944.330 query [update items set key_='net.udp.service[ntp,1]' where itemid=29842] failed, setting transaction as failed 12877:20150528:122944.330 query [txnlev:1] [rollback;] 12877:20150528:122944.331 database upgrade failed 12877:20150528:122944.331 End of DBcheck_version():FAIL

[ZBXNEXT-786] Key net.tcp.service[ntp] does not work with UDP Created: 2011 May 16 Updated: 2018 Jul 05 Resolved: 2015 Jun 18
Status:	Closed
Project:	ZABBIX FEATURE REQUESTS
Component/s:	Agent (G), Documentation (D)
Affects Version/s:	None
Fix Version/s:	2.0.15, 2.2.10, 2.4.6, 2.5.0

[ZBXNEXT-786] Key net.tcp.service[ntp] does not work with UDP Created: 2011 May 16 Updated: 2018 Jul 05 Resolved: 2015 Jun 18