Zabbix
Public
Commits
930
930
931
931
$db_items = CMacrosResolverHelper::resolveItemKeys($db_items);932
932
$db_items = CMacrosResolverHelper::resolveItemDescriptions($db_items);933
933
934
934
foreach ($db_items as &$db_item) {935
935
$db_item['state'] = itemState($db_item['state']);936
936
}937
937
unset($db_item);938
938
939
939
$item_macros = ['ITEM.DESCRIPTION' => 'description_expanded', 'ITEM.DESCRIPTION.ORIG' => 'description',940
-
'ITEM.ID' => 'itemid', 'ITEM.KEY' => 'key_expanded', 'ITEM.KEY.ORIG' => 'key_', 'ITEM.NAME' => 'name',941
-
'ITEM.NAME.ORIG' => 'name', 'ITEM.STATE' => 'state', 'ITEM.VALUETYPE' => 'value_type'940
+
'ITEM.ID' => 'itemid', 'ITEM.KEY' => 'key_expanded', 'ITEM.KEY.ORIG' => 'key_',941
+
'ITEM.NAME' => 'name_resolved', 'ITEM.NAME.ORIG' => 'name', 'ITEM.STATE' => 'state',942
+
'ITEM.VALUETYPE' => 'value_type'942
943
];943
944
944
945
foreach ($db_items as $itemid => $db_item) {945
946
foreach ($macros[$itemid] as $macro => $tokens) {946
947
$value = $db_item[$item_macros[$macro]];947
948
948
949
foreach ($tokens as $token) {949
950
$macro_values[$itemid][$token['token']] = array_key_exists('macrofunc', $token)950
951
? CMacroFunction::calcMacrofunc($value, $token['macrofunc'])951
952
: $value;