A.F....... [ZBXNEXT-6141] implemented frontend changes for new trigger functions for long term analytics; added new property event_name to Trigger and Trigger prototype API objects

1 files changed, 74 insertions, 0 deletions

diff --git a/ui/app/controllers/CControllerPopupTriggerExpr.php b/ui/app/controllers/CControllerPopupTriggerExpr.php
index 65de11fcc28..3eb84d98442 100644
--- a/ui/app/controllers/CControllerPopupTriggerExpr.php
+++ b/ui/app/controllers/CControllerPopupTriggerExpr.php
@@ -22,11 +22,13 @@
 class CControllerPopupTriggerExpr extends CController {
 	private $metrics = [];
 	private $param1SecCount = [];
+	private $param1Period = [];
 	private $param1Sec = [];
 	private $param1Str = [];
 	private $param2SecCount = [];
 	private $param2SecMode = [];
 	private $param3SecVal = [];
+	private $param3SecPeriod = [];
 	private $param3SecPercent = [];
 	private $paramSecIntCount = [];
 	private $paramForecast = [];
@@ -67,6 +69,19 @@ class CControllerPopupTriggerExpr extends CController {
 			]
 		];
 
+		$this->param1Period = [
+			'last' => [
+				'C' => _('Last of').' (T)',
+				'T' => T_ZBX_INT,
+				'A' => true
+			],
+			'period_shift' => [
+				'C' => _('Period shift'),
+				'T' => T_ZBX_INT,
+				'A' => true
+			]
+		];
+
 		$this->param1Sec = [
 			'last' => [
 				'C' => _('Last of').' (T)',
@@ -134,6 +149,29 @@ class CControllerPopupTriggerExpr extends CController {
 			]
 		];
 
+		$this->param3SecPeriod = [
+			'last' => [
+				'C' => _('Last of').' (T)',
+				'T' => T_ZBX_INT,
+				'A' => true
+			],
+			'v' => [
+				'C' => 'V',
+				'T' => T_ZBX_STR,
+				'A' => false
+			],
+			'o' => [
+				'C' => 'O',
+				'T' => T_ZBX_STR,
+				'A' => false
+			],
+			'period_shift' => [
+				'C' => _('Period shift'),
+				'T' => T_ZBX_INT,
+				'A' => true
+			]
+		];
+
 		$this->param3SecPercent = [
 			'last' => [
 				'C' => _('Last of').' (T)',
@@ -416,6 +454,42 @@ class CControllerPopupTriggerExpr extends CController {
 				'params' => $this->paramTimeleft,
 				'allowed_types' => $this->allowedTypesNumeric,
 				'operators' => ['=', '<>', '>', '<', '>=', '<=']
+			],
+			'trendavg' => [
+				'description' => _('trendavg() - Average value of a period T with exact period shift'),
+				'params' => $this->param1Period,
+				'allowed_types' => $this->allowedTypesNumeric,
+				'operators' => ['=', '<>', '>', '<', '>=', '<=']
+			],
+			'trendcount' => [
+				'description' => _('trendcount() - Number of successfully retrieved values V (which fulfill operator O) for period T with exact period shift'),
+				'params' => $this->param3SecPeriod,
+				'allowed_types' => $this->allowedTypesAny,
+				'operators' => ['=', '<>', '>', '<', '>=', '<=']
+			],
+			'trenddelta' => [
+				'description' => _('trenddelta() - Difference between MAX and MIN value of a period T with exact period shift'),
+				'params' => $this->param1Period,
+				'allowed_types' => $this->allowedTypesNumeric,
+				'operators' => ['=', '<>', '>', '<', '>=', '<=']
+			],
+			'trendmax' => [
+				'description' => _('trendmax() - Maximum value for period T with exact period shift'),
+				'params' => $this->param1Period,
+				'allowed_types' => $this->allowedTypesNumeric,
+				'operators' => ['=', '<>', '>', '<', '>=', '<=']
+			],
+			'trendmin' => [
+				'description' => _('trendmin() - Minimum value for period T with exact period shift'),
+				'params' => $this->param1Period,
+				'allowed_types' => $this->allowedTypesNumeric,
+				'operators' => ['=', '<>', '>', '<', '>=', '<=']
+			],
+			'trendsum' => [
+				'description' => _('trendsum() - Sum of values of a period T with exact period shift'),
+				'params' => $this->param1Period,
+				'allowed_types' => $this->allowedTypesNumeric,
+				'operators' => ['=', '<>', '>', '<', '>=', '<=']
 			]
 		];