diff options
Diffstat (limited to 'frontends/php/include/classes/api/services/CDiscoveryRule.php')
| -rw-r--r-- | frontends/php/include/classes/api/services/CDiscoveryRule.php | 77 |
1 files changed, 22 insertions, 55 deletions
diff --git a/frontends/php/include/classes/api/services/CDiscoveryRule.php b/frontends/php/include/classes/api/services/CDiscoveryRule.php index 3d68798a6ca..6fbf523cab3 100644 --- a/frontends/php/include/classes/api/services/CDiscoveryRule.php +++ b/frontends/php/include/classes/api/services/CDiscoveryRule.php @@ -28,6 +28,17 @@ class CDiscoveryRule extends CItemGeneral { protected $tableAlias = 'i'; protected $sortColumns = ['itemid', 'name', 'key_', 'delay', 'type', 'status']; + /** + * Define a set of supported pre-processing rules. + * + * @var array + * + * 5.6 would allow this to be defined constant. + */ + public static $supported_preprocessing_types = [ZBX_PREPROC_REGSUB, ZBX_PREPROC_JSONPATH, + ZBX_PREPROC_VALIDATE_NOT_REGEX, ZBX_PREPROC_ERROR_FIELD_JSON, ZBX_PREPROC_THROTTLE_TIMED_VALUE + ]; + public function __construct() { parent::__construct(); @@ -81,6 +92,7 @@ class CDiscoveryRule extends CItemGeneral { 'selectApplicationPrototypes' => null, 'selectFilter' => null, 'selectLLDMacroPaths' => null, + 'selectPreprocessing' => null, 'countOutput' => false, 'groupCount' => false, 'preservekeys' => false, @@ -647,6 +659,7 @@ class CDiscoveryRule extends CItemGeneral { 'hostids' => $data['templateids'], 'selectFilter' => ['formula', 'evaltype', 'conditions'], 'selectLLDMacroPaths' => ['lld_macro', 'path'], + 'selectPreprocessing' => ['type', 'params', 'error_handler', 'error_handler_params'], 'preservekeys' => true ]); $json = new CJson(); @@ -924,6 +937,8 @@ class CDiscoveryRule extends CItemGeneral { } DB::insertBatch('lld_macro_path', $lld_macro_paths); + + $this->createItemPreprocessing($items); } protected function updateReal($items) { @@ -1124,6 +1139,8 @@ class CDiscoveryRule extends CItemGeneral { } DB::insertBatch('lld_macro_path', $lld_macro_paths); + + $this->updateItemPreprocessing($items); } /** @@ -1282,10 +1299,6 @@ class CDiscoveryRule extends CItemGeneral { _s('Incorrect value for field "%1$s": %2$s.', 'lifetime', $error) ); } - - if (array_key_exists('preprocessing', $item)) { - self::exception(ZBX_API_ERROR_PARAMETERS, _('Item pre-processing is not allowed for discovery rules.')); - } } /** @@ -1479,57 +1492,6 @@ class CDiscoveryRule extends CItemGeneral { } } - protected function inherit(array $items, array $hostids = null) { - if (!$items) { - return; - } - - // Prepare the child discovery rules. - $new_items = $this->prepareInheritedItems($items, $hostids); - if (!$new_items) { - return; - } - - $ins_items = []; - $upd_items = []; - foreach ($new_items as $new_item) { - if (array_key_exists('itemid', $new_item)) { - $upd_items[] = $new_item; - } - else { - $ins_items[] = $new_item; - } - } - - // Save the new items. - $this->createReal($ins_items); - $this->updateReal($upd_items); - - $new_items = array_merge($upd_items, $ins_items); - - // Inheriting items from the templates. - $tpl_items = DBselect( - 'SELECT i.itemid'. - ' FROM items i,hosts h'. - ' WHERE i.hostid=h.hostid'. - ' AND '.dbConditionInt('i.itemid', zbx_objectValues($new_items, 'itemid')). - ' AND '.dbConditionInt('h.status', [HOST_STATUS_TEMPLATE]) - ); - - $tpl_itemids = []; - while ($tpl_item = DBfetch($tpl_items)) { - $tpl_itemids[$tpl_item['itemid']] = true; - } - - foreach ($new_items as $index => $new_item) { - if (!array_key_exists($new_item['itemid'], $tpl_itemids)) { - unset($new_items[$index]); - } - } - - $this->inherit($new_items); - } - /** * Copies the given discovery rule to the specified host. * @@ -1557,6 +1519,7 @@ class CDiscoveryRule extends CItemGeneral { ], 'selectFilter' => ['evaltype', 'formula', 'conditions'], 'selectLLDMacroPaths' => ['lld_macro', 'path'], + 'selectPreprocessing' => ['type', 'params', 'error_handler', 'error_handler_params'], 'preservekeys' => true ]); $srcDiscovery = reset($srcDiscovery); @@ -1582,6 +1545,10 @@ class CDiscoveryRule extends CItemGeneral { unset($condition); } + if (!$dstDiscovery['lld_macro_paths']) { + unset($dstDiscovery['lld_macro_paths']); + } + // if this is a plain host, map discovery interfaces if ($srcHost['status'] != HOST_STATUS_TEMPLATE) { // find a matching interface |