diff --git a/frontends/php/popup_trexpr.php b/frontends/php/popup_trexpr.php index c6d79a2..742d951 100644 --- a/frontends/php/popup_trexpr.php +++ b/frontends/php/popup_trexpr.php @@ -198,6 +198,14 @@ $functions = [ 'description' => _('Absolute difference between last and previous value is NOT N'), 'allowed_types' => $allowedTypesAny ], + 'abschange[>=]' => [ + 'description' => _('Absolute difference between last and previous value is >= N'), + 'allowed_types' => $allowedTypesAny + ], + 'abschange[<=]' => [ + 'description' => _('Absolute difference between last and previous value is <= N'), + 'allowed_types' => $allowedTypesAny + ], 'avg[<]' => [ 'description' => _('Average value of a period T is < N'), 'params' => $param1SecCount, @@ -218,6 +226,16 @@ $functions = [ 'params' => $param1SecCount, 'allowed_types' => $allowedTypesNumeric ], + 'avg[>=]' => [ + 'description' => _('Average value of a period T is >= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], + 'avg[<=]' => [ + 'description' => _('Average value of a period T is <= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], 'delta[<]' => [ 'description' => _('Difference between MAX and MIN value of a period T is < N'), 'params' => $param1SecCount, @@ -238,6 +256,16 @@ $functions = [ 'params' => $param1SecCount, 'allowed_types' => $allowedTypesNumeric ], + 'delta[>=]' => [ + 'description' => _('Difference between MAX and MIN value of a period T is >= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], + 'delta[<=]' => [ + 'description' => _('Difference between MAX and MIN value of a period T is <= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], 'change[<]' => [ 'description' => _('Difference between last and previous value is < N'), 'allowed_types' => $allowedTypesAny @@ -254,6 +282,14 @@ $functions = [ 'description' => _('Difference between last and previous value is NOT N'), 'allowed_types' => $allowedTypesAny ], + 'change[>=]' => [ + 'description' => _('Difference between last and previous value is >= N'), + 'allowed_types' => $allowedTypesAny + ], + 'change[<=]' => [ + 'description' => _('Difference between last and previous value is <= N'), + 'allowed_types' => $allowedTypesAny + ], 'count[<]' => [ 'description' => _('Number of successfully retrieved values V (which fulfill operator O) for period T is < N'), 'params' => $param3SecVal, @@ -274,6 +310,16 @@ $functions = [ 'params' => $param3SecVal, 'allowed_types' => $allowedTypesAny ], + 'count[>=]' => [ + 'description' => _('Number of successfully retrieved values V (which fulfill operator O) for period T is >= N'), + 'params' => $param3SecVal, + 'allowed_types' => $allowedTypesAny + ], + 'count[<=]' => [ + 'description' => _('Number of successfully retrieved values V (which fulfill operator O) for period T is <= N'), + 'params' => $param3SecVal, + 'allowed_types' => $allowedTypesAny + ], 'diff[=]' => [ 'description' => _('Difference between last and preceding values, then N = 1, 0 - otherwise'), 'allowed_types' => $allowedTypesAny @@ -302,6 +348,16 @@ $functions = [ 'params' => $param1SecCount, 'allowed_types' => $allowedTypesAny ], + 'last[>=]' => [ + 'description' => _('Last (most recent) T value is >= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesAny + ], + 'last[<=]' => [ + 'description' => _('Last (most recent) T value is <= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesAny + ], 'max[<]' => [ 'description' => _('Maximum value for period T is < N'), 'params' => $param1SecCount, @@ -322,6 +378,16 @@ $functions = [ 'params' => $param1SecCount, 'allowed_types' => $allowedTypesNumeric ], + 'max[>=]' => [ + 'description' => _('Maximum value for period T is >= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], + 'max[<=]' => [ + 'description' => _('Maximum value for period T is <= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], 'min[<]' => [ 'description' => _('Minimum value for period T is < N'), 'params' => $param1SecCount, @@ -342,6 +408,16 @@ $functions = [ 'params' => $param1SecCount, 'allowed_types' => $allowedTypesNumeric ], + 'min[>=]' => [ + 'description' => _('Minimum value for period T is >= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], + 'min[<=]' => [ + 'description' => _('Minimum value for period T is <= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], 'percentile[<]' => [ 'description' => _('Percentile P of a period T is < N'), 'params' => $param3SecPercent, @@ -362,6 +438,16 @@ $functions = [ 'params' => $param3SecPercent, 'allowed_types' => $allowedTypesNumeric ], + 'percentile[>=]' => [ + 'description' => _('Percentile P of a period T is >= N'), + 'params' => $param3SecPercent, + 'allowed_types' => $allowedTypesNumeric + ], + 'percentile[<=]' => [ + 'description' => _('Percentile P of a period T is <= N'), + 'params' => $param3SecPercent, + 'allowed_types' => $allowedTypesNumeric + ], 'prev[<]' => [ 'description' => _('Previous value is < N'), 'allowed_types' => $allowedTypesAny @@ -378,6 +464,14 @@ $functions = [ 'description' => _('Previous value is NOT N'), 'allowed_types' => $allowedTypesAny ], + 'prev[>=]' => [ + 'description' => _('Previous value is >= N'), + 'allowed_types' => $allowedTypesAny + ], + 'prev[<=]' => [ + 'description' => _('Previous value is <= N'), + 'allowed_types' => $allowedTypesAny + ], 'str[=]' => [ 'description' => _('Find string V in last (most recent) value. N = 1 - if found, 0 - otherwise'), 'params' => $param2SecCount, @@ -408,6 +502,16 @@ $functions = [ 'params' => $param1SecCount, 'allowed_types' => $allowedTypesStr ], + 'strlen[>=]' => [ + 'description' => _('Length of last (most recent) T value in characters is >= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesStr + ], + 'strlen[<=]' => [ + 'description' => _('Length of last (most recent) T value in characters is <= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesStr + ], 'sum[<]' => [ 'description' => _('Sum of values of a period T is < N'), 'params' => $param1SecCount, @@ -428,6 +532,16 @@ $functions = [ 'params' => $param1SecCount, 'allowed_types' => $allowedTypesNumeric ], + 'sum[>=]' => [ + 'description' => _('Sum of values of a period T is >= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], + 'sum[<=]' => [ + 'description' => _('Sum of values of a period T is <= N'), + 'params' => $param1SecCount, + 'allowed_types' => $allowedTypesNumeric + ], 'date[<]' => [ 'description' => _('Current date is < N'), 'allowed_types' => $allowedTypesAny @@ -444,6 +558,14 @@ $functions = [ 'description' => _('Current date is NOT N'), 'allowed_types' => $allowedTypesAny ], + 'date[>=]' => [ + 'description' => _('Current date is >= N'), + 'allowed_types' => $allowedTypesAny + ], + 'date[<=]' => [ + 'description' => _('Current date is <= N'), + 'allowed_types' => $allowedTypesAny + ], 'dayofweek[<]' => [ 'description' => _('Day of week is < N'), 'allowed_types' => $allowedTypesAny @@ -460,6 +582,14 @@ $functions = [ 'description' => _('Day of week is NOT N'), 'allowed_types' => $allowedTypesAny ], + 'dayofweek[>=]' => [ + 'description' => _('Day of week is >= N'), + 'allowed_types' => $allowedTypesAny + ], + 'dayofweek[<=]' => [ + 'description' => _('Day of week is <= N'), + 'allowed_types' => $allowedTypesAny + ], 'dayofmonth[<]' => [ 'description' => _('Day of month is < N'), 'allowed_types' => $allowedTypesAny @@ -476,6 +606,14 @@ $functions = [ 'description' => _('Day of month is NOT N'), 'allowed_types' => $allowedTypesAny ], + 'dayofmonth[>=]' => [ + 'description' => _('Day of month is >= N'), + 'allowed_types' => $allowedTypesAny + ], + 'dayofmonth[<=]' => [ + 'description' => _('Day of month is <= N'), + 'allowed_types' => $allowedTypesAny + ], 'fuzzytime[=]' => [ 'description' => _('Difference between item timestamp value and Zabbix server timestamp is over T seconds, then N = 0, 1 - otherwise'), 'params' => $param1Sec, @@ -532,6 +670,14 @@ $functions = [ 'description' => _('Log severity of the last log entry is NOT N'), 'allowed_types' => $allowedTypesLog ], + 'logseverity[>=]' => [ + 'description' => _('Log severity of the last log entry is >= N'), + 'allowed_types' => $allowedTypesLog + ], + 'logseverity[<=]' => [ + 'description' => _('Log severity of the last log entry is <= N'), + 'allowed_types' => $allowedTypesLog + ], 'logsource[=]' => [ 'description' => _('Log source of the last log entry matching parameter T, then N = 1, 0 - otherwise'), 'params' => $param1Str, @@ -558,6 +704,14 @@ $functions = [ 'description' => _('Number of seconds since the Epoch is NOT N'), 'allowed_types' => $allowedTypesAny ], + 'now[>=]' => [ + 'description' => _('Number of seconds since the Epoch is >= N'), + 'allowed_types' => $allowedTypesAny + ], + 'now[<=]' => [ + 'description' => _('Number of seconds since the Epoch is <= N'), + 'allowed_types' => $allowedTypesAny + ], 'time[<]' => [ 'description' => _('Current time is < N'), 'allowed_types' => $allowedTypesAny @@ -574,6 +728,14 @@ $functions = [ 'description' => _('Current time is NOT N'), 'allowed_types' => $allowedTypesAny ], + 'time[>=]' => [ + 'description' => _('Current time is >= N'), + 'allowed_types' => $allowedTypesAny + ], + 'time[<=]' => [ + 'description' => _('Current time is <= N'), + 'allowed_types' => $allowedTypesAny + ], 'nodata[=]' => [ 'description' => _('No data received during period of time T, then N = 1, 0 - otherwise'), 'params' => $param1Sec, @@ -614,6 +776,16 @@ $functions = [ 'params' => $paramForecast, 'allowed_types' => $allowedTypesNumeric ], + 'forecast[>=]' => [ + 'description' => _('Forecast for next t seconds based on period T is >= N'), + 'params' => $paramForecast, + 'allowed_types' => $allowedTypesNumeric + ], + 'forecast[<=]' => [ + 'description' => _('Forecast for next t seconds based on period T is <= N'), + 'params' => $paramForecast, + 'allowed_types' => $allowedTypesNumeric + ], 'timeleft[<]' => [ 'description' => _('Time to reach threshold estimated based on period T is < N'), 'params' => $paramTimeleft, @@ -633,7 +805,17 @@ $functions = [ 'description' => _('Time to reach threshold estimated based on period T is NOT N'), 'params' => $paramTimeleft, 'allowed_types' => $allowedTypesNumeric - ] + ], + 'timeleft[>=]' => [ + 'description' => _('Time to reach threshold estimated based on period T is >= N'), + 'params' => $paramTimeleft, + 'allowed_types' => $allowedTypesNumeric + ], + 'timeleft[<=]' => [ + 'description' => _('Time to reach threshold estimated based on period T is <= N'), + 'params' => $paramTimeleft, + 'allowed_types' => $allowedTypesNumeric + ] ]; order_result($functions, 'description');