Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanis Freibergs <janis.freibergs@zabbix.com>2021-12-07 16:58:43 +0300
committerJanis Freibergs <janis.freibergs@zabbix.com>2021-12-07 17:06:25 +0300
commit599ea54dca1156b9142ef7c8faa593879339dafa (patch)
treef6728ca672e6f98249928c19cd63584d0f72b381
parent01521557bb269e7304db7435114266f5c0110c19 (diff)
parentf6b9cea761f789bec6b7a6a01af52c8aed8de5c1 (diff)
.......... [ZBXNEXT-6999] updated to latest from release/6.0; resolved conflicts
- create/src/dashboards.tmpl - create/src/schema.tmpl - src/libs/zbxdbupgrade/dbupgrade_5050.c - ui/include/defines.inc.php
-rw-r--r--.gitignore2
-rw-r--r--ChangeLog86
-rw-r--r--ChangeLog.d/bugfix/ZBX-183891
-rw-r--r--ChangeLog.d/bugfix/ZBX-195141
-rw-r--r--ChangeLog.d/bugfix/ZBX-197041
-rw-r--r--ChangeLog.d/bugfix/ZBX-198661
-rw-r--r--ChangeLog.d/bugfix/ZBX-200601
-rw-r--r--ChangeLog.d/bugfix/ZBX-200751
-rw-r--r--ChangeLog.d/bugfix/ZBX-202401
-rw-r--r--ChangeLog.d/feature/ZBXNEXT-70181
-rw-r--r--ChangeLog.d/feature/ZBXNEXT-70851
-rw-r--r--build/mingw/Makefile4
-rw-r--r--build/win32/project/Makefile_agent1
-rw-r--r--configure.ac2
-rw-r--r--create/src/dashboards.tmpl1437
-rw-r--r--create/src/data.tmpl14
-rw-r--r--create/src/schema.tmpl5
-rw-r--r--create/src/templates.tmpl9364
-rw-r--r--include/cfg.h5
-rw-r--r--include/common.h14
-rw-r--r--include/db.h1
-rw-r--r--include/dbcache.h2
-rw-r--r--include/sysinfo.h1
-rw-r--r--include/version.h4
-rw-r--r--include/zbxhistory.h2
-rw-r--r--include/zbxtrends.h16
-rw-r--r--man/zabbix_agent2.man5
-rw-r--r--man/zabbix_agentd.man5
-rw-r--r--sass/stylesheets/sass/screen.scss16
-rw-r--r--src/go/cmd/zabbix_agent2/zabbix_agent2.go35
-rw-r--r--src/go/internal/agent/plugin_userparameter.go17
-rw-r--r--src/go/internal/agent/plugin_userparameter_test.go8
-rw-r--r--src/go/internal/agent/scheduler/manager.go86
-rw-r--r--src/go/internal/agent/scheduler/plugin.go2
-rw-r--r--src/go/pkg/conf/conf.go16
-rw-r--r--src/go/pkg/plugin/registry.go19
-rw-r--r--src/go/pkg/procfs/procfs.go2
-rw-r--r--src/go/pkg/version/version.go4
-rw-r--r--src/go/pkg/zbxcmd/zbxcmd_windows.go5
-rw-r--r--src/go/pkg/zbxlib/globals_windows.go1
-rw-r--r--src/go/pkg/zbxlib/logfile.go43
-rw-r--r--src/go/plugins/postgres/handler_archive.go25
-rw-r--r--src/go/plugins/postgres/handler_connections.go2
-rw-r--r--src/go/plugins/postgres/handler_replication.go21
-rw-r--r--src/go/plugins/postgres/handler_replication_process_name_discovery.go2
-rw-r--r--src/go/plugins/postgres/handler_wal.go11
-rw-r--r--src/libs/zbxcommon/misc.c94
-rw-r--r--src/libs/zbxcommon/str.c6
-rw-r--r--src/libs/zbxcommon/time.c80
-rw-r--r--src/libs/zbxconf/cfg.c35
-rw-r--r--src/libs/zbxcrypto/tls.c62
-rw-r--r--src/libs/zbxdbcache/dbconfig.c13
-rw-r--r--src/libs/zbxdbcache/dbconfig_maintenance.c10
-rw-r--r--src/libs/zbxdbcache/valuecache.c4
-rw-r--r--src/libs/zbxdbhigh/trigger_linking.c12
-rw-r--r--src/libs/zbxdbupgrade/dbupgrade_5050.c70
-rw-r--r--src/libs/zbxembed/duktape.c4
-rw-r--r--src/libs/zbxembed/embed.c2
-rw-r--r--src/libs/zbxembed/httprequest.c178
-rw-r--r--src/libs/zbxicmpping/icmpping.c8
-rw-r--r--src/libs/zbxnix/control.c6
-rw-r--r--src/libs/zbxnix/daemon.c4
-rw-r--r--src/libs/zbxserver/Makefile.am4
-rw-r--r--src/libs/zbxserver/anomalystl.c873
-rw-r--r--src/libs/zbxserver/anomalystl.h50
-rw-r--r--src/libs/zbxserver/evalfunc.c711
-rw-r--r--src/libs/zbxserver/evalfunc_common.c188
-rw-r--r--src/libs/zbxserver/evalfunc_common.h39
-rw-r--r--src/libs/zbxsysinfo/sysinfo.c30
-rw-r--r--src/libs/zbxtrends/Makefile.am8
-rw-r--r--src/libs/zbxtrends/baseline.c270
-rw-r--r--src/libs/zbxtrends/cache.c103
-rw-r--r--src/libs/zbxtrends/trends.c40
-rw-r--r--src/libs/zbxtrends/trends.h10
-rw-r--r--src/zabbix_agent/active.c224
-rw-r--r--src/zabbix_agent/listener.c26
-rw-r--r--src/zabbix_agent/logfiles/Makefile.am4
-rw-r--r--src/zabbix_agent/logfiles/logfiles.c904
-rw-r--r--src/zabbix_agent/logfiles/logfiles.h28
-rw-r--r--src/zabbix_agent/logfiles/persistent_state.c950
-rw-r--r--src/zabbix_agent/logfiles/persistent_state.h85
-rw-r--r--src/zabbix_agent/metrics.h1
-rw-r--r--src/zabbix_agent/zabbix_agentd.c34
-rw-r--r--src/zabbix_agent/zbxconf.c75
-rw-r--r--src/zabbix_agent/zbxconf.h3
-rw-r--r--src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java4
-rw-r--r--src/zabbix_proxy/Makefile.am1
-rw-r--r--src/zabbix_proxy/proxy.c4
-rw-r--r--src/zabbix_sender/zabbix_sender.c2
-rw-r--r--src/zabbix_server/Makefile.am1
-rw-r--r--src/zabbix_server/actions.c3
-rw-r--r--src/zabbix_server/escalator/escalator.c9
-rw-r--r--src/zabbix_server/server.c4
-rw-r--r--templates/db/oracle_odbc/README.md115
-rw-r--r--templates/db/oracle_odbc/template_db_oracle_odbc.yaml202
-rw-r--r--templates/db/postgresql/README.md2
-rw-r--r--templates/db/postgresql/postgresql/pgsql.frozenxid.sql29
-rw-r--r--templates/db/postgresql/postgresql/pgsql.replication.lag.sql48
-rw-r--r--templates/db/postgresql/template_db_postgresql.yaml46
-rw-r--r--templates/db/postgresql_agent2/README.md242
-rw-r--r--templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml112
-rw-r--r--templates/net/f5_bigip_snmp/README.md10
-rw-r--r--templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml31
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml6
-rw-r--r--templates/net/mikrotik/mikrotik_snmp/README.md4
-rw-r--r--templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml6
-rw-r--r--templates/os/windows_agent/README.md8
-rw-r--r--templates/os/windows_agent/template_os_windows_agent.yaml8
-rw-r--r--templates/os/windows_agent_active/README.md8
-rw-r--r--templates/os/windows_agent_active/template_os_windows_agent_active.yaml8
-rw-r--r--tests/libs/zbxcommon/Makefile.am19
-rw-r--r--tests/libs/zbxcommon/zbx_get_week_number.c53
-rw-r--r--tests/libs/zbxcommon/zbx_get_week_number.yaml1695
-rw-r--r--tests/libs/zbxcommon/zbx_tm_add.yaml24
-rw-r--r--tests/libs/zbxcommon/zbx_tm_round_down.c13
-rw-r--r--tests/libs/zbxcommon/zbx_tm_round_down.yaml48
-rw-r--r--tests/libs/zbxcommon/zbx_tm_sub.c26
-rw-r--r--tests/libs/zbxcommon/zbx_tm_sub.yaml48
-rw-r--r--tests/libs/zbxconf/parse_cfg_file.c4
-rw-r--r--tests/libs/zbxdbcache/Makefile.am3
-rw-r--r--tests/libs/zbxdbhigh/Makefile.am2
-rwxr-xr-xtests/libs/zbxeval/Makefile.am1
-rwxr-xr-xtests/libs/zbxserver/Makefile.am40
-rw-r--r--tests/libs/zbxserver/evaluate_function.c5
-rw-r--r--tests/libs/zbxserver/evaluate_function.yaml28
-rw-r--r--tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.c186
-rw-r--r--tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.yaml191
-rw-r--r--tests/libs/zbxserver/evaluate_stl.c224
-rw-r--r--tests/libs/zbxserver/evaluate_stl.yaml2915
-rw-r--r--tests/libs/zbxtrends/Makefile.am24
-rw-r--r--tests/libs/zbxtrends/zbx_baseline_get_data.c124
-rw-r--r--tests/libs/zbxtrends/zbx_baseline_get_data.yaml245
-rw-r--r--tests/mocks/valuecache/valuecache_mock.h2
-rw-r--r--tests/zbxmocktime.c17
-rw-r--r--ui/actionconf.php16
-rw-r--r--ui/app/controllers/CControllerHintboxEventlist.php2
-rw-r--r--ui/app/controllers/CControllerHostUpdate.php7
-rw-r--r--ui/app/controllers/CControllerPopupMassupdateTemplate.php10
-rw-r--r--ui/app/controllers/CControllerPopupTriggerExpr.php109
-rw-r--r--ui/app/controllers/CControllerWidgetSvgGraphView.php2
-rw-r--r--ui/app/partials/administration.system.info.php4
-rw-r--r--ui/app/partials/configuration.host.edit.html.php242
-rw-r--r--ui/app/partials/js/configuration.host.edit.html.js.php58
-rw-r--r--ui/app/views/js/popup.massupdate.js.php49
-rw-r--r--ui/app/views/js/popup.service.edit.js.php6
-rw-r--r--ui/app/views/popup.massupdate.host.php136
-rw-r--r--ui/app/views/popup.massupdate.template.php95
-rw-r--r--ui/app/views/popup.triggerexpr.php27
-rw-r--r--ui/assets/styles/blue-theme.css9
-rw-r--r--ui/assets/styles/dark-theme.css9
-rw-r--r--ui/assets/styles/hc-dark.css9
-rw-r--r--ui/assets/styles/hc-light.css9
-rw-r--r--ui/host_prototypes.php10
-rw-r--r--ui/include/classes/api/services/CAction.php12
-rw-r--r--ui/include/classes/api/services/CScript.php4
-rw-r--r--ui/include/classes/data/CHistFunctionData.php42
-rw-r--r--ui/include/classes/data/CItemData.php16
-rw-r--r--ui/include/classes/graphdraw/CLineGraphDraw.php2
-rw-r--r--ui/include/classes/helpers/CEncryptHelper.php23
-rw-r--r--ui/include/classes/import/CImportReferencer.php2
-rw-r--r--ui/include/classes/import/converters/C52AggregateItemKeyConverter.php6
-rw-r--r--ui/include/classes/parsers/C10TriggerExpression.php8
-rw-r--r--ui/include/classes/parsers/CExpressionParser.php8
-rw-r--r--ui/include/classes/parsers/CHistFunctionParser.php24
-rw-r--r--ui/include/classes/parsers/CNumberParser.php26
-rw-r--r--ui/include/classes/parsers/CRangeParser.php5
-rw-r--r--ui/include/classes/validators/CApiInputValidator.php2
-rw-r--r--ui/include/classes/validators/CHistFunctionValidator.php63
-rw-r--r--ui/include/classes/widgets/forms/CWidgetFormSvgGraph.php2
-rw-r--r--ui/include/defines.inc.php22
-rw-r--r--ui/include/items.inc.php2
-rw-r--r--ui/include/schema.inc.php8
-rw-r--r--ui/include/triggers.inc.php5
-rw-r--r--ui/include/validate.inc.php2
-rw-r--r--ui/include/views/configuration.action.edit.php23
-rw-r--r--ui/include/views/configuration.host.prototype.edit.php500
-rw-r--r--ui/include/views/configuration.template.edit.php236
-rw-r--r--ui/include/views/js/common.template.edit.js.php30
-rw-r--r--ui/include/views/js/configuration.host.prototype.edit.js.php21
-rw-r--r--ui/index_sso.php19
-rw-r--r--ui/js/class.tab-indicators.js88
-rw-r--r--ui/js/hostmacrosmanager.js5
-rw-r--r--ui/js/multiselect.js22
-rw-r--r--ui/locale/bg/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/ca/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/cs/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/de/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/el/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/es/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/fa/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/fi/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/fr/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/he/LC_MESSAGES/frontend.po1147
-rw-r--r--ui/locale/hu/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/id/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/it/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/ja/LC_MESSAGES/frontend.po1223
-rw-r--r--ui/locale/ka/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/ko/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/lt/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/lv/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/nb/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/nl/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/pl/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/pt_BR/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/pt_PT/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/ro/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/ru/LC_MESSAGES/frontend.po1123
-rw-r--r--ui/locale/sk/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/sv/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/tr/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/uk/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/vi/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/zh_CN/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/locale/zh_TW/LC_MESSAGES/frontend.po1115
-rw-r--r--ui/templates.php66
-rw-r--r--ui/tests/include/CIntegrationTest.php2
-rw-r--r--ui/tests/include/web/elements/CDashboardElement.php14
-rw-r--r--ui/tests/include/web/elements/CMessageElement.php10
-rw-r--r--ui/tests/integration/IntegrationTests.php4
-rw-r--r--ui/tests/integration/testEscalations.php53
-rw-r--r--ui/tests/integration/testTriggerState.php168
-rw-r--r--ui/tests/integration/testUserParametersReload.php297
-rw-r--r--ui/tests/selenium/SeleniumTests.php28
-rw-r--r--ui/tests/selenium/behaviors/CMessageBehavior.php11
-rw-r--r--ui/tests/selenium/common/testCalculatedFormula.php394
-rw-r--r--ui/tests/selenium/common/testFormHost.php (renamed from ui/tests/selenium/testFormHost.php)457
-rw-r--r--ui/tests/selenium/common/testFormMacros.php5
-rw-r--r--ui/tests/selenium/common/testFormTags.php1
-rw-r--r--ui/tests/selenium/common/testSystemInformation.php227
-rw-r--r--ui/tests/selenium/dashboard/testDashboardPages.php731
-rw-r--r--ui/tests/selenium/dashboard/testDashboardSystemInformationWidget.php290
-rw-r--r--ui/tests/selenium/hosts/testFormHostConfiguration.php99
-rw-r--r--ui/tests/selenium/hosts/testFormHostMonitoring.php101
-rw-r--r--ui/tests/selenium/hosts/testFormHostStandalone.php102
-rw-r--r--ui/tests/selenium/reports/testFormScheduledReport.php (renamed from ui/tests/selenium/scheduledReports/testFormScheduledReport.php)0
-rw-r--r--ui/tests/selenium/reports/testPageReportsActionLog.php (renamed from ui/tests/selenium/testPageReportsActionLog.php)2
-rw-r--r--ui/tests/selenium/reports/testPageReportsAudit.php (renamed from ui/tests/selenium/testPageReportsAudit.php)4
-rw-r--r--ui/tests/selenium/reports/testPageReportsNotifications.php (renamed from ui/tests/selenium/testPageReportsNotifications.php)2
-rw-r--r--ui/tests/selenium/reports/testPageReportsSystemInformation.php53
-rw-r--r--ui/tests/selenium/reports/testPageReportsTriggerTop.php (renamed from ui/tests/selenium/testPageReportsTriggerTop.php)2
-rw-r--r--ui/tests/selenium/reports/testPageScheduledReport.php (renamed from ui/tests/selenium/scheduledReports/testPageScheduledReport.php)0
-rw-r--r--ui/tests/selenium/reports/testScheduledReportPermissions.php (renamed from ui/tests/selenium/scheduledReports/testScheduledReportPermissions.php)0
-rw-r--r--ui/tests/selenium/testFormHostLinkTemplates.php12
-rw-r--r--ui/tests/selenium/testFormHostPrototype.php16
-rw-r--r--ui/tests/selenium/testFormTabIndicators.php35
-rw-r--r--ui/tests/selenium/testInheritanceHostPrototype.php16
-rw-r--r--ui/tests/selenium/testPageDashboard.php30
-rw-r--r--ui/tests/selenium/testTemplateInheritance.php4
-rw-r--r--ui/tests/selenium/traits/MacrosTrait.php2
-rw-r--r--ui/tests/unit/include/classes/parsers/CHistFunctionParserTest.php41
-rw-r--r--ui/tests/unit/include/classes/validators/CHistFunctionValidatorTest.php141
359 files changed, 39998 insertions, 25213 deletions
diff --git a/.gitignore b/.gitignore
index a3c166293d2..9dd4c4f4f9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -146,6 +146,7 @@ tests/libs/zbxcommon/zbx_dyn_escape_string
tests/libs/zbxcommon/zbx_get_report_nextcheck
tests/libs/zbxcommon/zbx_function_find
tests/libs/zbxcommon/zbx_function_get_param_dyn
+tests/libs/zbxcommon/zbx_get_week_number
tests/libs/zbxcommon/zbx_interval_preproc
tests/libs/zbxcommon/zbx_json_to_xml
tests/libs/zbxcommon/zbx_ltrim_utf8
@@ -223,6 +224,7 @@ tests/libs/zbxcommon/zbx_tm_add
tests/libs/zbxcommon/zbx_tm_sub
tests/libs/zbxcommon/zbx_tm_round_up
tests/libs/zbxcommon/zbx_tm_round_down
+tests/libs/zbxtrends/zbx_baseline_get_data
tests/libs/zbxtrends/zbx_trends_parse_range
tests/libs/zbxsysinfo/process_http
tests/zabbix_server/preprocessor/item_preproc_csv_to_json
diff --git a/ChangeLog b/ChangeLog
index c18f0f990d3..ac44cb7ddcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,39 @@
+Changes for 6.0.0alpha8
+
+New features:
+.........T [ZBXNEXT-7031] upgraded Oracle by ODBC template for using config string in items (abiba)
+........S. [ZBXNEXT-2579] added baseline monitoring functions baslinewma,baselinedev (wiper)
+..F....... [ZBXNEXT-7020] added baseline function entry to front-end (jfreibergs)
+A.F.....S. [ZBXNEXT-6250] added option to opt-out of "escalation canceled" messages (miks, ssimonenko)
+..FG...... [ZBXNEXT-6593] added support of persistent files for restoring log item state after agent restart (Andris)
+..F....... [ZBXNEXT-7070] transferred host and template mass update template inputs to main tab (jfreibergs)
+
+Bug fixes:
+.........T [ZBX-18474] fixed regexp in macros in Template Module Windows Services (abiba)
+........S. [ZBX-19651] fixed problem escalation when at least one of the hosts in a trigger expression is not in maintenance (dgoloscapov)
+...G.....T [ZBX-19897] updated postgresql templates and plugin files (vkhaliev)
+A......... [ZBX-20120] fixed import of several hosts assigned to different proxies (Sasha)
+........S. [ZBX-20238] fixed linking templates with trigger prototypes (wiper)
+........S. [ZBX-20178] fixed action webhook failure when return value is not required (dgoloscapov, wiper)
+........S. [ZBX-19806] added support of multiple header fields in JS method getHeaders() (dgoloscapov)
+...G...... [ZBX-20192] fixed quote expansion in command execution in agent2 on windows (dgoloscapov)
+........S. [ZBX-19924] fixed trigger expression and calculated items not allowing to specify timeshift that ends in future even if it starts in the past (vso)
+..F....... [ZBX-19973] fixed event list hintbox field validation (miks)
+..F....... [ZBX-20294] fixed typo in system information table (jfreibergs)
+..F....... [ZBX-20170] fixed trigger expression testing constructor for monoinc and monodec functions (miks)
+..F....... [ZBX-20268] fixed disabled button issue when cloning a service (averza)
+
+--------------------------------------------------------------------------------
Changes for 6.0.0alpha7
New features:
+..F.....S. [ZBXNEXT-6955] added trendstl() anomaly detection function (arimdjonoks, gcalenko)
+...G...... [ZBXNEXT-6936] added possibility to reload user parameters without restarting Zabbix Agent (asestakovs)
..F....PS. [ZBXNEXT-3706] added support for utf8mb4 encoding with utf8mb4_bin collation on mysql and mariadb (miks, yurii)
Bug fixes:
+.........T [ZBX-19514] fixed disc utilization metric for windows discs discovery (abiba)
+.......PS. [ZBX-19866] fixed possible duplication of server log messages with first network error or interface activation (akozlovs)
........S. [ZBX-20177] added acnowledgeid index for alerts table (ssimonenko)
.....J.... [ZBX-19587] fixed Zabbix Java gateway error message when object or attribute is not found (vso)
....I...S. [ZBX-20176] fixed trigger not being calculated for first value when item changes state to supported; fixed build failure when DES is disabled in Net-SNMP; fixed tests on big-endian systems (vso)
@@ -223,6 +253,29 @@ Bug fixes:
.........T [ZBX-19395] changed version in links of the templates and the media (mchudinov)
--------------------------------------------------------------------------------
+Changes for 5.4.9rc1
+
+New features:
+.........T [ZBXNEXT-7031] upgraded Oracle by ODBC template for using config string in items (abiba)
+..FG...... [ZBXNEXT-6593] added support of persistent files for restoring log item state after agent restart (Andris)
+
+Bug fixes:
+........S. [ZBX-19651] fixed problem escalation when at least one of the hosts in a trigger expression is not in maintenance (dgoloscapov)
+...G.....T [ZBX-19897] updated postgresql templates and plugin files (vkhaliev)
+A......... [ZBX-20120] fixed import of several hosts assigned to different proxies (Sasha)
+........S. [ZBX-20178] fixed action webhook failure when return value is not required (dgoloscapov, wiper)
+........S. [ZBX-19806] added support of multiple header fields in JS method getHeaders() (dgoloscapov)
+...G...... [ZBX-20192] fixed quote expansion in command execution in agent2 on windows (dgoloscapov)
+........S. [ZBX-19924] fixed trigger expression and calculated items not allowing to specify timeshift that ends in future even if it starts in the past (vso)
+........S. [ZBX-20238] fixed linking templates with trigger prototypes (wiper)
+..F....... [ZBX-19973] fixed event list hintbox field validation (miks)
+
+--------------------------------------------------------------------------------
+Changes for 5.4.8
+
+5.4.8rc1 was released as 5.4.8 without any changes
+
+--------------------------------------------------------------------------------
Changes for 5.4.8rc1
New features:
@@ -231,6 +284,8 @@ New features:
.........T [ZBXNEXT-7014] updated README for a newer version of PagerDuty (abiba)
Bug fixes:
+.........T [ZBX-19514] fixed disc utilization metric for windows discs discovery (abiba)
+.......PS. [ZBX-19866] fixed possible duplication of server log messages with first network error or interface activation (akozlovs)
........S. [ZBX-20177] added acknowledgeid index for alerts table (ssimonenko)
.....J.... [ZBX-19587] fixed Zabbix Java gateway error message when object or attribute is not found (vso)
....I...S. [ZBX-20176] fixed trigger not being calculated for first value when item changes state to supported; fixed build failure when DES is disabled in Net-SNMP; fixed tests on big-endian systems (vso)
@@ -1348,9 +1403,27 @@ A......... [ZBX-17955] fixed "medias" parameter named inconsistency in user.crea
.......PS. [ZBX-17548] don't store text items with history 0 in proxy history (wiper)
--------------------------------------------------------------------------------
+Changes for 5.0.19rc1
+
+New features:
+
+Bug fixes:
+.........T [ZBX-18474] fixed filters regex in OS Windows template (abiba)
+........S. [ZBX-19651] fixed problem escalation when at least one of the hosts in a trigger expression is not in maintenance (dgoloscapov)
+...G.....T [ZBX-19897] updated postgresql templates and plugin files (vkhaliev)
+.........T [ZBX-20212] fixed max columns values for screens in linux templates (vkhaliev)
+...G...... [ZBX-20192] fixed quote expansion in command execution in agent2 on windows (dgoloscapov)
+
+--------------------------------------------------------------------------------
+Changes for 5.0.18
+
+5.0.18rc1 was released as 5.0.18 without any changes
+
+--------------------------------------------------------------------------------
Changes for 5.0.18rc1
New features:
+..FG...... [ZBXNEXT-6593] added support of persistent files for restoring log item state after agent restart (Andris)
...G...... [ZBXNEXT-6651] added new item agent.variant for Agent and Agent2 (agriscenko, akozlovs)
...G.....T [ZBXNEXT-6677] added cpu percent field to docker.container_stats key for docker plugin in Zabbix agent 2 and docker template (afayantsev, esneiders)
.........T [ZBXNEXT-7014] updated README for a newer version of PagerDuty (abiba)
@@ -1361,6 +1434,7 @@ New features:
.......PS. [ZBXNEXT-6644] added support for vmware key named 'vmware.hv.maintenance' (MVekslers)
Bug fixes:
+.........T [ZBX-19514] fixed disc utilization metric for windows discs discovery (abiba)
........S. [ZBX-20177] added acknowledgeid index for alerts table (ssimonenko)
.....J.... [ZBX-19587] fixed Zabbix Java gateway error message when object or attribute is not found (vso)
....I...S. [ZBX-20176] fixed trigger not being calculated for first value when item changes state to supported; fixed build failure when DES is disabled in Net-SNMP; fixed tests on big-endian systems (vso)
@@ -3656,11 +3730,21 @@ A.F.I...S. [ZBXNEXT-4853,ZBXNEXT-517] added ability to send email messages in HT
..F.....S. [ZBXNEXT-1282,ZBXNEXT-4730] added changes to introduce regex based matching for auto-registration (vasilijs, viktors)
--------------------------------------------------------------------------------
-Changes for 4.0.36rc1
+Changes for 4.0.37rc1
New features:
Bug fixes:
+
+--------------------------------------------------------------------------------
+Changes for 4.0.36
+
+4.0.36rc1 was released as 4.0.36 without any changes
+
+--------------------------------------------------------------------------------
+Changes for 4.0.36rc1
+
+Bug fixes:
...G...... [ZBX-19926] fixed Zabbix agent crashing when reading event log on Windows Server 2022 (vso)
.......PS. [ZBX-20032] fixed server crash when restarting monitored vmware vc (MVekslers)
........S. [ZBX-19872] removed redundant escaping in XML data of HTTP agent POST request (asestakovs)
diff --git a/ChangeLog.d/bugfix/ZBX-18389 b/ChangeLog.d/bugfix/ZBX-18389
new file mode 100644
index 00000000000..18c155b9184
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-18389
@@ -0,0 +1 @@
+.........T [ZBX-18389] fixed sql query for 32 and 64 bit xids postgresql versions in postgresql by user parameters template (vkhaliev)
diff --git a/ChangeLog.d/bugfix/ZBX-19514 b/ChangeLog.d/bugfix/ZBX-19514
deleted file mode 100644
index bc802bf2289..00000000000
--- a/ChangeLog.d/bugfix/ZBX-19514
+++ /dev/null
@@ -1 +0,0 @@
-.........T [ZBX-19514] fixed disc utilization metric for windows discs discovery (abiba)
diff --git a/ChangeLog.d/bugfix/ZBX-19704 b/ChangeLog.d/bugfix/ZBX-19704
new file mode 100644
index 00000000000..de5d1379423
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-19704
@@ -0,0 +1 @@
+.........T [ZBX-19704] fixed item pattern in "Zabbix server health" dashboard (abakaldin)
diff --git a/ChangeLog.d/bugfix/ZBX-19866 b/ChangeLog.d/bugfix/ZBX-19866
deleted file mode 100644
index 10db67558b3..00000000000
--- a/ChangeLog.d/bugfix/ZBX-19866
+++ /dev/null
@@ -1 +0,0 @@
-.......PS. [ZBX-19866] fixed possible duplication of server log messages with first network error or interface activation (akozlovs)
diff --git a/ChangeLog.d/bugfix/ZBX-20060 b/ChangeLog.d/bugfix/ZBX-20060
new file mode 100644
index 00000000000..c2d1dbf8952
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20060
@@ -0,0 +1 @@
+.........T [ZBX-20060] fixed trigger expression for memory monitoring in F5 Big-IP SNMP template (abakaldin)
diff --git a/ChangeLog.d/bugfix/ZBX-20075 b/ChangeLog.d/bugfix/ZBX-20075
new file mode 100644
index 00000000000..1e2d01bfafd
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20075
@@ -0,0 +1 @@
+.........T [ZBX-20075] fixed trigger expression for certificate monitoring in F5 Big-IP SNMP template (abakaldin)
diff --git a/ChangeLog.d/bugfix/ZBX-20240 b/ChangeLog.d/bugfix/ZBX-20240
new file mode 100644
index 00000000000..439b133f897
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20240
@@ -0,0 +1 @@
+.......... [ZBX-20240] added integration tests for trigger state (ssimonenko)
diff --git a/ChangeLog.d/feature/ZBXNEXT-7018 b/ChangeLog.d/feature/ZBXNEXT-7018
new file mode 100644
index 00000000000..bbfb450806b
--- /dev/null
+++ b/ChangeLog.d/feature/ZBXNEXT-7018
@@ -0,0 +1 @@
+..F....... [ZBXNEXT-7018] transferred template and group input to main tabs (ashubin, jfreibergs)
diff --git a/ChangeLog.d/feature/ZBXNEXT-7085 b/ChangeLog.d/feature/ZBXNEXT-7085
new file mode 100644
index 00000000000..11e051f4eb2
--- /dev/null
+++ b/ChangeLog.d/feature/ZBXNEXT-7085
@@ -0,0 +1 @@
+..F.I..... [ZBXNEXT-7085] extended 'formula' field in 'actions' table from 255 to 1024 characters (akozlovs, rlataria)
diff --git a/build/mingw/Makefile b/build/mingw/Makefile
index 46097f96553..8e08f499747 100644
--- a/build/mingw/Makefile
+++ b/build/mingw/Makefile
@@ -24,6 +24,7 @@ OBJS = \
$(OUTPUTDIR)\sysinfo.o \
$(OUTPUTDIR)\vector.o \
$(OUTPUTDIR)\zbxregexp.o \
+ $(OUTPUTDIR)\persistent_state.o \
$(OUTPUTDIR)\logfiles.o \
$(OUTPUTDIR)\file.o \
$(OUTPUTDIR)\alias.o \
@@ -163,6 +164,9 @@ $(OUTPUTDIR)\algodefs.o: $(TOPDIR)\src\libs\zbxalgo\algodefs.c
$(OUTPUTDIR)\zbxregexp.o: $(TOPDIR)\src\libs\zbxregexp\zbxregexp.c
$(CC) $(CFLAGS) -DUNICODE -DPCRE_STATIC -c $^ -o $@
+$(OUTPUTDIR)\persistent_state.o: $(TOPDIR)\src\zabbix_agent\logfiles\persistent_state.c
+ $(CC) $(CFLAGS) -DUNICODE -c $^ -o $@
+
$(OUTPUTDIR)\logfiles.o: $(TOPDIR)\src\zabbix_agent\logfiles\logfiles.c
$(CC) $(CFLAGS) -DUNICODE -c $^ -o $@
diff --git a/build/win32/project/Makefile_agent b/build/win32/project/Makefile_agent
index b892c9084ae..35b32ddfcac 100644
--- a/build/win32/project/Makefile_agent
+++ b/build/win32/project/Makefile_agent
@@ -101,6 +101,7 @@ OBJS = \
..\..\..\src\zabbix_agent\cpustat.o \
..\..\..\src\zabbix_agent\eventlog.o \
..\..\..\src\zabbix_agent\listener.o \
+ ..\..\..\src\zabbix_agent\logfiles\persistent_state.o \
..\..\..\src\zabbix_agent\logfiles\logfiles.o \
..\..\..\src\zabbix_agent\perfstat.o \
..\..\..\src\zabbix_agent\stats.o \
diff --git a/configure.ac b/configure.ac
index 015c2ec7f5e..d84a3f44553 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([Zabbix],[6.0.0alpha7])
+AC_INIT([Zabbix],[6.0.0alpha8])
AC_CONFIG_SRCDIR(src/zabbix_server/server.c)
AM_INIT_AUTOMAKE([subdir-objects filename-length-max=99])
diff --git a/create/src/dashboards.tmpl b/create/src/dashboards.tmpl
index c0956879061..2f1bb2ca884 100644
--- a/create/src/dashboards.tmpl
+++ b/create/src/dashboards.tmpl
@@ -18,58 +18,58 @@
--
TABLE |dashboard
-FIELDS|dashboardid|name |userid|private|templateid|uuid |display_period|auto_start|
-ROW |1 |Global view |1 |0 |NULL | |30 |1 |
-ROW |2 |Zabbix server health |1 |1 |NULL | |30 |1 |
-ROW |3 |Apache performance |NULL |1 |10265 |a328c9e713424465a8e1adec7322b0dc|30 |1 |
-ROW |4 |Apache performance |NULL |1 |10264 |c27c68fb9c234a09b4023076b45affc1|30 |1 |
-ROW |5 |Docker overview |NULL |1 |10318 |7eb6472d07ac4c379e6b730b59a12507|30 |1 |
-ROW |7 |Redis performance |NULL |1 |10310 |ee4c29eb7a0f443fafb7e7d3b9df7b24|30 |1 |
-ROW |8 |RabbitMQ overview |NULL |1 |10300 |a886a871a00d47e28b8648cadae3bc99|30 |1 |
-ROW |9 |RabbitMQ node status |NULL |1 |10301 |ce0af043ed2c4e7c988674c9ecb787d6|30 |1 |
-ROW |10 |Network interfaces |NULL |1 |10285 |19dac6b780aa49558bf4a3782ba4b3b6|30 |1 |
-ROW |11 |System performance |NULL |1 |10285 |558606056f464970a7c544ba75d544f2|30 |1 |
-ROW |12 |RabbitMQ overview |NULL |1 |10302 |1b64af348f284f74a1f7f03de1d55f7b|30 |1 |
-ROW |13 |RabbitMQ node status |NULL |1 |10303 |5e70f5ff6706442abc83ec1b206d9fe4|30 |1 |
-ROW |14 |Network interfaces |NULL |1 |10342 |4c72409900b84a29bfcfd02648535a2b|30 |1 |
-ROW |15 |System performance |NULL |1 |10343 |3e6ceed431734cc29836019e93b5f89e|30 |1 |
-ROW |16 |Network interfaces |NULL |1 |10276 |1cbc445224b14af1b72f1580d7444ba5|30 |1 |
-ROW |17 |System performance |NULL |1 |10001 |e9ca2f8e715f428b8edc0129aa0c79de|30 |1 |
-ROW |18 |PostgreSQL databases |NULL |1 |10329 |e3ae726b06cc4663a3eef5a73909f796|30 |1 |
-ROW |19 |Netowrk interfaces |NULL |1 |10348 |1f4737b4a5364b35a8358dccedf6a492|30 |1 |
-ROW |20 |System performance |NULL |1 |10351 |234161507ccb4d83b111cb31e0db8ae5|30 |1 |
-ROW |21 |Netowrk interfaces |NULL |1 |10291 |9ddc1ce7e9ea4d7dba8e282366084f3b|30 |1 |
-ROW |22 |System performance |NULL |1 |10081 |5f494fac9dc94bf3827b67ea212240f2|30 |1 |
-ROW |23 |MySQL performance |NULL |1 |10316 |ce2f9d7bb18e469f97e692baee02841d|30 |1 |
-ROW |24 |MySQL performance |NULL |1 |10320 |ca5006123e0f4eb8bc0155027e663d2c|30 |1 |
-ROW |26 |Network interfaces |NULL |1 |10192 |8283a27e39a9451283ce74aca085ffaa|30 |1 |
-ROW |27 |Network interfaces |NULL |1 |10190 |b06fc59c5e744962b1ac5314e7e12cec|30 |1 |
-ROW |28 |Nginx performance |NULL |1 |10266 |9d071e3a148c405e85c53ef25d54efaf|30 |1 |
-ROW |29 |System performance |NULL |1 |10185 |623ea1bf76fc4e509e2b33b0642fb208|30 |1 |
-ROW |30 |Nginx performance |NULL |1 |10267 |7d0bf76f09204bb7ba9ee995bf161d46|30 |1 |
-ROW |31 |System performance |NULL |1 |10079 |d66f39e86e2047289acea0bc9a218807|30 |1 |
-ROW |32 |System performance |NULL |1 |10074 |b4606920366049bd98e2e6d31c602d67|30 |1 |
-ROW |33 |System performance |NULL |1 |10078 |774e5b14c75c49b4a3a4196ce1ccdaf7|30 |1 |
-ROW |36 |Zabbix server health |NULL |1 |10047 |6815a90fb9b745fd8f1b1f47697893d6|30 |1 |
-ROW |37 |Zabbix proxy health |NULL |1 |10048 |c12bdb602db645a292d0cbba39d58e9f|30 |1 |
-ROW |38 |Zabbix server health |NULL |1 |10261 |acf492c7fb70451ba2afc6938e745a3a|30 |1 |
-ROW |39 |Zabbix proxy health |NULL |1 |10262 |73c77a8555bc4a7d814d2cf54164f15f|30 |1 |
-ROW |40 |HAProxy Backend performance |NULL |1 |10309 |7910c0c96e014d68966c5ac989e9ebb7|30 |1 |
-ROW |41 |HAProxy Frontend performance|NULL |1 |10309 |d6ba5079de1c49bb9e0e5c47112b3ff9|30 |1 |
-ROW |42 |HAProxy Server performance |NULL |1 |10309 |f41c3a3976dc483d98a386273ab5678f|30 |1 |
-ROW |43 |HAProxy Backend performance |NULL |1 |10308 |6d515de988274ac6b31938eebd175973|30 |1 |
-ROW |44 |HAProxy Frontend performance|NULL |1 |10308 |7c4decb2fefc4cfe9c4a3f8717d710ca|30 |1 |
-ROW |45 |HAProxy Server performance |NULL |1 |10308 |ebc5a517fa544fada42550059c014c5b|30 |1 |
-ROW |48 |PostgreSQL databases |NULL |1 |10357 |d95f29826778497a9ed265e0c335fd0f|30 |1 |
-ROW |49 |PostgreSQL stat |NULL |1 |10357 |f2ceabf59fd64ca9828ea55e9b9668bd|30 |1 |
-ROW |50 |System performance |NULL |1 |10076 |873e38e16ef94f2b9b743a3251db0fbb|30 |1 |
-ROW |51 |System performance |NULL |1 |10075 |618c8fc9d4b640999b3389960f5bead4|30 |1 |
-ROW |52 |System performance |NULL |1 |10077 |cbac7a8959574b308d1c1e23cf3760ee|30 |1 |
-ROW |53 |MySQL performance |NULL |1 |10317 |d56c53704c264552a09cf3e59a1835f3|30 |1 |
-ROW |54 |Network interfaces |NULL |1 |10188 |2e6a063b22c6428db5f47ac6805fd263|30 |1 |
-ROW |55 |System performance |NULL |1 |10248 |59f09fada3ab43d1bdb70091f92e77f1|30 |1 |
-ROW |56 |Redis overview |NULL |1 |10310 |7c5bdd7bc74648c4891abc6649d105d0|30 |1 |
-ROW |57 |Zabbix server |1 |1 |NULL | |30 |1 |
+FIELDS|dashboardid|name |userid|private|templateid|display_period|auto_start|uuid |
+ROW |1 |Global view |1 |0 |NULL |30 |1 | |
+ROW |2 |Zabbix server health |1 |1 |NULL |30 |1 | |
+ROW |3 |Apache performance |NULL |1 |10265 |30 |1 |a328c9e713424465a8e1adec7322b0dc|
+ROW |4 |Apache performance |NULL |1 |10264 |30 |1 |c27c68fb9c234a09b4023076b45affc1|
+ROW |5 |Docker overview |NULL |1 |10318 |30 |1 |7eb6472d07ac4c379e6b730b59a12507|
+ROW |7 |Redis performance |NULL |1 |10310 |30 |1 |ee4c29eb7a0f443fafb7e7d3b9df7b24|
+ROW |8 |RabbitMQ overview |NULL |1 |10300 |30 |1 |a886a871a00d47e28b8648cadae3bc99|
+ROW |9 |RabbitMQ node status |NULL |1 |10301 |30 |1 |ce0af043ed2c4e7c988674c9ecb787d6|
+ROW |10 |Network interfaces |NULL |1 |10285 |30 |1 |19dac6b780aa49558bf4a3782ba4b3b6|
+ROW |11 |System performance |NULL |1 |10285 |30 |1 |558606056f464970a7c544ba75d544f2|
+ROW |12 |RabbitMQ overview |NULL |1 |10302 |30 |1 |1b64af348f284f74a1f7f03de1d55f7b|
+ROW |13 |RabbitMQ node status |NULL |1 |10303 |30 |1 |5e70f5ff6706442abc83ec1b206d9fe4|
+ROW |14 |Network interfaces |NULL |1 |10342 |30 |1 |4c72409900b84a29bfcfd02648535a2b|
+ROW |15 |System performance |NULL |1 |10343 |30 |1 |3e6ceed431734cc29836019e93b5f89e|
+ROW |16 |Network interfaces |NULL |1 |10276 |30 |1 |1cbc445224b14af1b72f1580d7444ba5|
+ROW |17 |System performance |NULL |1 |10001 |30 |1 |e9ca2f8e715f428b8edc0129aa0c79de|
+ROW |18 |PostgreSQL databases |NULL |1 |10329 |30 |1 |e3ae726b06cc4663a3eef5a73909f796|
+ROW |19 |Netowrk interfaces |NULL |1 |10348 |30 |1 |1f4737b4a5364b35a8358dccedf6a492|
+ROW |20 |System performance |NULL |1 |10351 |30 |1 |234161507ccb4d83b111cb31e0db8ae5|
+ROW |21 |Netowrk interfaces |NULL |1 |10291 |30 |1 |9ddc1ce7e9ea4d7dba8e282366084f3b|
+ROW |22 |System performance |NULL |1 |10081 |30 |1 |5f494fac9dc94bf3827b67ea212240f2|
+ROW |23 |MySQL performance |NULL |1 |10316 |30 |1 |ce2f9d7bb18e469f97e692baee02841d|
+ROW |24 |MySQL performance |NULL |1 |10320 |30 |1 |ca5006123e0f4eb8bc0155027e663d2c|
+ROW |26 |Network interfaces |NULL |1 |10192 |30 |1 |8283a27e39a9451283ce74aca085ffaa|
+ROW |27 |Network interfaces |NULL |1 |10190 |30 |1 |b06fc59c5e744962b1ac5314e7e12cec|
+ROW |28 |Nginx performance |NULL |1 |10266 |30 |1 |9d071e3a148c405e85c53ef25d54efaf|
+ROW |29 |System performance |NULL |1 |10185 |30 |1 |623ea1bf76fc4e509e2b33b0642fb208|
+ROW |30 |Nginx performance |NULL |1 |10267 |30 |1 |7d0bf76f09204bb7ba9ee995bf161d46|
+ROW |31 |System performance |NULL |1 |10079 |30 |1 |d66f39e86e2047289acea0bc9a218807|
+ROW |32 |System performance |NULL |1 |10074 |30 |1 |b4606920366049bd98e2e6d31c602d67|
+ROW |33 |System performance |NULL |1 |10078 |30 |1 |774e5b14c75c49b4a3a4196ce1ccdaf7|
+ROW |36 |Zabbix server health |NULL |1 |10047 |30 |1 |6815a90fb9b745fd8f1b1f47697893d6|
+ROW |37 |Zabbix proxy health |NULL |1 |10048 |30 |1 |c12bdb602db645a292d0cbba39d58e9f|
+ROW |38 |Zabbix server health |NULL |1 |10261 |30 |1 |acf492c7fb70451ba2afc6938e745a3a|
+ROW |39 |Zabbix proxy health |NULL |1 |10262 |30 |1 |73c77a8555bc4a7d814d2cf54164f15f|
+ROW |40 |HAProxy Backend performance |NULL |1 |10309 |30 |1 |7910c0c96e014d68966c5ac989e9ebb7|
+ROW |41 |HAProxy Frontend performance|NULL |1 |10309 |30 |1 |d6ba5079de1c49bb9e0e5c47112b3ff9|
+ROW |42 |HAProxy Server performance |NULL |1 |10309 |30 |1 |f41c3a3976dc483d98a386273ab5678f|
+ROW |43 |HAProxy Backend performance |NULL |1 |10308 |30 |1 |6d515de988274ac6b31938eebd175973|
+ROW |44 |HAProxy Frontend performance|NULL |1 |10308 |30 |1 |7c4decb2fefc4cfe9c4a3f8717d710ca|
+ROW |45 |HAProxy Server performance |NULL |1 |10308 |30 |1 |ebc5a517fa544fada42550059c014c5b|
+ROW |48 |PostgreSQL databases |NULL |1 |10357 |30 |1 |d95f29826778497a9ed265e0c335fd0f|
+ROW |49 |PostgreSQL stat |NULL |1 |10357 |30 |1 |f2ceabf59fd64ca9828ea55e9b9668bd|
+ROW |50 |System performance |NULL |1 |10076 |30 |1 |873e38e16ef94f2b9b743a3251db0fbb|
+ROW |51 |System performance |NULL |1 |10075 |30 |1 |618c8fc9d4b640999b3389960f5bead4|
+ROW |52 |System performance |NULL |1 |10077 |30 |1 |cbac7a8959574b308d1c1e23cf3760ee|
+ROW |53 |MySQL performance |NULL |1 |10317 |30 |1 |d56c53704c264552a09cf3e59a1835f3|
+ROW |54 |Network interfaces |NULL |1 |10188 |30 |1 |2e6a063b22c6428db5f47ac6805fd263|
+ROW |55 |System performance |NULL |1 |10248 |30 |1 |59f09fada3ab43d1bdb70091f92e77f1|
+ROW |56 |Redis overview |NULL |1 |10310 |30 |1 |7c5bdd7bc74648c4891abc6649d105d0|
+ROW |57 |Zabbix server |1 |1 |NULL |30 |1 | |
TABLE |dashboard_usrgrp
FIELDS|dashboard_usrgrpid|dashboardid|usrgrpid|permission|
@@ -362,693 +362,646 @@ ROW |399 |graph | |12 |5 |12
ROW |400 |map | |0 |0 |24 |4 |0 |57 |
TABLE |widget_field
-FIELDS|widget_fieldid|widgetid|type|name |value_int|value_str |value_groupid|value_hostid|value_itemid|value_graphid|value_sysmapid|value_serviceid|value_slaid
-ROW |1 |2 |0 |interface_type |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |2 |3 |0 |show_type |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |3 |5 |0 |show |3 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |4 |5 |0 |show_tags |3 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |5 |8 |3 |hostids |0 | |NULL |10084 |NULL |NULL |NULL |NULL |NULL |
-ROW |6 |10 |0 |ds.axisy.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |7 |10 |0 |ds.fill.0 |3 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |8 |10 |0 |ds.missingdatafunc.0|0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |9 |10 |0 |ds.transparency.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |10 |10 |0 |ds.type.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |11 |10 |0 |ds.width.0 |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |12 |10 |0 |graph_item_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |13 |10 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |14 |10 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |15 |10 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |16 |10 |1 |ds.color.0 |0 |00BFFF |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |17 |10 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |18 |10 |1 |ds.items.0.0 |0 |Number of processed *values per second|NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |19 |10 |1 |ds.timeshift.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |20 |10 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |21 |10 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |22 |11 |0 |ds.axisy.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |23 |11 |0 |ds.fill.0 |3 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |24 |11 |0 |ds.missingdatafunc.0|0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |25 |11 |0 |ds.transparency.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |26 |11 |0 |ds.type.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |27 |11 |0 |ds.width.0 |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |28 |11 |0 |graph_item_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |29 |11 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |30 |11 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |31 |11 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |32 |11 |1 |ds.color.0 |0 |E57373 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |33 |11 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |34 |11 |1 |ds.items.0.0 |0 |Utilization of * data collector * |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |35 |11 |1 |ds.timeshift.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |36 |11 |1 |lefty_max |0 |100 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |37 |11 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |38 |11 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |39 |12 |0 |ds.axisy.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |40 |12 |0 |ds.fill.0 |3 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |41 |12 |0 |ds.missingdatafunc.0|0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |42 |12 |0 |ds.transparency.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |43 |12 |0 |ds.type.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |44 |12 |0 |ds.width.0 |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |45 |12 |0 |graph_item_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |46 |12 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |47 |12 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |48 |12 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |49 |12 |1 |ds.color.0 |0 |E57373 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |50 |12 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |51 |12 |1 |ds.items.0.0 |0 |Utilization of * internal * |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |52 |12 |1 |ds.timeshift.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |53 |12 |1 |lefty_max |0 |100 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |54 |12 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |55 |12 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |56 |13 |0 |ds.axisy.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |57 |13 |0 |ds.fill.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |58 |13 |0 |ds.missingdatafunc.0|0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |59 |13 |0 |ds.transparency.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |60 |13 |0 |ds.type.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |61 |13 |0 |ds.width.0 |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |62 |13 |0 |graph_item_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |63 |13 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |64 |13 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |65 |13 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |66 |13 |1 |ds.color.0 |0 |4DB6AC |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |67 |13 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |68 |13 |1 |ds.items.0.0 |0 |Zabbix*cache*% used |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |69 |13 |1 |ds.timeshift.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |70 |13 |1 |lefty_max |0 |100 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |71 |13 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |72 |13 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |73 |14 |0 |ds.axisy.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |74 |14 |0 |ds.axisy.1 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |75 |14 |0 |ds.fill.0 |3 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |76 |14 |0 |ds.fill.1 |3 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |77 |14 |0 |ds.missingdatafunc.0|0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |78 |14 |0 |ds.missingdatafunc.1|0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |79 |14 |0 |ds.transparency.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |80 |14 |0 |ds.transparency.1 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |81 |14 |0 |ds.type.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |82 |14 |0 |ds.type.1 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |83 |14 |0 |ds.width.0 |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |84 |14 |0 |ds.width.1 |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |85 |14 |0 |graph_item_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |86 |14 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |87 |14 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |88 |14 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |89 |14 |1 |ds.color.0 |0 |9CCC65 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |90 |14 |1 |ds.color.1 |0 |FF465C |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |91 |14 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |92 |14 |1 |ds.hosts.1.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |93 |14 |1 |ds.items.0.0 |0 |Zabbix value cache hits |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |94 |14 |1 |ds.items.1.0 |0 |Zabbix value cache misses |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |95 |14 |1 |ds.timeshift.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |96 |14 |1 |ds.timeshift.1 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |97 |14 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |98 |14 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |99 |15 |0 |ds.axisy.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |100 |15 |0 |ds.axisy.1 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |101 |15 |0 |ds.axisy.2 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |102 |15 |0 |ds.fill.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |103 |15 |0 |ds.fill.1 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |104 |15 |0 |ds.fill.2 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |105 |15 |0 |ds.missingdatafunc.0|0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |106 |15 |0 |ds.missingdatafunc.1|0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |107 |15 |0 |ds.missingdatafunc.2|0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |108 |15 |0 |ds.transparency.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |109 |15 |0 |ds.transparency.1 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |110 |15 |0 |ds.transparency.2 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |111 |15 |0 |ds.type.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |112 |15 |0 |ds.type.1 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |113 |15 |0 |ds.type.2 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |114 |15 |0 |ds.width.0 |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |115 |15 |0 |ds.width.1 |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |116 |15 |0 |ds.width.2 |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |117 |15 |0 |graph_item_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |118 |15 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |119 |15 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |120 |15 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |121 |15 |1 |ds.color.0 |0 |B0AF07 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |122 |15 |1 |ds.color.1 |0 |E53935 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |123 |15 |1 |ds.color.2 |0 |0275B8 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |124 |15 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |125 |15 |1 |ds.hosts.1.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |126 |15 |1 |ds.hosts.2.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |127 |15 |1 |ds.items.0.0 |0 |Zabbix queue |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |128 |15 |1 |ds.items.1.0 |0 |Zabbix queue over 10 minutes |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |129 |15 |1 |ds.items.2.0 |0 |Zabbix preprocessing queue |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |130 |15 |1 |ds.timeshift.0 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |131 |15 |1 |ds.timeshift.1 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |132 |15 |1 |ds.timeshift.2 |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |133 |15 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |134 |15 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |135 |16 |6 |graphid |0 | |NULL |NULL |NULL |838 |NULL |NULL |NULL |
-ROW |137 |17 |6 |graphid |0 | |NULL |NULL |NULL |839 |NULL |NULL |NULL |
-ROW |139 |18 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |140 |18 |7 |graphid |0 | |NULL |NULL |NULL |836 |NULL |NULL |NULL |
-ROW |143 |19 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |144 |19 |7 |graphid |0 | |NULL |NULL |NULL |837 |NULL |NULL |NULL |
-ROW |147 |20 |6 |graphid |0 | |NULL |NULL |NULL |840 |NULL |NULL |NULL |
-ROW |149 |21 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |150 |21 |6 |graphid |0 | |NULL |NULL |NULL |1174 |NULL |NULL |NULL |
-ROW |151 |22 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |152 |22 |6 |graphid |0 | |NULL |NULL |NULL |1176 |NULL |NULL |NULL |
-ROW |153 |23 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |154 |23 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |155 |23 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |156 |23 |7 |graphid |0 | |NULL |NULL |NULL |1172 |NULL |NULL |NULL |
-ROW |157 |24 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |158 |24 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |159 |24 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |160 |24 |7 |graphid |0 | |NULL |NULL |NULL |1173 |NULL |NULL |NULL |
-ROW |161 |25 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |162 |25 |6 |graphid |0 | |NULL |NULL |NULL |1175 |NULL |NULL |NULL |
-ROW |173 |31 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |174 |31 |6 |graphid |0 | |NULL |NULL |NULL |1125 |NULL |NULL |NULL |
-ROW |175 |32 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |176 |32 |6 |graphid |0 | |NULL |NULL |NULL |1129 |NULL |NULL |NULL |
-ROW |177 |33 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |178 |33 |6 |graphid |0 | |NULL |NULL |NULL |1128 |NULL |NULL |NULL |
-ROW |179 |34 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |180 |34 |6 |graphid |0 | |NULL |NULL |NULL |1126 |NULL |NULL |NULL |
-ROW |181 |35 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |182 |35 |6 |graphid |0 | |NULL |NULL |NULL |1127 |NULL |NULL |NULL |
-ROW |211 |49 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |212 |49 |6 |graphid |0 | |NULL |NULL |NULL |1029 |NULL |NULL |NULL |
-ROW |213 |50 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |214 |50 |6 |graphid |0 | |NULL |NULL |NULL |1027 |NULL |NULL |NULL |
-ROW |215 |51 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |216 |51 |6 |graphid |0 | |NULL |NULL |NULL |1030 |NULL |NULL |NULL |
-ROW |217 |52 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |218 |52 |6 |graphid |0 | |NULL |NULL |NULL |1028 |NULL |NULL |NULL |
-ROW |219 |53 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |220 |53 |6 |graphid |0 | |NULL |NULL |NULL |1031 |NULL |NULL |NULL |
-ROW |221 |54 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |222 |54 |6 |graphid |0 | |NULL |NULL |NULL |1011 |NULL |NULL |NULL |
-ROW |223 |55 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |224 |55 |6 |graphid |0 | |NULL |NULL |NULL |1012 |NULL |NULL |NULL |
-ROW |225 |56 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |226 |56 |6 |graphid |0 | |NULL |NULL |NULL |1008 |NULL |NULL |NULL |
-ROW |227 |57 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |228 |57 |6 |graphid |0 | |NULL |NULL |NULL |1009 |NULL |NULL |NULL |
-ROW |229 |58 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |230 |58 |6 |graphid |0 | |NULL |NULL |NULL |1007 |NULL |NULL |NULL |
-ROW |231 |59 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |232 |59 |6 |graphid |0 | |NULL |NULL |NULL |1010 |NULL |NULL |NULL |
-ROW |233 |60 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |234 |60 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |235 |60 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |236 |60 |7 |graphid |0 | |NULL |NULL |NULL |952 |NULL |NULL |NULL |
-ROW |237 |61 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |238 |61 |6 |graphid |0 | |NULL |NULL |NULL |957 |NULL |NULL |NULL |
-ROW |239 |62 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |240 |62 |6 |graphid |0 | |NULL |NULL |NULL |959 |NULL |NULL |NULL |
-ROW |241 |63 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |242 |63 |6 |graphid |0 | |NULL |NULL |NULL |962 |NULL |NULL |NULL |
-ROW |243 |64 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |244 |64 |6 |graphid |0 | |NULL |NULL |NULL |963 |NULL |NULL |NULL |
-ROW |245 |65 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |246 |65 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |247 |65 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |248 |65 |7 |graphid |0 | |NULL |NULL |NULL |953 |NULL |NULL |NULL |
-ROW |249 |66 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |250 |66 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |251 |66 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |252 |66 |7 |graphid |0 | |NULL |NULL |NULL |954 |NULL |NULL |NULL |
-ROW |253 |67 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |254 |67 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |255 |67 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |256 |67 |7 |graphid |0 | |NULL |NULL |NULL |955 |NULL |NULL |NULL |
-ROW |257 |68 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |258 |68 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |259 |68 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |260 |68 |7 |graphid |0 | |NULL |NULL |NULL |956 |NULL |NULL |NULL |
-ROW |261 |69 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |262 |69 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |263 |69 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |264 |69 |7 |graphid |0 | |NULL |NULL |NULL |952 |NULL |NULL |NULL |
-ROW |287 |81 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |288 |81 |6 |graphid |0 | |NULL |NULL |NULL |1018 |NULL |NULL |NULL |
-ROW |289 |82 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |290 |82 |6 |graphid |0 | |NULL |NULL |NULL |1016 |NULL |NULL |NULL |
-ROW |291 |83 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |292 |83 |6 |graphid |0 | |NULL |NULL |NULL |1019 |NULL |NULL |NULL |
-ROW |293 |84 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |294 |84 |6 |graphid |0 | |NULL |NULL |NULL |1017 |NULL |NULL |NULL |
-ROW |295 |85 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |296 |85 |6 |graphid |0 | |NULL |NULL |NULL |1020 |NULL |NULL |NULL |
-ROW |297 |86 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |298 |86 |6 |graphid |0 | |NULL |NULL |NULL |1025 |NULL |NULL |NULL |
-ROW |299 |87 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |300 |87 |6 |graphid |0 | |NULL |NULL |NULL |1026 |NULL |NULL |NULL |
-ROW |301 |88 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |302 |88 |6 |graphid |0 | |NULL |NULL |NULL |1022 |NULL |NULL |NULL |
-ROW |303 |89 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |304 |89 |6 |graphid |0 | |NULL |NULL |NULL |1023 |NULL |NULL |NULL |
-ROW |305 |90 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |306 |90 |6 |graphid |0 | |NULL |NULL |NULL |1021 |NULL |NULL |NULL |
-ROW |307 |91 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |308 |91 |6 |graphid |0 | |NULL |NULL |NULL |1024 |NULL |NULL |NULL |
-ROW |309 |92 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |310 |92 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |311 |92 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |312 |92 |7 |graphid |0 | |NULL |NULL |NULL |1287 |NULL |NULL |NULL |
-ROW |313 |93 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |314 |93 |6 |graphid |0 | |NULL |NULL |NULL |1304 |NULL |NULL |NULL |
-ROW |315 |94 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |316 |94 |6 |graphid |0 | |NULL |NULL |NULL |1292 |NULL |NULL |NULL |
-ROW |317 |95 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |318 |95 |6 |graphid |0 | |NULL |NULL |NULL |1296 |NULL |NULL |NULL |
-ROW |319 |96 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |320 |96 |6 |graphid |0 | |NULL |NULL |NULL |1302 |NULL |NULL |NULL |
-ROW |321 |97 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |322 |97 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |323 |97 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |324 |97 |7 |graphid |0 | |NULL |NULL |NULL |1286 |NULL |NULL |NULL |
-ROW |325 |98 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |326 |98 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |327 |98 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |328 |98 |7 |graphid |0 | |NULL |NULL |NULL |1282 |NULL |NULL |NULL |
-ROW |329 |99 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |330 |99 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |331 |99 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |332 |99 |7 |graphid |0 | |NULL |NULL |NULL |1280 |NULL |NULL |NULL |
-ROW |333 |100 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |334 |100 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |335 |100 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |336 |100 |7 |graphid |0 | |NULL |NULL |NULL |1284 |NULL |NULL |NULL |
-ROW |337 |101 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |338 |101 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |339 |101 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |340 |101 |7 |graphid |0 | |NULL |NULL |NULL |1288 |NULL |NULL |NULL |
-ROW |341 |102 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |342 |102 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |343 |102 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |344 |102 |7 |graphid |0 | |NULL |NULL |NULL |899 |NULL |NULL |NULL |
-ROW |345 |103 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |346 |103 |6 |graphid |0 | |NULL |NULL |NULL |903 |NULL |NULL |NULL |
-ROW |347 |104 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |348 |104 |6 |graphid |0 | |NULL |NULL |NULL |909 |NULL |NULL |NULL |
-ROW |349 |105 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |350 |105 |6 |graphid |0 | |NULL |NULL |NULL |918 |NULL |NULL |NULL |
-ROW |351 |106 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |352 |106 |6 |graphid |0 | |NULL |NULL |NULL |921 |NULL |NULL |NULL |
-ROW |353 |107 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |354 |107 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |355 |107 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |356 |107 |7 |graphid |0 | |NULL |NULL |NULL |888 |NULL |NULL |NULL |
-ROW |357 |108 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |358 |108 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |359 |108 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |360 |108 |7 |graphid |0 | |NULL |NULL |NULL |1227 |NULL |NULL |NULL |
-ROW |361 |109 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |362 |109 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |363 |109 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |364 |109 |7 |graphid |0 | |NULL |NULL |NULL |1224 |NULL |NULL |NULL |
-ROW |365 |110 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |366 |110 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |367 |110 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |368 |110 |7 |graphid |0 | |NULL |NULL |NULL |1230 |NULL |NULL |NULL |
-ROW |369 |111 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |370 |111 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |371 |111 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |372 |111 |7 |graphid |0 | |NULL |NULL |NULL |900 |NULL |NULL |NULL |
-ROW |373 |112 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |374 |112 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |375 |112 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |376 |112 |7 |graphid |0 | |NULL |NULL |NULL |1221 |NULL |NULL |NULL |
-ROW |377 |113 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |378 |113 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |379 |113 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |380 |113 |7 |graphid |0 | |NULL |NULL |NULL |1219 |NULL |NULL |NULL |
-ROW |381 |114 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |382 |114 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |383 |114 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |384 |114 |7 |graphid |0 | |NULL |NULL |NULL |1222 |NULL |NULL |NULL |
-ROW |385 |115 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |386 |115 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |387 |115 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |388 |115 |7 |graphid |0 | |NULL |NULL |NULL |1220 |NULL |NULL |NULL |
-ROW |389 |116 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |390 |116 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |391 |116 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |392 |116 |7 |graphid |0 | |NULL |NULL |NULL |1307 |NULL |NULL |NULL |
-ROW |417 |125 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |418 |125 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |419 |125 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |420 |125 |7 |graphid |0 | |NULL |NULL |NULL |1238 |NULL |NULL |NULL |
-ROW |421 |126 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |422 |126 |6 |graphid |0 | |NULL |NULL |NULL |977 |NULL |NULL |NULL |
-ROW |423 |127 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |424 |127 |4 |itemid |0 | |NULL |NULL |29485 |NULL |NULL |NULL |NULL |
-ROW |425 |128 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |426 |128 |6 |graphid |0 | |NULL |NULL |NULL |979 |NULL |NULL |NULL |
-ROW |427 |129 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |428 |129 |6 |graphid |0 | |NULL |NULL |NULL |981 |NULL |NULL |NULL |
-ROW |429 |130 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |430 |130 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |431 |130 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |432 |130 |7 |graphid |0 | |NULL |NULL |NULL |965 |NULL |NULL |NULL |
-ROW |433 |131 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |434 |131 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |435 |131 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |436 |131 |7 |graphid |0 | |NULL |NULL |NULL |1241 |NULL |NULL |NULL |
-ROW |437 |132 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |438 |132 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |439 |132 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |440 |132 |7 |graphid |0 | |NULL |NULL |NULL |1243 |NULL |NULL |NULL |
-ROW |441 |133 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |442 |133 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |443 |133 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |444 |133 |7 |graphid |0 | |NULL |NULL |NULL |1239 |NULL |NULL |NULL |
-ROW |445 |134 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |446 |134 |6 |graphid |0 | |NULL |NULL |NULL |1112 |NULL |NULL |NULL |
-ROW |447 |135 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |448 |135 |6 |graphid |0 | |NULL |NULL |NULL |1113 |NULL |NULL |NULL |
-ROW |449 |136 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |450 |136 |6 |graphid |0 | |NULL |NULL |NULL |1110 |NULL |NULL |NULL |
-ROW |451 |137 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |452 |137 |6 |graphid |0 | |NULL |NULL |NULL |1109 |NULL |NULL |NULL |
-ROW |453 |138 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |454 |138 |6 |graphid |0 | |NULL |NULL |NULL |1111 |NULL |NULL |NULL |
-ROW |455 |139 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |456 |139 |6 |graphid |0 | |NULL |NULL |NULL |1114 |NULL |NULL |NULL |
-ROW |457 |140 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |458 |140 |6 |graphid |0 | |NULL |NULL |NULL |1139 |NULL |NULL |NULL |
-ROW |459 |141 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |460 |141 |6 |graphid |0 | |NULL |NULL |NULL |1140 |NULL |NULL |NULL |
-ROW |461 |142 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |462 |142 |6 |graphid |0 | |NULL |NULL |NULL |1137 |NULL |NULL |NULL |
-ROW |463 |143 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |464 |143 |6 |graphid |0 | |NULL |NULL |NULL |1136 |NULL |NULL |NULL |
-ROW |465 |144 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |466 |144 |6 |graphid |0 | |NULL |NULL |NULL |1138 |NULL |NULL |NULL |
-ROW |467 |145 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |468 |145 |6 |graphid |0 | |NULL |NULL |NULL |1141 |NULL |NULL |NULL |
-ROW |495 |154 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |496 |154 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |497 |154 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |498 |154 |7 |graphid |0 | |NULL |NULL |NULL |766 |NULL |NULL |NULL |
-ROW |499 |155 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |500 |155 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |501 |155 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |502 |155 |7 |graphid |0 | |NULL |NULL |NULL |745 |NULL |NULL |NULL |
-ROW |503 |156 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |504 |156 |6 |graphid |0 | |NULL |NULL |NULL |841 |NULL |NULL |NULL |
-ROW |505 |157 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |506 |157 |6 |graphid |0 | |NULL |NULL |NULL |843 |NULL |NULL |NULL |
-ROW |507 |158 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |508 |158 |6 |graphid |0 | |NULL |NULL |NULL |842 |NULL |NULL |NULL |
-ROW |519 |162 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |520 |162 |6 |graphid |0 | |NULL |NULL |NULL |845 |NULL |NULL |NULL |
-ROW |521 |163 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |522 |163 |6 |graphid |0 | |NULL |NULL |NULL |847 |NULL |NULL |NULL |
-ROW |523 |164 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |524 |164 |6 |graphid |0 | |NULL |NULL |NULL |846 |NULL |NULL |NULL |
-ROW |525 |165 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |526 |165 |6 |graphid |0 | |NULL |NULL |NULL |1071 |NULL |NULL |NULL |
-ROW |527 |166 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |528 |166 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |529 |166 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |530 |166 |7 |graphid |0 | |NULL |NULL |NULL |1061 |NULL |NULL |NULL |
-ROW |531 |167 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |532 |167 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |533 |167 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |534 |167 |7 |graphid |0 | |NULL |NULL |NULL |1066 |NULL |NULL |NULL |
-ROW |563 |182 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |564 |182 |6 |graphid |0 | |NULL |NULL |NULL |481 |NULL |NULL |NULL |
-ROW |565 |183 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |566 |183 |6 |graphid |0 | |NULL |NULL |NULL |480 |NULL |NULL |NULL |
-ROW |567 |184 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |568 |184 |6 |graphid |0 | |NULL |NULL |NULL |545 |NULL |NULL |NULL |
-ROW |569 |185 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |570 |185 |6 |graphid |0 | |NULL |NULL |NULL |482 |NULL |NULL |NULL |
-ROW |571 |186 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |572 |186 |4 |itemid |0 | |NULL |NULL |22998 |NULL |NULL |NULL |NULL |
-ROW |573 |187 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |574 |187 |4 |itemid |0 | |NULL |NULL |22997 |NULL |NULL |NULL |NULL |
-ROW |623 |204 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |624 |204 |6 |graphid |0 | |NULL |NULL |NULL |392 |NULL |NULL |NULL |
-ROW |625 |205 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |626 |205 |6 |graphid |0 | |NULL |NULL |NULL |404 |NULL |NULL |NULL |
-ROW |627 |206 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |628 |206 |6 |graphid |0 | |NULL |NULL |NULL |406 |NULL |NULL |NULL |
-ROW |629 |207 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |630 |207 |6 |graphid |0 | |NULL |NULL |NULL |410 |NULL |NULL |NULL |
-ROW |631 |208 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |632 |208 |6 |graphid |0 | |NULL |NULL |NULL |527 |NULL |NULL |NULL |
-ROW |633 |209 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |634 |209 |6 |graphid |0 | |NULL |NULL |NULL |788 |NULL |NULL |NULL |
-ROW |635 |210 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |636 |210 |6 |graphid |0 | |NULL |NULL |NULL |532 |NULL |NULL |NULL |
-ROW |637 |211 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |638 |211 |6 |graphid |0 | |NULL |NULL |NULL |530 |NULL |NULL |NULL |
-ROW |639 |212 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |640 |212 |6 |graphid |0 | |NULL |NULL |NULL |531 |NULL |NULL |NULL |
-ROW |641 |213 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |642 |213 |6 |graphid |0 | |NULL |NULL |NULL |529 |NULL |NULL |NULL |
-ROW |643 |214 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |644 |214 |6 |graphid |0 | |NULL |NULL |NULL |802 |NULL |NULL |NULL |
-ROW |645 |215 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |646 |215 |6 |graphid |0 | |NULL |NULL |NULL |799 |NULL |NULL |NULL |
-ROW |647 |216 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |648 |216 |6 |graphid |0 | |NULL |NULL |NULL |800 |NULL |NULL |NULL |
-ROW |649 |217 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |650 |217 |6 |graphid |0 | |NULL |NULL |NULL |798 |NULL |NULL |NULL |
-ROW |651 |218 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |652 |218 |6 |graphid |0 | |NULL |NULL |NULL |797 |NULL |NULL |NULL |
-ROW |653 |219 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |654 |219 |6 |graphid |0 | |NULL |NULL |NULL |801 |NULL |NULL |NULL |
-ROW |655 |220 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |656 |220 |6 |graphid |0 | |NULL |NULL |NULL |806 |NULL |NULL |NULL |
-ROW |657 |221 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |658 |221 |6 |graphid |0 | |NULL |NULL |NULL |804 |NULL |NULL |NULL |
-ROW |659 |222 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |660 |222 |6 |graphid |0 | |NULL |NULL |NULL |805 |NULL |NULL |NULL |
-ROW |661 |223 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |662 |223 |6 |graphid |0 | |NULL |NULL |NULL |803 |NULL |NULL |NULL |
-ROW |663 |224 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |664 |224 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |665 |224 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |666 |224 |7 |graphid |0 | |NULL |NULL |NULL |1081 |NULL |NULL |NULL |
-ROW |667 |225 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |668 |225 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |669 |225 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |670 |225 |7 |graphid |0 | |NULL |NULL |NULL |1084 |NULL |NULL |NULL |
-ROW |671 |226 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |672 |226 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |673 |226 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |674 |226 |7 |graphid |0 | |NULL |NULL |NULL |1082 |NULL |NULL |NULL |
-ROW |675 |227 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |676 |227 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |677 |227 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |678 |227 |7 |graphid |0 | |NULL |NULL |NULL |1085 |NULL |NULL |NULL |
-ROW |679 |228 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |680 |228 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |681 |228 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |682 |228 |7 |graphid |0 | |NULL |NULL |NULL |1083 |NULL |NULL |NULL |
-ROW |683 |229 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |684 |229 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |685 |229 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |686 |229 |7 |graphid |0 | |NULL |NULL |NULL |1086 |NULL |NULL |NULL |
-ROW |711 |236 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |712 |236 |6 |graphid |0 | |NULL |NULL |NULL |457 |NULL |NULL |NULL |
-ROW |713 |237 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |714 |237 |6 |graphid |0 | |NULL |NULL |NULL |456 |NULL |NULL |NULL |
-ROW |715 |238 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |716 |238 |6 |graphid |0 | |NULL |NULL |NULL |544 |NULL |NULL |NULL |
-ROW |717 |239 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |718 |239 |6 |graphid |0 | |NULL |NULL |NULL |458 |NULL |NULL |NULL |
-ROW |719 |240 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |720 |240 |4 |itemid |0 | |NULL |NULL |22838 |NULL |NULL |NULL |NULL |
-ROW |721 |241 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |722 |241 |4 |itemid |0 | |NULL |NULL |22837 |NULL |NULL |NULL |NULL |
-ROW |747 |248 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |748 |248 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |749 |248 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |750 |248 |7 |graphid |0 | |NULL |NULL |NULL |1075 |NULL |NULL |NULL |
-ROW |751 |249 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |752 |249 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |753 |249 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |754 |249 |7 |graphid |0 | |NULL |NULL |NULL |1078 |NULL |NULL |NULL |
-ROW |755 |250 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |756 |250 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |757 |250 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |758 |250 |7 |graphid |0 | |NULL |NULL |NULL |1076 |NULL |NULL |NULL |
-ROW |759 |251 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |760 |251 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |761 |251 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |762 |251 |7 |graphid |0 | |NULL |NULL |NULL |1079 |NULL |NULL |NULL |
-ROW |763 |252 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |764 |252 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |765 |252 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |766 |252 |7 |graphid |0 | |NULL |NULL |NULL |1077 |NULL |NULL |NULL |
-ROW |767 |253 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |768 |253 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |769 |253 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |770 |253 |7 |graphid |0 | |NULL |NULL |NULL |1080 |NULL |NULL |NULL |
-ROW |771 |254 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |772 |254 |6 |graphid |0 | |NULL |NULL |NULL |487 |NULL |NULL |NULL |
-ROW |773 |255 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |774 |255 |6 |graphid |0 | |NULL |NULL |NULL |543 |NULL |NULL |NULL |
-ROW |823 |272 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |824 |272 |6 |graphid |0 | |NULL |NULL |NULL |1316 |NULL |NULL |NULL |
-ROW |825 |273 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |826 |273 |4 |itemid |0 | |NULL |NULL |31980 |NULL |NULL |NULL |NULL |
-ROW |827 |274 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |828 |274 |6 |graphid |0 | |NULL |NULL |NULL |1320 |NULL |NULL |NULL |
-ROW |829 |275 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |830 |275 |6 |graphid |0 | |NULL |NULL |NULL |1322 |NULL |NULL |NULL |
-ROW |831 |276 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |832 |276 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |833 |276 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |834 |276 |7 |graphid |0 | |NULL |NULL |NULL |1306 |NULL |NULL |NULL |
-ROW |835 |277 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |836 |277 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |837 |277 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |838 |277 |7 |graphid |0 | |NULL |NULL |NULL |1310 |NULL |NULL |NULL |
-ROW |839 |278 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |840 |278 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |841 |278 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |842 |278 |7 |graphid |0 | |NULL |NULL |NULL |1312 |NULL |NULL |NULL |
-ROW |843 |279 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |844 |279 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |845 |279 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |846 |279 |7 |graphid |0 | |NULL |NULL |NULL |1308 |NULL |NULL |NULL |
-ROW |991 |328 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |992 |328 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |993 |328 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |994 |328 |7 |graphid |0 | |NULL |NULL |NULL |1387 |NULL |NULL |NULL |
-ROW |995 |329 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |996 |329 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |997 |329 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |998 |329 |7 |graphid |0 | |NULL |NULL |NULL |1382 |NULL |NULL |NULL |
-ROW |999 |330 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1000 |330 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1001 |330 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1002 |330 |7 |graphid |0 | |NULL |NULL |NULL |1380 |NULL |NULL |NULL |
-ROW |1003 |331 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1004 |331 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1005 |331 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1006 |331 |7 |graphid |0 | |NULL |NULL |NULL |1386 |NULL |NULL |NULL |
-ROW |1007 |332 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1008 |332 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1009 |332 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1010 |332 |7 |graphid |0 | |NULL |NULL |NULL |1383 |NULL |NULL |NULL |
-ROW |1011 |333 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1012 |333 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1013 |333 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1014 |333 |7 |graphid |0 | |NULL |NULL |NULL |1381 |NULL |NULL |NULL |
-ROW |1015 |334 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1016 |334 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1017 |334 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1018 |334 |7 |graphid |0 | |NULL |NULL |NULL |1384 |NULL |NULL |NULL |
-ROW |1019 |335 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1020 |335 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1021 |335 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1022 |335 |7 |graphid |0 | |NULL |NULL |NULL |1385 |NULL |NULL |NULL |
-ROW |1023 |336 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1024 |336 |6 |graphid |0 | |NULL |NULL |NULL |1390 |NULL |NULL |NULL |
-ROW |1025 |337 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1026 |337 |6 |graphid |0 | |NULL |NULL |NULL |1393 |NULL |NULL |NULL |
-ROW |1027 |338 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1028 |338 |6 |graphid |0 | |NULL |NULL |NULL |1391 |NULL |NULL |NULL |
-ROW |1029 |339 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1030 |339 |6 |graphid |0 | |NULL |NULL |NULL |1394 |NULL |NULL |NULL |
-ROW |1031 |340 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1032 |340 |6 |graphid |0 | |NULL |NULL |NULL |1392 |NULL |NULL |NULL |
-ROW |1033 |341 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1034 |341 |6 |graphid |0 | |NULL |NULL |NULL |1395 |NULL |NULL |NULL |
-ROW |1035 |342 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1036 |342 |6 |graphid |0 | |NULL |NULL |NULL |1388 |NULL |NULL |NULL |
-ROW |1037 |343 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1038 |343 |6 |graphid |0 | |NULL |NULL |NULL |1389 |NULL |NULL |NULL |
-ROW |1039 |344 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1040 |344 |6 |graphid |0 | |NULL |NULL |NULL |469 |NULL |NULL |NULL |
-ROW |1041 |345 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1042 |345 |6 |graphid |0 | |NULL |NULL |NULL |471 |NULL |NULL |NULL |
-ROW |1043 |346 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1044 |346 |6 |graphid |0 | |NULL |NULL |NULL |498 |NULL |NULL |NULL |
-ROW |1045 |347 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1046 |347 |6 |graphid |0 | |NULL |NULL |NULL |540 |NULL |NULL |NULL |
-ROW |1047 |348 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1048 |348 |6 |graphid |0 | |NULL |NULL |NULL |463 |NULL |NULL |NULL |
-ROW |1049 |349 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1050 |349 |6 |graphid |0 | |NULL |NULL |NULL |462 |NULL |NULL |NULL |
-ROW |1051 |350 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1052 |350 |6 |graphid |0 | |NULL |NULL |NULL |541 |NULL |NULL |NULL |
-ROW |1053 |351 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1054 |351 |6 |graphid |0 | |NULL |NULL |NULL |464 |NULL |NULL |NULL |
-ROW |1061 |355 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1062 |355 |6 |graphid |0 | |NULL |NULL |NULL |475 |NULL |NULL |NULL |
-ROW |1063 |356 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1064 |356 |6 |graphid |0 | |NULL |NULL |NULL |474 |NULL |NULL |NULL |
-ROW |1065 |357 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1066 |357 |6 |graphid |0 | |NULL |NULL |NULL |542 |NULL |NULL |NULL |
-ROW |1079 |364 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1080 |364 |6 |graphid |0 | |NULL |NULL |NULL |1118 |NULL |NULL |NULL |
-ROW |1081 |365 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1082 |365 |6 |graphid |0 | |NULL |NULL |NULL |1119 |NULL |NULL |NULL |
-ROW |1083 |366 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1084 |366 |6 |graphid |0 | |NULL |NULL |NULL |1116 |NULL |NULL |NULL |
-ROW |1085 |367 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1086 |367 |6 |graphid |0 | |NULL |NULL |NULL |1115 |NULL |NULL |NULL |
-ROW |1087 |368 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1088 |368 |6 |graphid |0 | |NULL |NULL |NULL |1117 |NULL |NULL |NULL |
-ROW |1089 |369 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1090 |369 |6 |graphid |0 | |NULL |NULL |NULL |1120 |NULL |NULL |NULL |
-ROW |1091 |370 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1092 |370 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1093 |370 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1094 |370 |7 |graphid |0 | |NULL |NULL |NULL |741 |NULL |NULL |NULL |
-ROW |1121 |379 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1122 |379 |6 |graphid |0 | |NULL |NULL |NULL |881 |NULL |NULL |NULL |
-ROW |1123 |380 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1124 |380 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1125 |380 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1126 |380 |7 |graphid |0 | |NULL |NULL |NULL |869 |NULL |NULL |NULL |
-ROW |1127 |381 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1128 |381 |6 |graphid |0 | |NULL |NULL |NULL |877 |NULL |NULL |NULL |
-ROW |1129 |382 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1130 |382 |6 |graphid |0 | |NULL |NULL |NULL |879 |NULL |NULL |NULL |
-ROW |1131 |383 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1132 |383 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1133 |383 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1134 |383 |7 |graphid |0 | |NULL |NULL |NULL |873 |NULL |NULL |NULL |
-ROW |1135 |384 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1136 |384 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1137 |384 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1138 |384 |7 |graphid |0 | |NULL |NULL |NULL |867 |NULL |NULL |NULL |
-ROW |1139 |385 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1140 |385 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1141 |385 |0 |source_type |3 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1142 |385 |5 |itemid |0 | |NULL |NULL |29033 |NULL |NULL |NULL |NULL |
-ROW |1143 |386 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1144 |386 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1145 |386 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1146 |386 |7 |graphid |0 | |NULL |NULL |NULL |865 |NULL |NULL |NULL |
-ROW |1147 |387 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1148 |387 |6 |graphid |0 | |NULL |NULL |NULL |1091 |NULL |NULL |NULL |
-ROW |1149 |388 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1150 |388 |6 |graphid |0 | |NULL |NULL |NULL |1095 |NULL |NULL |NULL |
-ROW |1151 |389 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1152 |389 |6 |graphid |0 | |NULL |NULL |NULL |1092 |NULL |NULL |NULL |
-ROW |1153 |390 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1154 |390 |6 |graphid |0 | |NULL |NULL |NULL |1094 |NULL |NULL |NULL |
-ROW |1155 |391 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1156 |391 |6 |graphid |0 | |NULL |NULL |NULL |1099 |NULL |NULL |NULL |
-ROW |1157 |392 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1158 |392 |6 |graphid |0 | |NULL |NULL |NULL |1100 |NULL |NULL |NULL |
-ROW |1159 |393 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1160 |393 |6 |graphid |0 | |NULL |NULL |NULL |1101 |NULL |NULL |NULL |
-ROW |1161 |394 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1162 |394 |6 |graphid |0 | |NULL |NULL |NULL |1102 |NULL |NULL |NULL |
-ROW |1163 |395 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1164 |395 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1165 |395 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1166 |395 |7 |graphid |0 | |NULL |NULL |NULL |1090 |NULL |NULL |NULL |
-ROW |1167 |396 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1168 |396 |6 |graphid |0 | |NULL |NULL |NULL |1093 |NULL |NULL |NULL |
-ROW |1169 |397 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1170 |397 |6 |graphid |0 | |NULL |NULL |NULL |1098 |NULL |NULL |NULL |
-ROW |1171 |398 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1172 |398 |6 |graphid |0 | |NULL |NULL |NULL |1096 |NULL |NULL |NULL |
-ROW |1173 |399 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
-ROW |1174 |399 |6 |graphid |0 | |NULL |NULL |NULL |1097 |NULL |NULL |NULL |
-ROW |1175 |400 |8 |sysmapid |0 | |NULL |NULL |NULL |NULL |1 |NULL |NULL |
-ROW |1176 |400 |1 |reference |0 |NWLRB |NULL |NULL |NULL |NULL |NULL |NULL |NULL |
+FIELDS|widget_fieldid|widgetid|type|name |value_int|value_str |value_groupid|value_hostid|value_itemid|value_graphid|value_sysmapid|
+ROW |1 |2 |0 |interface_type |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |2 |3 |0 |show_type |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |3 |5 |0 |show |3 | |NULL |NULL |NULL |NULL |NULL |
+ROW |4 |5 |0 |show_tags |3 | |NULL |NULL |NULL |NULL |NULL |
+ROW |5 |8 |3 |hostids |0 | |NULL |10084 |NULL |NULL |NULL |
+ROW |9 |10 |0 |ds.transparency.0|0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |13 |10 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |14 |10 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |15 |10 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |16 |10 |1 |ds.color.0 |0 |00BFFF |NULL |NULL |NULL |NULL |NULL |
+ROW |17 |10 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |18 |10 |1 |ds.items.0.0 |0 |*: Number of processed *values per second|NULL |NULL |NULL |NULL |NULL |
+ROW |20 |10 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |
+ROW |21 |10 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |25 |11 |0 |ds.transparency.0|0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |29 |11 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |30 |11 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |31 |11 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |32 |11 |1 |ds.color.0 |0 |E57373 |NULL |NULL |NULL |NULL |NULL |
+ROW |33 |11 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |34 |11 |1 |ds.items.0.0 |0 |*: Utilization of * data collector * |NULL |NULL |NULL |NULL |NULL |
+ROW |36 |11 |1 |lefty_max |0 |100 |NULL |NULL |NULL |NULL |NULL |
+ROW |37 |11 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |
+ROW |38 |11 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |42 |12 |0 |ds.transparency.0|0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |46 |12 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |47 |12 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |48 |12 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |49 |12 |1 |ds.color.0 |0 |E57373 |NULL |NULL |NULL |NULL |NULL |
+ROW |50 |12 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |51 |12 |1 |ds.items.0.0 |0 |*: Utilization of * internal * |NULL |NULL |NULL |NULL |NULL |
+ROW |53 |12 |1 |lefty_max |0 |100 |NULL |NULL |NULL |NULL |NULL |
+ROW |54 |12 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |
+ROW |55 |12 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |57 |13 |0 |ds.fill.0 |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |59 |13 |0 |ds.transparency.0|0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |61 |13 |0 |ds.width.0 |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |63 |13 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |64 |13 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |65 |13 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |66 |13 |1 |ds.color.0 |0 |4DB6AC |NULL |NULL |NULL |NULL |NULL |
+ROW |67 |13 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |68 |13 |1 |ds.items.0.0 |0 |*cache*% used |NULL |NULL |NULL |NULL |NULL |
+ROW |70 |13 |1 |lefty_max |0 |100 |NULL |NULL |NULL |NULL |NULL |
+ROW |71 |13 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |
+ROW |72 |13 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |79 |14 |0 |ds.transparency.0|0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |80 |14 |0 |ds.transparency.1|0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |83 |14 |0 |ds.width.0 |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |84 |14 |0 |ds.width.1 |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |86 |14 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |87 |14 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |88 |14 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |89 |14 |1 |ds.color.0 |0 |9CCC65 |NULL |NULL |NULL |NULL |NULL |
+ROW |91 |14 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |92 |14 |1 |ds.hosts.1.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |93 |14 |1 |ds.items.0.0 |0 |Zabbix server: Value cache hits |NULL |NULL |NULL |NULL |NULL |
+ROW |94 |14 |1 |ds.items.1.0 |0 |Zabbix server: Value cache misses |NULL |NULL |NULL |NULL |NULL |
+ROW |97 |14 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |
+ROW |98 |14 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |102 |15 |0 |ds.fill.0 |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |103 |15 |0 |ds.fill.1 |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |104 |15 |0 |ds.fill.2 |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |108 |15 |0 |ds.transparency.0|0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |109 |15 |0 |ds.transparency.1|0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |110 |15 |0 |ds.transparency.2|0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |114 |15 |0 |ds.width.0 |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |115 |15 |0 |ds.width.1 |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |116 |15 |0 |ds.width.2 |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |118 |15 |0 |legend |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |119 |15 |0 |righty |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |120 |15 |0 |show_problems |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |121 |15 |1 |ds.color.0 |0 |B0AF07 |NULL |NULL |NULL |NULL |NULL |
+ROW |122 |15 |1 |ds.color.1 |0 |E53935 |NULL |NULL |NULL |NULL |NULL |
+ROW |123 |15 |1 |ds.color.2 |0 |0275B8 |NULL |NULL |NULL |NULL |NULL |
+ROW |124 |15 |1 |ds.hosts.0.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |125 |15 |1 |ds.hosts.1.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |126 |15 |1 |ds.hosts.2.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |127 |15 |1 |ds.items.0.0 |0 |Zabbix server: Queue |NULL |NULL |NULL |NULL |NULL |
+ROW |128 |15 |1 |ds.items.1.0 |0 |Zabbix server: Queue over 10 minutes |NULL |NULL |NULL |NULL |NULL |
+ROW |129 |15 |1 |ds.items.2.0 |0 |Zabbix server: Preprocessing queue |NULL |NULL |NULL |NULL |NULL |
+ROW |133 |15 |1 |lefty_min |0 |0 |NULL |NULL |NULL |NULL |NULL |
+ROW |134 |15 |1 |problemhosts.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |135 |16 |6 |graphid |0 | |NULL |NULL |NULL |838 |NULL |
+ROW |137 |17 |6 |graphid |0 | |NULL |NULL |NULL |839 |NULL |
+ROW |139 |18 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |140 |18 |7 |graphid |0 | |NULL |NULL |NULL |836 |NULL |
+ROW |143 |19 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |144 |19 |7 |graphid |0 | |NULL |NULL |NULL |837 |NULL |
+ROW |147 |20 |6 |graphid |0 | |NULL |NULL |NULL |840 |NULL |
+ROW |149 |21 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |150 |21 |6 |graphid |0 | |NULL |NULL |NULL |1174 |NULL |
+ROW |151 |22 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |152 |22 |6 |graphid |0 | |NULL |NULL |NULL |1176 |NULL |
+ROW |153 |23 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |154 |23 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |155 |23 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |156 |23 |7 |graphid |0 | |NULL |NULL |NULL |1172 |NULL |
+ROW |157 |24 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |158 |24 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |159 |24 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |160 |24 |7 |graphid |0 | |NULL |NULL |NULL |1173 |NULL |
+ROW |161 |25 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |162 |25 |6 |graphid |0 | |NULL |NULL |NULL |1175 |NULL |
+ROW |173 |31 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |174 |31 |6 |graphid |0 | |NULL |NULL |NULL |1125 |NULL |
+ROW |175 |32 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |176 |32 |6 |graphid |0 | |NULL |NULL |NULL |1129 |NULL |
+ROW |177 |33 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |178 |33 |6 |graphid |0 | |NULL |NULL |NULL |1128 |NULL |
+ROW |179 |34 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |180 |34 |6 |graphid |0 | |NULL |NULL |NULL |1126 |NULL |
+ROW |181 |35 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |182 |35 |6 |graphid |0 | |NULL |NULL |NULL |1127 |NULL |
+ROW |211 |49 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |212 |49 |6 |graphid |0 | |NULL |NULL |NULL |1029 |NULL |
+ROW |213 |50 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |214 |50 |6 |graphid |0 | |NULL |NULL |NULL |1027 |NULL |
+ROW |215 |51 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |216 |51 |6 |graphid |0 | |NULL |NULL |NULL |1030 |NULL |
+ROW |217 |52 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |218 |52 |6 |graphid |0 | |NULL |NULL |NULL |1028 |NULL |
+ROW |219 |53 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |220 |53 |6 |graphid |0 | |NULL |NULL |NULL |1031 |NULL |
+ROW |221 |54 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |222 |54 |6 |graphid |0 | |NULL |NULL |NULL |1011 |NULL |
+ROW |223 |55 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |224 |55 |6 |graphid |0 | |NULL |NULL |NULL |1012 |NULL |
+ROW |225 |56 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |226 |56 |6 |graphid |0 | |NULL |NULL |NULL |1008 |NULL |
+ROW |227 |57 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |228 |57 |6 |graphid |0 | |NULL |NULL |NULL |1009 |NULL |
+ROW |229 |58 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |230 |58 |6 |graphid |0 | |NULL |NULL |NULL |1007 |NULL |
+ROW |231 |59 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |232 |59 |6 |graphid |0 | |NULL |NULL |NULL |1010 |NULL |
+ROW |233 |60 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |234 |60 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |235 |60 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |236 |60 |7 |graphid |0 | |NULL |NULL |NULL |952 |NULL |
+ROW |237 |61 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |238 |61 |6 |graphid |0 | |NULL |NULL |NULL |957 |NULL |
+ROW |239 |62 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |240 |62 |6 |graphid |0 | |NULL |NULL |NULL |959 |NULL |
+ROW |241 |63 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |242 |63 |6 |graphid |0 | |NULL |NULL |NULL |962 |NULL |
+ROW |243 |64 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |244 |64 |6 |graphid |0 | |NULL |NULL |NULL |963 |NULL |
+ROW |245 |65 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |246 |65 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |247 |65 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |248 |65 |7 |graphid |0 | |NULL |NULL |NULL |953 |NULL |
+ROW |249 |66 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |250 |66 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |251 |66 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |252 |66 |7 |graphid |0 | |NULL |NULL |NULL |954 |NULL |
+ROW |253 |67 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |254 |67 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |255 |67 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |256 |67 |7 |graphid |0 | |NULL |NULL |NULL |955 |NULL |
+ROW |257 |68 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |258 |68 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |259 |68 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |260 |68 |7 |graphid |0 | |NULL |NULL |NULL |956 |NULL |
+ROW |261 |69 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |262 |69 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |263 |69 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |264 |69 |7 |graphid |0 | |NULL |NULL |NULL |952 |NULL |
+ROW |287 |81 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |288 |81 |6 |graphid |0 | |NULL |NULL |NULL |1018 |NULL |
+ROW |289 |82 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |290 |82 |6 |graphid |0 | |NULL |NULL |NULL |1016 |NULL |
+ROW |291 |83 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |292 |83 |6 |graphid |0 | |NULL |NULL |NULL |1019 |NULL |
+ROW |293 |84 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |294 |84 |6 |graphid |0 | |NULL |NULL |NULL |1017 |NULL |
+ROW |295 |85 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |296 |85 |6 |graphid |0 | |NULL |NULL |NULL |1020 |NULL |
+ROW |297 |86 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |298 |86 |6 |graphid |0 | |NULL |NULL |NULL |1025 |NULL |
+ROW |299 |87 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |300 |87 |6 |graphid |0 | |NULL |NULL |NULL |1026 |NULL |
+ROW |301 |88 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |302 |88 |6 |graphid |0 | |NULL |NULL |NULL |1022 |NULL |
+ROW |303 |89 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |304 |89 |6 |graphid |0 | |NULL |NULL |NULL |1023 |NULL |
+ROW |305 |90 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |306 |90 |6 |graphid |0 | |NULL |NULL |NULL |1021 |NULL |
+ROW |307 |91 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |308 |91 |6 |graphid |0 | |NULL |NULL |NULL |1024 |NULL |
+ROW |309 |92 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |310 |92 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |311 |92 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |312 |92 |7 |graphid |0 | |NULL |NULL |NULL |1287 |NULL |
+ROW |313 |93 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |314 |93 |6 |graphid |0 | |NULL |NULL |NULL |1304 |NULL |
+ROW |315 |94 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |316 |94 |6 |graphid |0 | |NULL |NULL |NULL |1292 |NULL |
+ROW |317 |95 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |318 |95 |6 |graphid |0 | |NULL |NULL |NULL |1296 |NULL |
+ROW |319 |96 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |320 |96 |6 |graphid |0 | |NULL |NULL |NULL |1302 |NULL |
+ROW |321 |97 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |322 |97 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |323 |97 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |324 |97 |7 |graphid |0 | |NULL |NULL |NULL |1286 |NULL |
+ROW |325 |98 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |326 |98 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |327 |98 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |328 |98 |7 |graphid |0 | |NULL |NULL |NULL |1282 |NULL |
+ROW |329 |99 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |330 |99 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |331 |99 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |332 |99 |7 |graphid |0 | |NULL |NULL |NULL |1280 |NULL |
+ROW |333 |100 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |334 |100 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |335 |100 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |336 |100 |7 |graphid |0 | |NULL |NULL |NULL |1284 |NULL |
+ROW |337 |101 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |338 |101 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |339 |101 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |340 |101 |7 |graphid |0 | |NULL |NULL |NULL |1288 |NULL |
+ROW |341 |102 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |342 |102 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |343 |102 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |344 |102 |7 |graphid |0 | |NULL |NULL |NULL |899 |NULL |
+ROW |345 |103 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |346 |103 |6 |graphid |0 | |NULL |NULL |NULL |903 |NULL |
+ROW |347 |104 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |348 |104 |6 |graphid |0 | |NULL |NULL |NULL |909 |NULL |
+ROW |349 |105 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |350 |105 |6 |graphid |0 | |NULL |NULL |NULL |918 |NULL |
+ROW |351 |106 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |352 |106 |6 |graphid |0 | |NULL |NULL |NULL |921 |NULL |
+ROW |353 |107 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |354 |107 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |355 |107 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |356 |107 |7 |graphid |0 | |NULL |NULL |NULL |888 |NULL |
+ROW |357 |108 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |358 |108 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |359 |108 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |360 |108 |7 |graphid |0 | |NULL |NULL |NULL |1227 |NULL |
+ROW |361 |109 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |362 |109 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |363 |109 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |364 |109 |7 |graphid |0 | |NULL |NULL |NULL |1224 |NULL |
+ROW |365 |110 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |366 |110 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |367 |110 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |368 |110 |7 |graphid |0 | |NULL |NULL |NULL |1230 |NULL |
+ROW |369 |111 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |370 |111 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |371 |111 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |372 |111 |7 |graphid |0 | |NULL |NULL |NULL |900 |NULL |
+ROW |373 |112 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |374 |112 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |375 |112 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |376 |112 |7 |graphid |0 | |NULL |NULL |NULL |1221 |NULL |
+ROW |377 |113 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |378 |113 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |379 |113 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |380 |113 |7 |graphid |0 | |NULL |NULL |NULL |1219 |NULL |
+ROW |381 |114 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |382 |114 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |383 |114 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |384 |114 |7 |graphid |0 | |NULL |NULL |NULL |1222 |NULL |
+ROW |385 |115 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |386 |115 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |387 |115 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |388 |115 |7 |graphid |0 | |NULL |NULL |NULL |1220 |NULL |
+ROW |389 |116 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |390 |116 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |391 |116 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |392 |116 |7 |graphid |0 | |NULL |NULL |NULL |1307 |NULL |
+ROW |417 |125 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |418 |125 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |419 |125 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |420 |125 |7 |graphid |0 | |NULL |NULL |NULL |1238 |NULL |
+ROW |421 |126 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |422 |126 |6 |graphid |0 | |NULL |NULL |NULL |977 |NULL |
+ROW |423 |127 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |424 |127 |4 |itemid |0 | |NULL |NULL |29485 |NULL |NULL |
+ROW |425 |128 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |426 |128 |6 |graphid |0 | |NULL |NULL |NULL |979 |NULL |
+ROW |427 |129 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |428 |129 |6 |graphid |0 | |NULL |NULL |NULL |981 |NULL |
+ROW |429 |130 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |430 |130 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |431 |130 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |432 |130 |7 |graphid |0 | |NULL |NULL |NULL |965 |NULL |
+ROW |433 |131 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |434 |131 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |435 |131 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |436 |131 |7 |graphid |0 | |NULL |NULL |NULL |1241 |NULL |
+ROW |437 |132 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |438 |132 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |439 |132 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |440 |132 |7 |graphid |0 | |NULL |NULL |NULL |1243 |NULL |
+ROW |441 |133 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |442 |133 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |443 |133 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |444 |133 |7 |graphid |0 | |NULL |NULL |NULL |1239 |NULL |
+ROW |445 |134 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |446 |134 |6 |graphid |0 | |NULL |NULL |NULL |1112 |NULL |
+ROW |447 |135 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |448 |135 |6 |graphid |0 | |NULL |NULL |NULL |1113 |NULL |
+ROW |449 |136 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |450 |136 |6 |graphid |0 | |NULL |NULL |NULL |1110 |NULL |
+ROW |451 |137 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |452 |137 |6 |graphid |0 | |NULL |NULL |NULL |1109 |NULL |
+ROW |453 |138 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |454 |138 |6 |graphid |0 | |NULL |NULL |NULL |1111 |NULL |
+ROW |455 |139 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |456 |139 |6 |graphid |0 | |NULL |NULL |NULL |1114 |NULL |
+ROW |457 |140 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |458 |140 |6 |graphid |0 | |NULL |NULL |NULL |1139 |NULL |
+ROW |459 |141 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |460 |141 |6 |graphid |0 | |NULL |NULL |NULL |1140 |NULL |
+ROW |461 |142 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |462 |142 |6 |graphid |0 | |NULL |NULL |NULL |1137 |NULL |
+ROW |463 |143 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |464 |143 |6 |graphid |0 | |NULL |NULL |NULL |1136 |NULL |
+ROW |465 |144 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |466 |144 |6 |graphid |0 | |NULL |NULL |NULL |1138 |NULL |
+ROW |467 |145 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |468 |145 |6 |graphid |0 | |NULL |NULL |NULL |1141 |NULL |
+ROW |495 |154 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |496 |154 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |497 |154 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |498 |154 |7 |graphid |0 | |NULL |NULL |NULL |766 |NULL |
+ROW |499 |155 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |500 |155 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |501 |155 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |502 |155 |7 |graphid |0 | |NULL |NULL |NULL |745 |NULL |
+ROW |503 |156 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |504 |156 |6 |graphid |0 | |NULL |NULL |NULL |841 |NULL |
+ROW |505 |157 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |506 |157 |6 |graphid |0 | |NULL |NULL |NULL |843 |NULL |
+ROW |507 |158 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |508 |158 |6 |graphid |0 | |NULL |NULL |NULL |842 |NULL |
+ROW |519 |162 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |520 |162 |6 |graphid |0 | |NULL |NULL |NULL |845 |NULL |
+ROW |521 |163 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |522 |163 |6 |graphid |0 | |NULL |NULL |NULL |847 |NULL |
+ROW |523 |164 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |524 |164 |6 |graphid |0 | |NULL |NULL |NULL |846 |NULL |
+ROW |525 |165 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |526 |165 |6 |graphid |0 | |NULL |NULL |NULL |1071 |NULL |
+ROW |527 |166 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |528 |166 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |529 |166 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |530 |166 |7 |graphid |0 | |NULL |NULL |NULL |1061 |NULL |
+ROW |531 |167 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |532 |167 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |533 |167 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |534 |167 |7 |graphid |0 | |NULL |NULL |NULL |1066 |NULL |
+ROW |563 |182 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |564 |182 |6 |graphid |0 | |NULL |NULL |NULL |481 |NULL |
+ROW |565 |183 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |566 |183 |6 |graphid |0 | |NULL |NULL |NULL |480 |NULL |
+ROW |567 |184 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |568 |184 |6 |graphid |0 | |NULL |NULL |NULL |545 |NULL |
+ROW |569 |185 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |570 |185 |6 |graphid |0 | |NULL |NULL |NULL |482 |NULL |
+ROW |571 |186 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |572 |186 |4 |itemid |0 | |NULL |NULL |22998 |NULL |NULL |
+ROW |573 |187 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |574 |187 |4 |itemid |0 | |NULL |NULL |22997 |NULL |NULL |
+ROW |623 |204 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |624 |204 |6 |graphid |0 | |NULL |NULL |NULL |392 |NULL |
+ROW |625 |205 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |626 |205 |6 |graphid |0 | |NULL |NULL |NULL |404 |NULL |
+ROW |627 |206 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |628 |206 |6 |graphid |0 | |NULL |NULL |NULL |406 |NULL |
+ROW |629 |207 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |630 |207 |6 |graphid |0 | |NULL |NULL |NULL |410 |NULL |
+ROW |631 |208 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |632 |208 |6 |graphid |0 | |NULL |NULL |NULL |527 |NULL |
+ROW |633 |209 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |634 |209 |6 |graphid |0 | |NULL |NULL |NULL |788 |NULL |
+ROW |635 |210 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |636 |210 |6 |graphid |0 | |NULL |NULL |NULL |532 |NULL |
+ROW |637 |211 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |638 |211 |6 |graphid |0 | |NULL |NULL |NULL |530 |NULL |
+ROW |639 |212 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |640 |212 |6 |graphid |0 | |NULL |NULL |NULL |531 |NULL |
+ROW |641 |213 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |642 |213 |6 |graphid |0 | |NULL |NULL |NULL |529 |NULL |
+ROW |643 |214 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |644 |214 |6 |graphid |0 | |NULL |NULL |NULL |802 |NULL |
+ROW |645 |215 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |646 |215 |6 |graphid |0 | |NULL |NULL |NULL |799 |NULL |
+ROW |647 |216 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |648 |216 |6 |graphid |0 | |NULL |NULL |NULL |800 |NULL |
+ROW |649 |217 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |650 |217 |6 |graphid |0 | |NULL |NULL |NULL |798 |NULL |
+ROW |651 |218 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |652 |218 |6 |graphid |0 | |NULL |NULL |NULL |797 |NULL |
+ROW |653 |219 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |654 |219 |6 |graphid |0 | |NULL |NULL |NULL |801 |NULL |
+ROW |655 |220 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |656 |220 |6 |graphid |0 | |NULL |NULL |NULL |806 |NULL |
+ROW |657 |221 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |658 |221 |6 |graphid |0 | |NULL |NULL |NULL |804 |NULL |
+ROW |659 |222 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |660 |222 |6 |graphid |0 | |NULL |NULL |NULL |805 |NULL |
+ROW |661 |223 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |662 |223 |6 |graphid |0 | |NULL |NULL |NULL |803 |NULL |
+ROW |663 |224 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |664 |224 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |665 |224 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |666 |224 |7 |graphid |0 | |NULL |NULL |NULL |1081 |NULL |
+ROW |667 |225 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |668 |225 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |669 |225 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |670 |225 |7 |graphid |0 | |NULL |NULL |NULL |1084 |NULL |
+ROW |671 |226 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |672 |226 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |673 |226 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |674 |226 |7 |graphid |0 | |NULL |NULL |NULL |1082 |NULL |
+ROW |675 |227 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |676 |227 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |677 |227 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |678 |227 |7 |graphid |0 | |NULL |NULL |NULL |1085 |NULL |
+ROW |679 |228 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |680 |228 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |681 |228 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |682 |228 |7 |graphid |0 | |NULL |NULL |NULL |1083 |NULL |
+ROW |683 |229 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |684 |229 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |685 |229 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |686 |229 |7 |graphid |0 | |NULL |NULL |NULL |1086 |NULL |
+ROW |711 |236 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |712 |236 |6 |graphid |0 | |NULL |NULL |NULL |457 |NULL |
+ROW |713 |237 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |714 |237 |6 |graphid |0 | |NULL |NULL |NULL |456 |NULL |
+ROW |715 |238 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |716 |238 |6 |graphid |0 | |NULL |NULL |NULL |544 |NULL |
+ROW |717 |239 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |718 |239 |6 |graphid |0 | |NULL |NULL |NULL |458 |NULL |
+ROW |719 |240 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |720 |240 |4 |itemid |0 | |NULL |NULL |22838 |NULL |NULL |
+ROW |721 |241 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |722 |241 |4 |itemid |0 | |NULL |NULL |22837 |NULL |NULL |
+ROW |747 |248 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |748 |248 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |749 |248 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |750 |248 |7 |graphid |0 | |NULL |NULL |NULL |1075 |NULL |
+ROW |751 |249 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |752 |249 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |753 |249 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |754 |249 |7 |graphid |0 | |NULL |NULL |NULL |1078 |NULL |
+ROW |755 |250 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |756 |250 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |757 |250 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |758 |250 |7 |graphid |0 | |NULL |NULL |NULL |1076 |NULL |
+ROW |759 |251 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |760 |251 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |761 |251 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |762 |251 |7 |graphid |0 | |NULL |NULL |NULL |1079 |NULL |
+ROW |763 |252 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |764 |252 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |765 |252 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |766 |252 |7 |graphid |0 | |NULL |NULL |NULL |1077 |NULL |
+ROW |767 |253 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |768 |253 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |769 |253 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |770 |253 |7 |graphid |0 | |NULL |NULL |NULL |1080 |NULL |
+ROW |771 |254 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |772 |254 |6 |graphid |0 | |NULL |NULL |NULL |487 |NULL |
+ROW |773 |255 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |774 |255 |6 |graphid |0 | |NULL |NULL |NULL |543 |NULL |
+ROW |823 |272 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |824 |272 |6 |graphid |0 | |NULL |NULL |NULL |1316 |NULL |
+ROW |825 |273 |0 |source_type |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |826 |273 |4 |itemid |0 | |NULL |NULL |31980 |NULL |NULL |
+ROW |827 |274 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |828 |274 |6 |graphid |0 | |NULL |NULL |NULL |1320 |NULL |
+ROW |829 |275 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |830 |275 |6 |graphid |0 | |NULL |NULL |NULL |1322 |NULL |
+ROW |831 |276 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |832 |276 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |833 |276 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |834 |276 |7 |graphid |0 | |NULL |NULL |NULL |1306 |NULL |
+ROW |835 |277 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |836 |277 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |837 |277 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |838 |277 |7 |graphid |0 | |NULL |NULL |NULL |1310 |NULL |
+ROW |839 |278 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |840 |278 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |841 |278 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |842 |278 |7 |graphid |0 | |NULL |NULL |NULL |1312 |NULL |
+ROW |843 |279 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |844 |279 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |845 |279 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |846 |279 |7 |graphid |0 | |NULL |NULL |NULL |1308 |NULL |
+ROW |991 |328 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |992 |328 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |993 |328 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |994 |328 |7 |graphid |0 | |NULL |NULL |NULL |1387 |NULL |
+ROW |995 |329 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |996 |329 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |997 |329 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |998 |329 |7 |graphid |0 | |NULL |NULL |NULL |1382 |NULL |
+ROW |999 |330 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1000 |330 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1001 |330 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1002 |330 |7 |graphid |0 | |NULL |NULL |NULL |1380 |NULL |
+ROW |1003 |331 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1004 |331 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1005 |331 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1006 |331 |7 |graphid |0 | |NULL |NULL |NULL |1386 |NULL |
+ROW |1007 |332 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1008 |332 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1009 |332 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1010 |332 |7 |graphid |0 | |NULL |NULL |NULL |1383 |NULL |
+ROW |1011 |333 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1012 |333 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1013 |333 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1014 |333 |7 |graphid |0 | |NULL |NULL |NULL |1381 |NULL |
+ROW |1015 |334 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1016 |334 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1017 |334 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1018 |334 |7 |graphid |0 | |NULL |NULL |NULL |1384 |NULL |
+ROW |1019 |335 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1020 |335 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1021 |335 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1022 |335 |7 |graphid |0 | |NULL |NULL |NULL |1385 |NULL |
+ROW |1023 |336 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1024 |336 |6 |graphid |0 | |NULL |NULL |NULL |1390 |NULL |
+ROW |1025 |337 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1026 |337 |6 |graphid |0 | |NULL |NULL |NULL |1393 |NULL |
+ROW |1027 |338 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1028 |338 |6 |graphid |0 | |NULL |NULL |NULL |1391 |NULL |
+ROW |1029 |339 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1030 |339 |6 |graphid |0 | |NULL |NULL |NULL |1394 |NULL |
+ROW |1031 |340 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1032 |340 |6 |graphid |0 | |NULL |NULL |NULL |1392 |NULL |
+ROW |1033 |341 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1034 |341 |6 |graphid |0 | |NULL |NULL |NULL |1395 |NULL |
+ROW |1035 |342 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1036 |342 |6 |graphid |0 | |NULL |NULL |NULL |1388 |NULL |
+ROW |1037 |343 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1038 |343 |6 |graphid |0 | |NULL |NULL |NULL |1389 |NULL |
+ROW |1039 |344 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1040 |344 |6 |graphid |0 | |NULL |NULL |NULL |469 |NULL |
+ROW |1041 |345 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1042 |345 |6 |graphid |0 | |NULL |NULL |NULL |471 |NULL |
+ROW |1043 |346 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1044 |346 |6 |graphid |0 | |NULL |NULL |NULL |498 |NULL |
+ROW |1045 |347 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1046 |347 |6 |graphid |0 | |NULL |NULL |NULL |540 |NULL |
+ROW |1047 |348 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1048 |348 |6 |graphid |0 | |NULL |NULL |NULL |463 |NULL |
+ROW |1049 |349 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1050 |349 |6 |graphid |0 | |NULL |NULL |NULL |462 |NULL |
+ROW |1051 |350 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1052 |350 |6 |graphid |0 | |NULL |NULL |NULL |541 |NULL |
+ROW |1053 |351 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1054 |351 |6 |graphid |0 | |NULL |NULL |NULL |464 |NULL |
+ROW |1061 |355 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1062 |355 |6 |graphid |0 | |NULL |NULL |NULL |475 |NULL |
+ROW |1063 |356 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1064 |356 |6 |graphid |0 | |NULL |NULL |NULL |474 |NULL |
+ROW |1065 |357 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1066 |357 |6 |graphid |0 | |NULL |NULL |NULL |542 |NULL |
+ROW |1079 |364 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1080 |364 |6 |graphid |0 | |NULL |NULL |NULL |1118 |NULL |
+ROW |1081 |365 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1082 |365 |6 |graphid |0 | |NULL |NULL |NULL |1119 |NULL |
+ROW |1083 |366 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1084 |366 |6 |graphid |0 | |NULL |NULL |NULL |1116 |NULL |
+ROW |1085 |367 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1086 |367 |6 |graphid |0 | |NULL |NULL |NULL |1115 |NULL |
+ROW |1087 |368 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1088 |368 |6 |graphid |0 | |NULL |NULL |NULL |1117 |NULL |
+ROW |1089 |369 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1090 |369 |6 |graphid |0 | |NULL |NULL |NULL |1120 |NULL |
+ROW |1091 |370 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1092 |370 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1093 |370 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1094 |370 |7 |graphid |0 | |NULL |NULL |NULL |741 |NULL |
+ROW |1121 |379 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1122 |379 |6 |graphid |0 | |NULL |NULL |NULL |881 |NULL |
+ROW |1123 |380 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1124 |380 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1125 |380 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1126 |380 |7 |graphid |0 | |NULL |NULL |NULL |869 |NULL |
+ROW |1127 |381 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1128 |381 |6 |graphid |0 | |NULL |NULL |NULL |877 |NULL |
+ROW |1129 |382 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1130 |382 |6 |graphid |0 | |NULL |NULL |NULL |879 |NULL |
+ROW |1131 |383 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1132 |383 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1133 |383 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1134 |383 |7 |graphid |0 | |NULL |NULL |NULL |873 |NULL |
+ROW |1135 |384 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1136 |384 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1137 |384 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1138 |384 |7 |graphid |0 | |NULL |NULL |NULL |867 |NULL |
+ROW |1139 |385 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1140 |385 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1141 |385 |0 |source_type |3 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1142 |385 |5 |itemid |0 | |NULL |NULL |29033 |NULL |NULL |
+ROW |1143 |386 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1144 |386 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1145 |386 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1146 |386 |7 |graphid |0 | |NULL |NULL |NULL |865 |NULL |
+ROW |1147 |387 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1148 |387 |6 |graphid |0 | |NULL |NULL |NULL |1091 |NULL |
+ROW |1149 |388 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1150 |388 |6 |graphid |0 | |NULL |NULL |NULL |1095 |NULL |
+ROW |1151 |389 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1152 |389 |6 |graphid |0 | |NULL |NULL |NULL |1092 |NULL |
+ROW |1153 |390 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1154 |390 |6 |graphid |0 | |NULL |NULL |NULL |1094 |NULL |
+ROW |1155 |391 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1156 |391 |6 |graphid |0 | |NULL |NULL |NULL |1099 |NULL |
+ROW |1157 |392 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1158 |392 |6 |graphid |0 | |NULL |NULL |NULL |1100 |NULL |
+ROW |1159 |393 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1160 |393 |6 |graphid |0 | |NULL |NULL |NULL |1101 |NULL |
+ROW |1161 |394 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1162 |394 |6 |graphid |0 | |NULL |NULL |NULL |1102 |NULL |
+ROW |1163 |395 |0 |columns |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1164 |395 |0 |rows |1 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1165 |395 |0 |source_type |2 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1166 |395 |7 |graphid |0 | |NULL |NULL |NULL |1090 |NULL |
+ROW |1167 |396 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1168 |396 |6 |graphid |0 | |NULL |NULL |NULL |1093 |NULL |
+ROW |1169 |397 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1170 |397 |6 |graphid |0 | |NULL |NULL |NULL |1098 |NULL |
+ROW |1171 |398 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1172 |398 |6 |graphid |0 | |NULL |NULL |NULL |1096 |NULL |
+ROW |1173 |399 |0 |source_type |0 | |NULL |NULL |NULL |NULL |NULL |
+ROW |1174 |399 |6 |graphid |0 | |NULL |NULL |NULL |1097 |NULL |
+ROW |1175 |400 |8 |sysmapid |0 | |NULL |NULL |NULL |NULL |1 |
+ROW |1176 |400 |1 |reference |0 |NWLRB |NULL |NULL |NULL |NULL |NULL |
+ROW |1177 |15 |1 |ds.hosts.3.0 |0 |Zabbix server |NULL |NULL |NULL |NULL |NULL |
+ROW |1178 |15 |1 |ds.items.3.0 |0 |Zabbix server: LLD queue |NULL |NULL |NULL |NULL |NULL |
+ROW |1179 |15 |1 |ds.color.3 |0 |524BBC |NULL |NULL |NULL |NULL |NULL |
+
diff --git a/create/src/data.tmpl b/create/src/data.tmpl
index 037f1e2f766..0fb27f8acbd 100644
--- a/create/src/data.tmpl
+++ b/create/src/data.tmpl
@@ -73,7 +73,7 @@ ROW |12 |4 |Jira | | |
ROW |13 |4 |Jira with CustomFields | | | | | | | |0 |25 |0 |0 |0 |0 | |1 |3 |10s |1 |var Jira = {&eol; params: {},&eol;&eol; setParams: function (params) {&eol; if (typeof params !== 'object') {&eol; return;&eol; }&eol;&eol; Jira.params = params;&eol; if (typeof Jira.params.url === 'string') {&eol; if (!Jira.params.url.endsWith('/')) {&eol; Jira.params.url += '/';&eol; }&eol;&eol; Jira.params.url += 'rest/api/latest/';&eol; }&eol; },&eol;&eol; setProxy: function (HTTPProxy) {&eol; Jira.HTTPProxy = HTTPProxy;&eol; },&eol;&eol; setTags: function(event_tags_json) {&eol; if (typeof event_tags_json !== 'undefined' && event_tags_json !== ''&eol; && event_tags_json !== '{EVENT.TAGSJSON}') {&eol; try {&eol; var tags = JSON.parse(event_tags_json),&eol; label;&eol;&eol; Jira.labels = [];&eol;&eol; tags.forEach(function (tag) {&eol; if (typeof tag.tag !== 'undefined' && typeof tag.value !== 'undefined' ) {&eol; label = (tag.tag + (tag.value ? (':' + tag.value) : '')).replace(/\s/g, '_');&eol; if (label.length < 256) {&eol; Jira.labels.push(label);&eol; }&eol; }&eol; });&eol; }&eol; catch (error) {&eol; // Code is not missing here.&eol; }&eol; }&eol; },&eol;&eol; escapeMarkup: function (str) {&eol; var length = str.length,&eol; result = '',&eol; markup = ['{', '&pipe;', '}', '~', '_', '\\', '[', ']', '^', '<', '>', '?', '!', '#', '+', '*', '&'];&eol;&eol; for (var i = 0; i < length; i++) {&eol; var char = str[i];&eol;&eol; result += (markup.indexOf(char) !== -1) ? ('&#' + str[i].charCodeAt() + ';') : char;&eol; }&eol;&eol; return result;&eol; },&eol;&eol; addCustomFields: function (data, fields) {&eol; if (typeof fields === 'object' && Object.keys(fields).length) {&eol; var schema = Jira.getSchema(),&eol; path = ['projects', 0, 'issuetypes', 0, 'fields'],&eol; field;&eol;&eol; while ((field = path.shift()) !== undefined) {&eol; schema = schema[field];&eol; if (typeof schema === 'undefined') {&eol; schema = null;&eol; break;&eol; }&eol; }&eol;&eol; if (schema) {&eol; Object.keys(fields)&eol; .forEach(function(field) {&eol; data.fields[field] = fields[field];&eol;&eol; if (typeof schema[field] === 'object' && typeof schema[field].schema === 'object'&eol; && (schema[field].schema.type === 'number' &pipe;&pipe; schema[field].schema.type === 'datetime')) {&eol; switch (schema[field].schema.type) {&eol; case 'number':&eol; data.fields[field] = parseInt(fields[field]);&eol; break;&eol;&eol; case 'datetime':&eol; if (fields[field].match(/\d+[.-]\d+[.-]\d+T\d+:\d+:\d+/) !== null) {&eol; data.fields[field] = fields[field].replace(/\./g, '-');&eol; }&eol; else {&eol; delete data.fields[field];&eol; }&eol; break;&eol; }&eol; }&eol; });&eol; }&eol; else {&eol; Zabbix.Log(4, '[ Jira Webhook ] Failed to retrieve field schema.');&eol; }&eol; }&eol;&eol; return data;&eol; },&eol;&eol; request: function (method, query, data) {&eol; ['url', 'user', 'password', 'project_key', 'issue_type'].forEach(function (field) {&eol; if (typeof Jira.params !== 'object' &pipe;&pipe; typeof Jira.params[field] === 'undefined'&eol; &pipe;&pipe; Jira.params[field] === '' ) {&eol; throw 'Required Jira param is not set: "' + field + '".';&eol; }&eol; });&eol;&eol; var response,&eol; url = Jira.params.url + query,&eol; request = new CurlHttpRequest();&eol;&eol; request.AddHeader('Content-Type: application/json');&eol; request.AddHeader('Authorization: Basic ' + btoa(Jira.params.user + ':' + Jira.params.password));&eol;&eol; if (typeof Jira.HTTPProxy !== 'undefined' && Jira.HTTPProxy !== '') {&eol; request.SetProxy(Jira.HTTPProxy);&eol; }&eol;&eol; if (typeof data !== 'undefined') {&eol; data = JSON.stringify(data);&eol; }&eol;&eol; Zabbix.Log(4, '[ Jira Webhook ] Sending request: ' + url + ((typeof data === 'string') ? ('\n' + data) : ''));&eol;&eol; switch (method) {&eol; case 'get':&eol; response = request.Get(url, data);&eol; break;&eol;&eol; case 'post':&eol; response = request.Post(url, data);&eol; break;&eol;&eol; case 'put':&eol; response = request.Put(url, data);&eol; break;&eol;&eol; default:&eol; throw 'Unsupported HTTP request method: ' + method;&eol; }&eol;&eol; Zabbix.Log(4, '[ Jira Webhook ] Received response with status code ' + request.Status() + '\n' + response);&eol;&eol; if (response !== null) {&eol; try {&eol; response = JSON.parse(response);&eol; }&eol; catch (error) {&eol; Zabbix.Log(4, '[ Jira Webhook ] Failed to parse response received from Jira');&eol; response = null;&eol; }&eol; }&eol;&eol; if (request.Status() < 200 &pipe;&pipe; request.Status() >= 300) {&eol; var message = 'Request failed with status code ' + request.Status();&eol;&eol; if (response !== null && typeof response.errors !== 'undefined'&eol; && Object.keys(response.errors).length > 0) {&eol; message += ': ' + JSON.stringify(response.errors);&eol; }&eol; else if (response !== null && typeof response.errorMessages !== 'undefined'&eol; && Object.keys(response.errorMessages).length > 0) {&eol; message += ': ' + JSON.stringify(response.errorMessages);&eol; }&eol;&eol; throw message + ' Check debug log for more information.';&eol; }&eol;&eol; return {&eol; status: request.Status(),&eol; response: response&eol; };&eol; },&eol;&eol; getSchema: function() {&eol; var result = Jira.request('get', 'issue/createmeta?expand=projects.issuetypes.fields&projectKeys=' +&eol; Jira.params.project_key + '&issuetypeNames=' + Jira.params.issue_type);&eol;&eol; return result.response;&eol; },&eol;&eol; createIssue: function(summary, description, fields) {&eol; var data = {&eol; fields: {&eol; project: {&eol; key: Jira.params.project_key&eol; },&eol; issuetype: {&eol; name: Jira.params.issue_type&eol; },&eol; summary: summary,&eol; description: description&eol; }&eol; };&eol;&eol; if (Jira.labels && Jira.labels.length > 0) {&eol; data.fields.labels = Jira.labels;&eol; }&eol; var result = Jira.request('post', 'issue', Jira.addCustomFields(data, fields));&eol;&eol; if (typeof result.response !== 'object' &pipe;&pipe; typeof result.response.key === 'undefined') {&eol; throw 'Cannot create Jira issue. Check debug log for more information.';&eol; }&eol;&eol; return result.response.key;&eol; },&eol;&eol; updateIssue: function(summary, fields, update) {&eol; var data = {fields: {}};&eol;&eol; if (summary) {&eol; data.fields.summary = summary;&eol; }&eol;&eol; Jira.request('put', 'issue/' + Jira.params.issue_key, Jira.addCustomFields(data, fields));&eol; Jira.commentIssue(update);&eol; },&eol;&eol; commentIssue: function(update) {&eol; var data = {};&eol;&eol; if (typeof update === 'string') {&eol; data.body = update;&eol; Jira.request('post', 'issue/' + Jira.params.issue_key + '/comment', data);&eol; }&eol; else if (update.status === '1') {&eol; data.body = update.user + ' ' + update.action + '.';&eol;&eol; if (update.message) {&eol; data.body += '\nMessage: {quote}' + Jira.escapeMarkup(update.message) + '{quote}';&eol; }&eol;&eol; Jira.request('post', 'issue/' + Jira.params.issue_key + '/comment', data);&eol; }&eol; }&eol;};&eol;&eol;try {&eol; var params = JSON.parse(value),&eol; fields = {},&eol; jira = {},&eol; update = {},&eol; result = {tags: {}},&eol; required_params = ['alert_subject', 'summary', 'event_recovery_value', 'event_source', 'event_value'];&eol;&eol; Object.keys(params)&eol; .forEach(function (key) {&eol; if (key.startsWith('jira_')) {&eol; jira[key.substring(5)] = params[key];&eol; }&eol; else if (key.startsWith('customfield_')) {&eol; fields[key] = params[key];&eol; }&eol; else if (key.startsWith('event_update_')) {&eol; update[key.substring(13)] = params[key];&eol; }&eol; else if (required_params.indexOf(key) !== -1 && params[key] === '') {&eol; throw 'Parameter "' + key + '" can\'t be empty.';&eol; }&eol; });&eol;&eol; if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {&eol; throw 'Incorrect "event_source" parameter given: ' + params.event_source + '\nMust be 0-3.';&eol; }&eol;&eol; // Check {EVENT.VALUE} for trigger-based and internal events.&eol; if (params.event_value !== '0' && params.event_value !== '1'&eol; && (params.event_source === '0' &pipe;&pipe; params.event_source === '3')) {&eol; throw 'Incorrect "event_value" parameter given: ' + params.event_value + '\nMust be 0 or 1.';&eol; }&eol;&eol; // Check {EVENT.UPDATE.STATUS} only for trigger-based events.&eol; if (params.event_update_status !== '0' && params.event_update_status !== '1' && params.event_source === '0') {&eol; throw 'Incorrect "event_update_status" parameter given: ' + params.event_update_status + '\nMust be 0 or 1.';&eol; }&eol;&eol; if (params.event_source !== '0' && params.event_recovery_value === '0') {&eol; throw 'Recovery operations are supported only for trigger-based actions.';&eol; }&eol;&eol; Jira.setParams(jira);&eol; Jira.setProxy(params.HTTPProxy);&eol; Jira.setTags(params.event_tags_json);&eol;&eol; // Create issue for non trigger-based events.&eol; if (params.event_source !== '0' && params.event_recovery_value !== '0') {&eol; Jira.createIssue(params.alert_subject, params.alert_message);&eol; }&eol; // Create issue for trigger-based events.&eol; else if (params.event_value === '1' && update.status === '0' && !jira.issue_key.startsWith(jira.project_key)) {&eol; var key = Jira.createIssue(params.alert_subject,&eol; (Object.keys(fields).length ? params.trigger_description : params.alert_message), fields);&eol;&eol;&eol; result.tags.__zbx_jira_issuekey = key;&eol; result.tags.__zbx_jira_issuelink = params.jira_url +&eol; (params.jira_url.endsWith('/') ? '' : '/') + 'browse/' + key;&eol; }&eol; // Update created issue for trigger-based event.&eol; else {&eol; if (!jira.issue_key.startsWith(jira.project_key)) {&eol; throw 'Incorrect Issue key given: ' + jira.issue_key;&eol; }&eol; Jira.updateIssue(params.alert_subject, fields,&eol; ((params.event_value === '0' && !Object.keys(fields).length)&eol; ? params.alert_message : update));&eol; }&eol;&eol; return JSON.stringify(result);&eol;}&eol;catch (error) {&eol; Zabbix.Log(3, '[ Jira Webhook ] ERROR: ' + error);&eol; throw 'Sending failed: ' + error;&eol;}|30s |1 |1 |{EVENT.TAGS.__zbx_jira_issuelink} |Jira: {EVENT.TAGS.__zbx_jira_issuekey} | |
ROW |14 |4 |MS Teams | | | | | | | |0 |25 |0 |0 |0 |0 | |1 |3 |10s |1 |var SEVERITY_COLORS = [&eol; '#97AAB3', // Not classified.&eol; '#7499FF', // Information.&eol; '#FFC859', // Warning.&eol; '#FFA059', // Average.&eol; '#E97659', // High.&eol; '#E45959', // Disaster.&eol; '#009900', // Resolved.&eol; '#000000' // Default.&eol;];&eol;&eol;try {&eol; var params = JSON.parse(value);&eol;&eol; if (typeof params.teams_endpoint !== 'string' &pipe;&pipe; params.teams_endpoint.trim() === '') {&eol; throw 'Cannot get teams_endpoint';&eol; }&eol; else if (!params.teams_endpoint.startsWith('http')) {&eol; throw 'Invalid MS Teams webhook URL: ' + params.teams_endpoint;&eol; }&eol;&eol; params.zabbix_url = (params.zabbix_url.endsWith('/'))&eol; ? params.zabbix_url.slice(0, -1) : params.zabbix_url;&eol;&eol; if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {&eol; throw 'Incorrect "event_source" parameter given: "' + params.event_source + '".\nMust be 0-3.';&eol; }&eol;&eol; // Set "use_default_message" to true for non trigger-based events.&eol; if (params.event_source !== '0') {&eol; params.use_default_message = 'true';&eol; }&eol;&eol; // Check {EVENT.VALUE} for trigger-based and internal events.&eol; if (params.event_value !== '0' && params.event_value !== '1'&eol; && (params.event_source === '0' &pipe;&pipe; params.event_source === '3')) {&eol; throw 'Incorrect "event_value" parameter given: "' + params.event_value + '".\nMust be 0 or 1.';&eol; }&eol;&eol; // Check {EVENT.UPDATE.STATUS} only for trigger-based events.&eol; if (params.event_update_status !== '0' && params.event_update_status !== '1' && params.event_source === '0') {&eol; throw 'Incorrect "event_update_status" parameter given: "' + params.event_update_status + '".\nMust be 0 or 1.';&eol; }&eol;&eol; if (params.event_value == 0) {&eol; params.event_nseverity = '6';&eol; }&eol;&eol; if (!SEVERITY_COLORS[params.event_nseverity]) {&eol; params.event_nseverity = '7';&eol; }&eol;&eol; var request = new HttpRequest(),&eol; facts = [],&eol; body = {&eol; themeColor: SEVERITY_COLORS[params.event_nseverity].replace('#', ''),&eol; summary: 'Zabbix',&eol; sections: [&eol; {&eol; markdown: 'false',&eol; activityTitle: params.alert_subject,&eol; activitySubtitle: 'On ' + params.host_name + ' [' + params.host_ip + ']',&eol; text: (params.use_default_message.toLowerCase() == 'true')&eol; ? params.alert_message&eol; : params.trigger_description&eol; }&eol; ],&eol; potentialAction: [&eol; {&eol; '@type': 'OpenUri',&eol; name: (params.event_source === '0')&eol; ? 'Event Info'&eol; : 'Zabbix Home',&eol; targets: [&eol; {&eol; os: 'default',&eol; uri: (params.event_source === '0')&eol; ? params.zabbix_url + '/tr_events.php?triggerid=' +&eol; params.trigger_id + '&eventid=' + params.event_id&eol; : params.zabbix_url&eol; }&eol; ]&eol; }&eol; ]&eol; };&eol;&eol; if (params.use_default_message.toLowerCase() !== 'true') {&eol; // Problem message.&eol; if (params.event_value === '1' && params.event_update_status === '0') {&eol; facts.push({&eol; name: 'Event time',&eol; value: params.event_time + ' ' + params.event_date&eol; });&eol; }&eol; // Update message.&eol; else if (params.event_update_status === '1') {&eol; body.sections[0].text = params.event_update_user + ' ' + params.event_update_action + '.';&eol;&eol; if (params.event_update_message) {&eol; body.sections[0].text += '<br>Message:<br>' + params.event_update_message;&eol; }&eol;&eol; facts.push({&eol; name: 'Event update time',&eol; value: params.event_update_time + ' ' + params.event_update_date&eol; });&eol; }&eol; // Resolved message.&eol; else {&eol; facts.push({&eol; name: 'Recovery time',&eol; value: params.event_recovery_time + ' ' + params.event_recovery_date&eol; });&eol; }&eol;&eol; if (params.event_severity && params.event_severity !== '{EVENT.SEVERITY}') {&eol; facts.push({&eol; name: 'Severity',&eol; value: params.event_severity&eol; });&eol; }&eol;&eol;&eol; if (params.event_opdata && params.event_opdata !== '{EVENT.OPDATA}') {&eol; facts.push({&eol; name: 'Operational data',&eol; value: params.event_opdata&eol; });&eol; }&eol;&eol; if (params.event_tags && params.event_tags !== '{EVENT.TAGS}') {&eol; facts.push({&eol; name: 'Event tags',&eol; value: params.event_tags&eol; });&eol; }&eol;&eol; Object.keys(params)&eol; .forEach(function (key) {&eol; if (key.startsWith('fact_') && params[key] !== '') {&eol; facts.push({&eol; name: key.substring(5),&eol; value: params[key]&eol; });&eol; }&eol; else if (key.startsWith('openUri_') && params[key] !== '' && !params[key].startsWith('{')) {&eol; body.potentialAction.push({&eol; '@type': 'OpenUri',&eol; name: key.substring(8),&eol; targets: [&eol; {&eol; os: 'default',&eol; uri: params[key]&eol; }&eol; ]&eol; });&eol; }&eol; });&eol; body.sections[0].facts = facts;&eol; }&eol;&eol; body.sections[0].text = body.sections[0].text.replace(/(?:\r\n&pipe;\r&pipe;\n)/g, '<br>');&eol;&eol; request.addHeader('Content-Type: application/json');&eol;&eol; if (typeof params.HTTPProxy === 'string' && params.HTTPProxy !== '') {&eol; request.setProxy(params.HTTPProxy);&eol; }&eol;&eol; Zabbix.log(4, '[ MS Teams Webhook ] JSON: ' + JSON.stringify(body));&eol;&eol; var response = request.post(params.teams_endpoint, JSON.stringify(body));&eol;&eol; Zabbix.log(4, '[ MS Teams Webhook ] Response: ' + response);&eol;&eol; if (response === '1') {&eol; return 'OK';&eol; }&eol; else {&eol; Zabbix.log(4, '[ MS Teams Webhook ] FAILED with response: ' + response);&eol; throw response;&eol; }&eol;}&eol;catch (error) {&eol; Zabbix.log(3, '[ MS Teams Webhook ] ERROR: ' + error);&eol; throw 'Sending failed: ' + error;&eol;}|30s |0 |0 | | | |
ROW |15 |4 |Redmine | | | | | | | |0 |25 |0 |0 |0 |0 | |1 |3 |10s |1 |var Redmine = {&eol; params: {},&eol;&eol; setParams: function (params) {&eol; if (typeof params !== 'object') {&eol; return;&eol; }&eol;&eol; Redmine.params = params;&eol; if (typeof Redmine.params.url === 'string') {&eol; if (!Redmine.params.url.endsWith('/')) {&eol; Redmine.params.url += '/';&eol; }&eol; }&eol; },&eol;&eol; addCustomFields: function (data, fields) {&eol; if (typeof fields === 'object' && Object.keys(fields).length) {&eol; var schema = Redmine.getSchema();&eol;&eol; if (schema) {&eol; data.issue.custom_fields = [];&eol;&eol; Object.keys(fields)&eol; .forEach(function(field) {&eol; for (var idx in schema.custom_fields) {&eol; if (schema.custom_fields[idx].id != field) {&eol; continue;&eol; }&eol;&eol; var field_value;&eol;&eol; switch (schema.custom_fields[idx].field_format) {&eol; case 'string':&eol; field_value = fields[field];&eol; break;&eol;&eol; case 'int':&eol; field_value = parseInt(fields[field]);&eol; break;&eol;&eol; case 'float':&eol; field_value = parseFloat(fields[field]);&eol; break;&eol;&eol; case 'date':&eol; if (fields[field].match(/^\d{4}[.-]\d{2}[.-]\d{2}$/)) {&eol; field_value = fields[field].replace(/\./g, '-');&eol; }&eol; break;&eol; }&eol;&eol; if (field_value !== undefined) {&eol; data.issue.custom_fields.push({id: field, value: field_value});&eol; }&eol; }&eol; });&eol; }&eol; else {&eol; Zabbix.log(4, '[ Redmine Webhook ] Failed to retrieve field schema.');&eol; }&eol; }&eol;&eol; return data;&eol; },&eol;&eol; request: function (method, query, data) {&eol; ['url', 'access_key'].forEach(function (field) {&eol; if (typeof Redmine.params !== 'object' &pipe;&pipe; typeof Redmine.params[field] === 'undefined'&eol; &pipe;&pipe; Redmine.params[field] === '' ) {&eol; throw 'Required param is not set: "' + field + '".';&eol; }&eol; });&eol;&eol; var response,&eol; url = Redmine.params.url + query,&eol; request = new HttpRequest();&eol;&eol; if (typeof Redmine.HTTPProxy === 'string' && Redmine.HTTPProxy.trim() !== '') {&eol; request.setProxy(Redmine.HTTPProxy);&eol; }&eol;&eol; request.addHeader('Content-Type: application/json');&eol; request.addHeader('X-Redmine-API-Key: ' + Redmine.params.access_key);&eol;&eol; if (typeof data !== 'undefined') {&eol; data = JSON.stringify(data);&eol; }&eol;&eol; Zabbix.log(4, '[ Redmine Webhook ] Sending request: ' +&eol; url + ((typeof data === 'string') ? (' ' + data) : ''));&eol;&eol; switch (method) {&eol; case 'get':&eol; response = request.get(url, data);&eol; break;&eol;&eol; case 'post':&eol; response = request.post(url, data);&eol; break;&eol;&eol; case 'put':&eol; response = request.put(url, data);&eol; break;&eol;&eol; default:&eol; throw 'Unsupported HTTP request method: ' + method;&eol; }&eol;&eol; Zabbix.log(4, '[ Redmine Webhook ] Received response with status code ' + request.getStatus() + ': ' + response);&eol;&eol; if (response !== null) {&eol; try {&eol; response = JSON.parse(response);&eol; }&eol; catch (error) {&eol; Zabbix.log(4, '[ Redmine Webhook ] Failed to parse response received from Redmine');&eol; response = null;&eol; }&eol; }&eol;&eol; if (request.getStatus() < 200 &pipe;&pipe; request.getStatus() >= 300) {&eol; var message = 'Request failed with status code ' + request.getStatus();&eol;&eol; if (response !== null && typeof response.errors !== 'undefined'&eol; && Object.keys(response.errors).length > 0) {&eol; message += ': ' + JSON.stringify(response.errors);&eol; }&eol; else if (response !== null && typeof response.errorMessages !== 'undefined'&eol; && Object.keys(response.errorMessages).length > 0) {&eol; message += ': ' + JSON.stringify(response.errorMessages);&eol; }&eol;&eol; throw message + ' Check debug log for more information.';&eol; }&eol;&eol; return {&eol; status: request.getStatus(),&eol; response: response&eol; };&eol; },&eol;&eol; getProjectID: function(name) {&eol; var result = Redmine.request('get', 'projects.json'),&eol; project_id;&eol;&eol; if (result.response) {&eol; var projects = result.response.projects &pipe;&pipe; [];&eol;&eol; for (var i in projects) {&eol; if (projects[i].name === name) {&eol; project_id = projects[i].id;&eol; break;&eol; }&eol; }&eol; }&eol; else {&eol; Zabbix.log(4, '[ Redmine Webhook ] Failed to retrieve project data.');&eol; }&eol;&eol; if (typeof project_id === 'undefined') {&eol; throw 'Cannot find project with name: ' + name;&eol; }&eol;&eol; return project_id;&eol; },&eol;&eol; getSchema: function() {&eol; var result = Redmine.request('get', 'custom_fields.json');&eol;&eol; return result.response;&eol; },&eol;&eol; createIssue: function(subject, description, priority, fields) {&eol; var project_id = /^\d+$/.test(Redmine.params.project)&eol; ? Redmine.params.project&eol; : Redmine.getProjectID(Redmine.params.project),&eol; data = {&eol; issue: {&eol; project_id: project_id,&eol; tracker_id: Redmine.params.tracker_id,&eol; subject: subject,&eol; description: description&eol; }&eol; },&eol; result;&eol;&eol; if (priority) {&eol; data.issue.priority_id = priority;&eol; }&eol;&eol; result = Redmine.request('post', 'issues.json', Redmine.addCustomFields(data, fields));&eol;&eol; if (typeof result.response !== 'object'&eol; &pipe;&pipe; typeof result.response.issue.id === 'undefined'&eol; &pipe;&pipe; result.status != 201) {&eol; throw 'Cannot create Redmine issue. Check debug log for more information.';&eol; }&eol;&eol; return result.response.issue.id;&eol; },&eol;&eol; updateIssue: function(note, fields) {&eol; var data = {&eol; issue: {&eol; notes: note &pipe;&pipe; ''&eol; }&eol; };&eol;&eol; Redmine.request('put', 'issues/' + Redmine.params.issue_key + '.json', Redmine.addCustomFields(data, fields));&eol; }&eol;};&eol;&eol;try {&eol; var params = JSON.parse(value),&eol; params_redmine = {},&eol; params_fields = {},&eol; params_update = {},&eol; result = {tags: {}},&eol; required_params = [&eol; 'alert_subject', 'tracker_id', 'project',&eol; 'event_source', 'event_value', 'event_update_status'&eol; ],&eol; severities = [&eol; {name: 'not_classified', color: '#97AAB3'},&eol; {name: 'information', color: '#7499FF'},&eol; {name: 'warning', color: '#FFC859'},&eol; {name: 'average', color: '#FFA059'},&eol; {name: 'high', color: '#E97659'},&eol; {name: 'disaster', color: '#E45959'},&eol; {name: 'resolved', color: '#009900'},&eol; {name: null, color: '#000000'}&eol; ],&eol; priority;&eol;&eol; Object.keys(params)&eol; .forEach(function (key) {&eol; if (key.startsWith('redmine_')) {&eol; params_redmine[key.substring(8)] = params[key];&eol; }&eol; else if (key.startsWith('customfield_')) {&eol; params_fields[key.substring(12)] = params[key];&eol; }&eol; else if (key.startsWith('event_update_')) {&eol; params_update[key.substring(13)] = params[key];&eol; }&eol; else if (required_params.indexOf(key) !== -1 && params[key].trim() === '') {&eol; throw 'Parameter "' + key + '" cannot be empty.';&eol; }&eol; });&eol;&eol; if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {&eol; throw 'Incorrect "event_source" parameter given: ' + params.event_source + '\nMust be 0-3.';&eol; }&eol;&eol; // Check {EVENT.VALUE} for trigger-based and internal events.&eol; if (params.event_value !== '0' && params.event_value !== '1'&eol; && (params.event_source === '0' &pipe;&pipe; params.event_source === '3')) {&eol; throw 'Incorrect "event_value" parameter given: ' + params.event_value + '\nMust be 0 or 1.';&eol; }&eol;&eol; // Check {EVENT.UPDATE.STATUS} only for trigger-based events.&eol; if (params.event_source === '0' && params.event_update_status !== '0' && params.event_update_status !== '1') {&eol; throw 'Incorrect "event_update_status" parameter given: ' + params.event_update_status + '\nMust be 0 or 1.';&eol; }&eol;&eol; if (params.event_source !== '0' && params.event_value === '0') {&eol; throw 'Recovery operations are supported only for trigger-based actions.';&eol; }&eol;&eol; if (params.event_source === '0'&eol; && ((params.event_value === '1' && params.event_update_status === '1')&eol; &pipe;&pipe; (params.event_value === '0'&eol; && (params.event_update_status === '0' &pipe;&pipe; params.event_update_status === '1')))&eol; && (isNaN(parseInt(params.redmine_issue_key)) &pipe;&pipe; parseInt(params.redmine_issue_key) < 1 )) {&eol; throw 'Incorrect "redmine_issue_key" parameter given: ' + params.redmine_issue_key +&eol; '\nMust be positive integer.';&eol; }&eol;&eol; if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol; params.event_nseverity = '7';&eol; }&eol;&eol; if (params.event_value === '0') {&eol; params.event_nseverity = '6';&eol; }&eol;&eol; priority = params['severity_' + severities[params.event_nseverity].name];&eol; priority = priority && priority.trim() &pipe;&pipe; severities[7].name;&eol;&eol; Redmine.setParams(params_redmine);&eol; Redmine.HTTPProxy = params.HTTPProxy;&eol;&eol; // Create issue for non trigger-based events.&eol; if (params.event_source !== '0'&eol; && params.event_value !== '0') {&eol; Redmine.createIssue(params.alert_subject, params.alert_message, priority);&eol; }&eol; // Create issue for trigger-based events.&eol; else if (params.event_value === '1' && params_update.status === '0') {&eol; var issue_id = Redmine.createIssue(params.alert_subject,&eol; params.alert_subject + '\n' + params.alert_message + '\n' +&eol; params.zabbix_url + (params.zabbix_url.endsWith('/') ? '' : '/') +&eol; 'tr_events.php?triggerid=' + params.trigger_id + '&eventid=' + params.event_id + '\n',&eol; priority,&eol; params_fields);&eol;&eol; result.tags.__zbx_redmine_issue_id = issue_id;&eol; result.tags.__zbx_redmine_issuelink = params.redmine_url +&eol; (params.redmine_url.endsWith('/') ? '' : '/') + 'issues/' + issue_id;&eol; }&eol; // Update created issue for trigger-based event.&eol; else {&eol; Redmine.updateIssue(params.alert_subject + '\n' + params.alert_message, params_fields);&eol; }&eol;&eol; return JSON.stringify(result);&eol;}&eol;catch (error) {&eol; Zabbix.log(3, '[ Redmine Webhook ] ERROR: ' + error);&eol; throw 'Sending failed: ' + error;&eol;}|30s |1 |1 |{EVENT.TAGS.__zbx_redmine_issuelink} |Redmine: issue #{EVENT.TAGS.__zbx_redmine_issue_id} | |
-ROW |16 |4 |Telegram | | | | | | | |0 |25 |0 |0 |0 |0 | |1 |3 |10s |1 |var Telegram = {&eol; token: null,&eol; to: null,&eol; message: null,&eol; proxy: null,&eol; parse_mode: null,&eol;&eol; sendMessage: function() {&eol; var params = {&eol; chat_id: Telegram.to,&eol; text: Telegram.message,&eol; disable_web_page_preview: true,&eol; disable_notification: false&eol; },&eol; data,&eol; response,&eol; request = new HttpRequest(),&eol; url = 'https://api.telegram.org/bot' + Telegram.token + '/sendMessage';&eol;&eol; if (Telegram.parse_mode !== null) {&eol; params['parse_mode'] = Telegram.parse_mode;&eol; }&eol;&eol; if (Telegram.proxy) {&eol; request.setProxy(Telegram.proxy);&eol; }&eol;&eol; request.addHeader('Content-Type: application/json');&eol; data = JSON.stringify(params);&eol;&eol; // Remove replace() function if you want to see the exposed token in the log file.&eol; Zabbix.log(4, '[Telegram Webhook] URL: ' + url.replace(Telegram.token, '<TOKEN>'));&eol; Zabbix.log(4, '[Telegram Webhook] params: ' + data);&eol; response = request.post(url, data);&eol; Zabbix.log(4, '[Telegram Webhook] HTTP code: ' + request.getStatus());&eol;&eol; try {&eol; response = JSON.parse(response);&eol; }&eol; catch (error) {&eol; response = null;&eol; }&eol;&eol; if (request.getStatus() !== 200 &pipe;&pipe; typeof response.ok !== 'boolean' &pipe;&pipe; response.ok !== true) {&eol; if (typeof response.description === 'string') {&eol; throw response.description;&eol; }&eol; else {&eol; throw 'Unknown error. Check debug log for more information.'&eol; }&eol; }&eol; }&eol;}&eol;&eol;try {&eol; var params = JSON.parse(value);&eol;&eol; if (typeof params.Token === 'undefined') {&eol; throw 'Incorrect value is given for parameter "Token": parameter is missing';&eol; }&eol;&eol; Telegram.token = params.Token;&eol;&eol; if (params.HTTPProxy) {&eol; Telegram.proxy = params.HTTPProxy;&eol; } &eol;&eol; if (['Markdown', 'HTML', 'MarkdownV2'].indexOf(params.ParseMode) !== -1) {&eol; Telegram.parse_mode = params.ParseMode;&eol; }&eol;&eol; Telegram.to = params.To;&eol; Telegram.message = params.Subject + '\n' + params.Message;&eol; Telegram.sendMessage();&eol;&eol; return 'OK';&eol;}&eol;catch (error) {&eol; Zabbix.log(4, '[Telegram Webhook] notification failed: ' + error);&eol; throw 'Sending failed: ' + error + '.';&eol;}|10s |0 |0 | | |https://git.zabbix.com/projects/ZBX/repos/zabbix/browse/templates/media/telegram&eol;&eol;1. Register bot: send "/newbot" to @BotFather and follow instructions&eol;2. Copy and paste the obtained token into the "Token" field above&eol;3. If you want to send personal notifications, you need to get chat id of the user you want to send messages to:&eol; 3.1. Send "/getid" to "@myidbot" in Telegram messenger&eol; 3.2. Copy returned chat id and save it in the "Telegram Webhook" media for the user&eol; 3.3. Ask the user to send "/start" to your bot (Telegram bot won't send anything to the user without it)&eol;4. If you want to send group notifications, you need to get group id of the group you want to send messages to:&eol; 4.1. Add "@myidbot" to your group&eol; 4.2. Send "/getgroupid@myidbot" in your group&eol; 4.3. Copy returned group id save it in the "Telegram Webhook" media for the user you created for group notifications&eol; 4.4. Send "/start@your_bot_name_here" in your group (Telegram bot won't send anything to the group without it)|
+ROW |16 |4 |Telegram | | | | | | | |0 |25 |0 |0 |0 |0 | |1 |3 |10s |1 |var Telegram = {&eol; token: null,&eol; to: null,&eol; message: null,&eol; proxy: null,&eol; parse_mode: null,&eol;&eol; escapeMarkup: function (str, mode) {&eol; switch (mode) {&eol; case 'markdown':&eol; return str.replace(/([_*\[`])/g, '\\$&');&eol;&eol; case 'markdownv2':&eol; return str.replace(/([_*\[\]()~`>#+\-=&pipe;{}.!])/g, '\\$&');&eol;&eol; default:&eol; return str;&eol; }&eol; },&eol;&eol; sendMessage: function () {&eol; var params = {&eol; chat_id: Telegram.to,&eol; text: Telegram.message,&eol; disable_web_page_preview: true,&eol; disable_notification: false&eol; },&eol; data,&eol; response,&eol; request = new HttpRequest(),&eol; url = 'https://api.telegram.org/bot' + Telegram.token + '/sendMessage';&eol;&eol; if (Telegram.parse_mode !== null) {&eol; params['parse_mode'] = Telegram.parse_mode;&eol; }&eol;&eol; if (Telegram.proxy) {&eol; request.setProxy(Telegram.proxy);&eol; }&eol;&eol; request.addHeader('Content-Type: application/json');&eol; data = JSON.stringify(params);&eol;&eol; // Remove replace() function if you want to see the exposed token in the log file.&eol; Zabbix.log(4, '[Telegram Webhook] URL: ' + url.replace(Telegram.token, '<TOKEN>'));&eol; Zabbix.log(4, '[Telegram Webhook] params: ' + data);&eol; response = request.post(url, data);&eol; Zabbix.log(4, '[Telegram Webhook] HTTP code: ' + request.getStatus());&eol;&eol; try {&eol; response = JSON.parse(response);&eol; }&eol; catch (error) {&eol; response = null;&eol; }&eol;&eol; if (request.getStatus() !== 200 &pipe;&pipe; typeof response.ok !== 'boolean' &pipe;&pipe; response.ok !== true) {&eol; if (typeof response.description === 'string') {&eol; throw response.description;&eol; }&eol; else {&eol; throw 'Unknown error. Check debug log for more information.';&eol; }&eol; }&eol; }&eol;};&eol;&eol;try {&eol; var params = JSON.parse(value);&eol;&eol; if (typeof params.Token === 'undefined') {&eol; throw 'Incorrect value is given for parameter "Token": parameter is missing';&eol; }&eol;&eol; Telegram.token = params.Token;&eol;&eol; if (params.HTTPProxy) {&eol; Telegram.proxy = params.HTTPProxy;&eol; } &eol;&eol; params.ParseMode = params.ParseMode.toLowerCase();&eol; &eol; if (['markdown', 'html', 'markdownv2'].indexOf(params.ParseMode) !== -1) {&eol; Telegram.parse_mode = params.ParseMode;&eol; }&eol;&eol; Telegram.to = params.To;&eol; Telegram.message = params.Subject + '\n' + params.Message;&eol;&eol; if (['markdown', 'markdownv2'].indexOf(params.ParseMode) !== -1) {&eol; Telegram.message = Telegram.escapeMarkup(Telegram.message, params.ParseMode);&eol; }&eol;&eol; Telegram.sendMessage();&eol;&eol; return 'OK';&eol;}&eol;catch (error) {&eol; Zabbix.log(4, '[Telegram Webhook] notification failed: ' + error);&eol; throw 'Sending failed: ' + error + '.';&eol;}|10s |0 |0 | | |https://git.zabbix.com/projects/ZBX/repos/zabbix/browse/templates/media/telegram&eol;&eol;1. Register bot: send "/newbot" to @BotFather and follow instructions&eol;2. Copy and paste the obtained token into the "Token" field above&eol;3. If you want to send personal notifications, you need to get chat id of the user you want to send messages to:&eol; 3.1. Send "/getid" to "@myidbot" in Telegram messenger&eol; 3.2. Copy returned chat id and save it in the "Telegram Webhook" media for the user&eol; 3.3. Ask the user to send "/start" to your bot (Telegram bot won't send anything to the user without it)&eol;4. If you want to send group notifications, you need to get group id of the group you want to send messages to:&eol; 4.1. Add "@myidbot" to your group&eol; 4.2. Send "/getgroupid@myidbot" in your group&eol; 4.3. Copy returned group id save it in the "Telegram Webhook" media for the user you created for group notifications&eol; 4.4. Send "/start@your_bot_name_here" in your group (Telegram bot won't send anything to the group without it)|
ROW |17 |4 |Zendesk | | | | | | | |0 |25 |0 |0 |0 |0 | |1 |3 |10s |1 |var Zendesk = {&eol; params: {},&eol;&eol; setParams: function (params) {&eol; if (typeof params !== 'object') {&eol; return;&eol; }&eol;&eol; Zendesk.params = params;&eol; if (typeof Zendesk.params.url === 'string') {&eol; if (!Zendesk.params.url.endsWith('/')) {&eol; Zendesk.params.url += '/';&eol; }&eol; Zendesk.params.url += 'api/v2/';&eol; }&eol; },&eol;&eol; addCustomFields: function (data, fields) {&eol; if (typeof fields === 'object' && Object.keys(fields).length) {&eol; var schema = Zendesk.getSchema(),&eol; arr = [],&eol; i,&eol; n;&eol;&eol; if (schema) {&eol; Object.keys(fields)&eol; .forEach(function(field) {&eol; for (i = 0, n = schema.ticket_fields.length; i < n; i++) {&eol; if (schema.ticket_fields[i].id == field&eol; && ['text', 'integer', 'date'].indexOf(schema.ticket_fields[i].type) !== -1){&eol;&eol; switch (schema.ticket_fields[i].type) {&eol; case 'integer':&eol; fields[field] = parseInt(fields[field]);&eol; break;&eol; case 'date':&eol; if (fields[field].match(/^\d{4}[.-]\d{2}[.-]\d{2}$/) !== null) {&eol; fields[field] = fields[field].replace(/\./g, '-');&eol; }&eol; else {&eol; fields[field] = '';&eol; }&eol; break;&eol; }&eol;&eol; arr.push({id: field, value: fields[field]});&eol; break;&eol; }&eol; }&eol; });&eol;&eol; if (arr.length) {&eol; data.ticket['custom_fields'] = arr;&eol; }&eol; }&eol; else {&eol; Zabbix.log(4, '[Zendesk Webhook] Failed to retrieve field schema.');&eol; }&eol; }&eol;&eol; return data;&eol; },&eol;&eol; request: function (method, query, data) {&eol; ['url', 'token', 'type'].forEach(function (field) {&eol; if (typeof Zendesk.params !== 'object' &pipe;&pipe; typeof Zendesk.params[field] === 'undefined') {&eol; throw 'Required Zendesk param is not set: ' + field + '\n' + Zendesk.params[field];&eol; }&eol; });&eol;&eol; var response,&eol; url = Zendesk.params.url + query,&eol; request = new HttpRequest();&eol;&eol; if (typeof Zendesk.HTTPProxy === 'string' && Zendesk.HTTPProxy.trim() !== '') {&eol; request.setProxy(Zendesk.HTTPProxy);&eol; }&eol;&eol; request.addHeader('Content-Type: application/json');&eol; request.addHeader('Authorization: Basic ' + btoa(Zendesk.params.token));&eol;&eol; if (typeof data !== 'undefined') {&eol; data = JSON.stringify(data);&eol; }&eol;&eol; Zabbix.log(4, '[Zendesk Webhook] Sending request: ' + url + ((typeof data === 'string') ? (' ' + data) : ''));&eol;&eol; switch (method) {&eol; case 'get':&eol; response = request.get(url, data);&eol; break;&eol;&eol; case 'post':&eol; response = request.post(url, data);&eol; break;&eol;&eol; case 'put':&eol; response = request.put(url, data);&eol; break;&eol;&eol; default:&eol; throw 'Unsupported HTTP request method: ' + method;&eol; }&eol;&eol; Zabbix.log(4, '[Zendesk Webhook] Received response with status code ' + request.getStatus() + '. ' + response);&eol;&eol; if (response !== null) {&eol; try {&eol; response = JSON.parse(response);&eol; }&eol; catch (error) {&eol; Zabbix.log(4, '[Zendesk Webhook] Failed to parse response received from Zendesk.');&eol; }&eol; }&eol;&eol; if (request.getStatus() < 200 &pipe;&pipe; request.getStatus() >= 300) {&eol; var message = 'Request failed with status code ' + request.getStatus();&eol;&eol; if (response !== null && typeof response.error !== 'undefined'&eol; && Object.keys(response.error).length > 0) {&eol; message += ': ' + JSON.stringify(response.error);&eol; }&eol; else if (response !== null && typeof response.description !== 'undefined'&eol; && Object.keys(response.description).length > 0) {&eol; message += ': ' + JSON.stringify(response.description);&eol; }&eol; else {&eol; message += '. ' + response;&eol; }&eol; throw message + '. Check debug log for more information.';&eol; }&eol;&eol; return {&eol; status: request.getStatus(),&eol; response: response&eol; };&eol; },&eol;&eol; getSchema: function() {&eol; var result = Zendesk.request('get', 'ticket_fields.json');&eol;&eol; return result.response;&eol; },&eol;&eol; createIssue: function(data, fields) {&eol; var result = Zendesk.request('post', 'tickets.json', Zendesk.addCustomFields(data, fields));&eol;&eol; if (typeof result.response !== 'object' &pipe;&pipe; typeof result.response.ticket.id === 'undefined'&eol; &pipe;&pipe; result.status != 201) {&eol; throw 'Cannot create Zendesk issue. Check debug log for more information.';&eol; }&eol;&eol; return result.response.ticket.id;&eol; },&eol;&eol; updateIssue: function(data, fields) {&eol; Zendesk.request('put', 'tickets/' + Zendesk.params.issue_key + '.json', Zendesk.addCustomFields(data, fields));&eol; }&eol;};&eol;&eol;try {&eol; var params = JSON.parse(value),&eol; fields = {},&eol; zendesk = {},&eol; update = {},&eol; data = {},&eol; result = {tags: {}},&eol; required_params = [&eol; 'alert_subject',&eol; 'alert_message',&eol; 'event_id',&eol; 'event_source',&eol; 'event_value',&eol; 'event_update_status'&eol; ],&eol; severities = [&eol; {name: 'not_classified', color: '#97AAB3'},&eol; {name: 'information', color: '#7499FF'},&eol; {name: 'warning', color: '#FFC859'},&eol; {name: 'average', color: '#FFA059'},&eol; {name: 'high', color: '#E97659'},&eol; {name: 'disaster', color: '#E45959'},&eol; {name: 'resolved', color: '#009900'},&eol; {name: 'default', color: '#000000'}&eol; ],&eol; priority;&eol;&eol; Object.keys(params)&eol; .forEach(function (key) {&eol; if (key.startsWith('zendesk_')) {&eol; zendesk[key.substring(8)] = params[key];&eol; }&eol; else if (key.startsWith('customfield_')) {&eol; fields[key.substring(12)] = params[key];&eol; }&eol; else if (key.startsWith('event_update_')) {&eol; update[key.substring(13)] = params[key];&eol; }&eol; else if (required_params.indexOf(key) !== -1 && params[key].trim() === '') {&eol; throw 'Parameter ' + key + ' cannot be empty.';&eol; }&eol; });&eol;&eol; // Possible values: question, incident, problems, task&eol; if (['question', 'incident', 'problem', 'task'].indexOf(params.zendesk_type) === -1) {&eol; throw 'Incorrect "zendesk_type" parameter given: ' + params.zendesk_type +&eol; '\nMust be one of question, incident, problem, task.';&eol; }&eol;&eol; // Possible values: 0 - Trigger, 1 - Discovery, 2 - Autoregistration, 3 - Internal.&eol; if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {&eol; throw 'Incorrect "event_source" parameter given: ' + params.event_source + '\nMust be 0-3.';&eol; }&eol;&eol; // Check {EVENT.VALUE} for trigger-based and internal events.&eol; // Possible values: 1 for problem, 0 for recovering&eol; if (params.event_value !== '0' && params.event_value !== '1'&eol; && (params.event_source === '0' &pipe;&pipe; params.event_source === '3')) {&eol; throw 'Incorrect "event_value" parameter given: ' + params.event_value + '\nMust be 0 or 1.';&eol; }&eol;&eol; // Check {EVENT.UPDATE.STATUS} only for trigger-based events.&eol; // Possible values: 0 - Webhook was called because of problem/recovery event, 1 - Update operation.&eol; if (params.event_source === '0' && params.event_update_status !== '0' && params.event_update_status !== '1') {&eol; throw 'Incorrect "event_update_status" parameter given: ' + params.event_update_status + '\nMust be 0 or 1.';&eol; }&eol;&eol; if (params.event_source !== '0' && params.event_value === '0') {&eol; throw 'Recovery operations are supported only for trigger-based actions.';&eol; }&eol;&eol; // Zendesk_issue_key must be a positive integer if an update action is being performed.&eol; if (params.event_source === '0' && ((params.event_value === '1' && params.event_update_status === '1')&eol; &pipe;&pipe; (params.event_value === '0' && (params.event_update_status === '0' &pipe;&pipe; params.event_update_status === '1')))&eol; && (isNaN(parseInt(params.zendesk_issue_key)) &pipe;&pipe; parseInt(params.zendesk_issue_key) < 1 )) {&eol; throw 'Incorrect "zendesk_issue_key" parameter given: ' + params.zendesk_issue_key +&eol; '\nMust be positive integer.';&eol; }&eol;&eol; if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol; params.event_nseverity = '7';&eol; }&eol;&eol; if (params.event_value === '0') {&eol; params.event_nseverity = '6';&eol; }&eol;&eol; priority = params['severity_' + severities[params.event_nseverity].name] &pipe;&pipe; severities[7].name;&eol;&eol; Zendesk.setParams(zendesk);&eol; Zendesk.HTTPProxy = params.HTTPProxy;&eol;&eol; // Create issue for non trigger-based events.&eol; if (params.event_source !== '0' && params.event_value !== '0') {&eol; data = {&eol; ticket: {&eol; external_id: params.event_id,&eol; type: Zendesk.params.type,&eol; status: 'new',&eol; subject: params.alert_subject,&eol; comment: {&eol; body: params.alert_message,&eol; public: 'false'&eol; },&eol; priority: priority,&eol; tags: params.event_tags&eol; }&eol; };&eol;&eol; Zendesk.createIssue(data, fields);&eol; }&eol; // Create issue for trigger-based events.&eol; else if (params.event_value === '1' && update.status === '0') {&eol; data = {&eol; ticket: {&eol; external_id: params.event_id,&eol; type: Zendesk.params.type,&eol; status: 'new',&eol; subject: params.alert_subject,&eol; comment: {&eol; body: params.zbxurl + (params.zbxurl.endsWith('/') ? '' : '/') + 'tr_events.php?triggerid=' +&eol; params.trigger_id + '&eventid=' + params.event_id + '\n' + params.alert_message,&eol; public: 'false'&eol; },&eol; priority: priority,&eol; tags: params.event_tags&eol; }&eol; };&eol; var key = Zendesk.createIssue(data, fields);&eol;&eol; result.tags.__zbx_zdk_issuekey = key;&eol; result.tags.__zbx_zdk_issuelink = params.zendesk_url +&eol; (params.zendesk_url.endsWith('/') ? '' : '/') + 'agent/tickets/' + key;&eol; }&eol; // Update created issue for trigger-based event.&eol; else {&eol; data = {&eol; ticket: {&eol; type: Zendesk.params.type,&eol; subject: params.alert_subject,&eol; comment: {&eol; body: params.alert_message,&eol; public: 'false'&eol; }&eol; }&eol; };&eol;&eol; Zendesk.updateIssue(data, fields);&eol; }&eol;&eol; return JSON.stringify(result);&eol;}&eol;catch (error) {&eol; Zabbix.log(3, '[Zendesk Webhook] ERROR: ' + error);&eol; throw 'Sending failed: ' + error;&eol;}|30s |1 |1 |{EVENT.TAGS.__zbx_zdk_issuelink} |Zendesk: {EVENT.TAGS.__zbx_zdk_issuekey} | |
ROW |18 |4 |ServiceNow | | | | | | | |0 |25 |0 |0 |0 |0 | |1 |3 |10s |1 |var ServiceNow = {&eol; params: {},&eol;&eol; setParams: function (params) {&eol; if (typeof params !== 'object') {&eol; return;&eol; }&eol;&eol; ServiceNow.params = params;&eol; if (typeof ServiceNow.params.url === 'string') {&eol; if (!ServiceNow.params.url.endsWith('/')) {&eol; ServiceNow.params.url += '/';&eol; }&eol;&eol; ServiceNow.params.url += 'api/now/table/incident';&eol; }&eol; },&eol;&eol; setProxy: function (HTTPProxy) {&eol; ServiceNow.HTTPProxy = HTTPProxy;&eol; },&eol;&eol; setFields: function (data, fields) {&eol; if (typeof fields === 'object' && Object.keys(fields).length) {&eol; Object.keys(fields)&eol; .forEach(function(field) {&eol; data[field] = (fields[field].match(/^\d{4}\.\d{2}\.\d{2}$/) !== null)&eol; ? fields[field].replace(/\./g, '-')&eol; : fields[field];&eol; });&eol; }&eol; },&eol;&eol; request: function (method, data) {&eol; ['url', 'user', 'password'].forEach(function (field) {&eol; if (typeof ServiceNow.params !== 'object' &pipe;&pipe; typeof ServiceNow.params[field] === 'undefined'&eol; &pipe;&pipe; ServiceNow.params[field] === '' ) {&eol; throw 'Required ServiceNow param is not set: "' + field + '".';&eol; }&eol; });&eol;&eol; var response,&eol; url = ServiceNow.params.url,&eol; request = new HttpRequest();&eol;&eol; request.addHeader('Content-Type: application/json');&eol; request.addHeader('Authorization: Basic ' + btoa(ServiceNow.params.user + ':' + ServiceNow.params.password));&eol;&eol; if (typeof ServiceNow.HTTPProxy !== 'undefined' && ServiceNow.HTTPProxy !== '') {&eol; request.setProxy(ServiceNow.HTTPProxy);&eol; }&eol;&eol; if (typeof data !== 'undefined') {&eol; data = JSON.stringify(data);&eol; }&eol;&eol; Zabbix.log(4, '[ ServiceNow Webhook ] Sending request: ' + url + ((typeof data === 'string')&eol; ? ('\n' + data)&eol; : ''));&eol;&eol; switch (method) {&eol; case 'get':&eol; response = request.get(url, data);&eol; break;&eol;&eol; case 'post':&eol; response = request.post(url, data);&eol; break;&eol;&eol; case 'put':&eol; response = request.put(url, data);&eol; break;&eol;&eol; default:&eol; throw 'Unsupported HTTP request method: ' + method;&eol; }&eol;&eol; Zabbix.log(4, '[ ServiceNow Webhook ] Received response with status code ' +&eol; request.getStatus() + '\n' + response);&eol;&eol; if (response !== null) {&eol; try {&eol; response = JSON.parse(response);&eol; }&eol; catch (error) {&eol; Zabbix.log(4, '[ ServiceNow Webhook ] Failed to parse response received from ServiceNow');&eol; response = null;&eol; }&eol; }&eol;&eol; if (request.getStatus() < 200 &pipe;&pipe; request.getStatus() >= 300) {&eol; var message = 'Request failed with status code ' + request.getStatus();&eol;&eol; if (response !== null && typeof response.error.message !== 'undefined'&eol; && Object.keys(response.error).length > 0) {&eol; message += ': ' + JSON.stringify(response.error.message);&eol; }&eol;&eol; throw message + ' Check debug log for more information.';&eol; }&eol; else if (typeof response.result !== 'object' &pipe;&pipe; typeof response.result.sys_id === 'undefined') {&eol; throw 'Cannot create ServiceNow incident. Check debug log for more information.';&eol; }&eol;&eol; return response.result;&eol; }&eol;};&eol;&eol;try {&eol; var params = JSON.parse(value),&eol; fields = {},&eol; servicenow = {},&eol; data = {},&eol; result = {tags: {}},&eol; required_params = [&eol; 'alert_subject', 'alert_message', 'event_source', 'event_value',&eol; 'event_update_status', 'event_recovery_value', 'event_nseverity'&eol; ],&eol; severities = [&eol; {name: 'not_classified', color: '#97AAB3'},&eol; {name: 'information', color: '#7499FF'},&eol; {name: 'warning', color: '#FFC859'},&eol; {name: 'average', color: '#FFA059'},&eol; {name: 'high', color: '#E97659'},&eol; {name: 'disaster', color: '#E45959'},&eol; {name: 'resolved', color: '#009900'},&eol; {name: 'default', color: '#000000'}&eol; ],&eol; method = 'post',&eol; process_tags = true;&eol;&eol; Object.keys(params)&eol; .forEach(function (key) {&eol; if (key.startsWith('servicenow_')) {&eol; servicenow[key.substring(11)] = params[key];&eol; }&eol; else if (key.startsWith('u_')) {&eol; fields[key] = params[key];&eol; }&eol; else if (required_params.indexOf(key) !== -1 && params[key] === '') {&eol; throw 'Parameter "' + key + '" can\'t be empty.';&eol; }&eol; });&eol;&eol; if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {&eol; throw 'Incorrect "event_source" parameter given: ' + params.event_source + '\nMust be 0-3.';&eol; }&eol;&eol; if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol; params.event_nseverity = '7';&eol; }&eol;&eol; // Check {EVENT.VALUE} for trigger-based and internal events.&eol; if (params.event_value !== '0' && params.event_value !== '1'&eol; && (params.event_source === '0' &pipe;&pipe; params.event_source === '3')) {&eol; throw 'Incorrect "event_value" parameter given: ' + params.event_value + '\nMust be 0 or 1.';&eol; }&eol;&eol; // Check {EVENT.UPDATE.STATUS} only for trigger-based events.&eol; if (params.event_update_status !== '0' && params.event_update_status !== '1' && params.event_source === '0') {&eol; throw 'Incorrect "event_update_status" parameter given: ' + params.event_update_status + '\nMust be 0 or 1.';&eol; }&eol;&eol; if (params.event_source !== '0' && params.event_recovery_value === '0') {&eol; throw 'Recovery operations are supported only for trigger-based actions.';&eol; }&eol;&eol; data.short_description = params.alert_subject;&eol; data.description = params.alert_message;&eol; data.comments = params.alert_message;&eol;&eol; if (typeof params['urgency_for_' + severities[params.event_nseverity].name] !== 'undefined') {&eol; data.urgency = params['urgency_for_' + severities[params.event_nseverity].name];&eol; }&eol;&eol; ServiceNow.setParams(servicenow);&eol; ServiceNow.setProxy(params.HTTPProxy);&eol; ServiceNow.setFields(data, fields);&eol;&eol; if (params.event_source === '0' && (params.event_value === '0' &pipe;&pipe; params.event_update_status === '1')) {&eol; process_tags = false;&eol; method = 'put';&eol; delete data.description;&eol; delete data.urgency;&eol; ServiceNow.params.url += '/' + params.servicenow_sys_id;&eol; }&eol;&eol; var response = ServiceNow.request(method, data);&eol;&eol; if (process_tags) {&eol; result.tags.__zbx_servicenow_sys_id = response.sys_id;&eol; result.tags.__zbx_servicenow_link = params.servicenow_url +&eol; (params.servicenow_url.endsWith('/') ? '' : '/') + 'incident.do?sys_id=' + response.sys_id;&eol; result.tags.__zbx_servicenow_number = response.number;&eol; }&eol;&eol; return JSON.stringify(result);&eol;}&eol;catch (error) {&eol; Zabbix.log(3, '[ ServiceNow Webhook ] ERROR: ' + error);&eol; throw 'Sending failed: ' + error;&eol;}|30s |1 |1 |{EVENT.TAGS.__zbx_servicenow_link} |ServiceNow: {EVENT.TAGS.__zbx_servicenow_number} | |
ROW |19 |4 |Zammad | | | | | | | |0 |25 |0 |0 |0 |0 | |1 |3 |10s |1 |var Zammad = {&eol; params: {},&eol;&eol; setParams: function (params) {&eol; if (typeof params !== 'object') {&eol; return;&eol; }&eol;&eol; Zammad.params = params;&eol; if (typeof Zammad.params.url === 'string') {&eol; if (!Zammad.params.url.endsWith('/')) {&eol; Zammad.params.url += '/';&eol; }&eol; }&eol; },&eol;&eol; request: function (method, query, data) {&eol; ['url', 'access_token'].forEach(function (field) {&eol; if (typeof Zammad.params !== 'object' &pipe;&pipe; typeof Zammad.params[field] === 'undefined'&eol; &pipe;&pipe; Zammad.params[field] === '' ) {&eol; throw 'Required param is not set: "' + field + '".';&eol; }&eol; });&eol;&eol; var response,&eol; url = Zammad.params.url + query,&eol; request = new HttpRequest();&eol;&eol; if (typeof Zammad.HTTPProxy === 'string' && Zammad.HTTPProxy.trim() !== '') {&eol; request.setProxy(Zammad.HTTPProxy);&eol; }&eol;&eol; request.addHeader('Content-Type: application/json');&eol; request.addHeader('Authorization: Token token=' + Zammad.params.access_token);&eol;&eol; if (typeof data !== 'undefined') {&eol; data = JSON.stringify(data);&eol; }&eol;&eol; Zabbix.log(4, '[ Zammad Webhook ] Sending request: ' +&eol; url + ((typeof data === 'string') ? (' ' + data) : ''));&eol;&eol; switch (method) {&eol; case 'get':&eol; response = request.get(url, data);&eol; break;&eol;&eol; case 'post':&eol; response = request.post(url, data);&eol; break;&eol;&eol; case 'put':&eol; response = request.put(url, data);&eol; break;&eol;&eol; default:&eol; throw 'Unsupported HTTP request method: ' + method;&eol; }&eol;&eol; Zabbix.log(4, '[ Zammad Webhook ] Received response with status code ' + request.getStatus() + ': ' + response);&eol;&eol; if (response !== null) {&eol; try {&eol; response = JSON.parse(response);&eol; }&eol; catch (error) {&eol; Zabbix.log(4, '[ Zammad Webhook ] Failed to parse response received from Zammad');&eol; response = null;&eol; }&eol; }&eol;&eol; if (request.getStatus() < 200 &pipe;&pipe; request.getStatus() >= 300) {&eol; var message = 'Request failed with status code ' + request.getStatus();&eol;&eol; if (response !== null && typeof response.errors !== 'undefined'&eol; && Object.keys(response.errors).length > 0) {&eol; message += ': ' + JSON.stringify(response.errors);&eol; }&eol; else if (response !== null && typeof response.errorMessages !== 'undefined'&eol; && Object.keys(response.errorMessages).length > 0) {&eol; message += ': ' + JSON.stringify(response.errorMessages);&eol; }&eol;&eol; throw message + ' Check debug log for more information.';&eol; }&eol;&eol; return {&eol; status: request.getStatus(),&eol; response: response&eol; };&eol; },&eol;&eol; setTicketTags: function(tags, ticket_id) {&eol; try {&eol; var tags_json = JSON.parse(tags),&eol; result;&eol;&eol; for (var i in tags_json) {&eol; result = Zammad.request('get',&eol; '/api/v1/tags/add?object=Ticket&o_id=' + ticket_id +&eol; '&item=' + tags_json[i].tag);&eol;&eol; if (typeof result.response !== 'object'&eol; &pipe;&pipe; result.status != 200) {&eol; Zabbix.log(4, '[ Zammad Webhook ] Cannot add ticket tag:' + tags_json[i].tag);&eol; }&eol; }&eol; }&eol; catch (error) {&eol; Zabbix.log(4, '[ Zammad Webhook ] Failed to add ticket tags:' + error);&eol; }&eol;&eol; return;&eol; },&eol;&eol; createTicket: function(subject, message, priority) {&eol; var data = {&eol; title: subject,&eol; group: 'Users',&eol; article: {&eol; subject: subject,&eol; body: message,&eol; type: 'note',&eol; internal: false&eol; },&eol; customer: Zammad.params.customer&eol; },&eol; result;&eol;&eol; if (priority) {&eol; data.priority_id = priority;&eol; }&eol;&eol; result = Zammad.request('post', 'api/v1/tickets', data);&eol;&eol; if (typeof result.response !== 'object'&eol; &pipe;&pipe; typeof result.response.id === 'undefined'&eol; &pipe;&pipe; result.status != 201) {&eol; throw 'Cannot create Zammad ticket. Check debug log for more information.';&eol; }&eol;&eol; return result.response.id;&eol; },&eol;&eol; updateTicket: function(subject, message) {&eol; var data = {&eol; ticket_id: Zammad.params.ticket_id,&eol; subject: subject,&eol; body: message &pipe;&pipe; '',&eol; type: 'note',&eol; internal: false&eol; };&eol;&eol; result = Zammad.request('post', 'api/v1/ticket_articles', data);&eol;&eol; if (typeof result.response !== 'object'&eol; &pipe;&pipe; typeof result.response.id === 'undefined'&eol; &pipe;&pipe; result.status != 201) {&eol; throw 'Cannot update Zammad ticket. Check debug log for more information.';&eol; }&eol; }&eol;};&eol;&eol;try {&eol; var params = JSON.parse(value),&eol; params_zammad = {},&eol; params_update = {},&eol; result = {tags: {}},&eol; required_params = [&eol; 'alert_subject', 'customer',&eol; 'event_source', 'event_value',&eol; 'event_update_status'&eol; ],&eol; severities = [&eol; {name: 'not_classified', color: '#97AAB3'},&eol; {name: 'information', color: '#7499FF'},&eol; {name: 'warning', color: '#FFC859'},&eol; {name: 'average', color: '#FFA059'},&eol; {name: 'high', color: '#E97659'},&eol; {name: 'disaster', color: '#E45959'},&eol; {name: 'resolved', color: '#009900'},&eol; {name: null, color: '#000000'}&eol; ],&eol; priority;&eol;&eol; Object.keys(params)&eol; .forEach(function (key) {&eol; if (key.startsWith('zammad_')) {&eol; params_zammad[key.substring(7)] = params[key].trim();&eol; }&eol; else if (key.startsWith('event_update_')) {&eol; params_update[key.substring(13)] = params[key];&eol; }&eol; else if (required_params.indexOf(key) !== -1 && params[key].trim() === '') {&eol; throw 'Parameter "' + key + '" cannot be empty.';&eol; }&eol; });&eol;&eol; if ([0, 1, 2, 3].indexOf(parseInt(params.event_source)) === -1) {&eol; throw 'Incorrect "event_source" parameter given: ' + params.event_source + '\nMust be 0-3.';&eol; }&eol;&eol; // Check {EVENT.VALUE} for trigger-based and internal events.&eol; if (params.event_value !== '0' && params.event_value !== '1'&eol; && (params.event_source === '0' &pipe;&pipe; params.event_source === '3')) {&eol; throw 'Incorrect "event_value" parameter given: ' + params.event_value + '\nMust be 0 or 1.';&eol; }&eol;&eol; // Check {EVENT.UPDATE.STATUS} only for trigger-based events.&eol; if (params.event_source === '0' && params.event_update_status !== '0' && params.event_update_status !== '1') {&eol; throw 'Incorrect "event_update_status" parameter given: ' + params.event_update_status + '\nMust be 0 or 1.';&eol; }&eol;&eol; if (params.event_source !== '0' && params.event_value === '0') {&eol; throw 'Recovery operations are supported only for trigger-based actions.';&eol; }&eol;&eol; if (params.event_source === '0'&eol; && ((params.event_value === '1' && params.event_update_status === '1')&eol; &pipe;&pipe; (params.event_value === '0'&eol; && (params.event_update_status === '0' &pipe;&pipe; params.event_update_status === '1')))&eol; && (isNaN(parseInt(params.zammad_ticket_id)) &pipe;&pipe; parseInt(params.zammad_ticket_id) < 1 )) {&eol; throw 'Incorrect "zammad_ticket_id" parameter given: ' + params.zammad_ticket_id +&eol; '\nMust be positive integer.';&eol; }&eol;&eol; if ([0, 1, 2, 3, 4, 5].indexOf(parseInt(params.event_nseverity)) === -1) {&eol; params.event_nseverity = '7';&eol; }&eol;&eol; if (params.event_value === '0') {&eol; params.event_nseverity = '6';&eol; }&eol;&eol; priority = params['severity_' + severities[params.event_nseverity].name];&eol; priority = priority && priority.trim() &pipe;&pipe; severities[7].name;&eol;&eol; Zammad.setParams(params_zammad);&eol; Zammad.HTTPProxy = params.HTTPProxy;&eol;&eol; // Create ticket for non trigger-based events.&eol; if (params.event_source !== '0'&eol; && params.event_value !== '0') {&eol; Zammad.createTicket(params.alert_subject, params.alert_message, priority, params.event_tags);&eol; }&eol; // Create ticket for trigger-based events.&eol; else if (params.event_value === '1' && params_update.status === '0') {&eol; var ticket_id = Zammad.createTicket(params.alert_subject,&eol; params.alert_subject + '\n' + params.alert_message + '\n' +&eol; params.zabbix_url + (params.zabbix_url.endsWith('/') ? '' : '/') +&eol; 'tr_events.php?triggerid=' + params.trigger_id + '&eventid=' + params.event_id + '\n',&eol; priority);&eol;&eol; result.tags.__zbx_zammad_ticket_id = ticket_id;&eol; result.tags.__zbx_zammad_ticketlink = params.zammad_url +&eol; (params.zammad_url.endsWith('/') ? '' : '/') + '#ticket/zoom/' + ticket_id;&eol;&eol; if (Zammad.params.enable_tags.toLowerCase() === 'true') {&eol; Zammad.setTicketTags(params.event_tags, ticket_id);&eol; }&eol; }&eol; // Update created ticket for trigger-based event.&eol; else {&eol; Zammad.updateTicket(params.alert_subject, params.alert_message);&eol; }&eol;&eol; return JSON.stringify(result);&eol;}&eol;catch (error) {&eol; Zabbix.log(3, '[ Zammad Webhook ] ERROR: ' + error);&eol; throw 'Sending failed: ' + error;&eol;}|30s |1 |1 |{EVENT.TAGS.__zbx_zammad_ticketlink} |Zammad: ticket #{EVENT.TAGS.__zbx_zammad_ticket_id} | |
@@ -827,12 +827,12 @@ ROW |2 |Traceroute |/usr/bin/traceroute {HOST.CONN}
ROW |3 |Detect operating system|sudo /usr/bin/nmap -O {HOST.CONN} |2 |7 |NULL | | |0 |2 |2 | |0 | | | | | |
TABLE |actions
-FIELDS|actionid|name |eventsource|evaltype|status|esc_period|formula|pause_suppressed|
-ROW |2 |Auto discovery. Linux servers. |1 |0 |1 |0 | |1 |
-ROW |3 |Report problems to Zabbix administrators |0 |0 |1 |1h | |1 |
-ROW |4 |Report not supported items |3 |0 |1 |1h | |1 |
-ROW |5 |Report not supported low level discovery rules|3 |0 |1 |1h | |1 |
-ROW |6 |Report unknown triggers |3 |0 |1 |1h | |1 |
+FIELDS|actionid|name |eventsource|evaltype|status|esc_period|formula|pause_suppressed|notify_if_canceled|
+ROW |2 |Auto discovery. Linux servers. |1 |0 |1 |0 | |1 |1 |
+ROW |3 |Report problems to Zabbix administrators |0 |0 |1 |1h | |1 |1 |
+ROW |4 |Report not supported items |3 |0 |1 |1h | |1 |1 |
+ROW |5 |Report not supported low level discovery rules|3 |0 |1 |1h | |1 |1 |
+ROW |6 |Report unknown triggers |3 |0 |1 |1h | |1 |1 |
TABLE |operations
FIELDS|operationid|actionid|operationtype|esc_period|esc_step_from|esc_step_to|evaltype|recovery|
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl
index 9f441f479a2..e541160acd0 100644
--- a/create/src/schema.tmpl
+++ b/create/src/schema.tmpl
@@ -388,8 +388,9 @@ FIELD |eventsource |t_integer |'0' |NOT NULL |0
FIELD |evaltype |t_integer |'0' |NOT NULL |0
FIELD |status |t_integer |'0' |NOT NULL |0
FIELD |esc_period |t_varchar(255) |'1h' |NOT NULL |0
-FIELD |formula |t_varchar(255) |'' |NOT NULL |0
+FIELD |formula |t_varchar(1024)|'' |NOT NULL |0
FIELD |pause_suppressed|t_integer |'1' |NOT NULL |0
+FIELD |notify_if_canceled|t_integer |'1' |NOT NULL |0
INDEX |1 |eventsource,status
UNIQUE |2 |name
@@ -1935,4 +1936,4 @@ TABLE|dbversion|dbversionid|
FIELD |dbversionid |t_id | |NOT NULL |0
FIELD |mandatory |t_integer |'0' |NOT NULL |
FIELD |optional |t_integer |'0' |NOT NULL |
-ROW |1 |5050138 |5050138
+ROW |1 |5050140 |5050140
diff --git a/create/src/templates.tmpl b/create/src/templates.tmpl
index 0d3e9c2dcbd..c98dd94c2ca 100644
--- a/create/src/templates.tmpl
+++ b/create/src/templates.tmpl
@@ -329,12 +329,12 @@ ROW |35 |10388 |MongoDB sharded cluster/{#REPLICASET}|NULL |NU
ROW |37 |10389 |MongoDB sharded cluster/{#ID} |NULL |NULL |
ROW |54 |10334 |{#DATACENTER.NAME}/{#VM.FOLDER} (vm) |NULL |NULL |
ROW |57 |10368 |{#DATACENTER.NAME}/{#VM.FOLDER} (vm) |NULL |NULL |
-ROW |85 |10333 | |12 |NULL |
-ROW |86 |10334 | |12 |NULL |
-ROW |87 |10367 | |12 |NULL |
-ROW |88 |10368 | |12 |NULL |
-ROW |89 |10388 | |13 |NULL |
-ROW |90 |10389 | |13 |NULL |
+ROW |91 |10333 | |12 |NULL |
+ROW |92 |10334 | |12 |NULL |
+ROW |93 |10367 | |12 |NULL |
+ROW |94 |10368 | |12 |NULL |
+ROW |95 |10388 | |13 |NULL |
+ROW |96 |10389 | |13 |NULL |
TABLE |interface
FIELDS|interfaceid|hostid|main|type|useip|ip |dns |port |
@@ -2074,7 +2074,7 @@ ROW |31435 |0 |
ROW |31436 |0 | |10291 |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |net.if.out["{#IFGUID}",dropped] |3m |7d |365d |0 |3 | | | | |NULL |NULL | | |0 | | | | |2 |NULL |The number of outgoing packets dropped on the network interface. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |e3065d25674045938470ce2e10fbd6c0|
ROW |31437 |0 | |10291 |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |net.if.out["{#IFGUID}",errors] |3m |7d |365d |0 |3 | | | | |NULL |NULL | | |0 | | | | |2 |NULL |The number of outgoing packets with errors on the network interface. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |b3472a08272143bead7b9dc366b4992f|
ROW |31438 |0 | |10291 |Interface {#IFNAME}({#IFALIAS}): Bits sent |net.if.out["{#IFGUID}"] |3m |7d |365d |0 |3 | |bps | | |NULL |NULL | | |0 | | | | |2 |NULL |Outgoing traffic on the network interface. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |2e208f1d9ca949f582f24015350395b6|
-ROW |31439 |0 | |10289 |{#DEVNAME}: Disk utilization |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Disk Time",60] |1m |7d |365d |0 |0 | |% | | |NULL |NULL | | |0 | | | | |2 |NULL |This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |44d9353d47274309bb3edaa34b7b3470|
+ROW |31439 |0 | |10289 |{#DEVNAME}: Disk utilization by idle time |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Idle Time",60] |1m |7d |365d |0 |0 | |% | | |NULL |NULL | | |0 | | | | |2 |NULL |This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests based on idle time. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |44d9353d47274309bb3edaa34b7b3470|
ROW |31440 |0 | |10289 |{#DEVNAME}: Disk average queue size (avgqu-sz) |perf_counter_en["\PhysicalDisk({#DEVNAME})\Current Disk Queue Length",60] |1m |7d |365d |0 |0 | | | | |NULL |NULL | | |0 | | | | |2 |NULL |Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |3565ad70600d4c8aa5ebbbebd3f67270|
ROW |31441 |0 | |10289 |{#DEVNAME}: Disk read rate |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Reads/sec",60] |1m |7d |365d |0 |0 | |!r/s | | |NULL |NULL | | |0 | | | | |2 |NULL |Rate of read operations on the disk. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |3485202f1e6b42ce8099ce6d6347a994|
ROW |31442 |0 | |10289 |{#DEVNAME}: Disk write rate |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Writes/sec",60] |1m |7d |365d |0 |0 | |!w/s | | |NULL |NULL | | |0 | | | | |2 |NULL |Rate of write operations on the disk. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |66e312629db1460c8b215d34d29f7418|
@@ -2289,7 +2289,7 @@ ROW |32017 |7 |
ROW |32018 |7 | |10348 |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |net.if.out["{#IFGUID}",dropped] |3m |7d |365d |0 |3 | | | | |NULL |NULL | | |0 | | | | |2 |NULL |The number of outgoing packets dropped on the network interface. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |8feffdee85e2486191de0968ec7918b7|
ROW |32019 |7 | |10348 |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |net.if.out["{#IFGUID}",errors] |3m |7d |365d |0 |3 | | | | |NULL |NULL | | |0 | | | | |2 |NULL |The number of outgoing packets with errors on the network interface. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |84d1943e15c046f894bf0219288671e4|
ROW |32020 |7 | |10348 |Interface {#IFNAME}({#IFALIAS}): Bits sent |net.if.out["{#IFGUID}"] |3m |7d |365d |0 |3 | |bps | | |NULL |NULL | | |0 | | | | |2 |NULL |Outgoing traffic on the network interface. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |fb0785a7e7e54743bef715fb60dbe890|
-ROW |32021 |7 | |10349 |{#DEVNAME}: Disk utilization |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Disk Time",60] |1m |7d |365d |0 |0 | |% | | |NULL |NULL | | |0 | | | | |2 |NULL |This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |7d6ab9b1b76041869d7818652b5c5b0e|
+ROW |32021 |7 | |10349 |{#DEVNAME}: Disk utilization by idle time |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Idle Time",60] |1m |7d |365d |0 |0 | |% | | |NULL |NULL | | |0 | | | | |2 |NULL |This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests based on idle time. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |7d6ab9b1b76041869d7818652b5c5b0e|
ROW |32022 |7 | |10349 |{#DEVNAME}: Disk average queue size (avgqu-sz) |perf_counter_en["\PhysicalDisk({#DEVNAME})\Current Disk Queue Length",60] |1m |7d |365d |0 |0 | | | | |NULL |NULL | | |0 | | | | |2 |NULL |Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |1201592953094d48af20a0e420bfa846|
ROW |32023 |7 | |10349 |{#DEVNAME}: Disk read rate |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Reads/sec",60] |1m |7d |365d |0 |0 | |!r/s | | |NULL |NULL | | |0 | | | | |2 |NULL |Rate of read operations on the disk. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |e0f052d64ea544b09dfe619cb91f28c8|
ROW |32024 |7 | |10349 |{#DEVNAME}: Disk write rate |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Writes/sec",60] |1m |7d |365d |0 |0 | |!w/s | | |NULL |NULL | | |0 | | | | |2 |NULL |Rate of write operations on the disk. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 |33e5e9eccad84737bf428fc54b25fc5c|
@@ -10804,7 +10804,7 @@ ROW |31424 |0 |
ROW |31425 |15 | |10081 |Free swap space |system.swap.free |1m |7d |365d |0 |3 | |B | | |31421 |NULL |last(//system.swap.size[,total]) - last(//system.swap.size[,total]) / 100 * last(//perf_counter_en["\Paging file(_Total)\% Usage"]) | |0 | | | | |0 |NULL |The free space of swap volume/file in bytes. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |31426 |0 | |10081 |Network interfaces WMI get |wmi.getall[root\cimv2,"select Name,Description,NetConnectionID,Speed,AdapterTypeId,NetConnectionStatus,GUID from win32_networkadapter where PhysicalAdapter=True and NetConnectionStatus>0"]|1m |0 |0 |0 |4 | | | | |31422 |NULL | | |0 | | | | |0 |NULL |Raw data of win32_networkadapter. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |31431 |0 | |10081 |Physical disks discovery |perf_instance_en.discovery[PhysicalDisk] |1h |90d |0 |0 |4 | | | | |31430 |NULL | | |0 | | | | |1 |NULL |Discovery of installed physical disks. |0 |30d |1 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
-ROW |31443 |0 | |10081 |{#DEVNAME}: Disk utilization |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Disk Time",60] |1m |7d |365d |0 |0 | |% | | |31439 |NULL | | |0 | | | | |2 |NULL |This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
+ROW |31443 |0 | |10081 |{#DEVNAME}: Disk utilization by idle time |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Idle Time",60] |1m |7d |365d |0 |0 | |% | | |31439 |NULL | | |0 | | | | |2 |NULL |This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests based on idle time. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |31444 |0 | |10081 |{#DEVNAME}: Disk average queue size (avgqu-sz) |perf_counter_en["\PhysicalDisk({#DEVNAME})\Current Disk Queue Length",60] |1m |7d |365d |0 |0 | | | | |31440 |NULL | | |0 | | | | |2 |NULL |Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |31445 |0 | |10081 |{#DEVNAME}: Disk read rate |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Reads/sec",60] |1m |7d |365d |0 |0 | |!r/s | | |31441 |NULL | | |0 | | | | |2 |NULL |Rate of read operations on the disk. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |31446 |0 | |10081 |{#DEVNAME}: Disk write rate |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Writes/sec",60] |1m |7d |365d |0 |0 | |!w/s | | |31442 |NULL | | |0 | | | | |2 |NULL |Rate of write operations on the disk. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
@@ -10907,7 +10907,7 @@ ROW |32031 |7 |
ROW |32032 |7 | |10351 |Interface {#IFNAME}({#IFALIAS}): Outbound packets discarded |net.if.out["{#IFGUID}",dropped] |3m |7d |365d |0 |3 | | | | |32018 |NULL | | |0 | | | | |2 |NULL |The number of outgoing packets dropped on the network interface. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |32033 |7 | |10351 |Interface {#IFNAME}({#IFALIAS}): Outbound packets with errors |net.if.out["{#IFGUID}",errors] |3m |7d |365d |0 |3 | | | | |32019 |NULL | | |0 | | | | |2 |NULL |The number of outgoing packets with errors on the network interface. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |32034 |7 | |10351 |Interface {#IFNAME}({#IFALIAS}): Bits sent |net.if.out["{#IFGUID}"] |3m |7d |365d |0 |3 | |bps | | |32020 |NULL | | |0 | | | | |2 |NULL |Outgoing traffic on the network interface. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
-ROW |32035 |7 | |10351 |{#DEVNAME}: Disk utilization |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Disk Time",60] |1m |7d |365d |0 |0 | |% | | |32021 |NULL | | |0 | | | | |2 |NULL |This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
+ROW |32035 |7 | |10351 |{#DEVNAME}: Disk utilization by idle time |perf_counter_en["\PhysicalDisk({#DEVNAME})\% Idle Time",60] |1m |7d |365d |0 |0 | |% | | |32021 |NULL | | |0 | | | | |2 |NULL |This item is the percentage of elapsed time that the selected disk drive was busy servicing read or writes requests based on idle time. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |32036 |7 | |10351 |{#DEVNAME}: Disk average queue size (avgqu-sz) |perf_counter_en["\PhysicalDisk({#DEVNAME})\Current Disk Queue Length",60] |1m |7d |365d |0 |0 | | | | |32022 |NULL | | |0 | | | | |2 |NULL |Current average disk queue, the number of requests outstanding on the disk at the time the performance data is collected. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |32037 |7 | |10351 |{#DEVNAME}: Disk read rate |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Reads/sec",60] |1m |7d |365d |0 |0 | |!r/s | | |32023 |NULL | | |0 | | | | |2 |NULL |Rate of read operations on the disk. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
ROW |32038 |7 | |10351 |{#DEVNAME}: Disk write rate |perf_counter_en["\PhysicalDisk({#DEVNAME})\Disk Writes/sec",60] |1m |7d |365d |0 |0 | |!w/s | | |32024 |NULL | | |0 | | | | |2 |NULL |Rate of write operations on the disk. |0 |30d |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 |0 | |
@@ -17418,1554 +17418,1554 @@ ROW |21155 |{28166}>{$ICMP_RESPONSE_TIME_WARN}
TABLE |trigger_depends
FIELDS|triggerdepid|triggerid_down|triggerid_up|
ROW |25229 |18761 |18762 |
-ROW |32227 |17412 |17411 |
-ROW |32228 |17414 |17413 |
-ROW |32229 |17416 |17415 |
-ROW |32230 |15944 |15947 |
-ROW |32231 |15944 |15943 |
-ROW |32232 |15943 |15947 |
-ROW |32233 |16888 |15947 |
-ROW |32234 |16888 |15943 |
-ROW |32235 |15948 |15949 |
-ROW |32236 |15950 |15949 |
-ROW |32237 |17429 |17428 |
-ROW |32238 |17431 |17430 |
-ROW |32239 |17433 |17432 |
-ROW |32240 |17355 |17354 |
-ROW |32241 |17358 |17357 |
-ROW |32242 |18960 |18962 |
-ROW |32243 |16743 |16744 |
-ROW |32244 |16784 |16785 |
-ROW |32245 |16790 |16791 |
-ROW |32246 |16892 |16900 |
-ROW |32247 |16894 |16900 |
-ROW |32248 |17459 |17458 |
-ROW |32249 |17463 |17458 |
-ROW |32250 |17471 |17480 |
-ROW |32251 |17476 |17481 |
-ROW |32252 |17478 |17480 |
-ROW |32253 |17479 |17481 |
-ROW |32254 |17483 |17482 |
-ROW |32255 |17486 |17485 |
-ROW |32256 |16646 |16647 |
-ROW |32257 |18965 |16660 |
-ROW |32258 |16809 |16810 |
-ROW |32259 |18966 |16677 |
-ROW |32260 |16902 |16904 |
-ROW |32261 |16904 |16905 |
-ROW |32262 |16909 |16906 |
-ROW |32263 |16910 |16912 |
-ROW |32264 |16912 |16913 |
-ROW |32265 |16917 |16914 |
-ROW |32266 |17962 |17963 |
-ROW |32267 |17962 |17958 |
-ROW |32268 |16752 |16753 |
-ROW |32269 |15955 |15957 |
-ROW |32270 |15955 |15954 |
-ROW |32271 |15954 |15957 |
-ROW |32272 |15956 |15957 |
-ROW |32273 |15956 |15954 |
-ROW |32274 |16678 |15957 |
-ROW |32275 |16678 |15954 |
-ROW |32276 |15961 |15960 |
-ROW |32277 |15962 |15960 |
-ROW |32278 |16679 |15960 |
-ROW |32279 |17090 |17096 |
-ROW |32280 |17093 |17096 |
-ROW |32281 |17101 |17098 |
-ROW |32282 |16257 |16255 |
-ROW |32283 |16257 |16256 |
-ROW |32284 |16256 |16255 |
-ROW |32285 |16251 |16255 |
-ROW |32286 |16251 |16256 |
-ROW |32287 |16443 |16255 |
-ROW |32288 |16443 |16256 |
-ROW |32289 |16270 |16269 |
-ROW |32290 |16448 |16269 |
-ROW |32291 |16265 |16269 |
-ROW |32292 |17503 |17505 |
-ROW |32293 |17512 |17511 |
-ROW |32294 |17513 |17505 |
-ROW |32300 |17516 |17518 |
-ROW |32301 |17517 |17516 |
-ROW |32302 |17517 |17518 |
-ROW |32303 |17517 |17519 |
-ROW |32304 |17519 |17518 |
-ROW |32305 |18918 |18917 |
-ROW |32306 |17973 |17965 |
-ROW |32307 |17974 |17966 |
-ROW |32308 |17141 |17151 |
-ROW |32309 |17142 |17141 |
-ROW |32310 |17142 |17151 |
-ROW |32311 |17143 |17151 |
-ROW |32312 |17144 |17143 |
-ROW |32313 |17144 |17151 |
-ROW |32314 |17146 |17145 |
-ROW |32315 |17147 |17151 |
-ROW |32316 |17148 |17147 |
-ROW |32317 |17148 |17151 |
-ROW |32318 |17150 |17149 |
-ROW |32319 |17152 |17168 |
-ROW |32320 |17153 |17152 |
-ROW |32321 |17153 |17168 |
-ROW |32322 |17154 |17168 |
-ROW |32323 |17155 |17154 |
-ROW |32324 |17155 |17168 |
-ROW |32325 |17156 |17168 |
-ROW |32326 |17157 |17156 |
-ROW |32327 |17157 |17168 |
-ROW |32328 |17158 |17168 |
-ROW |32329 |17159 |17158 |
-ROW |32330 |17159 |17168 |
-ROW |32331 |17160 |17168 |
-ROW |32332 |17161 |17160 |
-ROW |32333 |17161 |17168 |
-ROW |32334 |17163 |17162 |
-ROW |32335 |17164 |17168 |
-ROW |32336 |17165 |17164 |
-ROW |32337 |17165 |17168 |
-ROW |32338 |17166 |17168 |
-ROW |32339 |17167 |17166 |
-ROW |32340 |17167 |17168 |
-ROW |32341 |17169 |17168 |
-ROW |32342 |17170 |17168 |
-ROW |32343 |17170 |17169 |
-ROW |32344 |17171 |17168 |
-ROW |32345 |17172 |17168 |
-ROW |32346 |17172 |17171 |
-ROW |32347 |17540 |17541 |
-ROW |32348 |16833 |16920 |
-ROW |32349 |16920 |16921 |
-ROW |32350 |18987 |18986 |
-ROW |32351 |18989 |18988 |
-ROW |32352 |18993 |18992 |
-ROW |32353 |18994 |18992 |
-ROW |32354 |19009 |19010 |
-ROW |32355 |17978 |17977 |
-ROW |32356 |17980 |17979 |
-ROW |32357 |17984 |17983 |
-ROW |32358 |17985 |17983 |
-ROW |32359 |18000 |18001 |
-ROW |32360 |18225 |18224 |
-ROW |32361 |18237 |18236 |
-ROW |32362 |16929 |16928 |
-ROW |32363 |16940 |17084 |
-ROW |32364 |18537 |18536 |
-ROW |32365 |18539 |18538 |
-ROW |32366 |18541 |18540 |
-ROW |32367 |16719 |16721 |
-ROW |32368 |16975 |16723 |
-ROW |32369 |16729 |16728 |
-ROW |32370 |16730 |16728 |
-ROW |32371 |16756 |16758 |
-ROW |32372 |16979 |16759 |
-ROW |32373 |16765 |16764 |
-ROW |32374 |16766 |16764 |
-ROW |32375 |16734 |16736 |
-ROW |32376 |16983 |16732 |
-ROW |32377 |16741 |16740 |
-ROW |32378 |16742 |16740 |
-ROW |32379 |17192 |17191 |
-ROW |32380 |17194 |17195 |
-ROW |32381 |17199 |17198 |
-ROW |32382 |17546 |17545 |
-ROW |32383 |17547 |17548 |
-ROW |32384 |16997 |16984 |
-ROW |32385 |17002 |17003 |
-ROW |32386 |17006 |17005 |
-ROW |32387 |17011 |17010 |
-ROW |32388 |17550 |17549 |
-ROW |32389 |17551 |17552 |
-ROW |32390 |17391 |17396 |
-ROW |32391 |17395 |17396 |
-ROW |32392 |16683 |16687 |
-ROW |32393 |14252 |14251 |
-ROW |32394 |14294 |14293 |
-ROW |32395 |14312 |14311 |
-ROW |32396 |14328 |14327 |
-ROW |32397 |14348 |14347 |
-ROW |32398 |14357 |14356 |
-ROW |32399 |14390 |14389 |
-ROW |32400 |14404 |14403 |
-ROW |32401 |14452 |14451 |
-ROW |32402 |14469 |14468 |
-ROW |32403 |14487 |14486 |
-ROW |32404 |14506 |14505 |
-ROW |32405 |14535 |14534 |
-ROW |32406 |14545 |14544 |
-ROW |32407 |14583 |14582 |
-ROW |32408 |14599 |14598 |
-ROW |32409 |14616 |14615 |
-ROW |32410 |14653 |14652 |
-ROW |32411 |14674 |14673 |
-ROW |32412 |14692 |14691 |
-ROW |32413 |14705 |14704 |
-ROW |32414 |14718 |14717 |
-ROW |32415 |14907 |14906 |
-ROW |32416 |15221 |15220 |
-ROW |32417 |15702 |15701 |
-ROW |32418 |15724 |15723 |
-ROW |32419 |15756 |15755 |
-ROW |32420 |15820 |15819 |
-ROW |32421 |15841 |15840 |
-ROW |32422 |15991 |15990 |
-ROW |32423 |16018 |16017 |
-ROW |32424 |16454 |16453 |
-ROW |32425 |17924 |17923 |
-ROW |32426 |18178 |18177 |
-ROW |32427 |19670 |19669 |
-ROW |32428 |19698 |19697 |
-ROW |32429 |19726 |19725 |
-ROW |32430 |19754 |19753 |
-ROW |32431 |19782 |19781 |
-ROW |32432 |19810 |19809 |
-ROW |32433 |19838 |19837 |
-ROW |32434 |19866 |19865 |
-ROW |32435 |19894 |19893 |
-ROW |32436 |19922 |19921 |
-ROW |32437 |19950 |19949 |
-ROW |32438 |19978 |19977 |
-ROW |32439 |20006 |20005 |
-ROW |32440 |20034 |20033 |
-ROW |32441 |20062 |20061 |
-ROW |32442 |20090 |20089 |
-ROW |32443 |20118 |20117 |
-ROW |32444 |20146 |20145 |
-ROW |32445 |20174 |20173 |
-ROW |32446 |20202 |20201 |
-ROW |32447 |20230 |20229 |
-ROW |32448 |20258 |20257 |
-ROW |32449 |20286 |20285 |
-ROW |32450 |20314 |20313 |
-ROW |32451 |20342 |20341 |
-ROW |32452 |20370 |20369 |
-ROW |32453 |20398 |20397 |
-ROW |32454 |20426 |20425 |
-ROW |32455 |20454 |20453 |
-ROW |32456 |20482 |20481 |
-ROW |32457 |20510 |20509 |
-ROW |32458 |20538 |20537 |
-ROW |32459 |20566 |20565 |
-ROW |32460 |20594 |20593 |
-ROW |32461 |20622 |20621 |
-ROW |32462 |20650 |20649 |
-ROW |32463 |20678 |20677 |
-ROW |32464 |20706 |20705 |
-ROW |32465 |20734 |20733 |
-ROW |32466 |20762 |20761 |
-ROW |32467 |20790 |20789 |
-ROW |32468 |20818 |20817 |
-ROW |32469 |20846 |20845 |
-ROW |32470 |20874 |20873 |
-ROW |32471 |20902 |20901 |
-ROW |32472 |20930 |20929 |
-ROW |32473 |20958 |20957 |
-ROW |32474 |20986 |20985 |
-ROW |32475 |21014 |21013 |
-ROW |32476 |21042 |21041 |
-ROW |32477 |21070 |21069 |
-ROW |32478 |21098 |21097 |
-ROW |32479 |21126 |21125 |
-ROW |32480 |21154 |21153 |
-ROW |32481 |14253 |14252 |
-ROW |32482 |14295 |14294 |
-ROW |32483 |14313 |14312 |
-ROW |32484 |14329 |14328 |
-ROW |32485 |14349 |14348 |
-ROW |32486 |14358 |14357 |
-ROW |32487 |14391 |14390 |
-ROW |32488 |14405 |14404 |
-ROW |32489 |14453 |14452 |
-ROW |32490 |14470 |14469 |
-ROW |32491 |14488 |14487 |
-ROW |32492 |14507 |14506 |
-ROW |32493 |14536 |14535 |
-ROW |32494 |14546 |14545 |
-ROW |32495 |14584 |14583 |
-ROW |32496 |14600 |14599 |
-ROW |32497 |14617 |14616 |
-ROW |32498 |14654 |14653 |
-ROW |32499 |14675 |14674 |
-ROW |32500 |14693 |14692 |
-ROW |32501 |14706 |14705 |
-ROW |32502 |14719 |14718 |
-ROW |32503 |14908 |14907 |
-ROW |32504 |15222 |15221 |
-ROW |32505 |15703 |15702 |
-ROW |32506 |15725 |15724 |
-ROW |32507 |15757 |15756 |
-ROW |32508 |15821 |15820 |
-ROW |32509 |15842 |15841 |
-ROW |32510 |15992 |15991 |
-ROW |32511 |16019 |16018 |
-ROW |32512 |16455 |16454 |
-ROW |32513 |17925 |17924 |
-ROW |32514 |18179 |18178 |
-ROW |32515 |19671 |19670 |
-ROW |32516 |19699 |19698 |
-ROW |32517 |19727 |19726 |
-ROW |32518 |19755 |19754 |
-ROW |32519 |19783 |19782 |
-ROW |32520 |19811 |19810 |
-ROW |32521 |19839 |19838 |
-ROW |32522 |19867 |19866 |
-ROW |32523 |19895 |19894 |
-ROW |32524 |19923 |19922 |
-ROW |32525 |19951 |19950 |
-ROW |32526 |19979 |19978 |
-ROW |32527 |20007 |20006 |
-ROW |32528 |20035 |20034 |
-ROW |32529 |20063 |20062 |
-ROW |32530 |20091 |20090 |
-ROW |32531 |20119 |20118 |
-ROW |32532 |20147 |20146 |
-ROW |32533 |20175 |20174 |
-ROW |32534 |20203 |20202 |
-ROW |32535 |20231 |20230 |
-ROW |32536 |20259 |20258 |
-ROW |32537 |20287 |20286 |
-ROW |32538 |20315 |20314 |
-ROW |32539 |20343 |20342 |
-ROW |32540 |20371 |20370 |
-ROW |32541 |20399 |20398 |
-ROW |32542 |20427 |20426 |
-ROW |32543 |20455 |20454 |
-ROW |32544 |20483 |20482 |
-ROW |32545 |20511 |20510 |
-ROW |32546 |20539 |20538 |
-ROW |32547 |20567 |20566 |
-ROW |32548 |20595 |20594 |
-ROW |32549 |20623 |20622 |
-ROW |32550 |20651 |20650 |
-ROW |32551 |20679 |20678 |
-ROW |32552 |20707 |20706 |
-ROW |32553 |20735 |20734 |
-ROW |32554 |20763 |20762 |
-ROW |32555 |20791 |20790 |
-ROW |32556 |20819 |20818 |
-ROW |32557 |20847 |20846 |
-ROW |32558 |20875 |20874 |
-ROW |32559 |20903 |20902 |
-ROW |32560 |20931 |20930 |
-ROW |32561 |20959 |20958 |
-ROW |32562 |20987 |20986 |
-ROW |32563 |21015 |21014 |
-ROW |32564 |21043 |21042 |
-ROW |32565 |21071 |21070 |
-ROW |32566 |21099 |21098 |
-ROW |32567 |21127 |21126 |
-ROW |32568 |21155 |21154 |
-ROW |32569 |14253 |14251 |
-ROW |32570 |14295 |14293 |
-ROW |32571 |14313 |14311 |
-ROW |32572 |14329 |14327 |
-ROW |32573 |14349 |14347 |
-ROW |32574 |14358 |14356 |
-ROW |32575 |14391 |14389 |
-ROW |32576 |14405 |14403 |
-ROW |32577 |14453 |14451 |
-ROW |32578 |14470 |14468 |
-ROW |32579 |14488 |14486 |
-ROW |32580 |14507 |14505 |
-ROW |32581 |14536 |14534 |
-ROW |32582 |14546 |14544 |
-ROW |32583 |14584 |14582 |
-ROW |32584 |14600 |14598 |
-ROW |32585 |14617 |14615 |
-ROW |32586 |14654 |14652 |
-ROW |32587 |14675 |14673 |
-ROW |32588 |14693 |14691 |
-ROW |32589 |14706 |14704 |
-ROW |32590 |14719 |14717 |
-ROW |32591 |14908 |14906 |
-ROW |32592 |15222 |15220 |
-ROW |32593 |15703 |15701 |
-ROW |32594 |15725 |15723 |
-ROW |32595 |15757 |15755 |
-ROW |32596 |15821 |15819 |
-ROW |32597 |15842 |15840 |
-ROW |32598 |15992 |15990 |
-ROW |32599 |16019 |16017 |
-ROW |32600 |16455 |16453 |
-ROW |32601 |17925 |17923 |
-ROW |32602 |18179 |18177 |
-ROW |32603 |19671 |19669 |
-ROW |32604 |19699 |19697 |
-ROW |32605 |19727 |19725 |
-ROW |32606 |19755 |19753 |
-ROW |32607 |19783 |19781 |
-ROW |32608 |19811 |19809 |
-ROW |32609 |19839 |19837 |
-ROW |32610 |19867 |19865 |
-ROW |32611 |19895 |19893 |
-ROW |32612 |19923 |19921 |
-ROW |32613 |19951 |19949 |
-ROW |32614 |19979 |19977 |
-ROW |32615 |20007 |20005 |
-ROW |32616 |20035 |20033 |
-ROW |32617 |20063 |20061 |
-ROW |32618 |20091 |20089 |
-ROW |32619 |20119 |20117 |
-ROW |32620 |20147 |20145 |
-ROW |32621 |20175 |20173 |
-ROW |32622 |20203 |20201 |
-ROW |32623 |20231 |20229 |
-ROW |32624 |20259 |20257 |
-ROW |32625 |20287 |20285 |
-ROW |32626 |20315 |20313 |
-ROW |32627 |20343 |20341 |
-ROW |32628 |20371 |20369 |
-ROW |32629 |20399 |20397 |
-ROW |32630 |20427 |20425 |
-ROW |32631 |20455 |20453 |
-ROW |32632 |20483 |20481 |
-ROW |32633 |20511 |20509 |
-ROW |32634 |20539 |20537 |
-ROW |32635 |20567 |20565 |
-ROW |32636 |20595 |20593 |
-ROW |32637 |20623 |20621 |
-ROW |32638 |20651 |20649 |
-ROW |32639 |20679 |20677 |
-ROW |32640 |20707 |20705 |
-ROW |32641 |20735 |20733 |
-ROW |32642 |20763 |20761 |
-ROW |32643 |20791 |20789 |
-ROW |32644 |20819 |20817 |
-ROW |32645 |20847 |20845 |
-ROW |32646 |20875 |20873 |
-ROW |32647 |20903 |20901 |
-ROW |32648 |20931 |20929 |
-ROW |32649 |20959 |20957 |
-ROW |32650 |20987 |20985 |
-ROW |32651 |21015 |21013 |
-ROW |32652 |21043 |21041 |
-ROW |32653 |21071 |21069 |
-ROW |32654 |21099 |21097 |
-ROW |32655 |21127 |21125 |
-ROW |32656 |21155 |21153 |
-ROW |32657 |16287 |16289 |
-ROW |32658 |16279 |16285 |
-ROW |32659 |16290 |16348 |
-ROW |32660 |16291 |16349 |
-ROW |32661 |16292 |16350 |
-ROW |32662 |16293 |16351 |
-ROW |32663 |16294 |16352 |
-ROW |32664 |16295 |16353 |
-ROW |32665 |16296 |16354 |
-ROW |32666 |16297 |16355 |
-ROW |32667 |16298 |16356 |
-ROW |32668 |16299 |16357 |
-ROW |32669 |16300 |16358 |
-ROW |32670 |16301 |16359 |
-ROW |32671 |16302 |16360 |
-ROW |32672 |16303 |16361 |
-ROW |32673 |16304 |16362 |
-ROW |32674 |16305 |16363 |
-ROW |32675 |16306 |16364 |
-ROW |32676 |16307 |16365 |
-ROW |32677 |16308 |16366 |
-ROW |32678 |16309 |16367 |
-ROW |32679 |16311 |16369 |
-ROW |32680 |16312 |16370 |
-ROW |32681 |16313 |16371 |
-ROW |32682 |16314 |16372 |
-ROW |32683 |16315 |16373 |
-ROW |32684 |16316 |16374 |
-ROW |32685 |16317 |16375 |
-ROW |32686 |16318 |16376 |
-ROW |32687 |16457 |16458 |
-ROW |32688 |17927 |17928 |
-ROW |32689 |18181 |18182 |
-ROW |32690 |19673 |19674 |
-ROW |32691 |19701 |19702 |
-ROW |32692 |19729 |19730 |
-ROW |32693 |19757 |19758 |
-ROW |32694 |19785 |19786 |
-ROW |32695 |19813 |19814 |
-ROW |32696 |19841 |19842 |
-ROW |32697 |19869 |19870 |
-ROW |32698 |19897 |19898 |
-ROW |32699 |19925 |19926 |
-ROW |32700 |19953 |19954 |
-ROW |32701 |19981 |19982 |
-ROW |32702 |20009 |20010 |
-ROW |32703 |20037 |20038 |
-ROW |32704 |20065 |20066 |
-ROW |32705 |20093 |20094 |
-ROW |32706 |20121 |20122 |
-ROW |32707 |20149 |20150 |
-ROW |32708 |20177 |20178 |
-ROW |32709 |20205 |20206 |
-ROW |32710 |20233 |20234 |
-ROW |32711 |20261 |20262 |
-ROW |32712 |20289 |20290 |
-ROW |32713 |20317 |20318 |
-ROW |32714 |20345 |20346 |
-ROW |32715 |20373 |20374 |
-ROW |32716 |20401 |20402 |
-ROW |32717 |20429 |20430 |
-ROW |32718 |20457 |20458 |
-ROW |32719 |20485 |20486 |
-ROW |32720 |20513 |20514 |
-ROW |32721 |20541 |20542 |
-ROW |32722 |20569 |20570 |
-ROW |32723 |20597 |20598 |
-ROW |32724 |20625 |20626 |
-ROW |32725 |20653 |20654 |
-ROW |32726 |20681 |20682 |
-ROW |32727 |20709 |20710 |
-ROW |32728 |20737 |20738 |
-ROW |32729 |20765 |20766 |
-ROW |32730 |20793 |20794 |
-ROW |32731 |20821 |20822 |
-ROW |32732 |20849 |20850 |
-ROW |32733 |20877 |20878 |
-ROW |32734 |20905 |20906 |
-ROW |32735 |20933 |20934 |
-ROW |32736 |20961 |20962 |
-ROW |32737 |20989 |20990 |
-ROW |32738 |21017 |21018 |
-ROW |32739 |21045 |21046 |
-ROW |32740 |21073 |21074 |
-ROW |32741 |21101 |21102 |
-ROW |32742 |21129 |21130 |
-ROW |32743 |21157 |21158 |
-ROW |32744 |16289 |14293 |
-ROW |32745 |16285 |14717 |
-ROW |32746 |16348 |14311 |
-ROW |32747 |16349 |14327 |
-ROW |32748 |16350 |14347 |
-ROW |32749 |16351 |14356 |
-ROW |32750 |16352 |14389 |
-ROW |32751 |16353 |14403 |
-ROW |32752 |16354 |14451 |
-ROW |32753 |16355 |14468 |
-ROW |32754 |16356 |14486 |
-ROW |32755 |16357 |14505 |
-ROW |32756 |16358 |14534 |
-ROW |32757 |16359 |14544 |
-ROW |32758 |16360 |14582 |
-ROW |32759 |16361 |14598 |
-ROW |32760 |16362 |14615 |
-ROW |32761 |16363 |14652 |
-ROW |32762 |16364 |14673 |
-ROW |32763 |16365 |14691 |
-ROW |32764 |16366 |14704 |
-ROW |32765 |16367 |14906 |
-ROW |32766 |16369 |15220 |
-ROW |32767 |16370 |15701 |
-ROW |32768 |16371 |15723 |
-ROW |32769 |16372 |15755 |
-ROW |32770 |16373 |15819 |
-ROW |32771 |16374 |15840 |
-ROW |32772 |16375 |15990 |
-ROW |32773 |16376 |16017 |
-ROW |32774 |16458 |16453 |
-ROW |32775 |17928 |17923 |
-ROW |32776 |18182 |18177 |
-ROW |32777 |19674 |19669 |
-ROW |32778 |19702 |19697 |
-ROW |32779 |19730 |19725 |
-ROW |32780 |19758 |19753 |
-ROW |32781 |19786 |19781 |
-ROW |32782 |19814 |19809 |
-ROW |32783 |19842 |19837 |
-ROW |32784 |19870 |19865 |
-ROW |32785 |19898 |19893 |
-ROW |32786 |19926 |19921 |
-ROW |32787 |19954 |19949 |
-ROW |32788 |19982 |19977 |
-ROW |32789 |20010 |20005 |
-ROW |32790 |20038 |20033 |
-ROW |32791 |20066 |20061 |
-ROW |32792 |20094 |20089 |
-ROW |32793 |20122 |20117 |
-ROW |32794 |20150 |20145 |
-ROW |32795 |20178 |20173 |
-ROW |32796 |20206 |20201 |
-ROW |32797 |20234 |20229 |
-ROW |32798 |20262 |20257 |
-ROW |32799 |20290 |20285 |
-ROW |32800 |20318 |20313 |
-ROW |32801 |20346 |20341 |
-ROW |32802 |20374 |20369 |
-ROW |32803 |20402 |20397 |
-ROW |32804 |20430 |20425 |
-ROW |32805 |20458 |20453 |
-ROW |32806 |20486 |20481 |
-ROW |32807 |20514 |20509 |
-ROW |32808 |20542 |20537 |
-ROW |32809 |20570 |20565 |
-ROW |32810 |20598 |20593 |
-ROW |32811 |20626 |20621 |
-ROW |32812 |20654 |20649 |
-ROW |32813 |20682 |20677 |
-ROW |32814 |20710 |20705 |
-ROW |32815 |20738 |20733 |
-ROW |32816 |20766 |20761 |
-ROW |32817 |20794 |20789 |
-ROW |32818 |20822 |20817 |
-ROW |32819 |20850 |20845 |
-ROW |32820 |20878 |20873 |
-ROW |32821 |20906 |20901 |
-ROW |32822 |20934 |20929 |
-ROW |32823 |20962 |20957 |
-ROW |32824 |20990 |20985 |
-ROW |32825 |21018 |21013 |
-ROW |32826 |21046 |21041 |
-ROW |32827 |21074 |21069 |
-ROW |32828 |21102 |21097 |
-ROW |32829 |21130 |21125 |
-ROW |32830 |21158 |21153 |
-ROW |32831 |16631 |16630 |
-ROW |32832 |16640 |16636 |
-ROW |32833 |16642 |16638 |
-ROW |32834 |16643 |16639 |
-ROW |32835 |15695 |16863 |
-ROW |32836 |18242 |16863 |
-ROW |32837 |18243 |16863 |
-ROW |32838 |15694 |16868 |
-ROW |32839 |15696 |16864 |
-ROW |32840 |15697 |16865 |
-ROW |32841 |18244 |16864 |
-ROW |32842 |18245 |16865 |
-ROW |32843 |18246 |16868 |
-ROW |32844 |18247 |16864 |
-ROW |32845 |18248 |16865 |
-ROW |32846 |18249 |16868 |
-ROW |32847 |15671 |16841 |
-ROW |32848 |18250 |16841 |
-ROW |32849 |18251 |16841 |
-ROW |32850 |15672 |16842 |
-ROW |32851 |15673 |16843 |
-ROW |32852 |15674 |16844 |
-ROW |32853 |15675 |16845 |
-ROW |32854 |15676 |16846 |
-ROW |32855 |15677 |16847 |
-ROW |32856 |15678 |16848 |
-ROW |32857 |15679 |16849 |
-ROW |32858 |15680 |16850 |
-ROW |32859 |15681 |16851 |
-ROW |32860 |15682 |16852 |
-ROW |32861 |15683 |16853 |
-ROW |32862 |15684 |16854 |
-ROW |32863 |15685 |16855 |
-ROW |32864 |15686 |16856 |
-ROW |32865 |15687 |16857 |
-ROW |32866 |15689 |16858 |
-ROW |32867 |15691 |16860 |
-ROW |32868 |15708 |16861 |
-ROW |32869 |15997 |16862 |
-ROW |32870 |19677 |19678 |
-ROW |32871 |19705 |19706 |
-ROW |32872 |19733 |19734 |
-ROW |32873 |19761 |19762 |
-ROW |32874 |19789 |19790 |
-ROW |32875 |19817 |19818 |
-ROW |32876 |19845 |19846 |
-ROW |32877 |19873 |19874 |
-ROW |32878 |19901 |19902 |
-ROW |32879 |19929 |19930 |
-ROW |32880 |19957 |19958 |
-ROW |32881 |19985 |19986 |
-ROW |32882 |20013 |20014 |
-ROW |32883 |20041 |20042 |
-ROW |32884 |20069 |20070 |
-ROW |32885 |20097 |20098 |
-ROW |32886 |20125 |20126 |
-ROW |32887 |20153 |20154 |
-ROW |32888 |20181 |20182 |
-ROW |32889 |20209 |20210 |
-ROW |32890 |20237 |20238 |
-ROW |32891 |20265 |20266 |
-ROW |32892 |20293 |20294 |
-ROW |32893 |20321 |20322 |
-ROW |32894 |20349 |20350 |
-ROW |32895 |20377 |20378 |
-ROW |32896 |20405 |20406 |
-ROW |32897 |20433 |20434 |
-ROW |32898 |20461 |20462 |
-ROW |32899 |20489 |20490 |
-ROW |32900 |20517 |20518 |
-ROW |32901 |20545 |20546 |
-ROW |32902 |20573 |20574 |
-ROW |32903 |20601 |20602 |
-ROW |32904 |20629 |20630 |
-ROW |32905 |20657 |20658 |
-ROW |32906 |20685 |20686 |
-ROW |32907 |20713 |20714 |
-ROW |32908 |20741 |20742 |
-ROW |32909 |20769 |20770 |
-ROW |32910 |20797 |20798 |
-ROW |32911 |20825 |20826 |
-ROW |32912 |20853 |20854 |
-ROW |32913 |20881 |20882 |
-ROW |32914 |20909 |20910 |
-ROW |32915 |20937 |20938 |
-ROW |32916 |20965 |20966 |
-ROW |32917 |20993 |20994 |
-ROW |32918 |21021 |21022 |
-ROW |32919 |21049 |21050 |
-ROW |32920 |21077 |21078 |
-ROW |32921 |21105 |21106 |
-ROW |32922 |21133 |21134 |
-ROW |32923 |21161 |21162 |
-ROW |32924 |18252 |16842 |
-ROW |32925 |18253 |16843 |
-ROW |32926 |18254 |16844 |
-ROW |32927 |18255 |16845 |
-ROW |32928 |18256 |16846 |
-ROW |32929 |18257 |16847 |
-ROW |32930 |18258 |16848 |
-ROW |32931 |18259 |16849 |
-ROW |32932 |18260 |16850 |
-ROW |32933 |18261 |16851 |
-ROW |32934 |18262 |16852 |
-ROW |32935 |18263 |16853 |
-ROW |32936 |18264 |16854 |
-ROW |32937 |18265 |16855 |
-ROW |32938 |18266 |16856 |
-ROW |32939 |18267 |16857 |
-ROW |32940 |18268 |16858 |
-ROW |32941 |18270 |16860 |
-ROW |32942 |18271 |16861 |
-ROW |32943 |18272 |16862 |
-ROW |32944 |19676 |19678 |
-ROW |32945 |19704 |19706 |
-ROW |32946 |19732 |19734 |
-ROW |32947 |19760 |19762 |
-ROW |32948 |19788 |19790 |
-ROW |32949 |19816 |19818 |
-ROW |32950 |19844 |19846 |
-ROW |32951 |19872 |19874 |
-ROW |32952 |19900 |19902 |
-ROW |32953 |19928 |19930 |
-ROW |32954 |19956 |19958 |
-ROW |32955 |19984 |19986 |
-ROW |32956 |20012 |20014 |
-ROW |32957 |20040 |20042 |
-ROW |32958 |20068 |20070 |
-ROW |32959 |20096 |20098 |
-ROW |32960 |20124 |20126 |
-ROW |32961 |20152 |20154 |
-ROW |32962 |20180 |20182 |
-ROW |32963 |20208 |20210 |
-ROW |32964 |20236 |20238 |
-ROW |32965 |20264 |20266 |
-ROW |32966 |20292 |20294 |
-ROW |32967 |20320 |20322 |
-ROW |32968 |20348 |20350 |
-ROW |32969 |20376 |20378 |
-ROW |32970 |20404 |20406 |
-ROW |32971 |20432 |20434 |
-ROW |32972 |20460 |20462 |
-ROW |32973 |20488 |20490 |
-ROW |32974 |20516 |20518 |
-ROW |32975 |20544 |20546 |
-ROW |32976 |20572 |20574 |
-ROW |32977 |20600 |20602 |
-ROW |32978 |20628 |20630 |
-ROW |32979 |20656 |20658 |
-ROW |32980 |20684 |20686 |
-ROW |32981 |20712 |20714 |
-ROW |32982 |20740 |20742 |
-ROW |32983 |20768 |20770 |
-ROW |32984 |20796 |20798 |
-ROW |32985 |20824 |20826 |
-ROW |32986 |20852 |20854 |
-ROW |32987 |20880 |20882 |
-ROW |32988 |20908 |20910 |
-ROW |32989 |20936 |20938 |
-ROW |32990 |20964 |20966 |
-ROW |32991 |20992 |20994 |
-ROW |32992 |21020 |21022 |
-ROW |32993 |21048 |21050 |
-ROW |32994 |21076 |21078 |
-ROW |32995 |21104 |21106 |
-ROW |32996 |21132 |21134 |
-ROW |32997 |21160 |21162 |
-ROW |32998 |18273 |16842 |
-ROW |32999 |18274 |16843 |
-ROW |33000 |18275 |16844 |
-ROW |33001 |18276 |16845 |
-ROW |33002 |18277 |16846 |
-ROW |33003 |18278 |16847 |
-ROW |33004 |18279 |16848 |
-ROW |33005 |18280 |16849 |
-ROW |33006 |18281 |16850 |
-ROW |33007 |18282 |16851 |
-ROW |33008 |18283 |16852 |
-ROW |33009 |18284 |16853 |
-ROW |33010 |18285 |16854 |
-ROW |33011 |18286 |16855 |
-ROW |33012 |18287 |16856 |
-ROW |33013 |18288 |16857 |
-ROW |33014 |18289 |16858 |
-ROW |33015 |18291 |16860 |
-ROW |33016 |18292 |16861 |
-ROW |33017 |18293 |16862 |
-ROW |33018 |19675 |19678 |
-ROW |33019 |19703 |19706 |
-ROW |33020 |19731 |19734 |
-ROW |33021 |19759 |19762 |
-ROW |33022 |19787 |19790 |
-ROW |33023 |19815 |19818 |
-ROW |33024 |19843 |19846 |
-ROW |33025 |19871 |19874 |
-ROW |33026 |19899 |19902 |
-ROW |33027 |19927 |19930 |
-ROW |33028 |19955 |19958 |
-ROW |33029 |19983 |19986 |
-ROW |33030 |20011 |20014 |
-ROW |33031 |20039 |20042 |
-ROW |33032 |20067 |20070 |
-ROW |33033 |20095 |20098 |
-ROW |33034 |20123 |20126 |
-ROW |33035 |20151 |20154 |
-ROW |33036 |20179 |20182 |
-ROW |33037 |20207 |20210 |
-ROW |33038 |20235 |20238 |
-ROW |33039 |20263 |20266 |
-ROW |33040 |20291 |20294 |
-ROW |33041 |20319 |20322 |
-ROW |33042 |20347 |20350 |
-ROW |33043 |20375 |20378 |
-ROW |33044 |20403 |20406 |
-ROW |33045 |20431 |20434 |
-ROW |33046 |20459 |20462 |
-ROW |33047 |20487 |20490 |
-ROW |33048 |20515 |20518 |
-ROW |33049 |20543 |20546 |
-ROW |33050 |20571 |20574 |
-ROW |33051 |20599 |20602 |
-ROW |33052 |20627 |20630 |
-ROW |33053 |20655 |20658 |
-ROW |33054 |20683 |20686 |
-ROW |33055 |20711 |20714 |
-ROW |33056 |20739 |20742 |
-ROW |33057 |20767 |20770 |
-ROW |33058 |20795 |20798 |
-ROW |33059 |20823 |20826 |
-ROW |33060 |20851 |20854 |
-ROW |33061 |20879 |20882 |
-ROW |33062 |20907 |20910 |
-ROW |33063 |20935 |20938 |
-ROW |33064 |20963 |20966 |
-ROW |33065 |20991 |20994 |
-ROW |33066 |21019 |21022 |
-ROW |33067 |21047 |21050 |
-ROW |33068 |21075 |21078 |
-ROW |33069 |21103 |21106 |
-ROW |33070 |21131 |21134 |
-ROW |33071 |21159 |21162 |
-ROW |33072 |15698 |16866 |
-ROW |33073 |18294 |16866 |
-ROW |33074 |18295 |16866 |
-ROW |33075 |16028 |16867 |
-ROW |33076 |18296 |16867 |
-ROW |33077 |18297 |16867 |
-ROW |33078 |18100 |18099 |
-ROW |33079 |18106 |18105 |
-ROW |33080 |14318 |14319 |
-ROW |33081 |17554 |15717 |
-ROW |33082 |17555 |15717 |
-ROW |33083 |17555 |17554 |
-ROW |33084 |17556 |15717 |
-ROW |33085 |17557 |15717 |
-ROW |33086 |17557 |17556 |
-ROW |33087 |17559 |17558 |
-ROW |33088 |17561 |17560 |
-ROW |33089 |17563 |17562 |
-ROW |33090 |17565 |17564 |
-ROW |33091 |15721 |15720 |
-ROW |33092 |15394 |15393 |
-ROW |33093 |15392 |15391 |
-ROW |33094 |17322 |14339 |
-ROW |33095 |15382 |15381 |
-ROW |33096 |15380 |15379 |
-ROW |33097 |16504 |16505 |
-ROW |33098 |14372 |14373 |
-ROW |33099 |15386 |15385 |
-ROW |33100 |15384 |15383 |
-ROW |33101 |14380 |14381 |
-ROW |33102 |18299 |18298 |
-ROW |33103 |18300 |18299 |
-ROW |33104 |18300 |18298 |
-ROW |33105 |18303 |18302 |
-ROW |33106 |18309 |18308 |
-ROW |33107 |18311 |18316 |
-ROW |33108 |18312 |18316 |
-ROW |33109 |18313 |18316 |
-ROW |33110 |18314 |18316 |
-ROW |33111 |18315 |18316 |
-ROW |33112 |18319 |18318 |
-ROW |33113 |18321 |18320 |
-ROW |33114 |18323 |18322 |
-ROW |33115 |18326 |18325 |
-ROW |33116 |18327 |18326 |
-ROW |33117 |18327 |18325 |
-ROW |33118 |18330 |18329 |
-ROW |33119 |18336 |18335 |
-ROW |33120 |18338 |18343 |
-ROW |33121 |18339 |18343 |
-ROW |33122 |18340 |18343 |
-ROW |33123 |18341 |18343 |
-ROW |33124 |18342 |18343 |
-ROW |33125 |18346 |18345 |
-ROW |33126 |18348 |18347 |
-ROW |33127 |18350 |18349 |
-ROW |33128 |18353 |18352 |
-ROW |33129 |18354 |18353 |
-ROW |33130 |18354 |18352 |
-ROW |33131 |18357 |18356 |
-ROW |33132 |18363 |18362 |
-ROW |33133 |18365 |18370 |
-ROW |33134 |18366 |18370 |
-ROW |33135 |18367 |18370 |
-ROW |33136 |18368 |18370 |
-ROW |33137 |18369 |18370 |
-ROW |33138 |18373 |18372 |
-ROW |33139 |18375 |18374 |
-ROW |33140 |18377 |18376 |
-ROW |33141 |18380 |18379 |
-ROW |33142 |18381 |18380 |
-ROW |33143 |18381 |18379 |
-ROW |33144 |18384 |18383 |
-ROW |33145 |18390 |18389 |
-ROW |33146 |18392 |18397 |
-ROW |33147 |18393 |18397 |
-ROW |33148 |18394 |18397 |
-ROW |33149 |18395 |18397 |
-ROW |33150 |18396 |18397 |
-ROW |33151 |18400 |18399 |
-ROW |33152 |18402 |18401 |
-ROW |33153 |18404 |18403 |
-ROW |33154 |18407 |18406 |
-ROW |33155 |18408 |18407 |
-ROW |33156 |18408 |18406 |
-ROW |33157 |18411 |18410 |
-ROW |33158 |18417 |18416 |
-ROW |33159 |18419 |18424 |
-ROW |33160 |18420 |18424 |
-ROW |33161 |18421 |18424 |
-ROW |33162 |18422 |18424 |
-ROW |33163 |18423 |18424 |
-ROW |33164 |18427 |18426 |
-ROW |33165 |18429 |18428 |
-ROW |33166 |18431 |18430 |
-ROW |33167 |15347 |15346 |
-ROW |33168 |15345 |15344 |
-ROW |33169 |17567 |17566 |
-ROW |33170 |15363 |15360 |
-ROW |33171 |15364 |15361 |
-ROW |33172 |15365 |15362 |
-ROW |33173 |15357 |15354 |
-ROW |33174 |15358 |15355 |
-ROW |33175 |15359 |15356 |
-ROW |33176 |17571 |17568 |
-ROW |33177 |17572 |17569 |
-ROW |33178 |17573 |17570 |
-ROW |33179 |15334 |15333 |
-ROW |33180 |15332 |15331 |
-ROW |33181 |14460 |14461 |
-ROW |33182 |14476 |14477 |
-ROW |33183 |14495 |14496 |
-ROW |33184 |14511 |17574 |
-ROW |33185 |19666 |19665 |
-ROW |33186 |19667 |19668 |
-ROW |33187 |14551 |14552 |
-ROW |33188 |15374 |15373 |
-ROW |33189 |15376 |15375 |
-ROW |33190 |14914 |14915 |
-ROW |33191 |14589 |14590 |
-ROW |33192 |15338 |15337 |
-ROW |33193 |17333 |17332 |
-ROW |33194 |14624 |14625 |
-ROW |33195 |18434 |18433 |
-ROW |33196 |18435 |18434 |
-ROW |33197 |18435 |18433 |
-ROW |33198 |18438 |18439 |
-ROW |33199 |18439 |18433 |
-ROW |33200 |18441 |18444 |
-ROW |33201 |18442 |18444 |
-ROW |33202 |18443 |18444 |
-ROW |33203 |18446 |18447 |
-ROW |33204 |18450 |18449 |
-ROW |33205 |19685 |19684 |
-ROW |33206 |19688 |19687 |
-ROW |33207 |19696 |19695 |
-ROW |33208 |19713 |19712 |
-ROW |33209 |19716 |19715 |
-ROW |33210 |19724 |19723 |
-ROW |33211 |19741 |19740 |
-ROW |33212 |19744 |19743 |
-ROW |33213 |19752 |19751 |
-ROW |33214 |19769 |19768 |
-ROW |33215 |19772 |19771 |
-ROW |33216 |19780 |19779 |
-ROW |33217 |19797 |19796 |
-ROW |33218 |19800 |19799 |
-ROW |33219 |19808 |19807 |
-ROW |33220 |19825 |19824 |
-ROW |33221 |19828 |19827 |
-ROW |33222 |19836 |19835 |
-ROW |33223 |19853 |19852 |
-ROW |33224 |19856 |19855 |
-ROW |33225 |19864 |19863 |
-ROW |33226 |19881 |19880 |
-ROW |33227 |19884 |19883 |
-ROW |33228 |19892 |19891 |
-ROW |33229 |19909 |19908 |
-ROW |33230 |19912 |19911 |
-ROW |33231 |19920 |19919 |
-ROW |33232 |19937 |19936 |
-ROW |33233 |19940 |19939 |
-ROW |33234 |19948 |19947 |
-ROW |33235 |19965 |19964 |
-ROW |33236 |19968 |19967 |
-ROW |33237 |19976 |19975 |
-ROW |33238 |19993 |19992 |
-ROW |33239 |19996 |19995 |
-ROW |33240 |20004 |20003 |
-ROW |33241 |20021 |20020 |
-ROW |33242 |20024 |20023 |
-ROW |33243 |20032 |20031 |
-ROW |33244 |20049 |20048 |
-ROW |33245 |20052 |20051 |
-ROW |33246 |20060 |20059 |
-ROW |33247 |20077 |20076 |
-ROW |33248 |20080 |20079 |
-ROW |33249 |20088 |20087 |
-ROW |33250 |20105 |20104 |
-ROW |33251 |20108 |20107 |
-ROW |33252 |20116 |20115 |
-ROW |33253 |20133 |20132 |
-ROW |33254 |20136 |20135 |
-ROW |33255 |20144 |20143 |
-ROW |33256 |20161 |20160 |
-ROW |33257 |20164 |20163 |
-ROW |33258 |20172 |20171 |
-ROW |33259 |20189 |20188 |
-ROW |33260 |20192 |20191 |
-ROW |33261 |20200 |20199 |
-ROW |33262 |20217 |20216 |
-ROW |33263 |20220 |20219 |
-ROW |33264 |20228 |20227 |
-ROW |33265 |20245 |20244 |
-ROW |33266 |20248 |20247 |
-ROW |33267 |20256 |20255 |
-ROW |33268 |20273 |20272 |
-ROW |33269 |20276 |20275 |
-ROW |33270 |20284 |20283 |
-ROW |33271 |20301 |20300 |
-ROW |33272 |20304 |20303 |
-ROW |33273 |20312 |20311 |
-ROW |33274 |20329 |20328 |
-ROW |33275 |20332 |20331 |
-ROW |33276 |20340 |20339 |
-ROW |33277 |20357 |20356 |
-ROW |33278 |20360 |20359 |
-ROW |33279 |20368 |20367 |
-ROW |33280 |20385 |20384 |
-ROW |33281 |20388 |20387 |
-ROW |33282 |20396 |20395 |
-ROW |33283 |20413 |20412 |
-ROW |33284 |20416 |20415 |
-ROW |33285 |20424 |20423 |
-ROW |33286 |20441 |20440 |
-ROW |33287 |20444 |20443 |
-ROW |33288 |20452 |20451 |
-ROW |33289 |20469 |20468 |
-ROW |33290 |20472 |20471 |
-ROW |33291 |20480 |20479 |
-ROW |33292 |20497 |20496 |
-ROW |33293 |20500 |20499 |
-ROW |33294 |20508 |20507 |
-ROW |33295 |20525 |20524 |
-ROW |33296 |20528 |20527 |
-ROW |33297 |20536 |20535 |
-ROW |33298 |20553 |20552 |
-ROW |33299 |20556 |20555 |
-ROW |33300 |20564 |20563 |
-ROW |33301 |20581 |20580 |
-ROW |33302 |20584 |20583 |
-ROW |33303 |20592 |20591 |
-ROW |33304 |20609 |20608 |
-ROW |33305 |20612 |20611 |
-ROW |33306 |20620 |20619 |
-ROW |33307 |20637 |20636 |
-ROW |33308 |20640 |20639 |
-ROW |33309 |20648 |20647 |
-ROW |33310 |20665 |20664 |
-ROW |33311 |20668 |20667 |
-ROW |33312 |20676 |20675 |
-ROW |33313 |20693 |20692 |
-ROW |33314 |20696 |20695 |
-ROW |33315 |20704 |20703 |
-ROW |33316 |20721 |20720 |
-ROW |33317 |20724 |20723 |
-ROW |33318 |20732 |20731 |
-ROW |33319 |20749 |20748 |
-ROW |33320 |20752 |20751 |
-ROW |33321 |20760 |20759 |
-ROW |33322 |20777 |20776 |
-ROW |33323 |20780 |20779 |
-ROW |33324 |20788 |20787 |
-ROW |33325 |20805 |20804 |
-ROW |33326 |20808 |20807 |
-ROW |33327 |20816 |20815 |
-ROW |33328 |20833 |20832 |
-ROW |33329 |20836 |20835 |
-ROW |33330 |20844 |20843 |
-ROW |33331 |20861 |20860 |
-ROW |33332 |20864 |20863 |
-ROW |33333 |20872 |20871 |
-ROW |33334 |20889 |20888 |
-ROW |33335 |20892 |20891 |
-ROW |33336 |20900 |20899 |
-ROW |33337 |20917 |20916 |
-ROW |33338 |20920 |20919 |
-ROW |33339 |20928 |20927 |
-ROW |33340 |20945 |20944 |
-ROW |33341 |20948 |20947 |
-ROW |33342 |20956 |20955 |
-ROW |33343 |20973 |20972 |
-ROW |33344 |20976 |20975 |
-ROW |33345 |20984 |20983 |
-ROW |33346 |21001 |21000 |
-ROW |33347 |21004 |21003 |
-ROW |33348 |21012 |21011 |
-ROW |33349 |21029 |21028 |
-ROW |33350 |21032 |21031 |
-ROW |33351 |21040 |21039 |
-ROW |33352 |21057 |21056 |
-ROW |33353 |21060 |21059 |
-ROW |33354 |21068 |21067 |
-ROW |33355 |21085 |21084 |
-ROW |33356 |21088 |21087 |
-ROW |33357 |21096 |21095 |
-ROW |33358 |21113 |21112 |
-ROW |33359 |21116 |21115 |
-ROW |33360 |21124 |21123 |
-ROW |33361 |21141 |21140 |
-ROW |33362 |21144 |21143 |
-ROW |33363 |21152 |21151 |
-ROW |33364 |21169 |21168 |
-ROW |33365 |21172 |21171 |
-ROW |33366 |21180 |21179 |
-ROW |33367 |14664 |14665 |
-ROW |33368 |17085 |17086 |
-ROW |33369 |16547 |16546 |
-ROW |33370 |17576 |17575 |
-ROW |33371 |17578 |17577 |
-ROW |33372 |17628 |17626 |
-ROW |33373 |17629 |17627 |
-ROW |33374 |17632 |17630 |
-ROW |33375 |17633 |17631 |
-ROW |33376 |17635 |17634 |
-ROW |33377 |17637 |17636 |
-ROW |33378 |17686 |17684 |
-ROW |33379 |17687 |17685 |
-ROW |33380 |17690 |17688 |
-ROW |33381 |17691 |17689 |
-ROW |33382 |17693 |17692 |
-ROW |33383 |17695 |17694 |
-ROW |33384 |17730 |17728 |
-ROW |33385 |17731 |17729 |
-ROW |33386 |17734 |17732 |
-ROW |33387 |17735 |17733 |
-ROW |33388 |17737 |17736 |
-ROW |33389 |17754 |17752 |
-ROW |33390 |17755 |17753 |
-ROW |33391 |17757 |17756 |
-ROW |33392 |17819 |17817 |
-ROW |33393 |17820 |17818 |
-ROW |33394 |17823 |17821 |
-ROW |33395 |17824 |17822 |
-ROW |33396 |17826 |17825 |
-ROW |33397 |17860 |17858 |
-ROW |33398 |17861 |17859 |
-ROW |33399 |17864 |17862 |
-ROW |33400 |17865 |17863 |
-ROW |33401 |17899 |17897 |
-ROW |33402 |17900 |17898 |
-ROW |33403 |17903 |17901 |
-ROW |33404 |17904 |17902 |
-ROW |33405 |17906 |17905 |
-ROW |33406 |17908 |17907 |
-ROW |33407 |17910 |17909 |
-ROW |33408 |16551 |16552 |
-ROW |33409 |16031 |16563 |
-ROW |33410 |16045 |16564 |
-ROW |33411 |16046 |16565 |
-ROW |33412 |16039 |16040 |
-ROW |33413 |16061 |16063 |
-ROW |33414 |16062 |16064 |
-ROW |33415 |16042 |16579 |
-ROW |33416 |16067 |16580 |
-ROW |33417 |16068 |16581 |
-ROW |33418 |16041 |16042 |
-ROW |33419 |16065 |16067 |
-ROW |33420 |16066 |16068 |
-ROW |33421 |16041 |16579 |
-ROW |33422 |16065 |16580 |
-ROW |33423 |16066 |16581 |
-ROW |33424 |18132 |18452 |
-ROW |33425 |18135 |18453 |
-ROW |33426 |18138 |18454 |
-ROW |33427 |18130 |18132 |
-ROW |33428 |18133 |18135 |
-ROW |33429 |18136 |18138 |
-ROW |33430 |18130 |18452 |
-ROW |33431 |18133 |18453 |
-ROW |33432 |18136 |18454 |
-ROW |33433 |16070 |16069 |
-ROW |33434 |16072 |16071 |
-ROW |33435 |16076 |17024 |
-ROW |33436 |18455 |17024 |
-ROW |33437 |16079 |16077 |
-ROW |33438 |16080 |16078 |
-ROW |33439 |16083 |16081 |
-ROW |33440 |16084 |16082 |
-ROW |33441 |16091 |17026 |
-ROW |33442 |16092 |17028 |
-ROW |33443 |18456 |17026 |
-ROW |33444 |18457 |17028 |
-ROW |33445 |17244 |17243 |
-ROW |33446 |17257 |17256 |
-ROW |33447 |17246 |17240 |
-ROW |33448 |17259 |17253 |
-ROW |33449 |17249 |17247 |
-ROW |33450 |17262 |17260 |
-ROW |33451 |17251 |17249 |
-ROW |33452 |17264 |17262 |
-ROW |33453 |17251 |17247 |
-ROW |33454 |17264 |17260 |
-ROW |33455 |18144 |18458 |
-ROW |33456 |18147 |18459 |
-ROW |33457 |18142 |18144 |
-ROW |33458 |18145 |18147 |
-ROW |33459 |18142 |18458 |
-ROW |33460 |18145 |18459 |
-ROW |33461 |17268 |17267 |
-ROW |33462 |17270 |17269 |
-ROW |33463 |17271 |17273 |
-ROW |33464 |18460 |17273 |
-ROW |33465 |17276 |17275 |
-ROW |33466 |17278 |17277 |
-ROW |33467 |17279 |17281 |
-ROW |33468 |18461 |17281 |
-ROW |33469 |16141 |16142 |
-ROW |33470 |16146 |16573 |
-ROW |33471 |16143 |16584 |
-ROW |33472 |18152 |18462 |
-ROW |33473 |18150 |18152 |
-ROW |33474 |18150 |18462 |
-ROW |33475 |16152 |16883 |
-ROW |33476 |16153 |16883 |
-ROW |33477 |18463 |16883 |
-ROW |33478 |18464 |16883 |
-ROW |33479 |16156 |16155 |
-ROW |33480 |16158 |16157 |
-ROW |33481 |18157 |18156 |
-ROW |33482 |18160 |18159 |
-ROW |33483 |18155 |18157 |
-ROW |33484 |18158 |18160 |
-ROW |33485 |18155 |18156 |
-ROW |33486 |18158 |18159 |
-ROW |33487 |16009 |16008 |
-ROW |33488 |16011 |16010 |
-ROW |33489 |16014 |16013 |
-ROW |33490 |16016 |16015 |
-ROW |33491 |16161 |16160 |
-ROW |33492 |16172 |16171 |
-ROW |33493 |16162 |16161 |
-ROW |33494 |16173 |16172 |
-ROW |33495 |16162 |16160 |
-ROW |33496 |16173 |16171 |
-ROW |33497 |16166 |18162 |
-ROW |33498 |16177 |18164 |
-ROW |33499 |16167 |18162 |
-ROW |33500 |16178 |18164 |
-ROW |33501 |17035 |16160 |
-ROW |33502 |17037 |16171 |
-ROW |33503 |18161 |18162 |
-ROW |33504 |18163 |18164 |
-ROW |33505 |16183 |16182 |
-ROW |33506 |17911 |17042 |
-ROW |33507 |18465 |17042 |
-ROW |33508 |18466 |17042 |
-ROW |33509 |17043 |17912 |
-ROW |33510 |17043 |17913 |
-ROW |33511 |16190 |16189 |
-ROW |33512 |17914 |17047 |
-ROW |33513 |18467 |17047 |
-ROW |33514 |18468 |17047 |
-ROW |33515 |17048 |17915 |
-ROW |33516 |17048 |17916 |
-ROW |33517 |17285 |17287 |
-ROW |33518 |17296 |17298 |
-ROW |33519 |17286 |17285 |
-ROW |33520 |17297 |17296 |
-ROW |33521 |17286 |17287 |
-ROW |33522 |17297 |17298 |
-ROW |33523 |17291 |18170 |
-ROW |33524 |17302 |18172 |
-ROW |33525 |17292 |18170 |
-ROW |33526 |17303 |18172 |
-ROW |33527 |17283 |17287 |
-ROW |33528 |17294 |17298 |
-ROW |33529 |18169 |18170 |
-ROW |33530 |18171 |18172 |
-ROW |33531 |17306 |17305 |
-ROW |33532 |17917 |17310 |
-ROW |33533 |18469 |17310 |
-ROW |33534 |18470 |17310 |
-ROW |33535 |17311 |17918 |
-ROW |33536 |17311 |17919 |
-ROW |33537 |17314 |17313 |
-ROW |33538 |17920 |17318 |
-ROW |33539 |18471 |17318 |
-ROW |33540 |18472 |17318 |
-ROW |33541 |17319 |17921 |
-ROW |33542 |17319 |17922 |
-ROW |33543 |18596 |18597 |
-ROW |33544 |18629 |18630 |
-ROW |33545 |18662 |18663 |
-ROW |33546 |18695 |18696 |
-ROW |33547 |18728 |18729 |
-ROW |33548 |18947 |18948 |
-ROW |33549 |18794 |18795 |
-ROW |33550 |18495 |18496 |
-ROW |33551 |18831 |18832 |
-ROW |33552 |18864 |18865 |
-ROW |33553 |18897 |18898 |
-ROW |33554 |16772 |16773 |
-ROW |33555 |16771 |16772 |
-ROW |33556 |16771 |16773 |
-ROW |33557 |16769 |16770 |
-ROW |33558 |16768 |16769 |
-ROW |33559 |16768 |16770 |
-ROW |33560 |19230 |19231 |
-ROW |33561 |19233 |19232 |
-ROW |33562 |19235 |19234 |
-ROW |33563 |19236 |19234 |
-ROW |33564 |19236 |19235 |
-ROW |33565 |19238 |19237 |
-ROW |33566 |19239 |19240 |
-ROW |33567 |19242 |19243 |
-ROW |33568 |19245 |19244 |
-ROW |33569 |19247 |19246 |
-ROW |33570 |19249 |19250 |
-ROW |33571 |19249 |19252 |
-ROW |33572 |19249 |19248 |
-ROW |33573 |19249 |19254 |
-ROW |33574 |19251 |19250 |
-ROW |33575 |19251 |19252 |
-ROW |33576 |19251 |19248 |
-ROW |33577 |19251 |19254 |
-ROW |33578 |19253 |19250 |
-ROW |33579 |19253 |19252 |
-ROW |33580 |19253 |19248 |
-ROW |33581 |19253 |19254 |
-ROW |33582 |19255 |19250 |
-ROW |33583 |19255 |19252 |
-ROW |33584 |19255 |19248 |
-ROW |33585 |19255 |19254 |
-ROW |33586 |19258 |19257 |
-ROW |33587 |16488 |16487 |
-ROW |33588 |16485 |16484 |
-ROW |33589 |16486 |16484 |
-ROW |33590 |16486 |16485 |
-ROW |33591 |16480 |16479 |
-ROW |33592 |16482 |16481 |
-ROW |33593 |16475 |16474 |
-ROW |33594 |16471 |16472 |
-ROW |33595 |16468 |16469 |
-ROW |33596 |16459 |16460 |
-ROW |33597 |16462 |16463 |
-ROW |33598 |16465 |16466 |
-ROW |33599 |16477 |16476 |
-ROW |33600 |19263 |19262 |
-ROW |33601 |19266 |19265 |
-ROW |33602 |19268 |19267 |
-ROW |33603 |19270 |19269 |
-ROW |33604 |19272 |19271 |
-ROW |33605 |19276 |19275 |
-ROW |33606 |19278 |19277 |
-ROW |33607 |19280 |19279 |
-ROW |33608 |19282 |19281 |
-ROW |33609 |19288 |19287 |
-ROW |33610 |19293 |19292 |
-ROW |33611 |19294 |19292 |
-ROW |33612 |19294 |19293 |
-ROW |33613 |19295 |19296 |
-ROW |33614 |19297 |19295 |
-ROW |33615 |19297 |19296 |
-ROW |33616 |19299 |19298 |
-ROW |33617 |19301 |19302 |
-ROW |33618 |19303 |19302 |
-ROW |33619 |19305 |19304 |
-ROW |33620 |19307 |19306 |
-ROW |33621 |19308 |19306 |
-ROW |33622 |19308 |19307 |
-ROW |33623 |19310 |19309 |
-ROW |33624 |19314 |19313 |
-ROW |33625 |19317 |19316 |
-ROW |33626 |19319 |19318 |
-ROW |33627 |19321 |19320 |
-ROW |33628 |19323 |19322 |
-ROW |33629 |19327 |19326 |
-ROW |33630 |19329 |19328 |
-ROW |33631 |19331 |19330 |
-ROW |33632 |19333 |19332 |
-ROW |33633 |19339 |19338 |
-ROW |33634 |19344 |19343 |
-ROW |33635 |19345 |19343 |
-ROW |33636 |19345 |19344 |
-ROW |33637 |19346 |19347 |
-ROW |33638 |19348 |19346 |
-ROW |33639 |19348 |19347 |
-ROW |33640 |19350 |19349 |
-ROW |33641 |19352 |19353 |
-ROW |33642 |19354 |19353 |
-ROW |33643 |19356 |19355 |
-ROW |33644 |19358 |19357 |
-ROW |33645 |19359 |19357 |
-ROW |33646 |19359 |19358 |
-ROW |33647 |19361 |19360 |
-ROW |33648 |19365 |19364 |
-ROW |33649 |19368 |19367 |
-ROW |33650 |19370 |19369 |
-ROW |33651 |19372 |19371 |
-ROW |33652 |19374 |19373 |
-ROW |33653 |19378 |19377 |
-ROW |33654 |19380 |19379 |
-ROW |33655 |19382 |19381 |
-ROW |33656 |19384 |19383 |
-ROW |33657 |19390 |19389 |
-ROW |33658 |19395 |19394 |
-ROW |33659 |19396 |19394 |
-ROW |33660 |19396 |19395 |
-ROW |33661 |19397 |19398 |
-ROW |33662 |19399 |19397 |
-ROW |33663 |19399 |19398 |
-ROW |33664 |19401 |19400 |
-ROW |33665 |19403 |19404 |
-ROW |33666 |19405 |19404 |
-ROW |33667 |19407 |19406 |
-ROW |33668 |19409 |19408 |
-ROW |33669 |19410 |19408 |
-ROW |33670 |19410 |19409 |
-ROW |33671 |19412 |19411 |
-ROW |33672 |19416 |19415 |
-ROW |33673 |19419 |19418 |
-ROW |33674 |19421 |19420 |
-ROW |33675 |19423 |19422 |
-ROW |33676 |19425 |19424 |
-ROW |33677 |19429 |19428 |
-ROW |33678 |19431 |19430 |
-ROW |33679 |19433 |19432 |
-ROW |33680 |19435 |19434 |
-ROW |33681 |19441 |19440 |
-ROW |33682 |19446 |19445 |
-ROW |33683 |19447 |19445 |
-ROW |33684 |19447 |19446 |
-ROW |33685 |19448 |19449 |
-ROW |33686 |19450 |19448 |
-ROW |33687 |19450 |19449 |
-ROW |33688 |19452 |19451 |
-ROW |33689 |19454 |19455 |
-ROW |33690 |19456 |19455 |
-ROW |33691 |19458 |19457 |
-ROW |33692 |19460 |19459 |
-ROW |33693 |19461 |19459 |
-ROW |33694 |19461 |19460 |
-ROW |33695 |19463 |19462 |
-ROW |33696 |15729 |15728 |
-ROW |33697 |15730 |15728 |
-ROW |33698 |15730 |15729 |
-ROW |33699 |15752 |15754 |
-ROW |33700 |15753 |15754 |
-ROW |33701 |15753 |15752 |
-ROW |33702 |15742 |15741 |
-ROW |33703 |15750 |15749 |
-ROW |33704 |15751 |15750 |
-ROW |33705 |15751 |15749 |
-ROW |33706 |15746 |15743 |
-ROW |33707 |15744 |15743 |
-ROW |33708 |15740 |15739 |
-ROW |33709 |17946 |17945 |
-ROW |33710 |17948 |17947 |
-ROW |33711 |15748 |15747 |
-ROW |33712 |19467 |19466 |
-ROW |33713 |19471 |19470 |
-ROW |33714 |19473 |19472 |
-ROW |33715 |19474 |19472 |
-ROW |33716 |19474 |19473 |
-ROW |33717 |19476 |19475 |
-ROW |33718 |19478 |19477 |
-ROW |33719 |19480 |19479 |
-ROW |33720 |19482 |19483 |
-ROW |33721 |19484 |19483 |
-ROW |33722 |19486 |19485 |
-ROW |33723 |19509 |19508 |
-ROW |33724 |19513 |19512 |
-ROW |33725 |19517 |19516 |
-ROW |33726 |19519 |19518 |
-ROW |33727 |19520 |19518 |
-ROW |33728 |19520 |19519 |
-ROW |33729 |19522 |19521 |
-ROW |33730 |19524 |19523 |
-ROW |33731 |19526 |19525 |
-ROW |33732 |19528 |19529 |
-ROW |33733 |19530 |19529 |
-ROW |33734 |19532 |19531 |
-ROW |33735 |19555 |19554 |
-ROW |33736 |19559 |19558 |
-ROW |33737 |19563 |19562 |
-ROW |33738 |19565 |19564 |
-ROW |33739 |19566 |19564 |
-ROW |33740 |19566 |19565 |
-ROW |33741 |19568 |19567 |
-ROW |33742 |19570 |19569 |
-ROW |33743 |19572 |19571 |
-ROW |33744 |19574 |19575 |
-ROW |33745 |19576 |19575 |
-ROW |33746 |19578 |19577 |
-ROW |33747 |19601 |19600 |
-ROW |33748 |19605 |19604 |
-ROW |33749 |19609 |19608 |
-ROW |33750 |19611 |19610 |
-ROW |33751 |19612 |19610 |
-ROW |33752 |19612 |19611 |
-ROW |33753 |19614 |19613 |
-ROW |33754 |19616 |19615 |
-ROW |33755 |19618 |19617 |
-ROW |33756 |19620 |19621 |
-ROW |33757 |19622 |19621 |
-ROW |33758 |19624 |19623 |
-ROW |33759 |19647 |19646 |
-ROW |33760 |16440 |16439 |
-ROW |33761 |18003 |15790 |
-ROW |33762 |18004 |15787 |
-ROW |33763 |18005 |15787 |
-ROW |33764 |18005 |18004 |
-ROW |33765 |15786 |15785 |
-ROW |33766 |15784 |15783 |
-ROW |33767 |15794 |15792 |
-ROW |33768 |15793 |15792 |
-ROW |33769 |15782 |15781 |
-ROW |33770 |15797 |15796 |
-ROW |33771 |15825 |15824 |
-ROW |33772 |15826 |15824 |
-ROW |33773 |15826 |15825 |
-ROW |33774 |15828 |15829 |
-ROW |33775 |15831 |15832 |
-ROW |33776 |15834 |15835 |
-ROW |33777 |15845 |15846 |
-ROW |33778 |17223 |17227 |
-ROW |33779 |17226 |17227 |
+ROW |33780 |17412 |17411 |
+ROW |33781 |17414 |17413 |
+ROW |33782 |17416 |17415 |
+ROW |33783 |15944 |15947 |
+ROW |33784 |15944 |15943 |
+ROW |33785 |15943 |15947 |
+ROW |33786 |16888 |15947 |
+ROW |33787 |16888 |15943 |
+ROW |33788 |15948 |15949 |
+ROW |33789 |15950 |15949 |
+ROW |33790 |17429 |17428 |
+ROW |33791 |17431 |17430 |
+ROW |33792 |17433 |17432 |
+ROW |33793 |17355 |17354 |
+ROW |33794 |17358 |17357 |
+ROW |33795 |18960 |18962 |
+ROW |33796 |16743 |16744 |
+ROW |33797 |16784 |16785 |
+ROW |33798 |16790 |16791 |
+ROW |33799 |16892 |16900 |
+ROW |33800 |16894 |16900 |
+ROW |33801 |17459 |17458 |
+ROW |33802 |17463 |17458 |
+ROW |33803 |17471 |17480 |
+ROW |33804 |17476 |17481 |
+ROW |33805 |17478 |17480 |
+ROW |33806 |17479 |17481 |
+ROW |33807 |17483 |17482 |
+ROW |33808 |17486 |17485 |
+ROW |33809 |16646 |16647 |
+ROW |33810 |18965 |16660 |
+ROW |33811 |16809 |16810 |
+ROW |33812 |18966 |16677 |
+ROW |33813 |16902 |16904 |
+ROW |33814 |16904 |16905 |
+ROW |33815 |16909 |16906 |
+ROW |33816 |16910 |16912 |
+ROW |33817 |16912 |16913 |
+ROW |33818 |16917 |16914 |
+ROW |33819 |17962 |17963 |
+ROW |33820 |17962 |17958 |
+ROW |33821 |16752 |16753 |
+ROW |33822 |15955 |15957 |
+ROW |33823 |15955 |15954 |
+ROW |33824 |15954 |15957 |
+ROW |33825 |15956 |15957 |
+ROW |33826 |15956 |15954 |
+ROW |33827 |16678 |15957 |
+ROW |33828 |16678 |15954 |
+ROW |33829 |15961 |15960 |
+ROW |33830 |15962 |15960 |
+ROW |33831 |16679 |15960 |
+ROW |33832 |17090 |17096 |
+ROW |33833 |17093 |17096 |
+ROW |33834 |17101 |17098 |
+ROW |33835 |16257 |16255 |
+ROW |33836 |16257 |16256 |
+ROW |33837 |16256 |16255 |
+ROW |33838 |16251 |16255 |
+ROW |33839 |16251 |16256 |
+ROW |33840 |16443 |16255 |
+ROW |33841 |16443 |16256 |
+ROW |33842 |16270 |16269 |
+ROW |33843 |16448 |16269 |
+ROW |33844 |16265 |16269 |
+ROW |33845 |17503 |17505 |
+ROW |33846 |17512 |17511 |
+ROW |33847 |17513 |17505 |
+ROW |33853 |17516 |17518 |
+ROW |33854 |17517 |17516 |
+ROW |33855 |17517 |17518 |
+ROW |33856 |17517 |17519 |
+ROW |33857 |17519 |17518 |
+ROW |33858 |18918 |18917 |
+ROW |33859 |17973 |17965 |
+ROW |33860 |17974 |17966 |
+ROW |33861 |17141 |17151 |
+ROW |33862 |17142 |17141 |
+ROW |33863 |17142 |17151 |
+ROW |33864 |17143 |17151 |
+ROW |33865 |17144 |17143 |
+ROW |33866 |17144 |17151 |
+ROW |33867 |17146 |17145 |
+ROW |33868 |17147 |17151 |
+ROW |33869 |17148 |17147 |
+ROW |33870 |17148 |17151 |
+ROW |33871 |17150 |17149 |
+ROW |33872 |17152 |17168 |
+ROW |33873 |17153 |17152 |
+ROW |33874 |17153 |17168 |
+ROW |33875 |17154 |17168 |
+ROW |33876 |17155 |17154 |
+ROW |33877 |17155 |17168 |
+ROW |33878 |17156 |17168 |
+ROW |33879 |17157 |17156 |
+ROW |33880 |17157 |17168 |
+ROW |33881 |17158 |17168 |
+ROW |33882 |17159 |17158 |
+ROW |33883 |17159 |17168 |
+ROW |33884 |17160 |17168 |
+ROW |33885 |17161 |17160 |
+ROW |33886 |17161 |17168 |
+ROW |33887 |17163 |17162 |
+ROW |33888 |17164 |17168 |
+ROW |33889 |17165 |17164 |
+ROW |33890 |17165 |17168 |
+ROW |33891 |17166 |17168 |
+ROW |33892 |17167 |17166 |
+ROW |33893 |17167 |17168 |
+ROW |33894 |17169 |17168 |
+ROW |33895 |17170 |17168 |
+ROW |33896 |17170 |17169 |
+ROW |33897 |17171 |17168 |
+ROW |33898 |17172 |17168 |
+ROW |33899 |17172 |17171 |
+ROW |33900 |17540 |17541 |
+ROW |33901 |16833 |16920 |
+ROW |33902 |16920 |16921 |
+ROW |33903 |18987 |18986 |
+ROW |33904 |18989 |18988 |
+ROW |33905 |18993 |18992 |
+ROW |33906 |18994 |18992 |
+ROW |33907 |19009 |19010 |
+ROW |33908 |17978 |17977 |
+ROW |33909 |17980 |17979 |
+ROW |33910 |17984 |17983 |
+ROW |33911 |17985 |17983 |
+ROW |33912 |18000 |18001 |
+ROW |33913 |18225 |18224 |
+ROW |33914 |18237 |18236 |
+ROW |33915 |16929 |16928 |
+ROW |33916 |16940 |17084 |
+ROW |33917 |18537 |18536 |
+ROW |33918 |18539 |18538 |
+ROW |33919 |18541 |18540 |
+ROW |33920 |16719 |16721 |
+ROW |33921 |16975 |16723 |
+ROW |33922 |16729 |16728 |
+ROW |33923 |16730 |16728 |
+ROW |33924 |16756 |16758 |
+ROW |33925 |16979 |16759 |
+ROW |33926 |16765 |16764 |
+ROW |33927 |16766 |16764 |
+ROW |33928 |16734 |16736 |
+ROW |33929 |16983 |16732 |
+ROW |33930 |16741 |16740 |
+ROW |33931 |16742 |16740 |
+ROW |33932 |17192 |17191 |
+ROW |33933 |17194 |17195 |
+ROW |33934 |17199 |17198 |
+ROW |33935 |17546 |17545 |
+ROW |33936 |17547 |17548 |
+ROW |33937 |16997 |16984 |
+ROW |33938 |17002 |17003 |
+ROW |33939 |17006 |17005 |
+ROW |33940 |17011 |17010 |
+ROW |33941 |17550 |17549 |
+ROW |33942 |17551 |17552 |
+ROW |33943 |17391 |17396 |
+ROW |33944 |17395 |17396 |
+ROW |33945 |16683 |16687 |
+ROW |33946 |14252 |14251 |
+ROW |33947 |14294 |14293 |
+ROW |33948 |14312 |14311 |
+ROW |33949 |14328 |14327 |
+ROW |33950 |14348 |14347 |
+ROW |33951 |14357 |14356 |
+ROW |33952 |14390 |14389 |
+ROW |33953 |14404 |14403 |
+ROW |33954 |14452 |14451 |
+ROW |33955 |14469 |14468 |
+ROW |33956 |14487 |14486 |
+ROW |33957 |14506 |14505 |
+ROW |33958 |14535 |14534 |
+ROW |33959 |14545 |14544 |
+ROW |33960 |14583 |14582 |
+ROW |33961 |14599 |14598 |
+ROW |33962 |14616 |14615 |
+ROW |33963 |14653 |14652 |
+ROW |33964 |14674 |14673 |
+ROW |33965 |14692 |14691 |
+ROW |33966 |14705 |14704 |
+ROW |33967 |14718 |14717 |
+ROW |33968 |14907 |14906 |
+ROW |33969 |15221 |15220 |
+ROW |33970 |15702 |15701 |
+ROW |33971 |15724 |15723 |
+ROW |33972 |15756 |15755 |
+ROW |33973 |15820 |15819 |
+ROW |33974 |15841 |15840 |
+ROW |33975 |15991 |15990 |
+ROW |33976 |16018 |16017 |
+ROW |33977 |16454 |16453 |
+ROW |33978 |17924 |17923 |
+ROW |33979 |18178 |18177 |
+ROW |33980 |19670 |19669 |
+ROW |33981 |19698 |19697 |
+ROW |33982 |19726 |19725 |
+ROW |33983 |19754 |19753 |
+ROW |33984 |19782 |19781 |
+ROW |33985 |19810 |19809 |
+ROW |33986 |19838 |19837 |
+ROW |33987 |19866 |19865 |
+ROW |33988 |19894 |19893 |
+ROW |33989 |19922 |19921 |
+ROW |33990 |19950 |19949 |
+ROW |33991 |19978 |19977 |
+ROW |33992 |20006 |20005 |
+ROW |33993 |20034 |20033 |
+ROW |33994 |20062 |20061 |
+ROW |33995 |20090 |20089 |
+ROW |33996 |20118 |20117 |
+ROW |33997 |20146 |20145 |
+ROW |33998 |20174 |20173 |
+ROW |33999 |20202 |20201 |
+ROW |34000 |20230 |20229 |
+ROW |34001 |20258 |20257 |
+ROW |34002 |20286 |20285 |
+ROW |34003 |20314 |20313 |
+ROW |34004 |20342 |20341 |
+ROW |34005 |20370 |20369 |
+ROW |34006 |20398 |20397 |
+ROW |34007 |20426 |20425 |
+ROW |34008 |20454 |20453 |
+ROW |34009 |20482 |20481 |
+ROW |34010 |20510 |20509 |
+ROW |34011 |20538 |20537 |
+ROW |34012 |20566 |20565 |
+ROW |34013 |20594 |20593 |
+ROW |34014 |20622 |20621 |
+ROW |34015 |20650 |20649 |
+ROW |34016 |20678 |20677 |
+ROW |34017 |20706 |20705 |
+ROW |34018 |20734 |20733 |
+ROW |34019 |20762 |20761 |
+ROW |34020 |20790 |20789 |
+ROW |34021 |20818 |20817 |
+ROW |34022 |20846 |20845 |
+ROW |34023 |20874 |20873 |
+ROW |34024 |20902 |20901 |
+ROW |34025 |20930 |20929 |
+ROW |34026 |20958 |20957 |
+ROW |34027 |20986 |20985 |
+ROW |34028 |21014 |21013 |
+ROW |34029 |21042 |21041 |
+ROW |34030 |21070 |21069 |
+ROW |34031 |21098 |21097 |
+ROW |34032 |21126 |21125 |
+ROW |34033 |21154 |21153 |
+ROW |34034 |14253 |14252 |
+ROW |34035 |14295 |14294 |
+ROW |34036 |14313 |14312 |
+ROW |34037 |14329 |14328 |
+ROW |34038 |14349 |14348 |
+ROW |34039 |14358 |14357 |
+ROW |34040 |14391 |14390 |
+ROW |34041 |14405 |14404 |
+ROW |34042 |14453 |14452 |
+ROW |34043 |14470 |14469 |
+ROW |34044 |14488 |14487 |
+ROW |34045 |14507 |14506 |
+ROW |34046 |14536 |14535 |
+ROW |34047 |14546 |14545 |
+ROW |34048 |14584 |14583 |
+ROW |34049 |14600 |14599 |
+ROW |34050 |14617 |14616 |
+ROW |34051 |14654 |14653 |
+ROW |34052 |14675 |14674 |
+ROW |34053 |14693 |14692 |
+ROW |34054 |14706 |14705 |
+ROW |34055 |14719 |14718 |
+ROW |34056 |14908 |14907 |
+ROW |34057 |15222 |15221 |
+ROW |34058 |15703 |15702 |
+ROW |34059 |15725 |15724 |
+ROW |34060 |15757 |15756 |
+ROW |34061 |15821 |15820 |
+ROW |34062 |15842 |15841 |
+ROW |34063 |15992 |15991 |
+ROW |34064 |16019 |16018 |
+ROW |34065 |16455 |16454 |
+ROW |34066 |17925 |17924 |
+ROW |34067 |18179 |18178 |
+ROW |34068 |19671 |19670 |
+ROW |34069 |19699 |19698 |
+ROW |34070 |19727 |19726 |
+ROW |34071 |19755 |19754 |
+ROW |34072 |19783 |19782 |
+ROW |34073 |19811 |19810 |
+ROW |34074 |19839 |19838 |
+ROW |34075 |19867 |19866 |
+ROW |34076 |19895 |19894 |
+ROW |34077 |19923 |19922 |
+ROW |34078 |19951 |19950 |
+ROW |34079 |19979 |19978 |
+ROW |34080 |20007 |20006 |
+ROW |34081 |20035 |20034 |
+ROW |34082 |20063 |20062 |
+ROW |34083 |20091 |20090 |
+ROW |34084 |20119 |20118 |
+ROW |34085 |20147 |20146 |
+ROW |34086 |20175 |20174 |
+ROW |34087 |20203 |20202 |
+ROW |34088 |20231 |20230 |
+ROW |34089 |20259 |20258 |
+ROW |34090 |20287 |20286 |
+ROW |34091 |20315 |20314 |
+ROW |34092 |20343 |20342 |
+ROW |34093 |20371 |20370 |
+ROW |34094 |20399 |20398 |
+ROW |34095 |20427 |20426 |
+ROW |34096 |20455 |20454 |
+ROW |34097 |20483 |20482 |
+ROW |34098 |20511 |20510 |
+ROW |34099 |20539 |20538 |
+ROW |34100 |20567 |20566 |
+ROW |34101 |20595 |20594 |
+ROW |34102 |20623 |20622 |
+ROW |34103 |20651 |20650 |
+ROW |34104 |20679 |20678 |
+ROW |34105 |20707 |20706 |
+ROW |34106 |20735 |20734 |
+ROW |34107 |20763 |20762 |
+ROW |34108 |20791 |20790 |
+ROW |34109 |20819 |20818 |
+ROW |34110 |20847 |20846 |
+ROW |34111 |20875 |20874 |
+ROW |34112 |20903 |20902 |
+ROW |34113 |20931 |20930 |
+ROW |34114 |20959 |20958 |
+ROW |34115 |20987 |20986 |
+ROW |34116 |21015 |21014 |
+ROW |34117 |21043 |21042 |
+ROW |34118 |21071 |21070 |
+ROW |34119 |21099 |21098 |
+ROW |34120 |21127 |21126 |
+ROW |34121 |21155 |21154 |
+ROW |34122 |14253 |14251 |
+ROW |34123 |14295 |14293 |
+ROW |34124 |14313 |14311 |
+ROW |34125 |14329 |14327 |
+ROW |34126 |14349 |14347 |
+ROW |34127 |14358 |14356 |
+ROW |34128 |14391 |14389 |
+ROW |34129 |14405 |14403 |
+ROW |34130 |14453 |14451 |
+ROW |34131 |14470 |14468 |
+ROW |34132 |14488 |14486 |
+ROW |34133 |14507 |14505 |
+ROW |34134 |14536 |14534 |
+ROW |34135 |14546 |14544 |
+ROW |34136 |14584 |14582 |
+ROW |34137 |14600 |14598 |
+ROW |34138 |14617 |14615 |
+ROW |34139 |14654 |14652 |
+ROW |34140 |14675 |14673 |
+ROW |34141 |14693 |14691 |
+ROW |34142 |14706 |14704 |
+ROW |34143 |14719 |14717 |
+ROW |34144 |14908 |14906 |
+ROW |34145 |15222 |15220 |
+ROW |34146 |15703 |15701 |
+ROW |34147 |15725 |15723 |
+ROW |34148 |15757 |15755 |
+ROW |34149 |15821 |15819 |
+ROW |34150 |15842 |15840 |
+ROW |34151 |15992 |15990 |
+ROW |34152 |16019 |16017 |
+ROW |34153 |16455 |16453 |
+ROW |34154 |17925 |17923 |
+ROW |34155 |18179 |18177 |
+ROW |34156 |19671 |19669 |
+ROW |34157 |19699 |19697 |
+ROW |34158 |19727 |19725 |
+ROW |34159 |19755 |19753 |
+ROW |34160 |19783 |19781 |
+ROW |34161 |19811 |19809 |
+ROW |34162 |19839 |19837 |
+ROW |34163 |19867 |19865 |
+ROW |34164 |19895 |19893 |
+ROW |34165 |19923 |19921 |
+ROW |34166 |19951 |19949 |
+ROW |34167 |19979 |19977 |
+ROW |34168 |20007 |20005 |
+ROW |34169 |20035 |20033 |
+ROW |34170 |20063 |20061 |
+ROW |34171 |20091 |20089 |
+ROW |34172 |20119 |20117 |
+ROW |34173 |20147 |20145 |
+ROW |34174 |20175 |20173 |
+ROW |34175 |20203 |20201 |
+ROW |34176 |20231 |20229 |
+ROW |34177 |20259 |20257 |
+ROW |34178 |20287 |20285 |
+ROW |34179 |20315 |20313 |
+ROW |34180 |20343 |20341 |
+ROW |34181 |20371 |20369 |
+ROW |34182 |20399 |20397 |
+ROW |34183 |20427 |20425 |
+ROW |34184 |20455 |20453 |
+ROW |34185 |20483 |20481 |
+ROW |34186 |20511 |20509 |
+ROW |34187 |20539 |20537 |
+ROW |34188 |20567 |20565 |
+ROW |34189 |20595 |20593 |
+ROW |34190 |20623 |20621 |
+ROW |34191 |20651 |20649 |
+ROW |34192 |20679 |20677 |
+ROW |34193 |20707 |20705 |
+ROW |34194 |20735 |20733 |
+ROW |34195 |20763 |20761 |
+ROW |34196 |20791 |20789 |
+ROW |34197 |20819 |20817 |
+ROW |34198 |20847 |20845 |
+ROW |34199 |20875 |20873 |
+ROW |34200 |20903 |20901 |
+ROW |34201 |20931 |20929 |
+ROW |34202 |20959 |20957 |
+ROW |34203 |20987 |20985 |
+ROW |34204 |21015 |21013 |
+ROW |34205 |21043 |21041 |
+ROW |34206 |21071 |21069 |
+ROW |34207 |21099 |21097 |
+ROW |34208 |21127 |21125 |
+ROW |34209 |21155 |21153 |
+ROW |34210 |16287 |16289 |
+ROW |34211 |16279 |16285 |
+ROW |34212 |16290 |16348 |
+ROW |34213 |16291 |16349 |
+ROW |34214 |16292 |16350 |
+ROW |34215 |16293 |16351 |
+ROW |34216 |16294 |16352 |
+ROW |34217 |16295 |16353 |
+ROW |34218 |16296 |16354 |
+ROW |34219 |16297 |16355 |
+ROW |34220 |16298 |16356 |
+ROW |34221 |16299 |16357 |
+ROW |34222 |16300 |16358 |
+ROW |34223 |16301 |16359 |
+ROW |34224 |16302 |16360 |
+ROW |34225 |16303 |16361 |
+ROW |34226 |16304 |16362 |
+ROW |34227 |16305 |16363 |
+ROW |34228 |16306 |16364 |
+ROW |34229 |16307 |16365 |
+ROW |34230 |16308 |16366 |
+ROW |34231 |16309 |16367 |
+ROW |34232 |16311 |16369 |
+ROW |34233 |16312 |16370 |
+ROW |34234 |16313 |16371 |
+ROW |34235 |16314 |16372 |
+ROW |34236 |16315 |16373 |
+ROW |34237 |16316 |16374 |
+ROW |34238 |16317 |16375 |
+ROW |34239 |16318 |16376 |
+ROW |34240 |16457 |16458 |
+ROW |34241 |17927 |17928 |
+ROW |34242 |18181 |18182 |
+ROW |34243 |19673 |19674 |
+ROW |34244 |19701 |19702 |
+ROW |34245 |19729 |19730 |
+ROW |34246 |19757 |19758 |
+ROW |34247 |19785 |19786 |
+ROW |34248 |19813 |19814 |
+ROW |34249 |19841 |19842 |
+ROW |34250 |19869 |19870 |
+ROW |34251 |19897 |19898 |
+ROW |34252 |19925 |19926 |
+ROW |34253 |19953 |19954 |
+ROW |34254 |19981 |19982 |
+ROW |34255 |20009 |20010 |
+ROW |34256 |20037 |20038 |
+ROW |34257 |20065 |20066 |
+ROW |34258 |20093 |20094 |
+ROW |34259 |20121 |20122 |
+ROW |34260 |20149 |20150 |
+ROW |34261 |20177 |20178 |
+ROW |34262 |20205 |20206 |
+ROW |34263 |20233 |20234 |
+ROW |34264 |20261 |20262 |
+ROW |34265 |20289 |20290 |
+ROW |34266 |20317 |20318 |
+ROW |34267 |20345 |20346 |
+ROW |34268 |20373 |20374 |
+ROW |34269 |20401 |20402 |
+ROW |34270 |20429 |20430 |
+ROW |34271 |20457 |20458 |
+ROW |34272 |20485 |20486 |
+ROW |34273 |20513 |20514 |
+ROW |34274 |20541 |20542 |
+ROW |34275 |20569 |20570 |
+ROW |34276 |20597 |20598 |
+ROW |34277 |20625 |20626 |
+ROW |34278 |20653 |20654 |
+ROW |34279 |20681 |20682 |
+ROW |34280 |20709 |20710 |
+ROW |34281 |20737 |20738 |
+ROW |34282 |20765 |20766 |
+ROW |34283 |20793 |20794 |
+ROW |34284 |20821 |20822 |
+ROW |34285 |20849 |20850 |
+ROW |34286 |20877 |20878 |
+ROW |34287 |20905 |20906 |
+ROW |34288 |20933 |20934 |
+ROW |34289 |20961 |20962 |
+ROW |34290 |20989 |20990 |
+ROW |34291 |21017 |21018 |
+ROW |34292 |21045 |21046 |
+ROW |34293 |21073 |21074 |
+ROW |34294 |21101 |21102 |
+ROW |34295 |21129 |21130 |
+ROW |34296 |21157 |21158 |
+ROW |34297 |16289 |14293 |
+ROW |34298 |16285 |14717 |
+ROW |34299 |16348 |14311 |
+ROW |34300 |16349 |14327 |
+ROW |34301 |16350 |14347 |
+ROW |34302 |16351 |14356 |
+ROW |34303 |16352 |14389 |
+ROW |34304 |16353 |14403 |
+ROW |34305 |16354 |14451 |
+ROW |34306 |16355 |14468 |
+ROW |34307 |16356 |14486 |
+ROW |34308 |16357 |14505 |
+ROW |34309 |16358 |14534 |
+ROW |34310 |16359 |14544 |
+ROW |34311 |16360 |14582 |
+ROW |34312 |16361 |14598 |
+ROW |34313 |16362 |14615 |
+ROW |34314 |16363 |14652 |
+ROW |34315 |16364 |14673 |
+ROW |34316 |16365 |14691 |
+ROW |34317 |16366 |14704 |
+ROW |34318 |16367 |14906 |
+ROW |34319 |16369 |15220 |
+ROW |34320 |16370 |15701 |
+ROW |34321 |16371 |15723 |
+ROW |34322 |16372 |15755 |
+ROW |34323 |16373 |15819 |
+ROW |34324 |16374 |15840 |
+ROW |34325 |16375 |15990 |
+ROW |34326 |16376 |16017 |
+ROW |34327 |16458 |16453 |
+ROW |34328 |17928 |17923 |
+ROW |34329 |18182 |18177 |
+ROW |34330 |19674 |19669 |
+ROW |34331 |19702 |19697 |
+ROW |34332 |19730 |19725 |
+ROW |34333 |19758 |19753 |
+ROW |34334 |19786 |19781 |
+ROW |34335 |19814 |19809 |
+ROW |34336 |19842 |19837 |
+ROW |34337 |19870 |19865 |
+ROW |34338 |19898 |19893 |
+ROW |34339 |19926 |19921 |
+ROW |34340 |19954 |19949 |
+ROW |34341 |19982 |19977 |
+ROW |34342 |20010 |20005 |
+ROW |34343 |20038 |20033 |
+ROW |34344 |20066 |20061 |
+ROW |34345 |20094 |20089 |
+ROW |34346 |20122 |20117 |
+ROW |34347 |20150 |20145 |
+ROW |34348 |20178 |20173 |
+ROW |34349 |20206 |20201 |
+ROW |34350 |20234 |20229 |
+ROW |34351 |20262 |20257 |
+ROW |34352 |20290 |20285 |
+ROW |34353 |20318 |20313 |
+ROW |34354 |20346 |20341 |
+ROW |34355 |20374 |20369 |
+ROW |34356 |20402 |20397 |
+ROW |34357 |20430 |20425 |
+ROW |34358 |20458 |20453 |
+ROW |34359 |20486 |20481 |
+ROW |34360 |20514 |20509 |
+ROW |34361 |20542 |20537 |
+ROW |34362 |20570 |20565 |
+ROW |34363 |20598 |20593 |
+ROW |34364 |20626 |20621 |
+ROW |34365 |20654 |20649 |
+ROW |34366 |20682 |20677 |
+ROW |34367 |20710 |20705 |
+ROW |34368 |20738 |20733 |
+ROW |34369 |20766 |20761 |
+ROW |34370 |20794 |20789 |
+ROW |34371 |20822 |20817 |
+ROW |34372 |20850 |20845 |
+ROW |34373 |20878 |20873 |
+ROW |34374 |20906 |20901 |
+ROW |34375 |20934 |20929 |
+ROW |34376 |20962 |20957 |
+ROW |34377 |20990 |20985 |
+ROW |34378 |21018 |21013 |
+ROW |34379 |21046 |21041 |
+ROW |34380 |21074 |21069 |
+ROW |34381 |21102 |21097 |
+ROW |34382 |21130 |21125 |
+ROW |34383 |21158 |21153 |
+ROW |34384 |16631 |16630 |
+ROW |34385 |16640 |16636 |
+ROW |34386 |16642 |16638 |
+ROW |34387 |16643 |16639 |
+ROW |34388 |15695 |16863 |
+ROW |34389 |18242 |16863 |
+ROW |34390 |18243 |16863 |
+ROW |34391 |15694 |16868 |
+ROW |34392 |15696 |16864 |
+ROW |34393 |15697 |16865 |
+ROW |34394 |18244 |16864 |
+ROW |34395 |18245 |16865 |
+ROW |34396 |18246 |16868 |
+ROW |34397 |18247 |16864 |
+ROW |34398 |18248 |16865 |
+ROW |34399 |18249 |16868 |
+ROW |34400 |15671 |16841 |
+ROW |34401 |18250 |16841 |
+ROW |34402 |18251 |16841 |
+ROW |34403 |15672 |16842 |
+ROW |34404 |15673 |16843 |
+ROW |34405 |15674 |16844 |
+ROW |34406 |15675 |16845 |
+ROW |34407 |15676 |16846 |
+ROW |34408 |15677 |16847 |
+ROW |34409 |15678 |16848 |
+ROW |34410 |15679 |16849 |
+ROW |34411 |15680 |16850 |
+ROW |34412 |15681 |16851 |
+ROW |34413 |15682 |16852 |
+ROW |34414 |15683 |16853 |
+ROW |34415 |15684 |16854 |
+ROW |34416 |15685 |16855 |
+ROW |34417 |15686 |16856 |
+ROW |34418 |15687 |16857 |
+ROW |34419 |15689 |16858 |
+ROW |34420 |15691 |16860 |
+ROW |34421 |15708 |16861 |
+ROW |34422 |15997 |16862 |
+ROW |34423 |19677 |19678 |
+ROW |34424 |19705 |19706 |
+ROW |34425 |19733 |19734 |
+ROW |34426 |19761 |19762 |
+ROW |34427 |19789 |19790 |
+ROW |34428 |19817 |19818 |
+ROW |34429 |19845 |19846 |
+ROW |34430 |19873 |19874 |
+ROW |34431 |19901 |19902 |
+ROW |34432 |19929 |19930 |
+ROW |34433 |19957 |19958 |
+ROW |34434 |19985 |19986 |
+ROW |34435 |20013 |20014 |
+ROW |34436 |20041 |20042 |
+ROW |34437 |20069 |20070 |
+ROW |34438 |20097 |20098 |
+ROW |34439 |20125 |20126 |
+ROW |34440 |20153 |20154 |
+ROW |34441 |20181 |20182 |
+ROW |34442 |20209 |20210 |
+ROW |34443 |20237 |20238 |
+ROW |34444 |20265 |20266 |
+ROW |34445 |20293 |20294 |
+ROW |34446 |20321 |20322 |
+ROW |34447 |20349 |20350 |
+ROW |34448 |20377 |20378 |
+ROW |34449 |20405 |20406 |
+ROW |34450 |20433 |20434 |
+ROW |34451 |20461 |20462 |
+ROW |34452 |20489 |20490 |
+ROW |34453 |20517 |20518 |
+ROW |34454 |20545 |20546 |
+ROW |34455 |20573 |20574 |
+ROW |34456 |20601 |20602 |
+ROW |34457 |20629 |20630 |
+ROW |34458 |20657 |20658 |
+ROW |34459 |20685 |20686 |
+ROW |34460 |20713 |20714 |
+ROW |34461 |20741 |20742 |
+ROW |34462 |20769 |20770 |
+ROW |34463 |20797 |20798 |
+ROW |34464 |20825 |20826 |
+ROW |34465 |20853 |20854 |
+ROW |34466 |20881 |20882 |
+ROW |34467 |20909 |20910 |
+ROW |34468 |20937 |20938 |
+ROW |34469 |20965 |20966 |
+ROW |34470 |20993 |20994 |
+ROW |34471 |21021 |21022 |
+ROW |34472 |21049 |21050 |
+ROW |34473 |21077 |21078 |
+ROW |34474 |21105 |21106 |
+ROW |34475 |21133 |21134 |
+ROW |34476 |21161 |21162 |
+ROW |34477 |18252 |16842 |
+ROW |34478 |18253 |16843 |
+ROW |34479 |18254 |16844 |
+ROW |34480 |18255 |16845 |
+ROW |34481 |18256 |16846 |
+ROW |34482 |18257 |16847 |
+ROW |34483 |18258 |16848 |
+ROW |34484 |18259 |16849 |
+ROW |34485 |18260 |16850 |
+ROW |34486 |18261 |16851 |
+ROW |34487 |18262 |16852 |
+ROW |34488 |18263 |16853 |
+ROW |34489 |18264 |16854 |
+ROW |34490 |18265 |16855 |
+ROW |34491 |18266 |16856 |
+ROW |34492 |18267 |16857 |
+ROW |34493 |18268 |16858 |
+ROW |34494 |18270 |16860 |
+ROW |34495 |18271 |16861 |
+ROW |34496 |18272 |16862 |
+ROW |34497 |19676 |19678 |
+ROW |34498 |19704 |19706 |
+ROW |34499 |19732 |19734 |
+ROW |34500 |19760 |19762 |
+ROW |34501 |19788 |19790 |
+ROW |34502 |19816 |19818 |
+ROW |34503 |19844 |19846 |
+ROW |34504 |19872 |19874 |
+ROW |34505 |19900 |19902 |
+ROW |34506 |19928 |19930 |
+ROW |34507 |19956 |19958 |
+ROW |34508 |19984 |19986 |
+ROW |34509 |20012 |20014 |
+ROW |34510 |20040 |20042 |
+ROW |34511 |20068 |20070 |
+ROW |34512 |20096 |20098 |
+ROW |34513 |20124 |20126 |
+ROW |34514 |20152 |20154 |
+ROW |34515 |20180 |20182 |
+ROW |34516 |20208 |20210 |
+ROW |34517 |20236 |20238 |
+ROW |34518 |20264 |20266 |
+ROW |34519 |20292 |20294 |
+ROW |34520 |20320 |20322 |
+ROW |34521 |20348 |20350 |
+ROW |34522 |20376 |20378 |
+ROW |34523 |20404 |20406 |
+ROW |34524 |20432 |20434 |
+ROW |34525 |20460 |20462 |
+ROW |34526 |20488 |20490 |
+ROW |34527 |20516 |20518 |
+ROW |34528 |20544 |20546 |
+ROW |34529 |20572 |20574 |
+ROW |34530 |20600 |20602 |
+ROW |34531 |20628 |20630 |
+ROW |34532 |20656 |20658 |
+ROW |34533 |20684 |20686 |
+ROW |34534 |20712 |20714 |
+ROW |34535 |20740 |20742 |
+ROW |34536 |20768 |20770 |
+ROW |34537 |20796 |20798 |
+ROW |34538 |20824 |20826 |
+ROW |34539 |20852 |20854 |
+ROW |34540 |20880 |20882 |
+ROW |34541 |20908 |20910 |
+ROW |34542 |20936 |20938 |
+ROW |34543 |20964 |20966 |
+ROW |34544 |20992 |20994 |
+ROW |34545 |21020 |21022 |
+ROW |34546 |21048 |21050 |
+ROW |34547 |21076 |21078 |
+ROW |34548 |21104 |21106 |
+ROW |34549 |21132 |21134 |
+ROW |34550 |21160 |21162 |
+ROW |34551 |18273 |16842 |
+ROW |34552 |18274 |16843 |
+ROW |34553 |18275 |16844 |
+ROW |34554 |18276 |16845 |
+ROW |34555 |18277 |16846 |
+ROW |34556 |18278 |16847 |
+ROW |34557 |18279 |16848 |
+ROW |34558 |18280 |16849 |
+ROW |34559 |18281 |16850 |
+ROW |34560 |18282 |16851 |
+ROW |34561 |18283 |16852 |
+ROW |34562 |18284 |16853 |
+ROW |34563 |18285 |16854 |
+ROW |34564 |18286 |16855 |
+ROW |34565 |18287 |16856 |
+ROW |34566 |18288 |16857 |
+ROW |34567 |18289 |16858 |
+ROW |34568 |18291 |16860 |
+ROW |34569 |18292 |16861 |
+ROW |34570 |18293 |16862 |
+ROW |34571 |19675 |19678 |
+ROW |34572 |19703 |19706 |
+ROW |34573 |19731 |19734 |
+ROW |34574 |19759 |19762 |
+ROW |34575 |19787 |19790 |
+ROW |34576 |19815 |19818 |
+ROW |34577 |19843 |19846 |
+ROW |34578 |19871 |19874 |
+ROW |34579 |19899 |19902 |
+ROW |34580 |19927 |19930 |
+ROW |34581 |19955 |19958 |
+ROW |34582 |19983 |19986 |
+ROW |34583 |20011 |20014 |
+ROW |34584 |20039 |20042 |
+ROW |34585 |20067 |20070 |
+ROW |34586 |20095 |20098 |
+ROW |34587 |20123 |20126 |
+ROW |34588 |20151 |20154 |
+ROW |34589 |20179 |20182 |
+ROW |34590 |20207 |20210 |
+ROW |34591 |20235 |20238 |
+ROW |34592 |20263 |20266 |
+ROW |34593 |20291 |20294 |
+ROW |34594 |20319 |20322 |
+ROW |34595 |20347 |20350 |
+ROW |34596 |20375 |20378 |
+ROW |34597 |20403 |20406 |
+ROW |34598 |20431 |20434 |
+ROW |34599 |20459 |20462 |
+ROW |34600 |20487 |20490 |
+ROW |34601 |20515 |20518 |
+ROW |34602 |20543 |20546 |
+ROW |34603 |20571 |20574 |
+ROW |34604 |20599 |20602 |
+ROW |34605 |20627 |20630 |
+ROW |34606 |20655 |20658 |
+ROW |34607 |20683 |20686 |
+ROW |34608 |20711 |20714 |
+ROW |34609 |20739 |20742 |
+ROW |34610 |20767 |20770 |
+ROW |34611 |20795 |20798 |
+ROW |34612 |20823 |20826 |
+ROW |34613 |20851 |20854 |
+ROW |34614 |20879 |20882 |
+ROW |34615 |20907 |20910 |
+ROW |34616 |20935 |20938 |
+ROW |34617 |20963 |20966 |
+ROW |34618 |20991 |20994 |
+ROW |34619 |21019 |21022 |
+ROW |34620 |21047 |21050 |
+ROW |34621 |21075 |21078 |
+ROW |34622 |21103 |21106 |
+ROW |34623 |21131 |21134 |
+ROW |34624 |21159 |21162 |
+ROW |34625 |15698 |16866 |
+ROW |34626 |18294 |16866 |
+ROW |34627 |18295 |16866 |
+ROW |34628 |16028 |16867 |
+ROW |34629 |18296 |16867 |
+ROW |34630 |18297 |16867 |
+ROW |34631 |18100 |18099 |
+ROW |34632 |18106 |18105 |
+ROW |34633 |14318 |14319 |
+ROW |34634 |17554 |15717 |
+ROW |34635 |17555 |15717 |
+ROW |34636 |17555 |17554 |
+ROW |34637 |17556 |15717 |
+ROW |34638 |17557 |15717 |
+ROW |34639 |17557 |17556 |
+ROW |34640 |17559 |17558 |
+ROW |34641 |17561 |17560 |
+ROW |34642 |17563 |17562 |
+ROW |34643 |17565 |17564 |
+ROW |34644 |15721 |15720 |
+ROW |34645 |15394 |15393 |
+ROW |34646 |15392 |15391 |
+ROW |34647 |17322 |14339 |
+ROW |34648 |15382 |15381 |
+ROW |34649 |15380 |15379 |
+ROW |34650 |16504 |16505 |
+ROW |34651 |14372 |14373 |
+ROW |34652 |15386 |15385 |
+ROW |34653 |15384 |15383 |
+ROW |34654 |14380 |14381 |
+ROW |34655 |18299 |18298 |
+ROW |34656 |18300 |18299 |
+ROW |34657 |18300 |18298 |
+ROW |34658 |18303 |18302 |
+ROW |34659 |18309 |18308 |
+ROW |34660 |18311 |18316 |
+ROW |34661 |18312 |18316 |
+ROW |34662 |18313 |18316 |
+ROW |34663 |18314 |18316 |
+ROW |34664 |18315 |18316 |
+ROW |34665 |18319 |18318 |
+ROW |34666 |18321 |18320 |
+ROW |34667 |18323 |18322 |
+ROW |34668 |18326 |18325 |
+ROW |34669 |18327 |18326 |
+ROW |34670 |18327 |18325 |
+ROW |34671 |18330 |18329 |
+ROW |34672 |18336 |18335 |
+ROW |34673 |18338 |18343 |
+ROW |34674 |18339 |18343 |
+ROW |34675 |18340 |18343 |
+ROW |34676 |18341 |18343 |
+ROW |34677 |18342 |18343 |
+ROW |34678 |18346 |18345 |
+ROW |34679 |18348 |18347 |
+ROW |34680 |18350 |18349 |
+ROW |34681 |18353 |18352 |
+ROW |34682 |18354 |18353 |
+ROW |34683 |18354 |18352 |
+ROW |34684 |18357 |18356 |
+ROW |34685 |18363 |18362 |
+ROW |34686 |18365 |18370 |
+ROW |34687 |18366 |18370 |
+ROW |34688 |18367 |18370 |
+ROW |34689 |18368 |18370 |
+ROW |34690 |18369 |18370 |
+ROW |34691 |18373 |18372 |
+ROW |34692 |18375 |18374 |
+ROW |34693 |18377 |18376 |
+ROW |34694 |18380 |18379 |
+ROW |34695 |18381 |18380 |
+ROW |34696 |18381 |18379 |
+ROW |34697 |18384 |18383 |
+ROW |34698 |18390 |18389 |
+ROW |34699 |18392 |18397 |
+ROW |34700 |18393 |18397 |
+ROW |34701 |18394 |18397 |
+ROW |34702 |18395 |18397 |
+ROW |34703 |18396 |18397 |
+ROW |34704 |18400 |18399 |
+ROW |34705 |18402 |18401 |
+ROW |34706 |18404 |18403 |
+ROW |34707 |18407 |18406 |
+ROW |34708 |18408 |18407 |
+ROW |34709 |18408 |18406 |
+ROW |34710 |18411 |18410 |
+ROW |34711 |18417 |18416 |
+ROW |34712 |18419 |18424 |
+ROW |34713 |18420 |18424 |
+ROW |34714 |18421 |18424 |
+ROW |34715 |18422 |18424 |
+ROW |34716 |18423 |18424 |
+ROW |34717 |18427 |18426 |
+ROW |34718 |18429 |18428 |
+ROW |34719 |18431 |18430 |
+ROW |34720 |15347 |15346 |
+ROW |34721 |15345 |15344 |
+ROW |34722 |17567 |17566 |
+ROW |34723 |15363 |15360 |
+ROW |34724 |15364 |15361 |
+ROW |34725 |15365 |15362 |
+ROW |34726 |15357 |15354 |
+ROW |34727 |15358 |15355 |
+ROW |34728 |15359 |15356 |
+ROW |34729 |17571 |17568 |
+ROW |34730 |17572 |17569 |
+ROW |34731 |17573 |17570 |
+ROW |34732 |15334 |15333 |
+ROW |34733 |15332 |15331 |
+ROW |34734 |14460 |14461 |
+ROW |34735 |14476 |14477 |
+ROW |34736 |14495 |14496 |
+ROW |34737 |14511 |17574 |
+ROW |34738 |19666 |19665 |
+ROW |34739 |19667 |19668 |
+ROW |34740 |14551 |14552 |
+ROW |34741 |15374 |15373 |
+ROW |34742 |15376 |15375 |
+ROW |34743 |14914 |14915 |
+ROW |34744 |14589 |14590 |
+ROW |34745 |15338 |15337 |
+ROW |34746 |17333 |17332 |
+ROW |34747 |14624 |14625 |
+ROW |34748 |18434 |18433 |
+ROW |34749 |18435 |18434 |
+ROW |34750 |18435 |18433 |
+ROW |34751 |18438 |18439 |
+ROW |34752 |18439 |18433 |
+ROW |34753 |18441 |18444 |
+ROW |34754 |18442 |18444 |
+ROW |34755 |18443 |18444 |
+ROW |34756 |18446 |18447 |
+ROW |34757 |18450 |18449 |
+ROW |34758 |19685 |19684 |
+ROW |34759 |19688 |19687 |
+ROW |34760 |19696 |19695 |
+ROW |34761 |19713 |19712 |
+ROW |34762 |19716 |19715 |
+ROW |34763 |19724 |19723 |
+ROW |34764 |19741 |19740 |
+ROW |34765 |19744 |19743 |
+ROW |34766 |19752 |19751 |
+ROW |34767 |19769 |19768 |
+ROW |34768 |19772 |19771 |
+ROW |34769 |19780 |19779 |
+ROW |34770 |19797 |19796 |
+ROW |34771 |19800 |19799 |
+ROW |34772 |19808 |19807 |
+ROW |34773 |19825 |19824 |
+ROW |34774 |19828 |19827 |
+ROW |34775 |19836 |19835 |
+ROW |34776 |19853 |19852 |
+ROW |34777 |19856 |19855 |
+ROW |34778 |19864 |19863 |
+ROW |34779 |19881 |19880 |
+ROW |34780 |19884 |19883 |
+ROW |34781 |19892 |19891 |
+ROW |34782 |19909 |19908 |
+ROW |34783 |19912 |19911 |
+ROW |34784 |19920 |19919 |
+ROW |34785 |19937 |19936 |
+ROW |34786 |19940 |19939 |
+ROW |34787 |19948 |19947 |
+ROW |34788 |19965 |19964 |
+ROW |34789 |19968 |19967 |
+ROW |34790 |19976 |19975 |
+ROW |34791 |19993 |19992 |
+ROW |34792 |19996 |19995 |
+ROW |34793 |20004 |20003 |
+ROW |34794 |20021 |20020 |
+ROW |34795 |20024 |20023 |
+ROW |34796 |20032 |20031 |
+ROW |34797 |20049 |20048 |
+ROW |34798 |20052 |20051 |
+ROW |34799 |20060 |20059 |
+ROW |34800 |20077 |20076 |
+ROW |34801 |20080 |20079 |
+ROW |34802 |20088 |20087 |
+ROW |34803 |20105 |20104 |
+ROW |34804 |20108 |20107 |
+ROW |34805 |20116 |20115 |
+ROW |34806 |20133 |20132 |
+ROW |34807 |20136 |20135 |
+ROW |34808 |20144 |20143 |
+ROW |34809 |20161 |20160 |
+ROW |34810 |20164 |20163 |
+ROW |34811 |20172 |20171 |
+ROW |34812 |20189 |20188 |
+ROW |34813 |20192 |20191 |
+ROW |34814 |20200 |20199 |
+ROW |34815 |20217 |20216 |
+ROW |34816 |20220 |20219 |
+ROW |34817 |20228 |20227 |
+ROW |34818 |20245 |20244 |
+ROW |34819 |20248 |20247 |
+ROW |34820 |20256 |20255 |
+ROW |34821 |20273 |20272 |
+ROW |34822 |20276 |20275 |
+ROW |34823 |20284 |20283 |
+ROW |34824 |20301 |20300 |
+ROW |34825 |20304 |20303 |
+ROW |34826 |20312 |20311 |
+ROW |34827 |20329 |20328 |
+ROW |34828 |20332 |20331 |
+ROW |34829 |20340 |20339 |
+ROW |34830 |20357 |20356 |
+ROW |34831 |20360 |20359 |
+ROW |34832 |20368 |20367 |
+ROW |34833 |20385 |20384 |
+ROW |34834 |20388 |20387 |
+ROW |34835 |20396 |20395 |
+ROW |34836 |20413 |20412 |
+ROW |34837 |20416 |20415 |
+ROW |34838 |20424 |20423 |
+ROW |34839 |20441 |20440 |
+ROW |34840 |20444 |20443 |
+ROW |34841 |20452 |20451 |
+ROW |34842 |20469 |20468 |
+ROW |34843 |20472 |20471 |
+ROW |34844 |20480 |20479 |
+ROW |34845 |20497 |20496 |
+ROW |34846 |20500 |20499 |
+ROW |34847 |20508 |20507 |
+ROW |34848 |20525 |20524 |
+ROW |34849 |20528 |20527 |
+ROW |34850 |20536 |20535 |
+ROW |34851 |20553 |20552 |
+ROW |34852 |20556 |20555 |
+ROW |34853 |20564 |20563 |
+ROW |34854 |20581 |20580 |
+ROW |34855 |20584 |20583 |
+ROW |34856 |20592 |20591 |
+ROW |34857 |20609 |20608 |
+ROW |34858 |20612 |20611 |
+ROW |34859 |20620 |20619 |
+ROW |34860 |20637 |20636 |
+ROW |34861 |20640 |20639 |
+ROW |34862 |20648 |20647 |
+ROW |34863 |20665 |20664 |
+ROW |34864 |20668 |20667 |
+ROW |34865 |20676 |20675 |
+ROW |34866 |20693 |20692 |
+ROW |34867 |20696 |20695 |
+ROW |34868 |20704 |20703 |
+ROW |34869 |20721 |20720 |
+ROW |34870 |20724 |20723 |
+ROW |34871 |20732 |20731 |
+ROW |34872 |20749 |20748 |
+ROW |34873 |20752 |20751 |
+ROW |34874 |20760 |20759 |
+ROW |34875 |20777 |20776 |
+ROW |34876 |20780 |20779 |
+ROW |34877 |20788 |20787 |
+ROW |34878 |20805 |20804 |
+ROW |34879 |20808 |20807 |
+ROW |34880 |20816 |20815 |
+ROW |34881 |20833 |20832 |
+ROW |34882 |20836 |20835 |
+ROW |34883 |20844 |20843 |
+ROW |34884 |20861 |20860 |
+ROW |34885 |20864 |20863 |
+ROW |34886 |20872 |20871 |
+ROW |34887 |20889 |20888 |
+ROW |34888 |20892 |20891 |
+ROW |34889 |20900 |20899 |
+ROW |34890 |20917 |20916 |
+ROW |34891 |20920 |20919 |
+ROW |34892 |20928 |20927 |
+ROW |34893 |20945 |20944 |
+ROW |34894 |20948 |20947 |
+ROW |34895 |20956 |20955 |
+ROW |34896 |20973 |20972 |
+ROW |34897 |20976 |20975 |
+ROW |34898 |20984 |20983 |
+ROW |34899 |21001 |21000 |
+ROW |34900 |21004 |21003 |
+ROW |34901 |21012 |21011 |
+ROW |34902 |21029 |21028 |
+ROW |34903 |21032 |21031 |
+ROW |34904 |21040 |21039 |
+ROW |34905 |21057 |21056 |
+ROW |34906 |21060 |21059 |
+ROW |34907 |21068 |21067 |
+ROW |34908 |21085 |21084 |
+ROW |34909 |21088 |21087 |
+ROW |34910 |21096 |21095 |
+ROW |34911 |21113 |21112 |
+ROW |34912 |21116 |21115 |
+ROW |34913 |21124 |21123 |
+ROW |34914 |21141 |21140 |
+ROW |34915 |21144 |21143 |
+ROW |34916 |21152 |21151 |
+ROW |34917 |21169 |21168 |
+ROW |34918 |21172 |21171 |
+ROW |34919 |21180 |21179 |
+ROW |34920 |14664 |14665 |
+ROW |34921 |17085 |17086 |
+ROW |34922 |16547 |16546 |
+ROW |34923 |17576 |17575 |
+ROW |34924 |17578 |17577 |
+ROW |34925 |17628 |17626 |
+ROW |34926 |17629 |17627 |
+ROW |34927 |17632 |17630 |
+ROW |34928 |17633 |17631 |
+ROW |34929 |17635 |17634 |
+ROW |34930 |17637 |17636 |
+ROW |34931 |17686 |17684 |
+ROW |34932 |17687 |17685 |
+ROW |34933 |17690 |17688 |
+ROW |34934 |17691 |17689 |
+ROW |34935 |17693 |17692 |
+ROW |34936 |17695 |17694 |
+ROW |34937 |17730 |17728 |
+ROW |34938 |17731 |17729 |
+ROW |34939 |17734 |17732 |
+ROW |34940 |17735 |17733 |
+ROW |34941 |17737 |17736 |
+ROW |34942 |17754 |17752 |
+ROW |34943 |17755 |17753 |
+ROW |34944 |17757 |17756 |
+ROW |34945 |17819 |17817 |
+ROW |34946 |17820 |17818 |
+ROW |34947 |17823 |17821 |
+ROW |34948 |17824 |17822 |
+ROW |34949 |17826 |17825 |
+ROW |34950 |17860 |17858 |
+ROW |34951 |17861 |17859 |
+ROW |34952 |17864 |17862 |
+ROW |34953 |17865 |17863 |
+ROW |34954 |17899 |17897 |
+ROW |34955 |17900 |17898 |
+ROW |34956 |17903 |17901 |
+ROW |34957 |17904 |17902 |
+ROW |34958 |17906 |17905 |
+ROW |34959 |17908 |17907 |
+ROW |34960 |17910 |17909 |
+ROW |34961 |16551 |16552 |
+ROW |34962 |16031 |16563 |
+ROW |34963 |16045 |16564 |
+ROW |34964 |16046 |16565 |
+ROW |34965 |16039 |16040 |
+ROW |34966 |16061 |16063 |
+ROW |34967 |16062 |16064 |
+ROW |34968 |16042 |16579 |
+ROW |34969 |16067 |16580 |
+ROW |34970 |16068 |16581 |
+ROW |34971 |16041 |16042 |
+ROW |34972 |16065 |16067 |
+ROW |34973 |16066 |16068 |
+ROW |34974 |16041 |16579 |
+ROW |34975 |16065 |16580 |
+ROW |34976 |16066 |16581 |
+ROW |34977 |18132 |18452 |
+ROW |34978 |18135 |18453 |
+ROW |34979 |18138 |18454 |
+ROW |34980 |18130 |18132 |
+ROW |34981 |18133 |18135 |
+ROW |34982 |18136 |18138 |
+ROW |34983 |18130 |18452 |
+ROW |34984 |18133 |18453 |
+ROW |34985 |18136 |18454 |
+ROW |34986 |16070 |16069 |
+ROW |34987 |16072 |16071 |
+ROW |34988 |16076 |17024 |
+ROW |34989 |18455 |17024 |
+ROW |34990 |16079 |16077 |
+ROW |34991 |16080 |16078 |
+ROW |34992 |16083 |16081 |
+ROW |34993 |16084 |16082 |
+ROW |34994 |16091 |17026 |
+ROW |34995 |16092 |17028 |
+ROW |34996 |18456 |17026 |
+ROW |34997 |18457 |17028 |
+ROW |34998 |17244 |17243 |
+ROW |34999 |17257 |17256 |
+ROW |35000 |17246 |17240 |
+ROW |35001 |17259 |17253 |
+ROW |35002 |17249 |17247 |
+ROW |35003 |17262 |17260 |
+ROW |35004 |17251 |17249 |
+ROW |35005 |17264 |17262 |
+ROW |35006 |17251 |17247 |
+ROW |35007 |17264 |17260 |
+ROW |35008 |18144 |18458 |
+ROW |35009 |18147 |18459 |
+ROW |35010 |18142 |18144 |
+ROW |35011 |18145 |18147 |
+ROW |35012 |18142 |18458 |
+ROW |35013 |18145 |18459 |
+ROW |35014 |17268 |17267 |
+ROW |35015 |17270 |17269 |
+ROW |35016 |17271 |17273 |
+ROW |35017 |18460 |17273 |
+ROW |35018 |17276 |17275 |
+ROW |35019 |17278 |17277 |
+ROW |35020 |17279 |17281 |
+ROW |35021 |18461 |17281 |
+ROW |35022 |16141 |16142 |
+ROW |35023 |16146 |16573 |
+ROW |35024 |16143 |16584 |
+ROW |35025 |18152 |18462 |
+ROW |35026 |18150 |18152 |
+ROW |35027 |18150 |18462 |
+ROW |35028 |16152 |16883 |
+ROW |35029 |16153 |16883 |
+ROW |35030 |18463 |16883 |
+ROW |35031 |18464 |16883 |
+ROW |35032 |16156 |16155 |
+ROW |35033 |16158 |16157 |
+ROW |35034 |18157 |18156 |
+ROW |35035 |18160 |18159 |
+ROW |35036 |18155 |18157 |
+ROW |35037 |18158 |18160 |
+ROW |35038 |18155 |18156 |
+ROW |35039 |18158 |18159 |
+ROW |35040 |16009 |16008 |
+ROW |35041 |16011 |16010 |
+ROW |35042 |16014 |16013 |
+ROW |35043 |16016 |16015 |
+ROW |35044 |16161 |16160 |
+ROW |35045 |16172 |16171 |
+ROW |35046 |16162 |16161 |
+ROW |35047 |16173 |16172 |
+ROW |35048 |16162 |16160 |
+ROW |35049 |16173 |16171 |
+ROW |35050 |16166 |18162 |
+ROW |35051 |16177 |18164 |
+ROW |35052 |16167 |18162 |
+ROW |35053 |16178 |18164 |
+ROW |35054 |17035 |16160 |
+ROW |35055 |17037 |16171 |
+ROW |35056 |18161 |18162 |
+ROW |35057 |18163 |18164 |
+ROW |35058 |16183 |16182 |
+ROW |35059 |17911 |17042 |
+ROW |35060 |18465 |17042 |
+ROW |35061 |18466 |17042 |
+ROW |35062 |17043 |17912 |
+ROW |35063 |17043 |17913 |
+ROW |35064 |16190 |16189 |
+ROW |35065 |17914 |17047 |
+ROW |35066 |18467 |17047 |
+ROW |35067 |18468 |17047 |
+ROW |35068 |17048 |17915 |
+ROW |35069 |17048 |17916 |
+ROW |35070 |17285 |17287 |
+ROW |35071 |17296 |17298 |
+ROW |35072 |17286 |17285 |
+ROW |35073 |17297 |17296 |
+ROW |35074 |17286 |17287 |
+ROW |35075 |17297 |17298 |
+ROW |35076 |17291 |18170 |
+ROW |35077 |17302 |18172 |
+ROW |35078 |17292 |18170 |
+ROW |35079 |17303 |18172 |
+ROW |35080 |17283 |17287 |
+ROW |35081 |17294 |17298 |
+ROW |35082 |18169 |18170 |
+ROW |35083 |18171 |18172 |
+ROW |35084 |17306 |17305 |
+ROW |35085 |17917 |17310 |
+ROW |35086 |18469 |17310 |
+ROW |35087 |18470 |17310 |
+ROW |35088 |17311 |17918 |
+ROW |35089 |17311 |17919 |
+ROW |35090 |17314 |17313 |
+ROW |35091 |17920 |17318 |
+ROW |35092 |18471 |17318 |
+ROW |35093 |18472 |17318 |
+ROW |35094 |17319 |17921 |
+ROW |35095 |17319 |17922 |
+ROW |35096 |18596 |18597 |
+ROW |35097 |18629 |18630 |
+ROW |35098 |18662 |18663 |
+ROW |35099 |18695 |18696 |
+ROW |35100 |18728 |18729 |
+ROW |35101 |18947 |18948 |
+ROW |35102 |18794 |18795 |
+ROW |35103 |18495 |18496 |
+ROW |35104 |18831 |18832 |
+ROW |35105 |18864 |18865 |
+ROW |35106 |18897 |18898 |
+ROW |35107 |16772 |16773 |
+ROW |35108 |16771 |16772 |
+ROW |35109 |16771 |16773 |
+ROW |35110 |16769 |16770 |
+ROW |35111 |16768 |16769 |
+ROW |35112 |16768 |16770 |
+ROW |35113 |19230 |19231 |
+ROW |35114 |19233 |19232 |
+ROW |35115 |19235 |19234 |
+ROW |35116 |19236 |19234 |
+ROW |35117 |19236 |19235 |
+ROW |35118 |19238 |19237 |
+ROW |35119 |19239 |19240 |
+ROW |35120 |19242 |19243 |
+ROW |35121 |19245 |19244 |
+ROW |35122 |19247 |19246 |
+ROW |35123 |19249 |19250 |
+ROW |35124 |19249 |19252 |
+ROW |35125 |19249 |19248 |
+ROW |35126 |19249 |19254 |
+ROW |35127 |19251 |19250 |
+ROW |35128 |19251 |19252 |
+ROW |35129 |19251 |19248 |
+ROW |35130 |19251 |19254 |
+ROW |35131 |19253 |19250 |
+ROW |35132 |19253 |19252 |
+ROW |35133 |19253 |19248 |
+ROW |35134 |19253 |19254 |
+ROW |35135 |19255 |19250 |
+ROW |35136 |19255 |19252 |
+ROW |35137 |19255 |19248 |
+ROW |35138 |19255 |19254 |
+ROW |35139 |19258 |19257 |
+ROW |35140 |16488 |16487 |
+ROW |35141 |16485 |16484 |
+ROW |35142 |16486 |16484 |
+ROW |35143 |16486 |16485 |
+ROW |35144 |16480 |16479 |
+ROW |35145 |16482 |16481 |
+ROW |35146 |16475 |16474 |
+ROW |35147 |16471 |16472 |
+ROW |35148 |16468 |16469 |
+ROW |35149 |16459 |16460 |
+ROW |35150 |16462 |16463 |
+ROW |35151 |16465 |16466 |
+ROW |35152 |16477 |16476 |
+ROW |35153 |19263 |19262 |
+ROW |35154 |19266 |19265 |
+ROW |35155 |19268 |19267 |
+ROW |35156 |19270 |19269 |
+ROW |35157 |19272 |19271 |
+ROW |35158 |19276 |19275 |
+ROW |35159 |19278 |19277 |
+ROW |35160 |19280 |19279 |
+ROW |35161 |19282 |19281 |
+ROW |35162 |19288 |19287 |
+ROW |35163 |19293 |19292 |
+ROW |35164 |19294 |19292 |
+ROW |35165 |19294 |19293 |
+ROW |35166 |19295 |19296 |
+ROW |35167 |19297 |19295 |
+ROW |35168 |19297 |19296 |
+ROW |35169 |19299 |19298 |
+ROW |35170 |19301 |19302 |
+ROW |35171 |19303 |19302 |
+ROW |35172 |19305 |19304 |
+ROW |35173 |19307 |19306 |
+ROW |35174 |19308 |19306 |
+ROW |35175 |19308 |19307 |
+ROW |35176 |19310 |19309 |
+ROW |35177 |19314 |19313 |
+ROW |35178 |19317 |19316 |
+ROW |35179 |19319 |19318 |
+ROW |35180 |19321 |19320 |
+ROW |35181 |19323 |19322 |
+ROW |35182 |19327 |19326 |
+ROW |35183 |19329 |19328 |
+ROW |35184 |19331 |19330 |
+ROW |35185 |19333 |19332 |
+ROW |35186 |19339 |19338 |
+ROW |35187 |19344 |19343 |
+ROW |35188 |19345 |19343 |
+ROW |35189 |19345 |19344 |
+ROW |35190 |19346 |19347 |
+ROW |35191 |19348 |19346 |
+ROW |35192 |19348 |19347 |
+ROW |35193 |19350 |19349 |
+ROW |35194 |19352 |19353 |
+ROW |35195 |19354 |19353 |
+ROW |35196 |19356 |19355 |
+ROW |35197 |19358 |19357 |
+ROW |35198 |19359 |19357 |
+ROW |35199 |19359 |19358 |
+ROW |35200 |19361 |19360 |
+ROW |35201 |19365 |19364 |
+ROW |35202 |19368 |19367 |
+ROW |35203 |19370 |19369 |
+ROW |35204 |19372 |19371 |
+ROW |35205 |19374 |19373 |
+ROW |35206 |19378 |19377 |
+ROW |35207 |19380 |19379 |
+ROW |35208 |19382 |19381 |
+ROW |35209 |19384 |19383 |
+ROW |35210 |19390 |19389 |
+ROW |35211 |19395 |19394 |
+ROW |35212 |19396 |19394 |
+ROW |35213 |19396 |19395 |
+ROW |35214 |19397 |19398 |
+ROW |35215 |19399 |19397 |
+ROW |35216 |19399 |19398 |
+ROW |35217 |19401 |19400 |
+ROW |35218 |19403 |19404 |
+ROW |35219 |19405 |19404 |
+ROW |35220 |19407 |19406 |
+ROW |35221 |19409 |19408 |
+ROW |35222 |19410 |19408 |
+ROW |35223 |19410 |19409 |
+ROW |35224 |19412 |19411 |
+ROW |35225 |19416 |19415 |
+ROW |35226 |19419 |19418 |
+ROW |35227 |19421 |19420 |
+ROW |35228 |19423 |19422 |
+ROW |35229 |19425 |19424 |
+ROW |35230 |19429 |19428 |
+ROW |35231 |19431 |19430 |
+ROW |35232 |19433 |19432 |
+ROW |35233 |19435 |19434 |
+ROW |35234 |19441 |19440 |
+ROW |35235 |19446 |19445 |
+ROW |35236 |19447 |19445 |
+ROW |35237 |19447 |19446 |
+ROW |35238 |19448 |19449 |
+ROW |35239 |19450 |19448 |
+ROW |35240 |19450 |19449 |
+ROW |35241 |19452 |19451 |
+ROW |35242 |19454 |19455 |
+ROW |35243 |19456 |19455 |
+ROW |35244 |19458 |19457 |
+ROW |35245 |19460 |19459 |
+ROW |35246 |19461 |19459 |
+ROW |35247 |19461 |19460 |
+ROW |35248 |19463 |19462 |
+ROW |35249 |15729 |15728 |
+ROW |35250 |15730 |15728 |
+ROW |35251 |15730 |15729 |
+ROW |35252 |15752 |15754 |
+ROW |35253 |15753 |15754 |
+ROW |35254 |15753 |15752 |
+ROW |35255 |15742 |15741 |
+ROW |35256 |15750 |15749 |
+ROW |35257 |15751 |15750 |
+ROW |35258 |15751 |15749 |
+ROW |35259 |15746 |15743 |
+ROW |35260 |15744 |15743 |
+ROW |35261 |15740 |15739 |
+ROW |35262 |17946 |17945 |
+ROW |35263 |17948 |17947 |
+ROW |35264 |15748 |15747 |
+ROW |35265 |19467 |19466 |
+ROW |35266 |19471 |19470 |
+ROW |35267 |19473 |19472 |
+ROW |35268 |19474 |19472 |
+ROW |35269 |19474 |19473 |
+ROW |35270 |19476 |19475 |
+ROW |35271 |19478 |19477 |
+ROW |35272 |19480 |19479 |
+ROW |35273 |19482 |19483 |
+ROW |35274 |19484 |19483 |
+ROW |35275 |19486 |19485 |
+ROW |35276 |19509 |19508 |
+ROW |35277 |19513 |19512 |
+ROW |35278 |19517 |19516 |
+ROW |35279 |19519 |19518 |
+ROW |35280 |19520 |19518 |
+ROW |35281 |19520 |19519 |
+ROW |35282 |19522 |19521 |
+ROW |35283 |19524 |19523 |
+ROW |35284 |19526 |19525 |
+ROW |35285 |19528 |19529 |
+ROW |35286 |19530 |19529 |
+ROW |35287 |19532 |19531 |
+ROW |35288 |19555 |19554 |
+ROW |35289 |19559 |19558 |
+ROW |35290 |19563 |19562 |
+ROW |35291 |19565 |19564 |
+ROW |35292 |19566 |19564 |
+ROW |35293 |19566 |19565 |
+ROW |35294 |19568 |19567 |
+ROW |35295 |19570 |19569 |
+ROW |35296 |19572 |19571 |
+ROW |35297 |19574 |19575 |
+ROW |35298 |19576 |19575 |
+ROW |35299 |19578 |19577 |
+ROW |35300 |19601 |19600 |
+ROW |35301 |19605 |19604 |
+ROW |35302 |19609 |19608 |
+ROW |35303 |19611 |19610 |
+ROW |35304 |19612 |19610 |
+ROW |35305 |19612 |19611 |
+ROW |35306 |19614 |19613 |
+ROW |35307 |19616 |19615 |
+ROW |35308 |19618 |19617 |
+ROW |35309 |19620 |19621 |
+ROW |35310 |19622 |19621 |
+ROW |35311 |19624 |19623 |
+ROW |35312 |19647 |19646 |
+ROW |35313 |16440 |16439 |
+ROW |35314 |18003 |15790 |
+ROW |35315 |18004 |15787 |
+ROW |35316 |18005 |15787 |
+ROW |35317 |18005 |18004 |
+ROW |35318 |15786 |15785 |
+ROW |35319 |15784 |15783 |
+ROW |35320 |15794 |15792 |
+ROW |35321 |15793 |15792 |
+ROW |35322 |15782 |15781 |
+ROW |35323 |15797 |15796 |
+ROW |35324 |15825 |15824 |
+ROW |35325 |15826 |15824 |
+ROW |35326 |15826 |15825 |
+ROW |35327 |15828 |15829 |
+ROW |35328 |15831 |15832 |
+ROW |35329 |15834 |15835 |
+ROW |35330 |15845 |15846 |
+ROW |35331 |17223 |17227 |
+ROW |35332 |17226 |17227 |
TABLE |functions
FIELDS|functionid|itemid|triggerid|name |parameter |
@@ -29433,2718 +29433,2718 @@ ROW |72156 |2075 |39704 |0 |2 |F63100|1 |2 |0 |
ROW |72157 |2075 |39701 |0 |3 |A54F10|1 |2 |0 |
ROW |72158 |2075 |39703 |0 |4 |FC6EA3|1 |2 |0 |
ROW |72159 |2075 |39700 |0 |5 |6C59DC|1 |2 |0 |
-ROW |72771 |1397 |32451 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72772 |1397 |32450 |5 |1 |2774A4|0 |2 |0 |
-ROW |72773 |1398 |32452 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72774 |1398 |32449 |5 |1 |2774A4|0 |2 |0 |
-ROW |72775 |1399 |32444 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72776 |1399 |32446 |5 |1 |2774A4|0 |2 |0 |
-ROW |72777 |1399 |32448 |5 |2 |F63100|0 |2 |0 |
-ROW |72778 |1400 |32460 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72779 |1401 |32458 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72780 |1401 |32457 |5 |1 |2774A4|0 |2 |0 |
-ROW |72781 |1402 |32461 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72782 |1402 |32456 |5 |1 |2774A4|0 |2 |0 |
-ROW |72783 |1172 |30918 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72784 |1172 |30919 |0 |1 |2774A4|0 |2 |0 |
-ROW |72785 |1172 |30920 |0 |2 |F63100|0 |2 |0 |
-ROW |72786 |1172 |30921 |2 |3 |A54F10|0 |2 |0 |
-ROW |72787 |1173 |30922 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72788 |835 |28744 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72789 |835 |28745 |0 |1 |2774A4|0 |2 |0 |
-ROW |72790 |1174 |30913 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72791 |1175 |30906 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72792 |1175 |30908 |0 |1 |2774A4|0 |2 |0 |
-ROW |72793 |1175 |30915 |0 |2 |F63100|0 |2 |0 |
-ROW |72794 |1175 |30897 |0 |3 |A54F10|0 |2 |0 |
-ROW |72795 |1175 |30901 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72796 |1175 |30899 |0 |5 |6C59DC|0 |2 |0 |
-ROW |72797 |1175 |30907 |0 |6 |AC8C14|0 |2 |0 |
-ROW |72798 |1175 |30905 |0 |7 |611F27|0 |2 |0 |
-ROW |72799 |1175 |30904 |0 |8 |F230E0|0 |2 |0 |
-ROW |72800 |1175 |30900 |0 |9 |FFAD40|0 |2 |0 |
-ROW |72801 |1175 |30898 |0 |10 |40CDFF|0 |2 |0 |
-ROW |72802 |1176 |30910 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72803 |1176 |30909 |0 |1 |2774A4|0 |2 |0 |
-ROW |72804 |836 |28798 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72805 |836 |28799 |0 |1 |2774A4|0 |2 |0 |
-ROW |72806 |836 |28800 |0 |2 |F63100|0 |2 |0 |
-ROW |72807 |836 |28801 |2 |3 |A54F10|0 |2 |0 |
-ROW |72808 |837 |28803 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72809 |838 |28793 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72810 |840 |28787 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72811 |840 |28784 |0 |1 |2774A4|0 |2 |0 |
-ROW |72812 |840 |28782 |0 |2 |F63100|0 |2 |0 |
-ROW |72813 |840 |28781 |0 |3 |A54F10|0 |2 |0 |
-ROW |72814 |840 |28780 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72815 |840 |28778 |0 |5 |6C59DC|0 |2 |0 |
-ROW |72816 |840 |28786 |0 |6 |AC8C14|0 |2 |0 |
-ROW |72817 |840 |28785 |0 |7 |611F27|0 |2 |0 |
-ROW |72818 |840 |28783 |0 |8 |F230E0|0 |2 |0 |
-ROW |72819 |840 |28779 |0 |9 |FFAD40|0 |2 |0 |
-ROW |72820 |840 |28796 |0 |10 |40CDFF|0 |2 |0 |
-ROW |72821 |839 |28789 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72822 |839 |28788 |0 |1 |2774A4|0 |2 |0 |
-ROW |72823 |1339 |32172 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72824 |1339 |32173 |0 |1 |2774A4|0 |2 |0 |
-ROW |72825 |1403 |32511 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72826 |1403 |32514 |0 |1 |2774A4|0 |2 |0 |
-ROW |72827 |1404 |32512 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72828 |1404 |32515 |0 |1 |2774A4|0 |2 |0 |
-ROW |72829 |1405 |32507 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72830 |1405 |32508 |0 |1 |2774A4|0 |2 |0 |
-ROW |72831 |1405 |32513 |0 |2 |F63100|0 |2 |0 |
-ROW |72832 |1343 |32135 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72833 |1343 |32142 |0 |1 |2774A4|0 |2 |0 |
-ROW |72834 |1344 |32167 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72835 |1344 |32136 |0 |1 |2774A4|0 |2 |0 |
-ROW |72836 |1345 |32141 |1 |0 |1A7C11|0 |2 |0 |
-ROW |72837 |1345 |32138 |1 |1 |2774A4|0 |2 |0 |
-ROW |72838 |1346 |32156 |2 |0 |1A7C11|0 |2 |0 |
-ROW |72839 |1346 |32158 |0 |1 |2774A4|0 |2 |0 |
-ROW |72840 |1346 |32159 |0 |2 |F63100|0 |2 |0 |
-ROW |72841 |1346 |32154 |2 |3 |A54F10|0 |2 |0 |
-ROW |72842 |1346 |32155 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72843 |1346 |32146 |0 |5 |6C59DC|0 |2 |0 |
-ROW |72844 |1347 |32150 |2 |0 |1A7C11|0 |2 |0 |
-ROW |72845 |1347 |32151 |0 |1 |2774A4|0 |2 |0 |
-ROW |72846 |1347 |32152 |0 |2 |F63100|0 |2 |0 |
-ROW |72847 |1622 |35078 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72848 |1622 |35091 |0 |1 |2774A4|0 |2 |0 |
-ROW |72849 |1622 |35098 |0 |2 |F63100|0 |2 |0 |
-ROW |72850 |1622 |35100 |0 |3 |A54F10|0 |2 |0 |
-ROW |72851 |1622 |35099 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72852 |1623 |35090 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72853 |1623 |35101 |0 |1 |2774A4|0 |2 |0 |
-ROW |72854 |1624 |35097 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72855 |1624 |35096 |0 |1 |2774A4|0 |2 |0 |
-ROW |72856 |1624 |35095 |0 |2 |F63100|0 |2 |0 |
-ROW |72857 |1625 |35089 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72858 |1625 |35088 |0 |1 |2774A4|0 |2 |0 |
-ROW |72859 |1625 |35087 |0 |2 |F63100|0 |2 |0 |
-ROW |72860 |1625 |35086 |0 |3 |A54F10|0 |2 |0 |
-ROW |72861 |1625 |35085 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72862 |1626 |35079 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72863 |1626 |35082 |0 |1 |2774A4|0 |2 |0 |
-ROW |72864 |1627 |35080 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72865 |1627 |35102 |0 |1 |2774A4|0 |2 |0 |
-ROW |72866 |1628 |35093 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72867 |1628 |35092 |0 |1 |2774A4|0 |2 |0 |
-ROW |72868 |1628 |35081 |0 |2 |F63100|0 |2 |0 |
-ROW |72869 |1628 |35084 |0 |3 |A54F10|0 |2 |0 |
-ROW |72870 |1628 |35083 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72871 |1121 |30606 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72872 |1121 |30590 |5 |1 |2774A4|0 |2 |0 |
-ROW |72873 |1121 |30582 |5 |2 |F63100|0 |2 |0 |
-ROW |72874 |1122 |30580 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72875 |1122 |30578 |5 |1 |2774A4|0 |2 |0 |
-ROW |72876 |1123 |30586 |2 |0 |1A7C11|0 |2 |0 |
-ROW |72877 |1123 |30608 |2 |1 |2774A4|0 |2 |0 |
-ROW |72878 |1123 |30585 |2 |2 |F63100|0 |2 |0 |
-ROW |72879 |1123 |30589 |2 |3 |A54F10|0 |2 |0 |
-ROW |72880 |1123 |30584 |2 |4 |FC6EA3|0 |2 |0 |
-ROW |72881 |1123 |30588 |2 |5 |6C59DC|0 |2 |0 |
-ROW |72882 |1124 |30583 |2 |0 |1A7C11|0 |2 |0 |
-ROW |72883 |1124 |30587 |2 |1 |2774A4|0 |2 |0 |
-ROW |72884 |1125 |30555 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72885 |1125 |30554 |2 |1 |2774A4|0 |2 |0 |
-ROW |72886 |1125 |30556 |2 |2 |F63100|0 |2 |0 |
-ROW |72887 |1125 |30557 |2 |3 |A54F10|0 |2 |0 |
-ROW |72888 |1126 |30565 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72889 |1127 |30567 |2 |0 |1A7C11|0 |2 |0 |
-ROW |72890 |1127 |30568 |2 |1 |2774A4|0 |2 |0 |
-ROW |72891 |1128 |30536 |2 |0 |1A7C11|0 |2 |0 |
-ROW |72892 |1129 |30566 |2 |0 |1A7C11|0 |2 |0 |
-ROW |72893 |1129 |30549 |2 |1 |2774A4|0 |2 |0 |
-ROW |72894 |1129 |30553 |2 |2 |F63100|0 |2 |0 |
-ROW |72895 |1129 |30570 |2 |3 |A54F10|0 |2 |0 |
-ROW |72896 |1143 |30714 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72897 |1143 |30716 |0 |1 |2774A4|0 |2 |0 |
-ROW |72898 |1143 |30717 |0 |2 |F63100|0 |2 |0 |
-ROW |72899 |1143 |30715 |0 |3 |A54F10|0 |2 |0 |
-ROW |72900 |1144 |30753 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72901 |1144 |30738 |0 |1 |2774A4|0 |2 |0 |
-ROW |72902 |1145 |30718 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72903 |1145 |30737 |0 |1 |2774A4|0 |2 |0 |
-ROW |72904 |1145 |30727 |0 |2 |F63100|0 |2 |0 |
-ROW |72905 |1145 |30729 |0 |3 |A54F10|0 |2 |0 |
-ROW |72906 |1146 |30730 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72907 |1146 |30732 |0 |1 |2774A4|0 |2 |0 |
-ROW |72908 |1146 |30731 |0 |2 |F63100|0 |2 |0 |
-ROW |72909 |1146 |30733 |0 |3 |A54F10|0 |2 |0 |
-ROW |72910 |1147 |30734 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72911 |1147 |30736 |0 |1 |2774A4|0 |2 |0 |
-ROW |72912 |1147 |30735 |0 |2 |F63100|0 |2 |0 |
-ROW |72913 |1147 |30758 |0 |3 |A54F10|0 |2 |0 |
-ROW |72914 |1148 |30711 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72915 |1148 |30706 |0 |1 |2774A4|0 |2 |0 |
-ROW |72916 |1148 |30710 |0 |2 |F63100|0 |2 |0 |
-ROW |72917 |1148 |30712 |0 |3 |A54F10|0 |2 |0 |
-ROW |72918 |1148 |30702 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72919 |1148 |30707 |0 |5 |6C59DC|0 |2 |0 |
-ROW |72920 |1148 |30704 |0 |6 |AC8C14|0 |2 |0 |
-ROW |72921 |1177 |30927 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72922 |1177 |30944 |2 |1 |2774A4|0 |2 |0 |
-ROW |72923 |1178 |30935 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72924 |1178 |30942 |0 |1 |2774A4|0 |2 |0 |
-ROW |72925 |1179 |30949 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72926 |1179 |30950 |0 |1 |2774A4|0 |2 |0 |
-ROW |72927 |1179 |30951 |0 |2 |F63100|0 |2 |0 |
-ROW |72928 |1180 |30952 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72929 |1180 |30954 |0 |1 |2774A4|0 |2 |0 |
-ROW |72930 |1180 |30955 |0 |2 |F63100|0 |2 |0 |
-ROW |72931 |1181 |30936 |5 |0 |1A7C11|0 |2 |0 |
-ROW |72932 |1181 |30940 |5 |1 |2774A4|0 |2 |0 |
-ROW |72933 |1182 |30930 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72934 |1182 |30929 |0 |1 |2774A4|0 |2 |0 |
-ROW |72935 |1182 |30928 |0 |2 |F63100|0 |2 |0 |
-ROW |72936 |1182 |30931 |2 |3 |A54F10|1 |2 |0 |
-ROW |72937 |1183 |30934 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72938 |1183 |30941 |0 |1 |2774A4|0 |2 |0 |
-ROW |72939 |1406 |32532 |0 |0 |1A7C11|1 |2 |0 |
-ROW |72940 |1406 |32535 |0 |1 |2774A4|1 |2 |0 |
-ROW |72941 |1406 |32533 |0 |2 |F63100|0 |2 |0 |
-ROW |72942 |1406 |32534 |0 |3 |A54F10|0 |2 |0 |
-ROW |72943 |1406 |32536 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72944 |1406 |32537 |0 |5 |6C59DC|0 |2 |0 |
-ROW |72945 |1407 |32543 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72946 |1407 |32544 |0 |1 |2774A4|0 |2 |0 |
-ROW |72947 |1408 |32518 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72948 |1408 |32521 |0 |1 |2774A4|0 |2 |0 |
-ROW |72949 |1408 |32523 |0 |2 |F63100|0 |2 |0 |
-ROW |72950 |1408 |32524 |0 |3 |A54F10|0 |2 |0 |
-ROW |72951 |1409 |32562 |0 |0 |1A7C11|1 |2 |0 |
-ROW |72952 |1409 |32565 |0 |1 |2774A4|1 |2 |0 |
-ROW |72953 |1409 |32563 |0 |2 |F63100|0 |2 |0 |
-ROW |72954 |1409 |32564 |0 |3 |A54F10|0 |2 |0 |
-ROW |72955 |1409 |32566 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72956 |1409 |32567 |0 |5 |6C59DC|0 |2 |0 |
-ROW |72957 |1410 |32573 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72958 |1410 |32574 |0 |1 |2774A4|0 |2 |0 |
-ROW |72959 |1411 |32548 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72960 |1411 |32551 |0 |1 |2774A4|0 |2 |0 |
-ROW |72961 |1411 |32553 |0 |2 |F63100|0 |2 |0 |
-ROW |72962 |1411 |32554 |0 |3 |A54F10|0 |2 |0 |
-ROW |72963 |1250 |31527 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72964 |1250 |31529 |0 |1 |2774A4|0 |2 |0 |
-ROW |72965 |1250 |31499 |0 |2 |F63100|0 |2 |0 |
-ROW |72966 |1251 |31532 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72967 |1251 |31534 |0 |1 |2774A4|0 |2 |0 |
-ROW |72968 |1251 |31538 |0 |2 |F63100|0 |2 |0 |
-ROW |72969 |1251 |31536 |0 |3 |A54F10|0 |2 |0 |
-ROW |72970 |1251 |31528 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |72971 |1251 |31542 |0 |5 |6C59DC|0 |2 |0 |
-ROW |72972 |1252 |31552 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72973 |1252 |31551 |0 |1 |2774A4|0 |2 |0 |
-ROW |72974 |1252 |31541 |0 |2 |F63100|0 |2 |0 |
-ROW |72975 |1253 |31513 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72976 |1253 |31526 |0 |1 |2774A4|0 |2 |0 |
-ROW |72977 |1253 |31525 |0 |2 |F63100|0 |2 |0 |
-ROW |72978 |1254 |31502 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72979 |1254 |31501 |0 |1 |2774A4|0 |2 |0 |
-ROW |72980 |1254 |31503 |0 |2 |F63100|0 |2 |0 |
-ROW |72981 |1255 |31505 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72982 |1255 |31504 |0 |1 |2774A4|0 |2 |0 |
-ROW |72983 |1255 |31506 |0 |2 |F63100|0 |2 |0 |
-ROW |72984 |1256 |31508 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72985 |1256 |31507 |0 |1 |2774A4|0 |2 |0 |
-ROW |72986 |1256 |31509 |0 |2 |F63100|0 |2 |0 |
-ROW |72987 |1257 |31511 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72988 |1257 |31510 |0 |1 |2774A4|0 |2 |0 |
-ROW |72989 |1257 |31500 |0 |2 |F63100|0 |2 |0 |
-ROW |72990 |1258 |31514 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72991 |1258 |31512 |0 |1 |2774A4|0 |2 |0 |
-ROW |72992 |1258 |31515 |0 |2 |F63100|0 |2 |0 |
-ROW |72993 |1259 |31516 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72994 |1259 |31517 |0 |1 |2774A4|0 |2 |0 |
-ROW |72995 |1260 |31523 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72996 |1260 |31522 |0 |1 |2774A4|0 |2 |0 |
-ROW |72997 |1260 |31524 |0 |2 |F63100|0 |2 |0 |
-ROW |72998 |1412 |32601 |0 |0 |1A7C11|0 |2 |0 |
-ROW |72999 |1412 |32602 |0 |1 |2774A4|0 |2 |0 |
-ROW |73000 |1412 |32603 |0 |2 |F63100|0 |2 |0 |
-ROW |73001 |1412 |32604 |0 |3 |A54F10|0 |2 |0 |
-ROW |73002 |1412 |32606 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73003 |1412 |32606 |2 |5 |6C59DC|0 |2 |0 |
-ROW |73004 |1413 |32608 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73005 |1413 |32610 |0 |1 |2774A4|0 |2 |0 |
-ROW |73006 |1413 |32611 |0 |2 |F63100|0 |2 |0 |
-ROW |73007 |1414 |32582 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73008 |1414 |32580 |2 |1 |2774A4|0 |2 |0 |
-ROW |73009 |1414 |32581 |2 |2 |F63100|0 |2 |0 |
-ROW |73010 |1414 |32597 |0 |3 |A54F10|1 |2 |0 |
-ROW |73011 |1414 |32599 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |73012 |1414 |32588 |0 |5 |6C59DC|1 |2 |0 |
-ROW |73013 |1415 |32583 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73014 |1415 |32584 |0 |1 |2774A4|0 |2 |0 |
-ROW |73015 |1415 |32585 |0 |2 |F63100|0 |2 |0 |
-ROW |73016 |1415 |32579 |2 |3 |A54F10|0 |2 |0 |
-ROW |73017 |1416 |32587 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73018 |1416 |32590 |0 |1 |2774A4|0 |2 |0 |
-ROW |73019 |1416 |32589 |0 |2 |F63100|0 |2 |0 |
-ROW |73020 |1417 |32673 |1 |0 |1A7C11|0 |2 |0 |
-ROW |73021 |1417 |32679 |1 |1 |2774A4|0 |2 |0 |
-ROW |73022 |1629 |35114 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73023 |1629 |35113 |5 |1 |2774A4|0 |2 |0 |
-ROW |73024 |1075 |30204 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73025 |1075 |30205 |0 |1 |2774A4|0 |2 |0 |
-ROW |73026 |1630 |35112 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73027 |1630 |35111 |0 |1 |2774A4|0 |2 |0 |
-ROW |73028 |1630 |35110 |0 |2 |F63100|0 |2 |0 |
-ROW |73029 |1630 |35108 |0 |3 |A54F10|0 |2 |0 |
-ROW |73030 |1630 |35105 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73031 |1076 |30209 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73032 |1076 |30208 |0 |1 |2774A4|0 |2 |0 |
-ROW |73033 |1077 |30206 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73034 |1077 |30207 |5 |1 |2774A4|0 |2 |0 |
-ROW |73035 |1078 |30216 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73036 |1078 |30215 |0 |1 |2774A4|0 |2 |0 |
-ROW |73037 |1079 |30210 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73038 |1079 |30211 |0 |1 |2774A4|0 |2 |0 |
-ROW |73039 |1079 |30212 |0 |2 |F63100|0 |2 |0 |
-ROW |73040 |1079 |30213 |0 |3 |A54F10|0 |2 |0 |
-ROW |73041 |1079 |30214 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73042 |1631 |35127 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73043 |1631 |35126 |5 |1 |2774A4|0 |2 |0 |
-ROW |73044 |1632 |35124 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73045 |1632 |35123 |0 |1 |2774A4|0 |2 |0 |
-ROW |73046 |1632 |35122 |0 |2 |F63100|0 |2 |0 |
-ROW |73047 |1632 |30222 |0 |3 |A54F10|0 |2 |0 |
-ROW |73048 |1632 |30223 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73049 |1080 |30226 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73050 |1080 |30225 |0 |1 |2774A4|0 |2 |0 |
-ROW |73051 |1633 |35139 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73052 |1633 |35138 |5 |1 |2774A4|0 |2 |0 |
-ROW |73053 |1081 |30247 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73054 |1081 |30248 |0 |1 |2774A4|0 |2 |0 |
-ROW |73055 |1634 |35137 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73056 |1634 |35136 |0 |1 |2774A4|0 |2 |0 |
-ROW |73057 |1634 |35135 |0 |2 |F63100|0 |2 |0 |
-ROW |73058 |1634 |35133 |0 |3 |A54F10|0 |2 |0 |
-ROW |73059 |1634 |35130 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73060 |1082 |30252 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73061 |1082 |30251 |0 |1 |2774A4|0 |2 |0 |
-ROW |73062 |1083 |30249 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73063 |1083 |30250 |5 |1 |2774A4|0 |2 |0 |
-ROW |73064 |1084 |30259 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73065 |1084 |30258 |0 |1 |2774A4|0 |2 |0 |
-ROW |73066 |1085 |30253 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73067 |1085 |30254 |0 |1 |2774A4|0 |2 |0 |
-ROW |73068 |1085 |30255 |0 |2 |F63100|0 |2 |0 |
-ROW |73069 |1085 |30256 |0 |3 |A54F10|0 |2 |0 |
-ROW |73070 |1085 |30257 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73071 |1635 |35152 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73072 |1635 |35151 |5 |1 |2774A4|0 |2 |0 |
-ROW |73073 |1636 |35149 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73074 |1636 |35148 |0 |1 |2774A4|0 |2 |0 |
-ROW |73075 |1636 |35147 |0 |2 |F63100|0 |2 |0 |
-ROW |73076 |1636 |30265 |0 |3 |A54F10|0 |2 |0 |
-ROW |73077 |1636 |30266 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73078 |1086 |30269 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73079 |1086 |30268 |0 |1 |2774A4|0 |2 |0 |
-ROW |73080 |1184 |30982 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73081 |1184 |30980 |5 |1 |2774A4|0 |2 |0 |
-ROW |73082 |1185 |30983 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73083 |1185 |30981 |0 |1 |2774A4|0 |2 |0 |
-ROW |73084 |1186 |30976 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73085 |1186 |30985 |0 |1 |2774A4|0 |2 |0 |
-ROW |73086 |1186 |30997 |0 |2 |F63100|0 |2 |0 |
-ROW |73087 |1186 |30970 |0 |3 |A54F10|0 |2 |0 |
-ROW |73088 |1186 |30973 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73089 |1186 |30995 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73090 |1186 |30998 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73091 |1186 |30978 |0 |7 |611F27|0 |2 |0 |
-ROW |73092 |1187 |31024 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73093 |1187 |31022 |5 |1 |2774A4|0 |2 |0 |
-ROW |73094 |1188 |31025 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73095 |1188 |31023 |0 |1 |2774A4|0 |2 |0 |
-ROW |73096 |1189 |31018 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73097 |1189 |31027 |0 |1 |2774A4|0 |2 |0 |
-ROW |73098 |1189 |31039 |0 |2 |F63100|0 |2 |0 |
-ROW |73099 |1189 |31012 |0 |3 |A54F10|0 |2 |0 |
-ROW |73100 |1189 |31015 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73101 |1189 |31037 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73102 |1189 |31040 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73103 |1189 |31020 |0 |7 |611F27|0 |2 |0 |
-ROW |73104 |1499 |33478 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73105 |1499 |33467 |0 |1 |2774A4|0 |2 |0 |
-ROW |73106 |1500 |33468 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73107 |1500 |33479 |0 |1 |2774A4|0 |2 |0 |
-ROW |73108 |1501 |33442 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73109 |1501 |33441 |0 |1 |2774A4|0 |2 |0 |
-ROW |73110 |1501 |33440 |0 |2 |F63100|0 |2 |0 |
-ROW |73111 |1502 |33423 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73112 |1502 |33419 |0 |1 |2774A4|0 |2 |0 |
-ROW |73113 |1502 |33422 |0 |2 |F63100|0 |2 |0 |
-ROW |73114 |1502 |33421 |0 |3 |A54F10|0 |2 |0 |
-ROW |73115 |1502 |33412 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73116 |1418 |32700 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73117 |1418 |32699 |0 |1 |2774A4|0 |2 |0 |
-ROW |73118 |1419 |32710 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73119 |1419 |32709 |0 |1 |2774A4|0 |2 |0 |
-ROW |73120 |1420 |32693 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73121 |1420 |32724 |0 |1 |2774A4|0 |2 |0 |
-ROW |73122 |1421 |32730 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73123 |1421 |32731 |0 |1 |2774A4|0 |2 |0 |
-ROW |73124 |1421 |32728 |0 |2 |F63100|0 |2 |0 |
-ROW |73125 |1421 |32729 |0 |3 |A54F10|0 |2 |0 |
-ROW |73126 |1422 |32705 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73127 |1422 |32706 |0 |1 |2774A4|0 |2 |0 |
-ROW |73128 |1423 |32702 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73129 |1423 |32703 |0 |1 |2774A4|0 |2 |0 |
-ROW |73130 |1424 |32708 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73131 |1424 |32722 |2 |1 |2774A4|0 |2 |0 |
-ROW |73132 |1424 |32695 |0 |2 |F63100|0 |2 |0 |
-ROW |73133 |1424 |32753 |0 |3 |A54F10|0 |2 |0 |
-ROW |73134 |1424 |32740 |2 |4 |FC6EA3|0 |2 |0 |
-ROW |73135 |1424 |32723 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73136 |1424 |32747 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73137 |1424 |32748 |2 |7 |611F27|0 |2 |0 |
-ROW |73138 |1424 |32749 |0 |8 |F230E0|0 |2 |0 |
-ROW |73139 |1424 |32750 |0 |9 |FFAD40|0 |2 |0 |
-ROW |73140 |1424 |32751 |2 |10 |40CDFF|0 |2 |0 |
-ROW |73141 |1424 |32752 |0 |11 |40FFA0|0 |2 |0 |
-ROW |73142 |1425 |32746 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73143 |1425 |32745 |2 |1 |2774A4|0 |2 |0 |
-ROW |73144 |1425 |32744 |0 |2 |F63100|0 |2 |0 |
-ROW |73145 |1425 |32743 |0 |3 |A54F10|0 |2 |0 |
-ROW |73146 |1425 |32743 |2 |4 |FC6EA3|0 |2 |0 |
-ROW |73147 |1425 |32742 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73148 |1426 |32720 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73149 |1426 |32721 |0 |1 |2774A4|0 |2 |0 |
-ROW |73150 |1426 |32719 |0 |2 |F63100|0 |2 |0 |
-ROW |73151 |1426 |32718 |0 |3 |A54F10|0 |2 |0 |
-ROW |73152 |1130 |30613 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73153 |1130 |30635 |0 |1 |2774A4|0 |2 |0 |
-ROW |73154 |1130 |30625 |0 |2 |F63100|0 |2 |0 |
-ROW |73155 |1131 |30632 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73156 |1131 |30633 |5 |1 |2774A4|0 |2 |0 |
-ROW |73157 |1131 |30629 |5 |2 |F63100|0 |2 |0 |
-ROW |73158 |1132 |30630 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73159 |1132 |30628 |2 |1 |2774A4|0 |2 |0 |
-ROW |73160 |1132 |30631 |2 |2 |F63100|0 |2 |0 |
-ROW |73161 |1133 |30619 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73162 |1133 |30618 |0 |1 |2774A4|0 |2 |0 |
-ROW |73163 |1134 |30623 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73164 |1134 |30622 |5 |1 |2774A4|0 |2 |0 |
-ROW |73165 |1135 |30615 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73166 |841 |28813 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73167 |841 |28811 |0 |1 |2774A4|0 |2 |0 |
-ROW |73168 |841 |28812 |0 |2 |F63100|0 |2 |0 |
-ROW |73169 |841 |28814 |0 |3 |A54F10|0 |2 |0 |
-ROW |73170 |842 |28817 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73171 |842 |28815 |0 |1 |2774A4|0 |2 |0 |
-ROW |73172 |842 |28816 |0 |2 |F63100|0 |2 |0 |
-ROW |73173 |844 |28808 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73174 |844 |28807 |0 |1 |2774A4|0 |2 |0 |
-ROW |73175 |843 |28818 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73176 |845 |28829 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73177 |845 |28831 |0 |1 |2774A4|0 |2 |0 |
-ROW |73178 |845 |28832 |0 |2 |F63100|0 |2 |0 |
-ROW |73179 |845 |28830 |0 |3 |A54F10|0 |2 |0 |
-ROW |73180 |846 |28826 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73181 |846 |28828 |0 |1 |2774A4|0 |2 |0 |
-ROW |73182 |846 |28827 |0 |2 |F63100|0 |2 |0 |
-ROW |73183 |847 |28825 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73184 |1637 |35187 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73185 |1638 |35189 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73186 |1638 |35188 |5 |1 |2774A4|0 |2 |0 |
-ROW |73187 |1638 |35190 |5 |2 |F63100|0 |2 |0 |
-ROW |73188 |1638 |35191 |5 |3 |A54F10|0 |2 |0 |
-ROW |73189 |1638 |35192 |5 |4 |FC6EA3|0 |2 |0 |
-ROW |73190 |1639 |35198 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73191 |1640 |35200 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73192 |1640 |35199 |5 |1 |2774A4|0 |2 |0 |
-ROW |73193 |1640 |35201 |5 |2 |F63100|0 |2 |0 |
-ROW |73194 |1640 |35202 |5 |3 |A54F10|0 |2 |0 |
-ROW |73195 |1640 |35203 |5 |4 |FC6EA3|0 |2 |0 |
-ROW |73196 |1641 |35221 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73197 |1641 |35220 |5 |1 |2774A4|0 |2 |0 |
-ROW |73198 |1641 |35219 |5 |2 |F63100|0 |2 |0 |
-ROW |73199 |1642 |35214 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73200 |1642 |35216 |5 |1 |2774A4|0 |2 |0 |
-ROW |73201 |1642 |35207 |5 |2 |F63100|0 |2 |0 |
-ROW |73202 |1642 |35213 |5 |3 |A54F10|0 |2 |0 |
-ROW |73203 |1642 |35212 |5 |4 |FC6EA3|0 |2 |0 |
-ROW |73204 |1643 |35228 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73205 |1643 |35229 |5 |1 |2774A4|0 |2 |0 |
-ROW |73206 |1643 |35227 |5 |2 |F63100|0 |2 |0 |
-ROW |73207 |1644 |35231 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73208 |1644 |35230 |5 |1 |2774A4|0 |2 |0 |
-ROW |73209 |1644 |35235 |5 |2 |F63100|0 |2 |0 |
-ROW |73210 |1644 |35233 |5 |3 |A54F10|0 |2 |0 |
-ROW |73211 |1644 |35232 |5 |4 |FC6EA3|0 |2 |0 |
-ROW |73212 |1644 |35234 |5 |5 |6C59DC|0 |2 |0 |
-ROW |73213 |1644 |35236 |5 |6 |AC8C14|0 |2 |0 |
-ROW |73214 |1644 |35237 |5 |7 |611F27|0 |2 |0 |
-ROW |73215 |1645 |35243 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73216 |1645 |35244 |5 |1 |2774A4|0 |2 |0 |
-ROW |73217 |1645 |35245 |5 |2 |F63100|0 |2 |0 |
-ROW |73218 |1646 |35252 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73219 |1646 |35253 |5 |1 |2774A4|0 |2 |0 |
-ROW |73220 |1646 |35254 |5 |2 |F63100|0 |2 |0 |
-ROW |73221 |1647 |35172 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73222 |1647 |35168 |5 |1 |2774A4|0 |2 |0 |
-ROW |73223 |1647 |35164 |5 |2 |F63100|0 |2 |0 |
-ROW |73224 |1647 |35163 |5 |3 |A54F10|0 |2 |0 |
-ROW |73225 |1648 |35170 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73226 |1649 |35167 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73227 |1649 |35166 |5 |1 |2774A4|0 |2 |0 |
-ROW |73228 |1649 |35165 |5 |2 |F63100|0 |2 |0 |
-ROW |73229 |1650 |35176 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73230 |1262 |31592 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73231 |1262 |31584 |0 |1 |2774A4|0 |2 |0 |
-ROW |73232 |1262 |31582 |0 |2 |F63100|0 |2 |0 |
-ROW |73233 |1262 |31585 |0 |3 |A54F10|0 |2 |0 |
-ROW |73234 |1263 |31591 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73235 |1263 |31583 |0 |1 |2774A4|0 |2 |0 |
-ROW |73236 |1263 |31590 |0 |2 |F63100|0 |2 |0 |
-ROW |73237 |1264 |31602 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73238 |1264 |31597 |0 |1 |2774A4|0 |2 |0 |
-ROW |73239 |1264 |31601 |0 |2 |F63100|0 |2 |0 |
-ROW |73240 |1264 |31604 |0 |3 |A54F10|0 |2 |0 |
-ROW |73241 |1265 |31609 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73242 |1265 |31610 |0 |1 |2774A4|0 |2 |0 |
-ROW |73243 |1265 |31608 |0 |2 |F63100|0 |2 |0 |
-ROW |73244 |1001 |29729 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73245 |1001 |29728 |0 |1 |2774A4|0 |2 |0 |
-ROW |73246 |1001 |29727 |0 |2 |F63100|0 |2 |0 |
-ROW |73247 |1001 |29725 |0 |3 |A54F10|0 |2 |0 |
-ROW |73248 |1001 |29723 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73249 |1001 |29733 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73250 |1001 |29737 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73251 |1001 |29731 |0 |7 |611F27|0 |2 |0 |
-ROW |73252 |1000 |29720 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73253 |1000 |29730 |0 |1 |2774A4|0 |2 |0 |
-ROW |73254 |1000 |29721 |0 |2 |F63100|0 |2 |0 |
-ROW |73255 |1000 |29726 |0 |3 |A54F10|0 |2 |0 |
-ROW |73256 |1000 |29724 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73257 |1000 |29734 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73258 |1000 |29722 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73259 |1000 |29732 |0 |7 |611F27|0 |2 |0 |
-ROW |73260 |1027 |30022 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73261 |1027 |30021 |0 |1 |2774A4|0 |2 |0 |
-ROW |73262 |1027 |30019 |0 |2 |F63100|0 |2 |0 |
-ROW |73263 |1008 |29698 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73264 |1008 |29700 |2 |1 |FF0000|0 |2 |0 |
-ROW |73265 |1007 |29691 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73266 |1013 |29657 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73267 |1013 |29658 |0 |1 |2774A4|0 |2 |0 |
-ROW |73268 |1009 |29687 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73269 |1009 |29694 |2 |1 |FF0000|0 |2 |0 |
-ROW |73270 |1029 |30017 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73271 |1029 |30016 |0 |1 |2774A4|0 |2 |0 |
-ROW |73272 |1029 |30015 |0 |2 |F63100|0 |2 |0 |
-ROW |73273 |1031 |30007 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73274 |1031 |30013 |0 |1 |2774A4|0 |2 |0 |
-ROW |73275 |1031 |30011 |0 |2 |F63100|0 |2 |0 |
-ROW |73276 |1031 |30009 |0 |3 |A54F10|0 |2 |0 |
-ROW |73277 |1031 |30005 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73278 |1031 |30003 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73279 |1031 |30023 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73280 |1031 |30001 |0 |7 |611F27|0 |2 |0 |
-ROW |73281 |1030 |30008 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73282 |1030 |30014 |0 |1 |2774A4|0 |2 |0 |
-ROW |73283 |1030 |30012 |0 |2 |F63100|0 |2 |0 |
-ROW |73284 |1030 |30010 |0 |3 |A54F10|0 |2 |0 |
-ROW |73285 |1030 |30006 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73286 |1030 |30004 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73287 |1030 |30000 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73288 |1030 |30002 |0 |7 |611F27|0 |2 |0 |
-ROW |73289 |1011 |29695 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73290 |1028 |30020 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73291 |1010 |29701 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73292 |1010 |29697 |0 |1 |2774A4|0 |2 |0 |
-ROW |73293 |1012 |29692 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73294 |1015 |29812 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73295 |1015 |29811 |0 |1 |2774A4|0 |2 |0 |
-ROW |73296 |1015 |29810 |0 |2 |F63100|0 |2 |0 |
-ROW |73297 |1015 |29808 |0 |3 |A54F10|0 |2 |0 |
-ROW |73298 |1015 |29806 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73299 |1015 |29816 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73300 |1015 |29820 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73301 |1015 |29814 |0 |7 |611F27|0 |2 |0 |
-ROW |73302 |1014 |29803 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73303 |1014 |29813 |0 |1 |2774A4|0 |2 |0 |
-ROW |73304 |1014 |29804 |0 |2 |F63100|0 |2 |0 |
-ROW |73305 |1014 |29809 |0 |3 |A54F10|0 |2 |0 |
-ROW |73306 |1014 |29807 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73307 |1014 |29817 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73308 |1014 |29805 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73309 |1014 |29815 |0 |7 |611F27|0 |2 |0 |
-ROW |73310 |1016 |29768 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73311 |1016 |29767 |0 |1 |2774A4|0 |2 |0 |
-ROW |73312 |1016 |29765 |0 |2 |F63100|0 |2 |0 |
-ROW |73313 |1022 |29782 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73314 |1022 |29781 |2 |1 |FF0000|0 |2 |0 |
-ROW |73315 |1021 |29783 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73316 |1023 |29780 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73317 |1023 |29784 |2 |1 |FF0000|0 |2 |0 |
-ROW |73318 |1018 |29763 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73319 |1018 |29762 |0 |1 |2774A4|0 |2 |0 |
-ROW |73320 |1018 |29761 |0 |2 |F63100|0 |2 |0 |
-ROW |73321 |1020 |29753 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73322 |1020 |29759 |0 |1 |2774A4|0 |2 |0 |
-ROW |73323 |1020 |29757 |0 |2 |F63100|0 |2 |0 |
-ROW |73324 |1020 |29755 |0 |3 |A54F10|0 |2 |0 |
-ROW |73325 |1020 |29751 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73326 |1020 |29749 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73327 |1020 |29769 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73328 |1020 |29747 |0 |7 |611F27|0 |2 |0 |
-ROW |73329 |1019 |29754 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73330 |1019 |29760 |0 |1 |2774A4|0 |2 |0 |
-ROW |73331 |1019 |29758 |0 |2 |F63100|0 |2 |0 |
-ROW |73332 |1019 |29756 |0 |3 |A54F10|0 |2 |0 |
-ROW |73333 |1019 |29752 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73334 |1019 |29750 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73335 |1019 |29746 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73336 |1019 |29748 |0 |7 |611F27|0 |2 |0 |
-ROW |73337 |1025 |29775 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73338 |1017 |29766 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73339 |1024 |29776 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73340 |1024 |29777 |0 |1 |2774A4|0 |2 |0 |
-ROW |73341 |1026 |29772 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73342 |1356 |32276 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73343 |1356 |32275 |0 |1 |2774A4|0 |2 |0 |
-ROW |73344 |1357 |32281 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73345 |1357 |32267 |0 |1 |2774A4|0 |2 |0 |
-ROW |73346 |1357 |32279 |0 |2 |F63100|0 |2 |0 |
-ROW |73347 |1358 |32268 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73348 |1358 |32274 |0 |1 |2774A4|0 |2 |0 |
-ROW |73349 |1358 |32271 |0 |2 |F63100|0 |2 |0 |
-ROW |73350 |1359 |32288 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73351 |1359 |32291 |0 |1 |2774A4|0 |2 |0 |
-ROW |73352 |1360 |32247 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73353 |1360 |32245 |0 |1 |2774A4|0 |2 |0 |
-ROW |73354 |1360 |32246 |0 |2 |F63100|0 |2 |0 |
-ROW |73355 |1361 |32248 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73356 |1361 |32249 |0 |1 |2774A4|0 |2 |0 |
-ROW |73357 |1361 |32250 |0 |2 |F63100|0 |2 |0 |
-ROW |73358 |1362 |32240 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73359 |1362 |32273 |0 |1 |2774A4|0 |2 |0 |
-ROW |73360 |1363 |32282 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73361 |1363 |32283 |0 |1 |2774A4|0 |2 |0 |
-ROW |73362 |1363 |32289 |0 |2 |F63100|0 |2 |0 |
-ROW |73363 |1363 |32290 |0 |3 |A54F10|0 |2 |0 |
-ROW |73364 |1363 |32286 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73365 |1363 |32287 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73366 |1363 |32241 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73367 |1363 |32242 |0 |7 |611F27|0 |2 |0 |
-ROW |73368 |1363 |32243 |0 |8 |F230E0|0 |2 |0 |
-ROW |73369 |1363 |32244 |0 |9 |FFAD40|0 |2 |0 |
-ROW |73370 |1363 |32277 |0 |10 |40CDFF|0 |2 |0 |
-ROW |73371 |1363 |32278 |0 |11 |40FFA0|0 |2 |0 |
-ROW |73372 |1427 |32768 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73373 |1427 |32767 |5 |1 |2774A4|0 |2 |0 |
-ROW |73374 |1428 |32774 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73375 |1428 |32772 |5 |1 |2774A4|0 |2 |0 |
-ROW |73376 |1428 |32775 |5 |2 |F63100|0 |2 |0 |
-ROW |73377 |1428 |32773 |5 |3 |A54F10|0 |2 |0 |
-ROW |73378 |1429 |32779 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73379 |1429 |32777 |5 |1 |2774A4|0 |2 |0 |
-ROW |73380 |1429 |32778 |5 |2 |F63100|0 |2 |0 |
-ROW |73381 |1806 |36785 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73382 |1806 |36786 |0 |1 |2774A4|0 |2 |0 |
-ROW |73383 |1806 |36787 |0 |2 |F63100|0 |2 |0 |
-ROW |73384 |1430 |32837 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73385 |1430 |32836 |2 |1 |2774A4|0 |2 |0 |
-ROW |73386 |1430 |32835 |2 |2 |F63100|0 |2 |0 |
-ROW |73387 |1431 |32856 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73388 |1432 |32828 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73389 |1433 |32847 |5 |0 |34bdeb|0 |2 |0 |
-ROW |73390 |1434 |32797 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73391 |1434 |32796 |5 |1 |2774A4|0 |2 |0 |
-ROW |73392 |1434 |32801 |2 |2 |F63100|0 |2 |0 |
-ROW |73393 |1435 |32834 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73394 |1436 |32819 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73395 |1437 |32826 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73396 |1614 |34976 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73397 |1614 |34975 |0 |1 |2774A4|0 |2 |0 |
-ROW |73398 |1614 |34978 |0 |2 |F63100|0 |2 |0 |
-ROW |73399 |1614 |34979 |0 |3 |A54F10|0 |2 |0 |
-ROW |73400 |1614 |34980 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73401 |1615 |34982 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73402 |1615 |34997 |0 |1 |2774A4|0 |2 |0 |
-ROW |73403 |1615 |35001 |0 |2 |F63100|0 |2 |0 |
-ROW |73404 |1615 |35000 |0 |3 |A54F10|0 |2 |0 |
-ROW |73405 |1615 |34998 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73406 |1615 |34996 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73407 |1616 |35015 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73408 |1616 |35014 |0 |1 |2774A4|0 |2 |0 |
-ROW |73409 |1617 |35012 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73410 |1617 |35013 |0 |1 |2774A4|0 |2 |0 |
-ROW |73411 |1618 |34951 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73412 |1618 |34952 |0 |1 |2774A4|0 |2 |0 |
-ROW |73413 |1618 |34953 |0 |2 |F63100|0 |2 |0 |
-ROW |73414 |1618 |34954 |0 |3 |A54F10|0 |2 |0 |
-ROW |73415 |1618 |34956 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73416 |1618 |34950 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73417 |1618 |34957 |0 |6 |AC8C14|0 |2 |0 |
-ROW |73418 |1618 |34959 |0 |7 |611F27|0 |2 |0 |
-ROW |73419 |1618 |34965 |0 |8 |F230E0|0 |2 |0 |
-ROW |73420 |1445 |22404 |0 |0 |990099|0 |2 |0 |
-ROW |73421 |1445 |22399 |0 |1 |990000|0 |2 |0 |
-ROW |73422 |1445 |22416 |0 |2 |0000EE|0 |2 |0 |
-ROW |73423 |1445 |25366 |0 |3 |FF33FF|0 |2 |0 |
-ROW |73424 |1445 |22418 |0 |4 |009600|0 |2 |0 |
-ROW |73425 |1445 |22402 |0 |5 |003300|0 |2 |0 |
-ROW |73426 |1445 |22400 |0 |6 |33FFFF|0 |2 |0 |
-ROW |73427 |1445 |22689 |0 |7 |DD0000|0 |2 |0 |
-ROW |73428 |1445 |23171 |0 |8 |000099|0 |2 |0 |
-ROW |73429 |1445 |22401 |0 |9 |00FF00|0 |2 |0 |
-ROW |73430 |1445 |33023 |0 |10 |5A2B57|0 |2 |0 |
-ROW |73431 |1651 |22406 |0 |0 |00EE00|0 |2 |0 |
-ROW |73432 |1651 |25665 |0 |1 |0000EE|0 |2 |0 |
-ROW |73433 |1651 |25666 |0 |2 |FFAA00|0 |2 |0 |
-ROW |73434 |1651 |28537 |0 |3 |00EEEE|0 |2 |0 |
-ROW |73435 |1651 |28535 |0 |4 |990099|0 |2 |0 |
-ROW |73436 |1652 |22426 |0 |0 |00EE00|0 |2 |0 |
-ROW |73437 |1652 |22408 |0 |1 |FFAA00|0 |2 |0 |
-ROW |73438 |1652 |22412 |0 |2 |990099|0 |2 |0 |
-ROW |73439 |1652 |22414 |0 |3 |FF66FF|0 |2 |0 |
-ROW |73440 |1652 |23663 |0 |4 |009999|0 |2 |0 |
-ROW |73441 |1652 |33022 |0 |5 |2B5429|0 |2 |0 |
-ROW |73442 |1652 |22430 |0 |6 |8048B4|0 |2 |0 |
-ROW |73443 |1652 |22420 |0 |7 |FD5434|0 |2 |0 |
-ROW |73444 |1653 |22422 |0 |0 |00EE00|0 |2 |0 |
-ROW |73445 |1653 |22424 |0 |1 |0000EE|0 |2 |0 |
-ROW |73446 |1653 |25370 |0 |2 |FFAA00|0 |2 |0 |
-ROW |73447 |1653 |29822 |0 |3 |00EEEE|0 |2 |0 |
-ROW |73448 |1653 |34317 |0 |4 |990099|0 |2 |0 |
-ROW |73449 |1653 |34316 |0 |5 |EE0000|0 |2 |0 |
-ROW |73450 |1654 |33021 |0 |0 |C80000|0 |2 |0 |
-ROW |73451 |1654 |33020 |0 |1 |00C800|0 |2 |0 |
-ROW |73452 |527 |22199 |0 |0 |C80000|0 |2 |0 |
-ROW |73453 |527 |22196 |0 |1 |00C800|0 |2 |0 |
-ROW |73454 |410 |22185 |0 |0 |009900|0 |2 |0 |
-ROW |73455 |410 |22189 |0 |1 |DD0000|0 |2 |0 |
-ROW |73456 |410 |22396 |0 |2 |00DDDD|0 |2 |0 |
-ROW |73457 |410 |22183 |0 |3 |3333FF|0 |2 |0 |
-ROW |73458 |410 |22191 |0 |4 |999900|0 |2 |0 |
-ROW |73459 |410 |23634 |0 |5 |00FF00|0 |2 |0 |
-ROW |73460 |404 |22404 |0 |0 |990099|0 |2 |0 |
-ROW |73461 |404 |22399 |0 |1 |990000|0 |2 |0 |
-ROW |73462 |404 |22416 |0 |2 |0000EE|0 |2 |0 |
-ROW |73463 |404 |22430 |0 |3 |FF33FF|0 |2 |0 |
-ROW |73464 |404 |22418 |0 |4 |009600|0 |2 |0 |
-ROW |73465 |404 |22402 |0 |5 |003300|0 |2 |0 |
-ROW |73466 |404 |22420 |0 |6 |CCCC00|0 |2 |0 |
-ROW |73467 |404 |22400 |0 |7 |33FFFF|0 |2 |0 |
-ROW |73468 |404 |22689 |0 |8 |DD0000|0 |2 |0 |
-ROW |73469 |404 |23171 |0 |9 |000099|0 |2 |0 |
-ROW |73470 |404 |22401 |0 |10 |00FF00|0 |2 |0 |
-ROW |73471 |404 |33023 |0 |11 |5A2B57|0 |2 |0 |
-ROW |73472 |406 |22426 |0 |1 |00EE00|0 |2 |0 |
-ROW |73473 |406 |22422 |0 |2 |0000EE|0 |2 |0 |
-ROW |73474 |406 |22408 |0 |3 |FFAA00|0 |2 |0 |
-ROW |73475 |406 |22424 |0 |4 |00EEEE|0 |2 |0 |
-ROW |73476 |406 |22412 |0 |5 |990099|0 |2 |0 |
-ROW |73477 |406 |22406 |0 |6 |EE0000|0 |2 |0 |
-ROW |73478 |406 |22414 |0 |7 |FF66FF|0 |2 |0 |
-ROW |73479 |406 |23663 |0 |8 |009999|0 |2 |0 |
-ROW |73480 |406 |25366 |0 |9 |BBBB00|0 |2 |0 |
-ROW |73481 |406 |25370 |0 |10 |AA0000|0 |2 |0 |
-ROW |73482 |406 |25665 |0 |11 |990000|0 |2 |0 |
-ROW |73483 |406 |25666 |0 |12 |008800|0 |2 |0 |
-ROW |73484 |406 |28535 |0 |13 |80B0E0|0 |2 |0 |
-ROW |73485 |406 |28537 |0 |14 |4080B0|0 |2 |0 |
-ROW |73486 |406 |29822 |0 |15 |8000FF|0 |2 |0 |
-ROW |73487 |406 |33022 |0 |16 |2B5429|0 |2 |0 |
-ROW |73488 |406 |34317 |0 |17 |8048B4|0 |2 |0 |
-ROW |73489 |406 |34316 |0 |18 |FD5434|0 |2 |0 |
-ROW |73490 |406 |35274 |0 |19 |790E1F|0 |2 |0 |
-ROW |73491 |406 |35272 |0 |20 |87AC4D|0 |2 |0 |
-ROW |73492 |788 |28248 |0 |0 |008800|0 |2 |0 |
-ROW |73493 |788 |28533 |0 |1 |EE0000|0 |2 |0 |
-ROW |73494 |392 |22187 |5 |0 |00C800|0 |2 |0 |
-ROW |73495 |392 |23251 |0 |1 |F63100|0 |2 |0 |
-ROW |73496 |1444 |28581 |0 |0 |990099|0 |2 |0 |
-ROW |73497 |1444 |28574 |0 |1 |990000|0 |2 |0 |
-ROW |73498 |1444 |28571 |0 |2 |0000EE|0 |2 |0 |
-ROW |73499 |1444 |28562 |0 |3 |FF33FF|0 |2 |0 |
-ROW |73500 |1444 |28570 |0 |4 |009600|0 |2 |0 |
-ROW |73501 |1444 |28569 |0 |5 |003300|0 |2 |0 |
-ROW |73502 |1444 |28552 |0 |6 |33FFFF|0 |2 |0 |
-ROW |73503 |1444 |28573 |0 |7 |DD0000|0 |2 |0 |
-ROW |73504 |1444 |28579 |0 |8 |000099|0 |2 |0 |
-ROW |73505 |1444 |28559 |0 |9 |00FF00|0 |2 |0 |
-ROW |73506 |1444 |33017 |0 |10 |5A2B57|0 |2 |0 |
-ROW |73507 |1659 |28567 |0 |0 |00EE00|0 |2 |0 |
-ROW |73508 |1659 |28575 |0 |1 |0000EE|0 |2 |0 |
-ROW |73509 |1659 |28576 |0 |2 |FFAA00|0 |2 |0 |
-ROW |73510 |1659 |28583 |0 |3 |00EEEE|0 |2 |0 |
-ROW |73511 |1659 |28582 |0 |4 |990099|0 |2 |0 |
-ROW |73512 |1660 |28572 |0 |0 |00EE00|0 |2 |0 |
-ROW |73513 |1660 |28568 |0 |1 |FFAA00|0 |2 |0 |
-ROW |73514 |1660 |28564 |0 |2 |990099|0 |2 |0 |
-ROW |73515 |1660 |28578 |0 |3 |FF66FF|0 |2 |0 |
-ROW |73516 |1660 |28580 |0 |4 |009999|0 |2 |0 |
-ROW |73517 |1660 |33016 |0 |5 |2B5429|0 |2 |0 |
-ROW |73518 |1660 |28565 |0 |6 |8048B4|0 |2 |0 |
-ROW |73519 |1660 |28577 |0 |7 |FD5434|0 |2 |0 |
-ROW |73520 |1661 |28566 |0 |0 |00EE00|0 |2 |0 |
-ROW |73521 |1661 |28561 |0 |1 |0000EE|0 |2 |0 |
-ROW |73522 |1661 |28563 |0 |2 |FFAA00|0 |2 |0 |
-ROW |73523 |1661 |29821 |0 |3 |00EEEE|0 |2 |0 |
-ROW |73524 |1661 |34314 |0 |4 |990099|0 |2 |0 |
-ROW |73525 |1661 |34315 |0 |5 |EE0000|0 |2 |0 |
-ROW |73526 |1662 |33015 |0 |0 |C80000|0 |2 |0 |
-ROW |73527 |1662 |33014 |0 |1 |00C800|0 |2 |0 |
-ROW |73528 |797 |28546 |0 |0 |C80000|0 |2 |0 |
-ROW |73529 |797 |28545 |0 |1 |00C800|0 |2 |0 |
-ROW |73530 |798 |28551 |0 |0 |009900|0 |2 |0 |
-ROW |73531 |798 |28543 |0 |1 |DD0000|0 |2 |0 |
-ROW |73532 |798 |28542 |0 |2 |00DDDD|0 |2 |0 |
-ROW |73533 |798 |28549 |0 |3 |3333FF|0 |2 |0 |
-ROW |73534 |798 |28544 |0 |4 |999900|0 |2 |0 |
-ROW |73535 |798 |28548 |0 |5 |00FF00|0 |2 |0 |
-ROW |73536 |799 |28581 |0 |0 |990099|0 |2 |0 |
-ROW |73537 |799 |28574 |0 |1 |990000|0 |2 |0 |
-ROW |73538 |799 |28571 |0 |2 |0000EE|0 |2 |0 |
-ROW |73539 |799 |28565 |0 |3 |FF33FF|0 |2 |0 |
-ROW |73540 |799 |28570 |0 |4 |009600|0 |2 |0 |
-ROW |73541 |799 |28569 |0 |5 |003300|0 |2 |0 |
-ROW |73542 |799 |28577 |0 |6 |CCCC00|0 |2 |0 |
-ROW |73543 |799 |28552 |0 |7 |33FFFF|0 |2 |0 |
-ROW |73544 |799 |28573 |0 |8 |DD0000|0 |2 |0 |
-ROW |73545 |799 |28579 |0 |9 |000099|0 |2 |0 |
-ROW |73546 |799 |28559 |0 |10 |00FF00|0 |2 |0 |
-ROW |73547 |799 |33017 |0 |11 |5A2B57|0 |2 |0 |
-ROW |73548 |800 |28572 |0 |1 |00EE00|0 |2 |0 |
-ROW |73549 |800 |28566 |0 |2 |0000EE|0 |2 |0 |
-ROW |73550 |800 |28568 |0 |3 |FFAA00|0 |2 |0 |
-ROW |73551 |800 |28561 |0 |4 |00EEEE|0 |2 |0 |
-ROW |73552 |800 |28564 |0 |5 |990099|0 |2 |0 |
-ROW |73553 |800 |28567 |0 |6 |EE0000|0 |2 |0 |
-ROW |73554 |800 |28578 |0 |7 |FF66FF|0 |2 |0 |
-ROW |73555 |800 |28580 |0 |8 |009999|0 |2 |0 |
-ROW |73556 |800 |28562 |0 |9 |BBBB00|0 |2 |0 |
-ROW |73557 |800 |28563 |0 |10 |AA0000|0 |2 |0 |
-ROW |73558 |800 |28575 |0 |11 |990000|0 |2 |0 |
-ROW |73559 |800 |28576 |0 |12 |008800|0 |2 |0 |
-ROW |73560 |800 |28582 |0 |13 |80B0E0|0 |2 |0 |
-ROW |73561 |800 |28583 |0 |14 |4080B0|0 |2 |0 |
-ROW |73562 |800 |29821 |0 |15 |8000FF|0 |2 |0 |
-ROW |73563 |800 |33016 |0 |16 |2B5429|0 |2 |0 |
-ROW |73564 |800 |34314 |0 |17 |8048B4|0 |2 |0 |
-ROW |73565 |800 |34315 |0 |18 |FD5434|0 |2 |0 |
-ROW |73566 |800 |35279 |0 |19 |790E1F|0 |2 |0 |
-ROW |73567 |800 |35278 |0 |20 |87AC4D|0 |2 |0 |
-ROW |73568 |801 |28560 |0 |0 |008800|0 |2 |0 |
-ROW |73569 |801 |28584 |0 |1 |EE0000|0 |2 |0 |
-ROW |73570 |802 |28550 |5 |0 |00C800|0 |2 |0 |
-ROW |73571 |802 |28540 |0 |1 |F63100|0 |2 |0 |
-ROW |73572 |1438 |33001 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73573 |1438 |33002 |0 |1 |2774A4|0 |2 |0 |
-ROW |73574 |1438 |33000 |2 |2 |F63100|0 |2 |0 |
-ROW |73575 |1439 |33005 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73576 |1439 |33004 |0 |1 |2774A4|0 |2 |0 |
-ROW |73577 |1440 |32980 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73578 |1440 |32970 |0 |1 |2774A4|0 |2 |0 |
-ROW |73579 |1441 |32967 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73580 |1441 |32968 |0 |1 |2774A4|0 |2 |0 |
-ROW |73581 |1441 |32995 |2 |2 |F63100|0 |2 |0 |
-ROW |73582 |1442 |32997 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73583 |1442 |32984 |0 |1 |2774A4|0 |2 |0 |
-ROW |73584 |1443 |32973 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73585 |1443 |32971 |0 |1 |2774A4|0 |2 |0 |
-ROW |73586 |1503 |33518 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73587 |1504 |33501 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73588 |803 |28599 |0 |0 |DD0000|0 |2 |0 |
-ROW |73589 |803 |28596 |0 |1 |00DDDD|0 |2 |0 |
-ROW |73590 |803 |28597 |0 |2 |3333FF|0 |2 |0 |
-ROW |73591 |803 |28598 |0 |3 |00FF00|0 |2 |0 |
-ROW |73592 |804 |28602 |0 |1 |990099|0 |2 |0 |
-ROW |73593 |804 |28606 |0 |2 |990000|0 |2 |0 |
-ROW |73594 |804 |28608 |0 |3 |0000EE|0 |2 |0 |
-ROW |73595 |804 |28615 |0 |4 |FF33FF|0 |2 |0 |
-ROW |73596 |804 |28610 |0 |5 |00EE00|0 |2 |0 |
-ROW |73597 |804 |28611 |0 |6 |003300|0 |2 |0 |
-ROW |73598 |804 |28616 |0 |7 |33FFFF|0 |2 |0 |
-ROW |73599 |804 |28607 |0 |8 |DD0000|0 |2 |0 |
-ROW |73600 |804 |28604 |0 |9 |000099|0 |2 |0 |
-ROW |73601 |804 |28588 |0 |10 |00FF00|0 |2 |0 |
-ROW |73602 |804 |33013 |0 |11 |BB2A02|0 |2 |0 |
-ROW |73603 |805 |28612 |0 |1 |FFAA00|0 |2 |0 |
-ROW |73604 |805 |28600 |0 |2 |990099|0 |2 |0 |
-ROW |73605 |805 |28613 |0 |3 |EE0000|0 |2 |0 |
-ROW |73606 |805 |28605 |0 |4 |FF66FF|0 |2 |0 |
-ROW |73607 |805 |28614 |0 |5 |960000|0 |2 |0 |
-ROW |73608 |805 |28601 |0 |6 |009600|0 |2 |0 |
-ROW |73609 |805 |28603 |0 |7 |009999|0 |2 |0 |
-ROW |73610 |805 |28609 |0 |8 |BBBB00|0 |2 |0 |
-ROW |73611 |805 |33012 |0 |9 |F230E0|0 |2 |0 |
-ROW |73612 |806 |28595 |0 |0 |00C800|0 |2 |0 |
-ROW |73613 |806 |28586 |0 |1 |C80000|0 |2 |0 |
-ROW |73614 |529 |23357 |0 |0 |DD0000|0 |2 |0 |
-ROW |73615 |529 |23341 |0 |1 |00DDDD|0 |2 |0 |
-ROW |73616 |529 |23342 |0 |2 |3333FF|0 |2 |0 |
-ROW |73617 |529 |28251 |0 |3 |00FF00|0 |2 |0 |
-ROW |73618 |530 |23345 |0 |1 |990099|0 |2 |0 |
-ROW |73619 |530 |23348 |0 |2 |990000|0 |2 |0 |
-ROW |73620 |530 |23355 |0 |3 |0000EE|0 |2 |0 |
-ROW |73621 |530 |23352 |0 |4 |FF33FF|0 |2 |0 |
-ROW |73622 |530 |23356 |0 |5 |007700|0 |2 |0 |
-ROW |73623 |530 |23354 |0 |6 |003300|0 |2 |0 |
-ROW |73624 |530 |23346 |0 |7 |33FFFF|0 |2 |0 |
-ROW |73625 |530 |23349 |0 |8 |DD0000|0 |2 |0 |
-ROW |73626 |530 |23344 |0 |9 |000099|0 |7 |0 |
-ROW |73627 |530 |28250 |0 |10 |00FF00|0 |2 |0 |
-ROW |73628 |530 |33019 |0 |11 |BB2A02|0 |2 |0 |
-ROW |73629 |531 |23353 |0 |1 |FFAA00|0 |2 |0 |
-ROW |73630 |531 |23347 |0 |2 |990099|0 |2 |0 |
-ROW |73631 |531 |23350 |0 |3 |EE0000|0 |2 |0 |
-ROW |73632 |531 |23343 |0 |4 |FF66FF|0 |2 |0 |
-ROW |73633 |531 |23351 |0 |5 |0000EE|0 |2 |0 |
-ROW |73634 |531 |23360 |0 |6 |00EE00|0 |2 |0 |
-ROW |73635 |531 |25369 |0 |7 |009999|0 |2 |0 |
-ROW |73636 |531 |25368 |0 |8 |BBBB00|0 |2 |0 |
-ROW |73637 |531 |28618 |0 |9 |990000|0 |2 |0 |
-ROW |73638 |531 |28619 |0 |10 |008800|0 |2 |0 |
-ROW |73639 |531 |33018 |0 |11 |BB2A02|0 |2 |0 |
-ROW |73640 |807 |28617 |0 |0 |008800|0 |2 |0 |
-ROW |73641 |532 |23340 |5 |0 |00C800|0 |2 |0 |
-ROW |73642 |532 |23358 |5 |1 |C80000|1 |2 |0 |
-ROW |73643 |472 |22945 |5 |0 |00AA00|0 |2 |0 |
-ROW |73644 |472 |22946 |5 |1 |3333FF|0 |2 |0 |
-ROW |73645 |473 |22950 |0 |0 |C80000|0 |2 |2 |
-ROW |73646 |473 |22948 |0 |1 |00C800|0 |2 |0 |
-ROW |73647 |471 |22924 |0 |0 |009900|0 |2 |0 |
-ROW |73648 |471 |22920 |0 |1 |000099|0 |2 |0 |
-ROW |73649 |469 |22922 |0 |0 |009900|0 |2 |0 |
-ROW |73650 |469 |22923 |0 |1 |000099|0 |2 |0 |
-ROW |73651 |469 |22921 |0 |2 |990000|0 |2 |0 |
-ROW |73652 |498 |23109 |0 |0 |009999|0 |2 |0 |
-ROW |73653 |498 |23112 |0 |1 |990099|0 |2 |0 |
-ROW |73654 |498 |23115 |0 |2 |999900|0 |2 |0 |
-ROW |73655 |498 |23113 |0 |3 |990000|0 |2 |0 |
-ROW |73656 |498 |23114 |0 |4 |000099|0 |2 |0 |
-ROW |73657 |498 |23110 |0 |5 |009900|0 |2 |0 |
-ROW |73658 |540 |22942 |5 |0 |00C800|0 |2 |0 |
-ROW |73659 |492 |23073 |5 |0 |00AA00|0 |2 |0 |
-ROW |73660 |492 |23074 |5 |1 |3333FF|0 |2 |0 |
-ROW |73661 |467 |22910 |0 |0 |C80000|0 |2 |2 |
-ROW |73662 |467 |22908 |0 |1 |00C800|0 |2 |0 |
-ROW |73663 |465 |22884 |0 |0 |009900|0 |2 |0 |
-ROW |73664 |465 |22880 |0 |1 |000099|0 |2 |0 |
-ROW |73665 |463 |22882 |0 |0 |009900|0 |2 |0 |
-ROW |73666 |463 |22883 |0 |1 |000099|0 |2 |0 |
-ROW |73667 |463 |22881 |0 |2 |990000|0 |2 |0 |
-ROW |73668 |462 |22886 |1 |0 |009999|0 |2 |0 |
-ROW |73669 |462 |22888 |1 |1 |990099|0 |2 |0 |
-ROW |73670 |462 |22891 |1 |2 |990000|0 |2 |0 |
-ROW |73671 |462 |22892 |1 |3 |000099|0 |2 |0 |
-ROW |73672 |462 |22885 |1 |4 |009900|0 |2 |0 |
-ROW |73673 |541 |22902 |5 |0 |00C800|0 |2 |0 |
-ROW |73674 |464 |22897 |0 |0 |AA0000|0 |2 |2 |
-ROW |73675 |464 |22895 |0 |1 |00AA00|0 |2 |0 |
-ROW |73676 |478 |22985 |5 |0 |00AA00|0 |2 |0 |
-ROW |73677 |478 |22986 |5 |1 |3333FF|0 |2 |0 |
-ROW |73678 |479 |22990 |0 |0 |C80000|0 |2 |2 |
-ROW |73679 |479 |22988 |0 |1 |00C800|0 |2 |0 |
-ROW |73680 |475 |22962 |0 |0 |009900|0 |2 |0 |
-ROW |73681 |475 |22963 |0 |1 |000099|0 |2 |0 |
-ROW |73682 |475 |22961 |0 |2 |990000|0 |2 |0 |
-ROW |73683 |474 |22968 |1 |0 |990099|0 |2 |0 |
-ROW |73684 |474 |22971 |1 |1 |990000|0 |2 |0 |
-ROW |73685 |474 |22972 |1 |2 |000099|0 |2 |0 |
-ROW |73686 |474 |22965 |1 |3 |009900|0 |2 |0 |
-ROW |73687 |542 |22982 |5 |0 |00C800|0 |2 |0 |
-ROW |73688 |491 |23070 |0 |0 |C80000|0 |2 |2 |
-ROW |73689 |491 |23068 |0 |1 |00C800|0 |2 |0 |
-ROW |73690 |487 |23042 |0 |0 |009900|0 |2 |0 |
-ROW |73691 |487 |23043 |0 |1 |000099|0 |2 |0 |
-ROW |73692 |487 |23041 |0 |2 |990000|0 |2 |0 |
-ROW |73693 |543 |23062 |5 |0 |00C800|0 |2 |0 |
-ROW |73694 |494 |23077 |5 |0 |00AA00|0 |2 |0 |
-ROW |73695 |494 |23078 |5 |1 |3333FF|0 |2 |0 |
-ROW |73696 |493 |23075 |5 |0 |00AA00|0 |2 |0 |
-ROW |73697 |493 |23076 |5 |1 |3333FF|0 |2 |0 |
-ROW |73698 |461 |22870 |0 |0 |C80000|0 |2 |2 |
-ROW |73699 |461 |22868 |0 |1 |00C800|0 |2 |0 |
-ROW |73700 |459 |22844 |0 |0 |009900|0 |2 |0 |
-ROW |73701 |459 |22840 |0 |1 |000099|0 |2 |0 |
-ROW |73702 |457 |22842 |0 |0 |009900|0 |2 |0 |
-ROW |73703 |457 |22843 |0 |1 |000099|0 |2 |0 |
-ROW |73704 |457 |22841 |0 |2 |990000|0 |2 |0 |
-ROW |73705 |456 |22846 |1 |0 |009999|0 |2 |0 |
-ROW |73706 |456 |22848 |1 |1 |990099|0 |2 |0 |
-ROW |73707 |456 |22851 |1 |2 |990000|0 |2 |0 |
-ROW |73708 |456 |22852 |1 |3 |000099|0 |2 |0 |
-ROW |73709 |456 |22845 |1 |4 |009900|0 |2 |0 |
-ROW |73710 |544 |22862 |5 |0 |00C800|0 |2 |0 |
-ROW |73711 |458 |22857 |0 |0 |AA0000|0 |2 |2 |
-ROW |73712 |458 |22855 |0 |1 |00AA00|0 |2 |0 |
-ROW |73713 |484 |23025 |5 |0 |00AA00|0 |2 |0 |
-ROW |73714 |484 |23026 |5 |1 |3333FF|0 |2 |0 |
-ROW |73715 |485 |23030 |0 |0 |C80000|0 |2 |2 |
-ROW |73716 |485 |23028 |0 |1 |00C800|0 |2 |0 |
-ROW |73717 |483 |23004 |0 |0 |009900|0 |2 |0 |
-ROW |73718 |483 |23000 |0 |1 |000099|0 |2 |0 |
-ROW |73719 |481 |23002 |0 |0 |009900|0 |2 |0 |
-ROW |73720 |481 |23003 |0 |1 |000099|0 |2 |0 |
-ROW |73721 |481 |23001 |0 |2 |990000|0 |2 |0 |
-ROW |73722 |480 |23007 |1 |0 |999900|0 |2 |0 |
-ROW |73723 |480 |23011 |1 |1 |990000|0 |2 |0 |
-ROW |73724 |480 |23012 |1 |2 |000099|0 |2 |0 |
-ROW |73725 |480 |23005 |1 |3 |009900|0 |2 |0 |
-ROW |73726 |545 |23022 |5 |0 |00C800|0 |2 |0 |
-ROW |73727 |482 |23017 |0 |0 |AA0000|0 |2 |2 |
-ROW |73728 |482 |23015 |0 |1 |00AA00|0 |2 |0 |
-ROW |73729 |651 |26928 |5 |0 |EE0000|0 |2 |0 |
-ROW |73730 |651 |26927 |0 |1 |000000|1 |2 |0 |
-ROW |73731 |652 |26925 |2 |0 |880000|0 |2 |0 |
-ROW |73732 |652 |26932 |0 |1 |009900|0 |2 |0 |
-ROW |73733 |652 |26930 |0 |2 |00CCCC|0 |2 |0 |
-ROW |73734 |652 |26931 |0 |3 |000000|0 |2 |0 |
-ROW |73735 |652 |26929 |0 |4 |3333FF|0 |2 |0 |
-ROW |73736 |652 |26926 |0 |5 |777700|0 |2 |0 |
-ROW |73737 |653 |26933 |2 |0 |EE0000|0 |2 |0 |
-ROW |73738 |653 |26943 |2 |1 |EE00EE|0 |2 |0 |
-ROW |73739 |653 |26935 |0 |2 |000000|1 |2 |0 |
-ROW |73740 |653 |26936 |4 |3 |000000|1 |2 |0 |
-ROW |73741 |654 |26934 |2 |0 |880000|0 |2 |0 |
-ROW |73742 |654 |26939 |0 |1 |009900|0 |2 |0 |
-ROW |73743 |654 |26942 |0 |2 |00CCCC|0 |2 |0 |
-ROW |73744 |654 |26938 |0 |3 |000000|0 |2 |0 |
-ROW |73745 |654 |26937 |0 |4 |3333FF|0 |2 |0 |
-ROW |73746 |1447 |33113 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73747 |1447 |33112 |0 |1 |2774A4|0 |2 |0 |
-ROW |73748 |1447 |33099 |0 |2 |F63100|0 |2 |0 |
-ROW |73749 |1447 |33098 |0 |3 |A54F10|0 |2 |0 |
-ROW |73750 |1448 |33125 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73751 |1448 |33110 |0 |1 |2774A4|0 |2 |0 |
-ROW |73752 |1449 |33080 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73753 |1449 |33081 |2 |1 |2774A4|0 |2 |0 |
-ROW |73754 |1450 |33089 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73755 |1450 |33085 |2 |1 |2774A4|0 |2 |0 |
-ROW |73756 |1451 |33082 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73757 |1451 |33086 |2 |1 |2774A4|0 |2 |0 |
-ROW |73758 |1451 |33083 |0 |2 |F63100|0 |2 |0 |
-ROW |73759 |1451 |33084 |0 |3 |A54F10|0 |2 |0 |
-ROW |73760 |1451 |33087 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73761 |1451 |33088 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73762 |1452 |33093 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73763 |1452 |33092 |2 |1 |2774A4|0 |2 |0 |
-ROW |73764 |1453 |33077 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73765 |1453 |33063 |2 |1 |2774A4|0 |2 |0 |
-ROW |73766 |1454 |33094 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73767 |1454 |33059 |0 |1 |2774A4|0 |2 |0 |
-ROW |73768 |1455 |33066 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73769 |1455 |33071 |2 |1 |2774A4|0 |2 |0 |
-ROW |73770 |1455 |33067 |0 |2 |F63100|0 |2 |0 |
-ROW |73771 |1455 |33068 |0 |3 |A54F10|0 |2 |0 |
-ROW |73772 |1455 |33072 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73773 |1455 |33073 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73774 |1159 |30886 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73775 |1159 |30887 |0 |1 |2774A4|0 |2 |0 |
-ROW |73776 |1160 |30888 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73777 |1160 |30882 |0 |1 |2774A4|0 |2 |0 |
-ROW |73778 |1160 |30890 |0 |2 |F63100|0 |2 |0 |
-ROW |73779 |1160 |30881 |0 |3 |A54F10|0 |2 |0 |
-ROW |73780 |1160 |30889 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73781 |1161 |30847 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73782 |1161 |30872 |2 |1 |2774A4|0 |2 |0 |
-ROW |73783 |1162 |30853 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73784 |1162 |30849 |2 |1 |2774A4|0 |2 |0 |
-ROW |73785 |1162 |30852 |2 |2 |F63100|0 |2 |0 |
-ROW |73786 |1162 |30851 |2 |3 |A54F10|0 |2 |0 |
-ROW |73787 |1162 |30848 |2 |4 |FC6EA3|0 |2 |0 |
-ROW |73788 |1163 |30856 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73789 |1163 |30855 |0 |1 |2774A4|0 |2 |0 |
-ROW |73790 |1163 |30854 |2 |2 |F63100|1 |2 |0 |
-ROW |73791 |1164 |30859 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73792 |1164 |30870 |2 |1 |2774A4|0 |2 |0 |
-ROW |73793 |1165 |30860 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73794 |1165 |30871 |2 |1 |2774A4|0 |2 |0 |
-ROW |73795 |1166 |30868 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73796 |1166 |30869 |0 |1 |2774A4|0 |2 |0 |
-ROW |73797 |1166 |30867 |0 |2 |F63100|0 |2 |0 |
-ROW |73798 |1166 |30866 |0 |3 |A54F10|0 |2 |0 |
-ROW |73799 |1166 |30865 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73800 |1167 |30850 |5 |0 |1A7C11|0 |2 |0 |
-ROW |73801 |1167 |30863 |5 |1 |2774A4|0 |2 |0 |
-ROW |73802 |1167 |30861 |5 |2 |F63100|0 |2 |0 |
-ROW |73803 |1168 |30833 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73804 |1168 |30841 |2 |1 |2774A4|0 |2 |0 |
-ROW |73805 |1168 |30857 |2 |2 |F63100|0 |2 |0 |
-ROW |73806 |1169 |30834 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73807 |1169 |30831 |2 |1 |2774A4|0 |2 |0 |
-ROW |73808 |1170 |30846 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73809 |1576 |34320 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73810 |1576 |30845 |0 |1 |2774A4|0 |2 |0 |
-ROW |73811 |1576 |30842 |0 |2 |F63100|0 |2 |0 |
-ROW |73812 |1576 |30873 |2 |3 |A54F10|1 |2 |0 |
-ROW |73813 |1663 |35291 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73814 |1663 |35300 |0 |1 |2774A4|0 |2 |0 |
-ROW |73815 |1664 |35295 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73816 |1664 |35296 |0 |1 |2774A4|0 |2 |0 |
-ROW |73817 |1665 |35301 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73818 |1665 |35306 |0 |1 |2774A4|0 |2 |0 |
-ROW |73819 |1665 |35304 |0 |2 |F63100|0 |2 |0 |
-ROW |73820 |1665 |35302 |0 |3 |A54F10|0 |2 |0 |
-ROW |73821 |1666 |35308 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73822 |1666 |35310 |0 |1 |2774A4|0 |2 |0 |
-ROW |73823 |1666 |35309 |0 |2 |F63100|0 |2 |0 |
-ROW |73824 |1667 |35322 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73825 |1667 |35320 |0 |1 |2774A4|0 |2 |0 |
-ROW |73826 |1668 |35329 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73827 |1668 |35330 |0 |1 |2774A4|0 |2 |0 |
-ROW |73828 |1669 |35332 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73829 |1669 |35334 |0 |1 |2774A4|0 |2 |0 |
-ROW |73830 |1670 |35335 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73831 |1670 |35333 |0 |1 |2774A4|0 |2 |0 |
-ROW |73832 |1671 |35338 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73833 |1671 |35341 |0 |1 |2774A4|0 |2 |0 |
-ROW |73834 |1671 |35339 |0 |2 |F63100|0 |2 |0 |
-ROW |73835 |1671 |35340 |0 |3 |A54F10|0 |2 |0 |
-ROW |73836 |1672 |35347 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73837 |1672 |35346 |0 |1 |2774A4|0 |2 |0 |
-ROW |73838 |1672 |35345 |0 |2 |F63100|0 |2 |0 |
-ROW |73839 |1673 |35350 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73840 |1673 |35351 |0 |1 |2774A4|0 |2 |0 |
-ROW |73841 |1674 |35349 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73842 |1674 |35352 |0 |1 |2774A4|0 |2 |0 |
-ROW |73843 |1674 |35353 |0 |2 |F63100|0 |2 |0 |
-ROW |73844 |1675 |35355 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73845 |1675 |35356 |0 |1 |2774A4|0 |2 |0 |
-ROW |73846 |1505 |33553 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73847 |1505 |33562 |0 |1 |2774A4|0 |2 |0 |
-ROW |73848 |1506 |33557 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73849 |1506 |33558 |0 |1 |2774A4|0 |2 |0 |
-ROW |73850 |1507 |33563 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73851 |1507 |33568 |0 |1 |2774A4|0 |2 |0 |
-ROW |73852 |1507 |33566 |0 |2 |F63100|0 |2 |0 |
-ROW |73853 |1507 |33564 |0 |3 |A54F10|0 |2 |0 |
-ROW |73854 |1508 |33570 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73855 |1508 |33572 |0 |1 |2774A4|0 |2 |0 |
-ROW |73856 |1508 |33571 |0 |2 |F63100|0 |2 |0 |
-ROW |73857 |1509 |33584 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73858 |1509 |33582 |0 |1 |2774A4|0 |2 |0 |
-ROW |73859 |1510 |33591 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73860 |1510 |33592 |0 |1 |2774A4|0 |2 |0 |
-ROW |73861 |1511 |33594 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73862 |1511 |33596 |0 |1 |2774A4|0 |2 |0 |
-ROW |73863 |1512 |33597 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73864 |1512 |33595 |0 |1 |2774A4|0 |2 |0 |
-ROW |73865 |1513 |33600 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73866 |1513 |33603 |0 |1 |2774A4|0 |2 |0 |
-ROW |73867 |1513 |33601 |0 |2 |F63100|0 |2 |0 |
-ROW |73868 |1513 |33602 |0 |3 |A54F10|0 |2 |0 |
-ROW |73869 |1514 |33609 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73870 |1514 |33608 |0 |1 |2774A4|0 |2 |0 |
-ROW |73871 |1514 |33607 |0 |2 |F63100|0 |2 |0 |
-ROW |73872 |1515 |33612 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73873 |1515 |33613 |0 |1 |2774A4|0 |2 |0 |
-ROW |73874 |1516 |33611 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73875 |1516 |33614 |0 |1 |2774A4|0 |2 |0 |
-ROW |73876 |1516 |33615 |0 |2 |F63100|0 |2 |0 |
-ROW |73877 |1517 |33617 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73878 |1517 |33618 |0 |1 |2774A4|0 |2 |0 |
-ROW |73879 |1807 |36817 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73880 |1807 |36816 |0 |1 |2774A4|0 |2 |0 |
-ROW |73881 |1808 |36815 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73882 |1808 |36814 |0 |1 |2774A4|0 |2 |0 |
-ROW |73883 |1808 |36818 |0 |2 |F63100|0 |2 |0 |
-ROW |73884 |1808 |36819 |0 |3 |A54F10|0 |2 |0 |
-ROW |73885 |1809 |36805 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73886 |1809 |36804 |0 |1 |2774A4|0 |2 |0 |
-ROW |73887 |1527 |33819 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73888 |1527 |33839 |0 |1 |2774A4|0 |2 |0 |
-ROW |73889 |1528 |33820 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73890 |1528 |33816 |0 |1 |2774A4|0 |2 |0 |
-ROW |73891 |1529 |33826 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73892 |1529 |33831 |0 |1 |2774A4|0 |2 |0 |
-ROW |73893 |1529 |33829 |0 |2 |F63100|0 |2 |0 |
-ROW |73894 |1529 |33821 |0 |3 |A54F10|0 |2 |0 |
-ROW |73895 |1529 |33825 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73896 |1529 |33833 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73897 |1529 |33823 |2 |6 |AC8C14|0 |2 |0 |
-ROW |73898 |1530 |33828 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73899 |1530 |33832 |0 |1 |2774A4|0 |2 |0 |
-ROW |73900 |1530 |33830 |0 |2 |F63100|0 |2 |0 |
-ROW |73901 |1530 |33822 |0 |3 |A54F10|0 |2 |0 |
-ROW |73902 |1530 |33815 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73903 |1530 |33834 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73904 |1530 |33824 |2 |6 |AC8C14|0 |2 |0 |
-ROW |73905 |1531 |33840 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73906 |1531 |33845 |0 |1 |2774A4|0 |2 |0 |
-ROW |73907 |1532 |33844 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73908 |1532 |33847 |0 |1 |2774A4|0 |2 |0 |
-ROW |73909 |1532 |33843 |0 |2 |F63100|0 |2 |0 |
-ROW |73910 |1532 |33841 |0 |3 |A54F10|0 |2 |0 |
-ROW |73911 |1533 |33863 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73912 |1534 |33792 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73913 |1534 |33791 |0 |1 |2774A4|0 |2 |0 |
-ROW |73914 |1534 |33793 |0 |2 |F63100|0 |2 |0 |
-ROW |73915 |1535 |33802 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73916 |1535 |33770 |0 |1 |2774A4|0 |2 |0 |
-ROW |73917 |1536 |33800 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73918 |1536 |33799 |0 |1 |2774A4|0 |2 |0 |
-ROW |73919 |1536 |33801 |0 |2 |F63100|0 |2 |0 |
-ROW |73920 |1537 |33798 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73921 |1537 |33806 |0 |1 |2774A4|0 |2 |0 |
-ROW |73922 |1537 |33774 |0 |2 |F63100|0 |2 |0 |
-ROW |73923 |1538 |33769 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73924 |1538 |33787 |0 |1 |2774A4|0 |2 |0 |
-ROW |73925 |1538 |33789 |0 |2 |F63100|0 |2 |0 |
-ROW |73926 |1538 |33790 |0 |3 |A54F10|0 |2 |0 |
-ROW |73927 |1539 |33785 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73928 |1539 |33772 |0 |1 |2774A4|0 |2 |0 |
-ROW |73929 |1539 |33773 |0 |2 |F63100|0 |2 |0 |
-ROW |73930 |1539 |33771 |0 |3 |A54F10|0 |2 |0 |
-ROW |73931 |1540 |33776 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73932 |1540 |33775 |0 |1 |2774A4|0 |2 |0 |
-ROW |73933 |1541 |33782 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73934 |1541 |33781 |0 |1 |2774A4|0 |2 |0 |
-ROW |73935 |1541 |33780 |0 |2 |F63100|0 |2 |0 |
-ROW |73936 |1541 |33783 |0 |3 |A54F10|0 |2 |0 |
-ROW |73937 |1541 |33777 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73938 |1541 |33778 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73939 |1542 |33804 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73940 |1542 |33803 |2 |1 |2774A4|0 |2 |0 |
-ROW |73941 |1542 |33805 |2 |2 |F63100|0 |2 |0 |
-ROW |73942 |1543 |33937 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73943 |1543 |33940 |0 |1 |2774A4|0 |2 |0 |
-ROW |73944 |1543 |33936 |0 |2 |F63100|0 |2 |0 |
-ROW |73945 |1543 |33934 |0 |3 |A54F10|0 |2 |0 |
-ROW |73946 |1544 |33915 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73947 |1544 |33911 |0 |1 |2774A4|0 |2 |0 |
-ROW |73948 |1544 |33912 |0 |2 |F63100|0 |2 |0 |
-ROW |73949 |1544 |33910 |0 |3 |A54F10|0 |2 |0 |
-ROW |73950 |1544 |33914 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73951 |1545 |33918 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73952 |1545 |33905 |0 |1 |2774A4|0 |2 |0 |
-ROW |73953 |1545 |33917 |0 |2 |F63100|0 |2 |0 |
-ROW |73954 |1545 |33916 |2 |3 |A54F10|1 |2 |0 |
-ROW |73955 |1546 |33908 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73956 |1546 |33909 |0 |1 |2774A4|0 |2 |0 |
-ROW |73957 |1546 |33902 |0 |2 |F63100|0 |2 |0 |
-ROW |73958 |1547 |33893 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73959 |1547 |33892 |0 |1 |2774A4|0 |2 |0 |
-ROW |73960 |1548 |33899 |2 |0 |1A7C11|0 |2 |0 |
-ROW |73961 |1548 |33898 |2 |1 |2774A4|0 |2 |0 |
-ROW |73962 |1548 |33895 |2 |2 |F63100|0 |2 |0 |
-ROW |73963 |1548 |33900 |2 |3 |A54F10|0 |2 |0 |
-ROW |73964 |1548 |33896 |2 |4 |FC6EA3|0 |2 |0 |
-ROW |73965 |1548 |33891 |2 |5 |6C59DC|0 |2 |0 |
-ROW |73966 |1190 |31140 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73967 |1190 |31141 |0 |1 |2774A4|0 |2 |0 |
-ROW |73968 |1261 |31145 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73969 |1261 |31146 |0 |1 |2774A4|0 |2 |0 |
-ROW |73970 |1261 |31147 |0 |2 |F63100|0 |2 |0 |
-ROW |73971 |1191 |31138 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73972 |1192 |31157 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73973 |1192 |31158 |0 |1 |2774A4|0 |2 |0 |
-ROW |73974 |1193 |31092 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73975 |1193 |31108 |0 |1 |2774A4|0 |2 |0 |
-ROW |73976 |1193 |31110 |0 |2 |F63100|0 |2 |0 |
-ROW |73977 |1193 |31067 |0 |3 |A54F10|0 |2 |0 |
-ROW |73978 |1193 |31086 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73979 |1193 |31087 |0 |5 |6C59DC|0 |2 |0 |
-ROW |73980 |1194 |31120 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73981 |1194 |31105 |0 |1 |2774A4|0 |2 |0 |
-ROW |73982 |1194 |31071 |0 |2 |F63100|0 |2 |0 |
-ROW |73983 |1194 |31081 |0 |3 |A54F10|0 |2 |0 |
-ROW |73984 |1195 |31098 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73985 |1195 |31099 |0 |1 |2774A4|0 |2 |0 |
-ROW |73986 |1196 |31072 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73987 |1196 |31072 |0 |1 |2774A4|0 |2 |0 |
-ROW |73988 |1197 |31103 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73989 |1197 |31074 |0 |1 |2774A4|0 |2 |0 |
-ROW |73990 |1198 |31104 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73991 |1198 |31063 |0 |1 |2774A4|0 |2 |0 |
-ROW |73992 |1198 |31111 |0 |2 |F63100|0 |2 |0 |
-ROW |73993 |1198 |31112 |0 |3 |A54F10|0 |2 |0 |
-ROW |73994 |1198 |31084 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |73995 |1199 |31115 |0 |0 |1A7C11|0 |2 |0 |
-ROW |73996 |1199 |31116 |0 |1 |2774A4|0 |2 |0 |
-ROW |73997 |1199 |31062 |0 |2 |F63100|0 |2 |0 |
-ROW |73998 |1199 |31118 |0 |3 |A54F10|0 |2 |0 |
-ROW |73999 |1199 |31056 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74000 |1200 |31107 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74001 |1200 |31090 |0 |1 |2774A4|0 |2 |0 |
-ROW |74002 |1201 |31097 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74003 |1201 |31096 |0 |1 |2774A4|0 |2 |0 |
-ROW |74004 |1202 |31089 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74005 |1202 |31061 |0 |1 |2774A4|0 |2 |0 |
-ROW |74006 |1203 |31064 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74007 |1204 |31065 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74008 |1204 |31066 |0 |1 |2774A4|0 |2 |0 |
-ROW |74009 |1204 |31068 |0 |2 |F63100|0 |2 |0 |
-ROW |74010 |1204 |31070 |0 |3 |A54F10|0 |2 |0 |
-ROW |74011 |1204 |31101 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74012 |1204 |31106 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74013 |1204 |31114 |0 |6 |AC8C14|0 |2 |0 |
-ROW |74014 |1205 |31069 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74015 |1206 |31076 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74016 |1206 |31078 |0 |1 |2774A4|0 |2 |0 |
-ROW |74017 |1206 |31109 |0 |2 |F63100|0 |2 |0 |
-ROW |74018 |1206 |31075 |0 |3 |A54F10|0 |2 |0 |
-ROW |74019 |1207 |31080 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74020 |1207 |31095 |0 |1 |2774A4|0 |2 |0 |
-ROW |74021 |1208 |31113 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74022 |1208 |31118 |0 |1 |2774A4|0 |2 |0 |
-ROW |74023 |1209 |31058 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74024 |1209 |31077 |0 |1 |2774A4|0 |2 |0 |
-ROW |74025 |1209 |31056 |0 |2 |F63100|0 |2 |0 |
-ROW |74026 |1209 |31117 |0 |3 |A54F10|0 |2 |0 |
-ROW |74027 |1109 |30453 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74028 |1109 |30455 |5 |1 |2774A4|0 |2 |0 |
-ROW |74029 |1110 |30471 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74030 |1110 |30470 |0 |1 |2774A4|0 |2 |0 |
-ROW |74031 |1110 |30466 |0 |2 |F63100|0 |2 |0 |
-ROW |74032 |1110 |30441 |0 |3 |A54F10|0 |2 |0 |
-ROW |74033 |1111 |30463 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74034 |1111 |30452 |0 |1 |2774A4|0 |2 |0 |
-ROW |74035 |1111 |30451 |0 |2 |F63100|0 |2 |0 |
-ROW |74036 |1111 |30437 |0 |3 |A54F10|0 |2 |0 |
-ROW |74037 |1112 |30456 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74038 |1112 |30457 |0 |1 |2774A4|0 |2 |0 |
-ROW |74039 |1112 |30458 |0 |2 |F63100|0 |2 |0 |
-ROW |74040 |1112 |30459 |0 |3 |A54F10|0 |2 |0 |
-ROW |74041 |1113 |30442 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74042 |1113 |30444 |0 |1 |2774A4|0 |2 |0 |
-ROW |74043 |1113 |30445 |0 |2 |F63100|0 |2 |0 |
-ROW |74044 |1114 |30446 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74045 |1114 |30447 |0 |1 |2774A4|0 |2 |0 |
-ROW |74046 |1114 |31168 |0 |2 |F63100|0 |2 |0 |
-ROW |74047 |1114 |30449 |0 |3 |A54F10|0 |2 |0 |
-ROW |74048 |1136 |30659 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74049 |1136 |30661 |5 |1 |2774A4|0 |2 |0 |
-ROW |74050 |1137 |30677 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74051 |1137 |30676 |0 |1 |2774A4|0 |2 |0 |
-ROW |74052 |1137 |30672 |0 |2 |F63100|0 |2 |0 |
-ROW |74053 |1137 |30647 |0 |3 |A54F10|0 |2 |0 |
-ROW |74054 |1138 |30669 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74055 |1138 |30658 |0 |1 |2774A4|0 |2 |0 |
-ROW |74056 |1138 |30657 |0 |2 |F63100|0 |2 |0 |
-ROW |74057 |1138 |30643 |0 |3 |A54F10|0 |2 |0 |
-ROW |74058 |1139 |30662 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74059 |1139 |30663 |0 |1 |2774A4|0 |2 |0 |
-ROW |74060 |1139 |30664 |0 |2 |F63100|0 |2 |0 |
-ROW |74061 |1139 |30665 |0 |3 |A54F10|0 |2 |0 |
-ROW |74062 |1140 |30648 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74063 |1140 |30650 |0 |1 |2774A4|0 |2 |0 |
-ROW |74064 |1140 |30651 |0 |2 |F63100|0 |2 |0 |
-ROW |74065 |1141 |30652 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74066 |1141 |30653 |0 |1 |2774A4|0 |2 |0 |
-ROW |74067 |1141 |31172 |0 |2 |F63100|0 |2 |0 |
-ROW |74068 |1141 |30655 |0 |3 |A54F10|0 |2 |0 |
-ROW |74069 |1115 |30506 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74070 |1115 |30507 |5 |1 |2774A4|0 |2 |0 |
-ROW |74071 |1116 |30504 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74072 |1116 |30505 |0 |1 |2774A4|0 |2 |0 |
-ROW |74073 |1116 |30518 |0 |2 |F63100|0 |2 |0 |
-ROW |74074 |1116 |30492 |0 |3 |A54F10|0 |2 |0 |
-ROW |74075 |1117 |30493 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74076 |1117 |30500 |0 |1 |2774A4|0 |2 |0 |
-ROW |74077 |1117 |30486 |0 |2 |F63100|0 |2 |0 |
-ROW |74078 |1117 |30488 |0 |3 |A54F10|0 |2 |0 |
-ROW |74079 |1118 |30508 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74080 |1118 |30509 |0 |1 |2774A4|0 |2 |0 |
-ROW |74081 |1118 |30503 |0 |2 |F63100|0 |2 |0 |
-ROW |74082 |1118 |30510 |0 |3 |A54F10|0 |2 |0 |
-ROW |74083 |1119 |30491 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74084 |1119 |30494 |0 |1 |2774A4|0 |2 |0 |
-ROW |74085 |1119 |30495 |0 |2 |F63100|0 |2 |0 |
-ROW |74086 |1120 |30496 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74087 |1120 |30497 |0 |1 |2774A4|0 |2 |0 |
-ROW |74088 |1120 |31176 |0 |2 |F63100|0 |2 |0 |
-ROW |74089 |1120 |30499 |0 |3 |A54F10|0 |2 |0 |
-ROW |74090 |1266 |31773 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74091 |1266 |31774 |0 |1 |2774A4|0 |2 |0 |
-ROW |74092 |1267 |31777 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74093 |1267 |31779 |0 |1 |2774A4|0 |2 |0 |
-ROW |74094 |1267 |33168 |0 |2 |F63100|0 |2 |0 |
-ROW |74095 |1268 |31685 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74096 |1268 |31738 |0 |1 |2774A4|0 |2 |0 |
-ROW |74097 |1269 |31723 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74098 |1269 |31757 |0 |1 |2774A4|0 |2 |0 |
-ROW |74099 |1269 |31721 |0 |2 |F63100|0 |2 |0 |
-ROW |74100 |1270 |31728 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74101 |1270 |31759 |0 |1 |2774A4|0 |2 |0 |
-ROW |74102 |1271 |31745 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74103 |1271 |31727 |0 |1 |2774A4|0 |2 |0 |
-ROW |74104 |1272 |31687 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74105 |1272 |31710 |0 |1 |2774A4|0 |2 |0 |
-ROW |74106 |1273 |31705 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74107 |1273 |31703 |0 |1 |2774A4|0 |2 |0 |
-ROW |74108 |1273 |31706 |0 |2 |F63100|0 |2 |0 |
-ROW |74109 |1273 |31701 |0 |3 |A54F10|0 |2 |0 |
-ROW |74110 |1273 |31708 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74111 |1274 |31715 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74112 |1274 |31726 |0 |1 |2774A4|0 |2 |0 |
-ROW |74113 |1274 |31717 |0 |2 |F63100|0 |2 |0 |
-ROW |74114 |1274 |31716 |0 |3 |A54F10|0 |2 |0 |
-ROW |74115 |1274 |31714 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74116 |1274 |31713 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74117 |1210 |31261 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74118 |1210 |31262 |0 |1 |2774A4|0 |2 |0 |
-ROW |74119 |1211 |31269 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74120 |1211 |31271 |0 |1 |2774A4|0 |2 |0 |
-ROW |74121 |1211 |33170 |0 |2 |F63100|0 |2 |0 |
-ROW |74122 |1212 |31233 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74123 |1212 |31234 |0 |1 |2774A4|0 |2 |0 |
-ROW |74124 |1213 |31216 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74125 |1213 |31237 |0 |1 |2774A4|0 |2 |0 |
-ROW |74126 |1213 |31214 |0 |2 |F63100|0 |2 |0 |
-ROW |74127 |1214 |31191 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74128 |1214 |31221 |0 |1 |2774A4|0 |2 |0 |
-ROW |74129 |1215 |31206 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74130 |1215 |31220 |0 |1 |2774A4|0 |2 |0 |
-ROW |74131 |1216 |31192 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74132 |1216 |31193 |0 |1 |2774A4|0 |2 |0 |
-ROW |74133 |1217 |31200 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74134 |1217 |31197 |0 |1 |2774A4|0 |2 |0 |
-ROW |74135 |1217 |31201 |0 |2 |F63100|0 |2 |0 |
-ROW |74136 |1217 |31198 |0 |3 |A54F10|0 |2 |0 |
-ROW |74137 |1217 |31202 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74138 |1218 |31207 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74139 |1218 |31208 |0 |1 |2774A4|0 |2 |0 |
-ROW |74140 |1218 |31210 |0 |2 |F63100|0 |2 |0 |
-ROW |74141 |1218 |31209 |0 |3 |A54F10|0 |2 |0 |
-ROW |74142 |1218 |31219 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74143 |1218 |31205 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74144 |1380 |32423 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74145 |1380 |32421 |0 |1 |2774A4|0 |2 |0 |
-ROW |74146 |1381 |32405 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74147 |1382 |32426 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74148 |1382 |32408 |0 |1 |2774A4|0 |2 |0 |
-ROW |74149 |1382 |32422 |0 |2 |F63100|0 |2 |0 |
-ROW |74150 |1382 |32425 |0 |3 |A54F10|0 |2 |0 |
-ROW |74151 |1383 |32409 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74152 |1384 |32419 |0 |0 |1A7C11|1 |2 |0 |
-ROW |74153 |1384 |32416 |0 |1 |2774A4|1 |2 |0 |
-ROW |74154 |1384 |32413 |0 |2 |F63100|1 |2 |0 |
-ROW |74155 |1384 |32418 |5 |3 |A54F10|0 |2 |0 |
-ROW |74156 |1384 |32415 |5 |4 |FC6EA3|0 |2 |0 |
-ROW |74157 |1384 |32412 |5 |5 |6C59DC|0 |2 |0 |
-ROW |74158 |1385 |32420 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74159 |1385 |32417 |0 |1 |2774A4|0 |2 |0 |
-ROW |74160 |1385 |32414 |0 |2 |F63100|0 |2 |0 |
-ROW |74161 |1386 |32433 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74162 |1386 |32432 |0 |1 |2774A4|1 |2 |0 |
-ROW |74163 |1387 |32431 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74164 |1387 |32430 |0 |1 |2774A4|0 |2 |0 |
-ROW |74165 |1387 |32429 |0 |2 |F63100|0 |2 |0 |
-ROW |74166 |1387 |32428 |0 |3 |A54F10|0 |2 |0 |
-ROW |74167 |1387 |32427 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74168 |1388 |32386 |0 |0 |1A7C11|1 |2 |0 |
-ROW |74169 |1388 |32391 |0 |1 |2774A4|1 |2 |0 |
-ROW |74170 |1388 |32387 |0 |2 |F63100|1 |2 |0 |
-ROW |74171 |1388 |32390 |0 |3 |A54F10|1 |2 |0 |
-ROW |74172 |1388 |32395 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74173 |1388 |32389 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74174 |1389 |32393 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74175 |1389 |32392 |0 |1 |2774A4|0 |2 |0 |
-ROW |74176 |1389 |32394 |0 |2 |F63100|1 |2 |0 |
-ROW |74177 |1389 |32388 |0 |3 |A54F10|1 |2 |0 |
-ROW |74178 |1390 |32401 |5 |0 |1A7C11|1 |2 |0 |
-ROW |74179 |1390 |32402 |0 |1 |2774A4|0 |2 |0 |
-ROW |74180 |1390 |32397 |0 |2 |F63100|1 |2 |0 |
-ROW |74181 |1390 |32398 |0 |3 |A54F10|1 |2 |0 |
-ROW |74182 |1390 |32399 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74183 |1390 |32400 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74184 |1390 |32396 |0 |6 |AC8C14|1 |2 |0 |
-ROW |74185 |1391 |32367 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74186 |1391 |32366 |0 |1 |2774A4|1 |2 |0 |
-ROW |74187 |1392 |32370 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74188 |1393 |32382 |0 |0 |1A7C11|1 |2 |0 |
-ROW |74189 |1393 |32381 |0 |1 |2774A4|1 |2 |0 |
-ROW |74190 |1393 |32383 |0 |2 |F63100|1 |2 |0 |
-ROW |74191 |1393 |32384 |0 |3 |A54F10|1 |2 |0 |
-ROW |74192 |1394 |32377 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74193 |1394 |32374 |0 |1 |2774A4|1 |2 |0 |
-ROW |74194 |1395 |32403 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74195 |1395 |32385 |0 |1 |2774A4|1 |2 |0 |
-ROW |74196 |1219 |31363 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74197 |1219 |31346 |0 |1 |2774A4|0 |2 |0 |
-ROW |74198 |1219 |31345 |0 |2 |F63100|0 |2 |0 |
-ROW |74199 |1219 |31344 |0 |3 |A54F10|0 |2 |0 |
-ROW |74200 |1219 |31343 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74201 |1219 |31342 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74202 |1219 |31340 |0 |6 |AC8C14|0 |2 |0 |
-ROW |74203 |1219 |31339 |0 |7 |611F27|0 |2 |0 |
-ROW |74204 |1219 |31341 |0 |8 |F230E0|0 |2 |0 |
-ROW |74205 |1219 |31341 |0 |9 |FFAD40|0 |2 |0 |
-ROW |74206 |1220 |31337 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74207 |1221 |31360 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74208 |1221 |31359 |0 |1 |2774A4|0 |2 |0 |
-ROW |74209 |1221 |31357 |0 |2 |F63100|0 |2 |0 |
-ROW |74210 |1221 |31356 |0 |3 |A54F10|0 |2 |0 |
-ROW |74211 |1221 |31354 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74212 |1221 |31353 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74213 |1221 |31352 |0 |6 |AC8C14|0 |2 |0 |
-ROW |74214 |1221 |31350 |0 |7 |611F27|0 |2 |0 |
-ROW |74215 |1221 |31351 |0 |8 |F230E0|0 |2 |0 |
-ROW |74216 |1221 |31338 |0 |9 |FFAD40|0 |2 |0 |
-ROW |74217 |1221 |31349 |0 |10 |40CDFF|0 |2 |0 |
-ROW |74218 |1221 |31348 |0 |11 |40FFA0|0 |2 |0 |
-ROW |74219 |1221 |31347 |0 |12 |AE4500|0 |2 |0 |
-ROW |74220 |1222 |31336 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74221 |1456 |33178 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74222 |1456 |33179 |0 |1 |2774A4|0 |2 |0 |
-ROW |74223 |1456 |33180 |0 |2 |F63100|0 |2 |0 |
-ROW |74224 |1087 |30346 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74225 |1087 |30345 |0 |1 |2774A4|0 |2 |0 |
-ROW |74226 |1088 |30350 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74227 |1088 |30349 |5 |1 |2774A4|0 |2 |0 |
-ROW |74228 |1089 |30396 |2 |0 |1A7C11|0 |2 |0 |
-ROW |74229 |1090 |30398 |2 |0 |1A7C11|0 |2 |0 |
-ROW |74230 |1091 |30322 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74231 |1091 |30277 |5 |1 |2774A4|0 |2 |0 |
-ROW |74232 |1092 |30284 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74233 |1093 |30313 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74234 |1093 |30314 |0 |1 |2774A4|0 |2 |0 |
-ROW |74235 |1093 |30315 |5 |2 |F63100|0 |2 |0 |
-ROW |74236 |1093 |30316 |0 |3 |A54F10|0 |2 |0 |
-ROW |74237 |1094 |30279 |2 |0 |1A7C11|0 |2 |0 |
-ROW |74238 |1094 |30280 |2 |1 |2774A4|0 |2 |0 |
-ROW |74239 |1095 |30290 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74240 |1095 |30293 |0 |1 |2774A4|0 |2 |0 |
-ROW |74241 |1096 |30318 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74242 |1096 |30308 |2 |1 |2774A4|0 |2 |0 |
-ROW |74243 |1096 |30320 |2 |2 |F63100|0 |2 |0 |
-ROW |74244 |1097 |30317 |2 |0 |1A7C11|0 |2 |0 |
-ROW |74245 |1098 |30289 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74246 |1098 |30291 |5 |1 |2774A4|0 |2 |0 |
-ROW |74247 |1099 |30334 |2 |0 |1A7C11|0 |2 |0 |
-ROW |74248 |1099 |30325 |2 |1 |2774A4|0 |2 |0 |
-ROW |74249 |1100 |30306 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74250 |1101 |30274 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74251 |1102 |30281 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74252 |1577 |34351 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74253 |1577 |34350 |0 |1 |2774A4|0 |2 |0 |
-ROW |74254 |1578 |34387 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74255 |1578 |34388 |2 |1 |2774A4|0 |2 |0 |
-ROW |74256 |1579 |34393 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74257 |1579 |34386 |0 |1 |2774A4|0 |2 |0 |
-ROW |74258 |1580 |34370 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74259 |1580 |34384 |0 |1 |2774A4|0 |2 |0 |
-ROW |74260 |1580 |34383 |0 |2 |F63100|0 |2 |0 |
-ROW |74261 |1581 |34438 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74262 |1581 |34413 |0 |1 |2774A4|0 |2 |0 |
-ROW |74263 |1581 |34427 |0 |2 |F63100|0 |2 |0 |
-ROW |74264 |1582 |34420 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74265 |1582 |34419 |0 |1 |2774A4|0 |2 |0 |
-ROW |74266 |1582 |34418 |0 |2 |F63100|0 |2 |0 |
-ROW |74267 |1060 |30159 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74268 |1065 |30161 |0 |0 |969696|0 |9 |2 |
-ROW |74269 |1065 |30162 |0 |1 |C80000|0 |9 |0 |
-ROW |74270 |1070 |30142 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74271 |741 |27084 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74272 |741 |27085 |2 |1 |2774A4|0 |2 |0 |
-ROW |74273 |741 |27083 |0 |2 |F63100|1 |2 |0 |
-ROW |74274 |741 |27086 |0 |3 |A54F10|1 |2 |0 |
-ROW |74275 |741 |27082 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74276 |741 |27079 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74277 |745 |27104 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74278 |745 |27105 |2 |1 |2774A4|0 |2 |0 |
-ROW |74279 |745 |27103 |0 |2 |F63100|1 |2 |0 |
-ROW |74280 |745 |27106 |0 |3 |A54F10|1 |2 |0 |
-ROW |74281 |745 |27102 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74282 |745 |27099 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74283 |766 |27124 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74284 |766 |27125 |2 |1 |2774A4|0 |2 |0 |
-ROW |74285 |766 |27123 |0 |2 |F63100|1 |2 |0 |
-ROW |74286 |766 |27126 |0 |3 |A54F10|1 |2 |0 |
-ROW |74287 |766 |27122 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74288 |766 |27119 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74289 |668 |27208 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74290 |1032 |30088 |2 |0 |1A7C11|0 |2 |0 |
-ROW |74291 |1032 |30087 |5 |1 |2774A4|0 |2 |0 |
-ROW |74292 |1033 |30089 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74293 |671 |27240 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74294 |1034 |30093 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74295 |675 |27294 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74296 |1035 |30094 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74297 |1676 |35369 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74298 |1677 |35372 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74299 |1678 |35379 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74300 |1678 |35386 |0 |1 |2774A4|0 |2 |0 |
-ROW |74301 |1678 |35377 |0 |2 |F63100|0 |2 |0 |
-ROW |74302 |1678 |35384 |0 |3 |A54F10|0 |2 |0 |
-ROW |74303 |1678 |35376 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74304 |1678 |35383 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74305 |1679 |35387 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74306 |1679 |35380 |0 |1 |2774A4|0 |2 |0 |
-ROW |74307 |1680 |35378 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74308 |1680 |35385 |0 |1 |2774A4|0 |2 |0 |
-ROW |74309 |1681 |35403 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74310 |1681 |35404 |0 |1 |2774A4|0 |2 |0 |
-ROW |74311 |1549 |33966 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74312 |1550 |33971 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74313 |1551 |33974 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74314 |1551 |33977 |2 |1 |2774A4|0 |2 |0 |
-ROW |74315 |1551 |33976 |0 |2 |F63100|1 |2 |0 |
-ROW |74316 |1551 |33973 |0 |3 |A54F10|1 |2 |0 |
-ROW |74317 |1551 |33975 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74318 |1551 |33972 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74319 |1552 |34007 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74320 |1553 |34012 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74321 |1554 |34015 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74322 |1554 |34018 |2 |1 |2774A4|0 |2 |0 |
-ROW |74323 |1554 |34017 |0 |2 |F63100|1 |2 |0 |
-ROW |74324 |1554 |34014 |0 |3 |A54F10|1 |2 |0 |
-ROW |74325 |1554 |34016 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74326 |1554 |34013 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74327 |1555 |34048 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74328 |1556 |34053 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74329 |1557 |34056 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74330 |1557 |34059 |2 |1 |2774A4|0 |2 |0 |
-ROW |74331 |1557 |34058 |0 |2 |F63100|1 |2 |0 |
-ROW |74332 |1557 |34055 |0 |3 |A54F10|1 |2 |0 |
-ROW |74333 |1557 |34057 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74334 |1557 |34054 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74335 |1558 |34089 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74336 |1559 |34094 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74337 |1560 |34097 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74338 |1560 |34100 |2 |1 |2774A4|0 |2 |0 |
-ROW |74339 |1560 |34099 |0 |2 |F63100|1 |2 |0 |
-ROW |74340 |1560 |34096 |0 |3 |A54F10|1 |2 |0 |
-ROW |74341 |1560 |34098 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74342 |1560 |34095 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74343 |1561 |34130 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74344 |1562 |34135 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74345 |1563 |34138 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74346 |1563 |34141 |2 |1 |2774A4|0 |2 |0 |
-ROW |74347 |1563 |34140 |0 |2 |F63100|1 |2 |0 |
-ROW |74348 |1563 |34137 |0 |3 |A54F10|1 |2 |0 |
-ROW |74349 |1563 |34139 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74350 |1563 |34136 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74351 |1038 |30101 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74352 |786 |28246 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74353 |687 |27417 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74354 |691 |27376 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74355 |694 |27478 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74356 |1042 |30105 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74357 |1043 |30107 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74358 |698 |27511 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74359 |1044 |30108 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74360 |701 |27547 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74361 |1045 |27591 |2 |0 |1A7C11|0 |2 |0 |
-ROW |74362 |1045 |30110 |5 |1 |2774A4|0 |2 |0 |
-ROW |74363 |1046 |30111 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74364 |704 |27586 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74365 |1682 |35439 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74366 |1683 |35441 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74367 |1684 |35443 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74368 |1685 |35446 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74369 |1686 |35450 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74370 |1686 |35465 |0 |1 |2774A4|0 |2 |0 |
-ROW |74371 |1686 |35456 |0 |2 |F63100|0 |2 |0 |
-ROW |74372 |1686 |35447 |0 |3 |A54F10|0 |2 |0 |
-ROW |74373 |1686 |35468 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74374 |1686 |35471 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74375 |1686 |35459 |0 |6 |AC8C14|0 |2 |0 |
-ROW |74376 |1687 |35449 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74377 |1687 |35464 |0 |1 |2774A4|0 |2 |0 |
-ROW |74378 |1687 |35455 |0 |2 |F63100|0 |2 |0 |
-ROW |74379 |1687 |35461 |0 |3 |A54F10|0 |2 |0 |
-ROW |74380 |1687 |35467 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74381 |1687 |35470 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74382 |1687 |35457 |0 |6 |AC8C14|0 |2 |0 |
-ROW |74383 |1688 |35473 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74384 |1688 |35463 |0 |1 |2774A4|0 |2 |0 |
-ROW |74385 |1688 |35454 |0 |2 |F63100|0 |2 |0 |
-ROW |74386 |1688 |35472 |0 |3 |A54F10|0 |2 |0 |
-ROW |74387 |1688 |35466 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74388 |1688 |35469 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74389 |1688 |35458 |0 |6 |AC8C14|0 |2 |0 |
-ROW |74390 |1689 |35474 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74391 |1690 |35476 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74392 |1691 |35478 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74393 |1691 |35480 |0 |1 |2774A4|0 |2 |0 |
-ROW |74394 |1692 |35487 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74395 |1692 |35484 |0 |1 |2774A4|0 |2 |0 |
-ROW |74396 |1693 |35486 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74397 |1693 |35483 |0 |1 |2774A4|0 |2 |0 |
-ROW |74398 |1694 |35490 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74399 |1694 |35488 |0 |1 |2774A4|0 |2 |0 |
-ROW |74400 |1694 |35489 |0 |2 |F63100|0 |2 |0 |
-ROW |74401 |1695 |35497 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74402 |1695 |35493 |0 |1 |2774A4|1 |2 |0 |
-ROW |74403 |1695 |35503 |0 |2 |F63100|0 |2 |0 |
-ROW |74404 |1695 |35499 |0 |3 |A54F10|1 |2 |0 |
-ROW |74405 |1695 |35496 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74406 |1695 |35502 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74407 |1696 |35508 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74408 |1696 |35507 |0 |1 |2774A4|1 |2 |0 |
-ROW |74409 |1696 |35510 |0 |2 |F63100|0 |2 |0 |
-ROW |74410 |1696 |35509 |0 |3 |A54F10|1 |2 |0 |
-ROW |74411 |1697 |35516 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74412 |1697 |35515 |0 |1 |2774A4|1 |2 |0 |
-ROW |74413 |1697 |35518 |0 |2 |F63100|0 |2 |0 |
-ROW |74414 |1697 |35517 |0 |3 |A54F10|1 |2 |0 |
-ROW |74415 |1698 |35524 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74416 |1698 |35523 |0 |1 |2774A4|1 |2 |0 |
-ROW |74417 |1698 |35526 |0 |2 |F63100|0 |2 |0 |
-ROW |74418 |1698 |35525 |0 |3 |A54F10|1 |2 |0 |
-ROW |74419 |1699 |35531 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74420 |1699 |35529 |0 |1 |2774A4|0 |2 |0 |
-ROW |74421 |1699 |35530 |0 |2 |F63100|0 |2 |0 |
-ROW |74422 |1700 |35411 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74423 |1700 |35409 |0 |1 |2774A4|0 |2 |0 |
-ROW |74424 |1700 |35407 |0 |2 |F63100|0 |2 |0 |
-ROW |74425 |1700 |35413 |0 |3 |A54F10|0 |2 |0 |
-ROW |74426 |1700 |35412 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74427 |1700 |35410 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74428 |708 |27671 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74429 |1047 |30112 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74430 |1048 |30114 |2 |0 |1A7C11|0 |2 |0 |
-ROW |74431 |1048 |30113 |5 |1 |2774A4|0 |2 |0 |
-ROW |74432 |1049 |30115 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74433 |775 |28143 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74434 |714 |27753 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74435 |1050 |30116 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74436 |856 |28894 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74437 |1051 |30118 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74438 |1564 |34166 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74439 |1564 |34169 |2 |1 |2774A4|0 |2 |0 |
-ROW |74440 |1564 |34168 |0 |2 |F63100|1 |2 |0 |
-ROW |74441 |1564 |34165 |0 |3 |A54F10|1 |2 |0 |
-ROW |74442 |1564 |34167 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |74443 |1564 |34164 |0 |5 |6C59DC|1 |2 |0 |
-ROW |74444 |1565 |34174 |0 |0 |969696|0 |9 |2 |
-ROW |74445 |1565 |34175 |0 |1 |C80000|0 |9 |0 |
-ROW |74446 |1566 |34178 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74447 |1567 |34154 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74448 |1811 |36861 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74449 |1812 |36867 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74450 |1812 |36865 |0 |1 |2774A4|0 |2 |0 |
-ROW |74451 |1812 |36864 |0 |2 |F63100|0 |2 |0 |
-ROW |74452 |1812 |36866 |0 |3 |A54F10|0 |2 |0 |
-ROW |74453 |1813 |36878 |0 |0 |969696|0 |9 |2 |
-ROW |74454 |1813 |36879 |0 |1 |C80000|0 |9 |0 |
-ROW |74455 |1814 |36853 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74456 |1816 |36915 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74457 |1817 |36921 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74458 |1817 |36919 |0 |1 |2774A4|0 |2 |0 |
-ROW |74459 |1817 |36918 |0 |2 |F63100|0 |2 |0 |
-ROW |74460 |1817 |36920 |0 |3 |A54F10|0 |2 |0 |
-ROW |74461 |1818 |36932 |0 |0 |969696|0 |9 |2 |
-ROW |74462 |1818 |36933 |0 |1 |C80000|0 |9 |0 |
-ROW |74463 |1819 |36907 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74464 |1821 |36969 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74465 |1822 |36975 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74466 |1822 |36973 |0 |1 |2774A4|0 |2 |0 |
-ROW |74467 |1822 |36972 |0 |2 |F63100|0 |2 |0 |
-ROW |74468 |1822 |36974 |0 |3 |A54F10|0 |2 |0 |
-ROW |74469 |1823 |36986 |0 |0 |969696|0 |9 |2 |
-ROW |74470 |1823 |36987 |0 |1 |C80000|0 |9 |0 |
-ROW |74471 |1824 |36961 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74472 |1826 |37023 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74473 |1827 |37029 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74474 |1827 |37027 |0 |1 |2774A4|0 |2 |0 |
-ROW |74475 |1827 |37026 |0 |2 |F63100|0 |2 |0 |
-ROW |74476 |1827 |37028 |0 |3 |A54F10|0 |2 |0 |
-ROW |74477 |1828 |37040 |0 |0 |969696|0 |9 |2 |
-ROW |74478 |1828 |37041 |0 |1 |C80000|0 |9 |0 |
-ROW |74479 |1829 |37015 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74480 |1831 |37077 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74481 |1832 |37083 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74482 |1832 |37081 |0 |1 |2774A4|0 |2 |0 |
-ROW |74483 |1832 |37080 |0 |2 |F63100|0 |2 |0 |
-ROW |74484 |1832 |37082 |0 |3 |A54F10|0 |2 |0 |
-ROW |74485 |1833 |37094 |0 |0 |969696|0 |9 |2 |
-ROW |74486 |1833 |37095 |0 |1 |C80000|0 |9 |0 |
-ROW |74487 |1834 |37069 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74488 |1836 |37131 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74489 |1837 |37137 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74490 |1837 |37135 |0 |1 |2774A4|0 |2 |0 |
-ROW |74491 |1837 |37134 |0 |2 |F63100|0 |2 |0 |
-ROW |74492 |1837 |37136 |0 |3 |A54F10|0 |2 |0 |
-ROW |74493 |1838 |37148 |0 |0 |969696|0 |9 |2 |
-ROW |74494 |1838 |37149 |0 |1 |C80000|0 |9 |0 |
-ROW |74495 |1839 |37123 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74496 |1841 |37185 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74497 |1842 |37191 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74498 |1842 |37189 |0 |1 |2774A4|0 |2 |0 |
-ROW |74499 |1842 |37188 |0 |2 |F63100|0 |2 |0 |
-ROW |74500 |1842 |37190 |0 |3 |A54F10|0 |2 |0 |
-ROW |74501 |1843 |37202 |0 |0 |969696|0 |9 |2 |
-ROW |74502 |1843 |37203 |0 |1 |C80000|0 |9 |0 |
-ROW |74503 |1844 |37177 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74504 |1846 |37239 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74505 |1847 |37245 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74506 |1847 |37243 |0 |1 |2774A4|0 |2 |0 |
-ROW |74507 |1847 |37242 |0 |2 |F63100|0 |2 |0 |
-ROW |74508 |1847 |37244 |0 |3 |A54F10|0 |2 |0 |
-ROW |74509 |1848 |37256 |0 |0 |969696|0 |9 |2 |
-ROW |74510 |1848 |37257 |0 |1 |C80000|0 |9 |0 |
-ROW |74511 |1849 |37231 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74512 |1851 |37293 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74513 |1852 |37299 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74514 |1852 |37297 |0 |1 |2774A4|0 |2 |0 |
-ROW |74515 |1852 |37296 |0 |2 |F63100|0 |2 |0 |
-ROW |74516 |1852 |37298 |0 |3 |A54F10|0 |2 |0 |
-ROW |74517 |1853 |37310 |0 |0 |969696|0 |9 |2 |
-ROW |74518 |1853 |37311 |0 |1 |C80000|0 |9 |0 |
-ROW |74519 |1854 |37285 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74520 |1856 |37347 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74521 |1857 |37353 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74522 |1857 |37351 |0 |1 |2774A4|0 |2 |0 |
-ROW |74523 |1857 |37350 |0 |2 |F63100|0 |2 |0 |
-ROW |74524 |1857 |37352 |0 |3 |A54F10|0 |2 |0 |
-ROW |74525 |1858 |37364 |0 |0 |969696|0 |9 |2 |
-ROW |74526 |1858 |37365 |0 |1 |C80000|0 |9 |0 |
-ROW |74527 |1859 |37339 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74528 |1861 |37401 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74529 |1862 |37407 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74530 |1862 |37405 |0 |1 |2774A4|0 |2 |0 |
-ROW |74531 |1862 |37404 |0 |2 |F63100|0 |2 |0 |
-ROW |74532 |1862 |37406 |0 |3 |A54F10|0 |2 |0 |
-ROW |74533 |1863 |37418 |0 |0 |969696|0 |9 |2 |
-ROW |74534 |1863 |37419 |0 |1 |C80000|0 |9 |0 |
-ROW |74535 |1864 |37393 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74536 |1866 |37455 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74537 |1867 |37461 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74538 |1867 |37459 |0 |1 |2774A4|0 |2 |0 |
-ROW |74539 |1867 |37458 |0 |2 |F63100|0 |2 |0 |
-ROW |74540 |1867 |37460 |0 |3 |A54F10|0 |2 |0 |
-ROW |74541 |1868 |37472 |0 |0 |969696|0 |9 |2 |
-ROW |74542 |1868 |37473 |0 |1 |C80000|0 |9 |0 |
-ROW |74543 |1869 |37447 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74544 |1871 |37509 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74545 |1872 |37515 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74546 |1872 |37513 |0 |1 |2774A4|0 |2 |0 |
-ROW |74547 |1872 |37512 |0 |2 |F63100|0 |2 |0 |
-ROW |74548 |1872 |37514 |0 |3 |A54F10|0 |2 |0 |
-ROW |74549 |1873 |37526 |0 |0 |969696|0 |9 |2 |
-ROW |74550 |1873 |37527 |0 |1 |C80000|0 |9 |0 |
-ROW |74551 |1874 |37501 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74552 |1876 |37563 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74553 |1877 |37569 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74554 |1877 |37567 |0 |1 |2774A4|0 |2 |0 |
-ROW |74555 |1877 |37566 |0 |2 |F63100|0 |2 |0 |
-ROW |74556 |1877 |37568 |0 |3 |A54F10|0 |2 |0 |
-ROW |74557 |1878 |37580 |0 |0 |969696|0 |9 |2 |
-ROW |74558 |1878 |37581 |0 |1 |C80000|0 |9 |0 |
-ROW |74559 |1879 |37555 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74560 |1881 |37617 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74561 |1882 |37623 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74562 |1882 |37621 |0 |1 |2774A4|0 |2 |0 |
-ROW |74563 |1882 |37620 |0 |2 |F63100|0 |2 |0 |
-ROW |74564 |1882 |37622 |0 |3 |A54F10|0 |2 |0 |
-ROW |74565 |1883 |37634 |0 |0 |969696|0 |9 |2 |
-ROW |74566 |1883 |37635 |0 |1 |C80000|0 |9 |0 |
-ROW |74567 |1884 |37609 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74568 |1886 |37671 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74569 |1887 |37677 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74570 |1887 |37675 |0 |1 |2774A4|0 |2 |0 |
-ROW |74571 |1887 |37674 |0 |2 |F63100|0 |2 |0 |
-ROW |74572 |1887 |37676 |0 |3 |A54F10|0 |2 |0 |
-ROW |74573 |1888 |37688 |0 |0 |969696|0 |9 |2 |
-ROW |74574 |1888 |37689 |0 |1 |C80000|0 |9 |0 |
-ROW |74575 |1889 |37663 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74576 |1891 |37725 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74577 |1892 |37731 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74578 |1892 |37729 |0 |1 |2774A4|0 |2 |0 |
-ROW |74579 |1892 |37728 |0 |2 |F63100|0 |2 |0 |
-ROW |74580 |1892 |37730 |0 |3 |A54F10|0 |2 |0 |
-ROW |74581 |1893 |37742 |0 |0 |969696|0 |9 |2 |
-ROW |74582 |1893 |37743 |0 |1 |C80000|0 |9 |0 |
-ROW |74583 |1894 |37717 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74584 |1896 |37779 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74585 |1897 |37785 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74586 |1897 |37783 |0 |1 |2774A4|0 |2 |0 |
-ROW |74587 |1897 |37782 |0 |2 |F63100|0 |2 |0 |
-ROW |74588 |1897 |37784 |0 |3 |A54F10|0 |2 |0 |
-ROW |74589 |1898 |37796 |0 |0 |969696|0 |9 |2 |
-ROW |74590 |1898 |37797 |0 |1 |C80000|0 |9 |0 |
-ROW |74591 |1899 |37771 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74592 |1901 |37833 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74593 |1902 |37839 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74594 |1902 |37837 |0 |1 |2774A4|0 |2 |0 |
-ROW |74595 |1902 |37836 |0 |2 |F63100|0 |2 |0 |
-ROW |74596 |1902 |37838 |0 |3 |A54F10|0 |2 |0 |
-ROW |74597 |1903 |37850 |0 |0 |969696|0 |9 |2 |
-ROW |74598 |1903 |37851 |0 |1 |C80000|0 |9 |0 |
-ROW |74599 |1904 |37825 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74600 |1906 |37887 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74601 |1907 |37893 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74602 |1907 |37891 |0 |1 |2774A4|0 |2 |0 |
-ROW |74603 |1907 |37890 |0 |2 |F63100|0 |2 |0 |
-ROW |74604 |1907 |37892 |0 |3 |A54F10|0 |2 |0 |
-ROW |74605 |1908 |37904 |0 |0 |969696|0 |9 |2 |
-ROW |74606 |1908 |37905 |0 |1 |C80000|0 |9 |0 |
-ROW |74607 |1909 |37879 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74608 |1911 |37941 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74609 |1912 |37947 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74610 |1912 |37945 |0 |1 |2774A4|0 |2 |0 |
-ROW |74611 |1912 |37944 |0 |2 |F63100|0 |2 |0 |
-ROW |74612 |1912 |37946 |0 |3 |A54F10|0 |2 |0 |
-ROW |74613 |1913 |37958 |0 |0 |969696|0 |9 |2 |
-ROW |74614 |1913 |37959 |0 |1 |C80000|0 |9 |0 |
-ROW |74615 |1914 |37933 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74616 |1916 |37995 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74617 |1917 |38001 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74618 |1917 |37999 |0 |1 |2774A4|0 |2 |0 |
-ROW |74619 |1917 |37998 |0 |2 |F63100|0 |2 |0 |
-ROW |74620 |1917 |38000 |0 |3 |A54F10|0 |2 |0 |
-ROW |74621 |1918 |38012 |0 |0 |969696|0 |9 |2 |
-ROW |74622 |1918 |38013 |0 |1 |C80000|0 |9 |0 |
-ROW |74623 |1919 |37987 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74624 |1921 |38049 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74625 |1922 |38055 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74626 |1922 |38053 |0 |1 |2774A4|0 |2 |0 |
-ROW |74627 |1922 |38052 |0 |2 |F63100|0 |2 |0 |
-ROW |74628 |1922 |38054 |0 |3 |A54F10|0 |2 |0 |
-ROW |74629 |1923 |38066 |0 |0 |969696|0 |9 |2 |
-ROW |74630 |1923 |38067 |0 |1 |C80000|0 |9 |0 |
-ROW |74631 |1924 |38041 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74632 |1926 |38103 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74633 |1927 |38109 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74634 |1927 |38107 |0 |1 |2774A4|0 |2 |0 |
-ROW |74635 |1927 |38106 |0 |2 |F63100|0 |2 |0 |
-ROW |74636 |1927 |38108 |0 |3 |A54F10|0 |2 |0 |
-ROW |74637 |1928 |38120 |0 |0 |969696|0 |9 |2 |
-ROW |74638 |1928 |38121 |0 |1 |C80000|0 |9 |0 |
-ROW |74639 |1929 |38095 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74640 |1931 |38157 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74641 |1932 |38163 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74642 |1932 |38161 |0 |1 |2774A4|0 |2 |0 |
-ROW |74643 |1932 |38160 |0 |2 |F63100|0 |2 |0 |
-ROW |74644 |1932 |38162 |0 |3 |A54F10|0 |2 |0 |
-ROW |74645 |1933 |38174 |0 |0 |969696|0 |9 |2 |
-ROW |74646 |1933 |38175 |0 |1 |C80000|0 |9 |0 |
-ROW |74647 |1934 |38149 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74648 |1936 |38211 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74649 |1937 |38217 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74650 |1937 |38215 |0 |1 |2774A4|0 |2 |0 |
-ROW |74651 |1937 |38214 |0 |2 |F63100|0 |2 |0 |
-ROW |74652 |1937 |38216 |0 |3 |A54F10|0 |2 |0 |
-ROW |74653 |1938 |38228 |0 |0 |969696|0 |9 |2 |
-ROW |74654 |1938 |38229 |0 |1 |C80000|0 |9 |0 |
-ROW |74655 |1939 |38203 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74656 |1941 |38265 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74657 |1942 |38271 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74658 |1942 |38269 |0 |1 |2774A4|0 |2 |0 |
-ROW |74659 |1942 |38268 |0 |2 |F63100|0 |2 |0 |
-ROW |74660 |1942 |38270 |0 |3 |A54F10|0 |2 |0 |
-ROW |74661 |1943 |38282 |0 |0 |969696|0 |9 |2 |
-ROW |74662 |1943 |38283 |0 |1 |C80000|0 |9 |0 |
-ROW |74663 |1944 |38257 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74664 |1946 |38319 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74665 |1947 |38325 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74666 |1947 |38323 |0 |1 |2774A4|0 |2 |0 |
-ROW |74667 |1947 |38322 |0 |2 |F63100|0 |2 |0 |
-ROW |74668 |1947 |38324 |0 |3 |A54F10|0 |2 |0 |
-ROW |74669 |1948 |38336 |0 |0 |969696|0 |9 |2 |
-ROW |74670 |1948 |38337 |0 |1 |C80000|0 |9 |0 |
-ROW |74671 |1949 |38311 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74672 |1951 |38373 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74673 |1952 |38379 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74674 |1952 |38377 |0 |1 |2774A4|0 |2 |0 |
-ROW |74675 |1952 |38376 |0 |2 |F63100|0 |2 |0 |
-ROW |74676 |1952 |38378 |0 |3 |A54F10|0 |2 |0 |
-ROW |74677 |1953 |38390 |0 |0 |969696|0 |9 |2 |
-ROW |74678 |1953 |38391 |0 |1 |C80000|0 |9 |0 |
-ROW |74679 |1954 |38365 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74680 |1956 |38427 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74681 |1957 |38433 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74682 |1957 |38431 |0 |1 |2774A4|0 |2 |0 |
-ROW |74683 |1957 |38430 |0 |2 |F63100|0 |2 |0 |
-ROW |74684 |1957 |38432 |0 |3 |A54F10|0 |2 |0 |
-ROW |74685 |1958 |38444 |0 |0 |969696|0 |9 |2 |
-ROW |74686 |1958 |38445 |0 |1 |C80000|0 |9 |0 |
-ROW |74687 |1959 |38419 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74688 |1961 |38481 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74689 |1962 |38487 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74690 |1962 |38485 |0 |1 |2774A4|0 |2 |0 |
-ROW |74691 |1962 |38484 |0 |2 |F63100|0 |2 |0 |
-ROW |74692 |1962 |38486 |0 |3 |A54F10|0 |2 |0 |
-ROW |74693 |1963 |38498 |0 |0 |969696|0 |9 |2 |
-ROW |74694 |1963 |38499 |0 |1 |C80000|0 |9 |0 |
-ROW |74695 |1964 |38473 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74696 |1966 |38535 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74697 |1967 |38541 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74698 |1967 |38539 |0 |1 |2774A4|0 |2 |0 |
-ROW |74699 |1967 |38538 |0 |2 |F63100|0 |2 |0 |
-ROW |74700 |1967 |38540 |0 |3 |A54F10|0 |2 |0 |
-ROW |74701 |1968 |38552 |0 |0 |969696|0 |9 |2 |
-ROW |74702 |1968 |38553 |0 |1 |C80000|0 |9 |0 |
-ROW |74703 |1969 |38527 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74704 |1971 |38589 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74705 |1972 |38595 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74706 |1972 |38593 |0 |1 |2774A4|0 |2 |0 |
-ROW |74707 |1972 |38592 |0 |2 |F63100|0 |2 |0 |
-ROW |74708 |1972 |38594 |0 |3 |A54F10|0 |2 |0 |
-ROW |74709 |1973 |38606 |0 |0 |969696|0 |9 |2 |
-ROW |74710 |1973 |38607 |0 |1 |C80000|0 |9 |0 |
-ROW |74711 |1974 |38581 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74712 |1976 |38643 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74713 |1977 |38649 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74714 |1977 |38647 |0 |1 |2774A4|0 |2 |0 |
-ROW |74715 |1977 |38646 |0 |2 |F63100|0 |2 |0 |
-ROW |74716 |1977 |38648 |0 |3 |A54F10|0 |2 |0 |
-ROW |74717 |1978 |38660 |0 |0 |969696|0 |9 |2 |
-ROW |74718 |1978 |38661 |0 |1 |C80000|0 |9 |0 |
-ROW |74719 |1979 |38635 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74720 |1981 |38697 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74721 |1982 |38703 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74722 |1982 |38701 |0 |1 |2774A4|0 |2 |0 |
-ROW |74723 |1982 |38700 |0 |2 |F63100|0 |2 |0 |
-ROW |74724 |1982 |38702 |0 |3 |A54F10|0 |2 |0 |
-ROW |74725 |1983 |38714 |0 |0 |969696|0 |9 |2 |
-ROW |74726 |1983 |38715 |0 |1 |C80000|0 |9 |0 |
-ROW |74727 |1984 |38689 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74728 |1986 |38751 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74729 |1987 |38757 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74730 |1987 |38755 |0 |1 |2774A4|0 |2 |0 |
-ROW |74731 |1987 |38754 |0 |2 |F63100|0 |2 |0 |
-ROW |74732 |1987 |38756 |0 |3 |A54F10|0 |2 |0 |
-ROW |74733 |1988 |38768 |0 |0 |969696|0 |9 |2 |
-ROW |74734 |1988 |38769 |0 |1 |C80000|0 |9 |0 |
-ROW |74735 |1989 |38743 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74736 |1991 |38805 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74737 |1992 |38811 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74738 |1992 |38809 |0 |1 |2774A4|0 |2 |0 |
-ROW |74739 |1992 |38808 |0 |2 |F63100|0 |2 |0 |
-ROW |74740 |1992 |38810 |0 |3 |A54F10|0 |2 |0 |
-ROW |74741 |1993 |38822 |0 |0 |969696|0 |9 |2 |
-ROW |74742 |1993 |38823 |0 |1 |C80000|0 |9 |0 |
-ROW |74743 |1994 |38797 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74744 |1996 |38859 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74745 |1997 |38865 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74746 |1997 |38863 |0 |1 |2774A4|0 |2 |0 |
-ROW |74747 |1997 |38862 |0 |2 |F63100|0 |2 |0 |
-ROW |74748 |1997 |38864 |0 |3 |A54F10|0 |2 |0 |
-ROW |74749 |1998 |38876 |0 |0 |969696|0 |9 |2 |
-ROW |74750 |1998 |38877 |0 |1 |C80000|0 |9 |0 |
-ROW |74751 |1999 |38851 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74752 |2001 |38913 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74753 |2002 |38919 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74754 |2002 |38917 |0 |1 |2774A4|0 |2 |0 |
-ROW |74755 |2002 |38916 |0 |2 |F63100|0 |2 |0 |
-ROW |74756 |2002 |38918 |0 |3 |A54F10|0 |2 |0 |
-ROW |74757 |2003 |38930 |0 |0 |969696|0 |9 |2 |
-ROW |74758 |2003 |38931 |0 |1 |C80000|0 |9 |0 |
-ROW |74759 |2004 |38905 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74760 |2006 |38967 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74761 |2007 |38973 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74762 |2007 |38971 |0 |1 |2774A4|0 |2 |0 |
-ROW |74763 |2007 |38970 |0 |2 |F63100|0 |2 |0 |
-ROW |74764 |2007 |38972 |0 |3 |A54F10|0 |2 |0 |
-ROW |74765 |2008 |38984 |0 |0 |969696|0 |9 |2 |
-ROW |74766 |2008 |38985 |0 |1 |C80000|0 |9 |0 |
-ROW |74767 |2009 |38959 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74768 |2011 |39021 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74769 |2012 |39027 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74770 |2012 |39025 |0 |1 |2774A4|0 |2 |0 |
-ROW |74771 |2012 |39024 |0 |2 |F63100|0 |2 |0 |
-ROW |74772 |2012 |39026 |0 |3 |A54F10|0 |2 |0 |
-ROW |74773 |2013 |39038 |0 |0 |969696|0 |9 |2 |
-ROW |74774 |2013 |39039 |0 |1 |C80000|0 |9 |0 |
-ROW |74775 |2014 |39013 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74776 |2016 |39075 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74777 |2017 |39081 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74778 |2017 |39079 |0 |1 |2774A4|0 |2 |0 |
-ROW |74779 |2017 |39078 |0 |2 |F63100|0 |2 |0 |
-ROW |74780 |2017 |39080 |0 |3 |A54F10|0 |2 |0 |
-ROW |74781 |2018 |39092 |0 |0 |969696|0 |9 |2 |
-ROW |74782 |2018 |39093 |0 |1 |C80000|0 |9 |0 |
-ROW |74783 |2019 |39067 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74784 |2021 |39129 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74785 |2022 |39135 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74786 |2022 |39133 |0 |1 |2774A4|0 |2 |0 |
-ROW |74787 |2022 |39132 |0 |2 |F63100|0 |2 |0 |
-ROW |74788 |2022 |39134 |0 |3 |A54F10|0 |2 |0 |
-ROW |74789 |2023 |39146 |0 |0 |969696|0 |9 |2 |
-ROW |74790 |2023 |39147 |0 |1 |C80000|0 |9 |0 |
-ROW |74791 |2024 |39121 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74792 |2026 |39183 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74793 |2027 |39189 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74794 |2027 |39187 |0 |1 |2774A4|0 |2 |0 |
-ROW |74795 |2027 |39186 |0 |2 |F63100|0 |2 |0 |
-ROW |74796 |2027 |39188 |0 |3 |A54F10|0 |2 |0 |
-ROW |74797 |2028 |39200 |0 |0 |969696|0 |9 |2 |
-ROW |74798 |2028 |39201 |0 |1 |C80000|0 |9 |0 |
-ROW |74799 |2029 |39175 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74800 |2031 |39237 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74801 |2032 |39243 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74802 |2032 |39241 |0 |1 |2774A4|0 |2 |0 |
-ROW |74803 |2032 |39240 |0 |2 |F63100|0 |2 |0 |
-ROW |74804 |2032 |39242 |0 |3 |A54F10|0 |2 |0 |
-ROW |74805 |2033 |39254 |0 |0 |969696|0 |9 |2 |
-ROW |74806 |2033 |39255 |0 |1 |C80000|0 |9 |0 |
-ROW |74807 |2034 |39229 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74808 |2036 |39291 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74809 |2037 |39297 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74810 |2037 |39295 |0 |1 |2774A4|0 |2 |0 |
-ROW |74811 |2037 |39294 |0 |2 |F63100|0 |2 |0 |
-ROW |74812 |2037 |39296 |0 |3 |A54F10|0 |2 |0 |
-ROW |74813 |2038 |39308 |0 |0 |969696|0 |9 |2 |
-ROW |74814 |2038 |39309 |0 |1 |C80000|0 |9 |0 |
-ROW |74815 |2039 |39283 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74816 |2041 |39345 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74817 |2042 |39351 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74818 |2042 |39349 |0 |1 |2774A4|0 |2 |0 |
-ROW |74819 |2042 |39348 |0 |2 |F63100|0 |2 |0 |
-ROW |74820 |2042 |39350 |0 |3 |A54F10|0 |2 |0 |
-ROW |74821 |2043 |39362 |0 |0 |969696|0 |9 |2 |
-ROW |74822 |2043 |39363 |0 |1 |C80000|0 |9 |0 |
-ROW |74823 |2044 |39337 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74824 |2046 |39399 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74825 |2047 |39405 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74826 |2047 |39403 |0 |1 |2774A4|0 |2 |0 |
-ROW |74827 |2047 |39402 |0 |2 |F63100|0 |2 |0 |
-ROW |74828 |2047 |39404 |0 |3 |A54F10|0 |2 |0 |
-ROW |74829 |2048 |39416 |0 |0 |969696|0 |9 |2 |
-ROW |74830 |2048 |39417 |0 |1 |C80000|0 |9 |0 |
-ROW |74831 |2049 |39391 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74832 |2051 |39453 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74833 |2052 |39459 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74834 |2052 |39457 |0 |1 |2774A4|0 |2 |0 |
-ROW |74835 |2052 |39456 |0 |2 |F63100|0 |2 |0 |
-ROW |74836 |2052 |39458 |0 |3 |A54F10|0 |2 |0 |
-ROW |74837 |2053 |39470 |0 |0 |969696|0 |9 |2 |
-ROW |74838 |2053 |39471 |0 |1 |C80000|0 |9 |0 |
-ROW |74839 |2054 |39445 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74840 |2056 |39507 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74841 |2057 |39513 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74842 |2057 |39511 |0 |1 |2774A4|0 |2 |0 |
-ROW |74843 |2057 |39510 |0 |2 |F63100|0 |2 |0 |
-ROW |74844 |2057 |39512 |0 |3 |A54F10|0 |2 |0 |
-ROW |74845 |2058 |39524 |0 |0 |969696|0 |9 |2 |
-ROW |74846 |2058 |39525 |0 |1 |C80000|0 |9 |0 |
-ROW |74847 |2059 |39499 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74848 |2061 |39561 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74849 |2062 |39567 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74850 |2062 |39565 |0 |1 |2774A4|0 |2 |0 |
-ROW |74851 |2062 |39564 |0 |2 |F63100|0 |2 |0 |
-ROW |74852 |2062 |39566 |0 |3 |A54F10|0 |2 |0 |
-ROW |74853 |2063 |39578 |0 |0 |969696|0 |9 |2 |
-ROW |74854 |2063 |39579 |0 |1 |C80000|0 |9 |0 |
-ROW |74855 |2064 |39553 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74856 |2066 |39615 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74857 |2067 |39621 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74858 |2067 |39619 |0 |1 |2774A4|0 |2 |0 |
-ROW |74859 |2067 |39618 |0 |2 |F63100|0 |2 |0 |
-ROW |74860 |2067 |39620 |0 |3 |A54F10|0 |2 |0 |
-ROW |74861 |2068 |39632 |0 |0 |969696|0 |9 |2 |
-ROW |74862 |2068 |39633 |0 |1 |C80000|0 |9 |0 |
-ROW |74863 |2069 |39607 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74864 |2071 |39669 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74865 |2072 |39675 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74866 |2072 |39673 |0 |1 |2774A4|0 |2 |0 |
-ROW |74867 |2072 |39672 |0 |2 |F63100|0 |2 |0 |
-ROW |74868 |2072 |39674 |0 |3 |A54F10|0 |2 |0 |
-ROW |74869 |2073 |39686 |0 |0 |969696|0 |9 |2 |
-ROW |74870 |2073 |39687 |0 |1 |C80000|0 |9 |0 |
-ROW |74871 |2074 |39661 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74872 |2076 |39723 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74873 |2077 |39729 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74874 |2077 |39727 |0 |1 |2774A4|0 |2 |0 |
-ROW |74875 |2077 |39726 |0 |2 |F63100|0 |2 |0 |
-ROW |74876 |2077 |39728 |0 |3 |A54F10|0 |2 |0 |
-ROW |74877 |2078 |39740 |0 |0 |969696|0 |9 |2 |
-ROW |74878 |2078 |39741 |0 |1 |C80000|0 |9 |0 |
-ROW |74879 |2079 |39715 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74880 |724 |27904 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74881 |1396 |32439 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74882 |1396 |32437 |0 |1 |2774A4|0 |2 |0 |
-ROW |74883 |1396 |32436 |0 |2 |F63100|0 |2 |0 |
-ROW |74884 |1396 |32438 |0 |3 |A54F10|0 |2 |0 |
-ROW |74885 |1052 |27907 |0 |0 |969696|0 |9 |2 |
-ROW |74886 |1052 |27908 |0 |1 |C80000|0 |9 |0 |
-ROW |74887 |1053 |30120 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74888 |1457 |33206 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74889 |1457 |33193 |5 |1 |2774A4|0 |2 |0 |
-ROW |74890 |1458 |33195 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74891 |1458 |33203 |5 |1 |2774A4|0 |2 |0 |
-ROW |74892 |1458 |33202 |5 |2 |F63100|0 |2 |0 |
-ROW |74893 |1459 |33200 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74894 |1459 |33194 |5 |1 |2774A4|0 |2 |0 |
-ROW |74895 |1460 |33187 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74896 |1460 |33186 |5 |1 |2774A4|0 |2 |0 |
-ROW |74897 |1460 |33204 |5 |2 |F63100|0 |2 |0 |
-ROW |74898 |1461 |33226 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74899 |1461 |33215 |5 |1 |2774A4|0 |2 |0 |
-ROW |74900 |1462 |33207 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74901 |1463 |33223 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74902 |1463 |33218 |5 |1 |2774A4|0 |2 |0 |
-ROW |74903 |1464 |33210 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74904 |1464 |33209 |5 |1 |2774A4|0 |2 |0 |
-ROW |74905 |1464 |33224 |5 |2 |F63100|0 |2 |0 |
-ROW |74906 |1465 |33249 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74907 |1465 |33236 |5 |1 |2774A4|0 |2 |0 |
-ROW |74908 |1466 |33238 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74909 |1466 |33246 |5 |1 |2774A4|0 |2 |0 |
-ROW |74910 |1466 |33245 |5 |2 |F63100|0 |2 |0 |
-ROW |74911 |1467 |33243 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74912 |1467 |33237 |5 |1 |2774A4|0 |2 |0 |
-ROW |74913 |1468 |33230 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74914 |1468 |33229 |5 |1 |2774A4|0 |2 |0 |
-ROW |74915 |1468 |33247 |5 |2 |F63100|0 |2 |0 |
-ROW |74916 |1469 |33258 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74917 |1470 |33251 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74918 |1471 |33256 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74919 |1472 |33277 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74920 |1473 |33274 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74921 |1473 |33273 |5 |1 |2774A4|0 |2 |0 |
-ROW |74922 |1473 |33272 |5 |2 |F63100|0 |2 |0 |
-ROW |74923 |1474 |33270 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74924 |1475 |33269 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74925 |1476 |33261 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74926 |1476 |33275 |5 |1 |2774A4|0 |2 |0 |
-ROW |74927 |1477 |33296 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74928 |1478 |33293 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74929 |1478 |33292 |5 |1 |2774A4|0 |2 |0 |
-ROW |74930 |1478 |33291 |5 |2 |F63100|0 |2 |0 |
-ROW |74931 |1479 |33289 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74932 |1480 |33288 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74933 |1481 |33280 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74934 |1481 |33294 |5 |1 |2774A4|0 |2 |0 |
-ROW |74935 |1482 |33312 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74936 |1483 |33313 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74937 |1484 |33314 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74938 |1485 |33319 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74939 |1486 |33320 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74940 |1487 |33304 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74941 |1487 |33305 |5 |1 |2774A4|0 |2 |0 |
-ROW |74942 |727 |27936 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74943 |1054 |27935 |2 |0 |1A7C11|0 |2 |0 |
-ROW |74944 |1054 |30122 |5 |1 |2774A4|0 |2 |0 |
-ROW |74945 |1055 |30123 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74946 |730 |27975 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74947 |1056 |30126 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74948 |733 |28003 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74949 |1057 |30131 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74950 |736 |28031 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74951 |1058 |30136 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74952 |2080 |39768 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74953 |2080 |39769 |0 |1 |2774A4|0 |2 |0 |
-ROW |74954 |2080 |39770 |0 |2 |F63100|0 |2 |0 |
-ROW |74955 |2080 |39771 |0 |3 |A54F10|0 |2 |0 |
-ROW |74956 |2081 |39772 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74957 |2081 |39773 |0 |1 |2774A4|0 |2 |0 |
-ROW |74958 |2082 |39774 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74959 |2082 |39775 |0 |1 |2774A4|0 |2 |0 |
-ROW |74960 |2082 |39780 |0 |2 |F63100|0 |2 |0 |
-ROW |74961 |2083 |39777 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74962 |2083 |39778 |0 |1 |2774A4|0 |2 |0 |
-ROW |74963 |2083 |39781 |0 |2 |F63100|0 |2 |0 |
-ROW |74964 |2084 |39792 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74965 |2084 |39790 |0 |1 |2774A4|0 |2 |0 |
-ROW |74966 |2084 |39793 |0 |2 |F63100|0 |2 |0 |
-ROW |74967 |2084 |39795 |0 |3 |A54F10|0 |2 |0 |
-ROW |74968 |2084 |39796 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74969 |1701 |35553 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74970 |1701 |35556 |0 |1 |2774A4|0 |2 |0 |
-ROW |74971 |1702 |35558 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74972 |1702 |35561 |0 |1 |2774A4|0 |2 |0 |
-ROW |74973 |1703 |35562 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74974 |1704 |35563 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74975 |1705 |35592 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74976 |1705 |35584 |0 |1 |2774A4|0 |2 |0 |
-ROW |74977 |1705 |35594 |0 |2 |F63100|0 |2 |0 |
-ROW |74978 |1705 |35586 |0 |3 |A54F10|0 |2 |0 |
-ROW |74979 |1705 |35595 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74980 |1705 |35587 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74981 |1706 |35593 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74982 |1706 |35585 |0 |1 |2774A4|0 |2 |0 |
-ROW |74983 |1707 |35583 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74984 |1707 |35591 |0 |1 |2774A4|0 |2 |0 |
-ROW |74985 |1708 |35598 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74986 |1709 |35606 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74987 |1710 |35607 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74988 |1711 |35566 |5 |0 |1A7C11|0 |2 |0 |
-ROW |74989 |1712 |35622 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74990 |1713 |35634 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74991 |1713 |35626 |0 |1 |2774A4|0 |2 |0 |
-ROW |74992 |1713 |35636 |0 |2 |F63100|0 |2 |0 |
-ROW |74993 |1713 |35628 |0 |3 |A54F10|0 |2 |0 |
-ROW |74994 |1713 |35637 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |74995 |1713 |35629 |0 |5 |6C59DC|0 |2 |0 |
-ROW |74996 |1714 |35635 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74997 |1714 |35627 |0 |1 |2774A4|0 |2 |0 |
-ROW |74998 |1715 |35625 |0 |0 |1A7C11|0 |2 |0 |
-ROW |74999 |1715 |35633 |0 |1 |2774A4|0 |2 |0 |
-ROW |75000 |1716 |35640 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75001 |1717 |35641 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75002 |1718 |35610 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75003 |1719 |35658 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75004 |1720 |35659 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75005 |1721 |35660 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75006 |1722 |35661 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75007 |1723 |35669 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75008 |1723 |35679 |0 |1 |2774A4|0 |2 |0 |
-ROW |75009 |1723 |35670 |0 |2 |F63100|0 |2 |0 |
-ROW |75010 |1723 |35665 |0 |3 |A54F10|0 |2 |0 |
-ROW |75011 |1723 |35672 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75012 |1723 |35666 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75013 |1724 |35663 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75014 |1724 |35664 |0 |1 |2774A4|0 |2 |0 |
-ROW |75015 |1725 |35686 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75016 |1725 |35693 |0 |1 |2774A4|0 |2 |0 |
-ROW |75017 |1725 |35684 |0 |2 |F63100|0 |2 |0 |
-ROW |75018 |1725 |35691 |0 |3 |A54F10|0 |2 |0 |
-ROW |75019 |1725 |35683 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75020 |1725 |35690 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75021 |1726 |35685 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75022 |1726 |35692 |0 |1 |2774A4|0 |2 |0 |
-ROW |75023 |1727 |35694 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75024 |1727 |35687 |0 |1 |2774A4|0 |2 |0 |
-ROW |75025 |1728 |35707 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75026 |1729 |35708 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75027 |1730 |35725 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75028 |1731 |35726 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75029 |1732 |35727 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75030 |1733 |35728 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75031 |1734 |35736 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75032 |1734 |35746 |0 |1 |2774A4|0 |2 |0 |
-ROW |75033 |1734 |35737 |0 |2 |F63100|0 |2 |0 |
-ROW |75034 |1734 |35732 |0 |3 |A54F10|0 |2 |0 |
-ROW |75035 |1734 |35739 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75036 |1734 |35733 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75037 |1735 |35730 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75038 |1735 |35731 |0 |1 |2774A4|0 |2 |0 |
-ROW |75039 |1736 |35753 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75040 |1736 |35760 |0 |1 |2774A4|0 |2 |0 |
-ROW |75041 |1736 |35751 |0 |2 |F63100|0 |2 |0 |
-ROW |75042 |1736 |35758 |0 |3 |A54F10|0 |2 |0 |
-ROW |75043 |1736 |35750 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75044 |1736 |35757 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75045 |1737 |35752 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75046 |1737 |35759 |0 |1 |2774A4|0 |2 |0 |
-ROW |75047 |1738 |35761 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75048 |1738 |35754 |0 |1 |2774A4|0 |2 |0 |
-ROW |75049 |1739 |35774 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75050 |1740 |35775 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75051 |1741 |35791 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75052 |1742 |35799 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75053 |1742 |35802 |0 |1 |2774A4|0 |2 |0 |
-ROW |75054 |1743 |35804 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75055 |1743 |35807 |0 |1 |2774A4|0 |2 |0 |
-ROW |75056 |1744 |35808 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75057 |1745 |35809 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75058 |1746 |35834 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75059 |1746 |35826 |0 |1 |2774A4|0 |2 |0 |
-ROW |75060 |1746 |35836 |0 |2 |F63100|0 |2 |0 |
-ROW |75061 |1746 |35828 |0 |3 |A54F10|0 |2 |0 |
-ROW |75062 |1746 |35837 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75063 |1746 |35829 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75064 |1747 |35835 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75065 |1747 |35827 |0 |1 |2774A4|0 |2 |0 |
-ROW |75066 |1748 |35825 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75067 |1748 |35833 |0 |1 |2774A4|0 |2 |0 |
-ROW |75068 |1749 |35840 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75069 |1750 |35812 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75070 |1751 |35876 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75071 |1751 |35868 |0 |1 |2774A4|0 |2 |0 |
-ROW |75072 |1751 |35878 |0 |2 |F63100|0 |2 |0 |
-ROW |75073 |1751 |35870 |0 |3 |A54F10|0 |2 |0 |
-ROW |75074 |1751 |35879 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75075 |1751 |35871 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75076 |1752 |35877 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75077 |1752 |35869 |0 |1 |2774A4|0 |2 |0 |
-ROW |75078 |1753 |35867 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75079 |1753 |35875 |0 |1 |2774A4|0 |2 |0 |
-ROW |75080 |1754 |35882 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75081 |1755 |35890 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75082 |1756 |35891 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75083 |1757 |35850 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75084 |1758 |35920 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75085 |1758 |35912 |0 |1 |2774A4|0 |2 |0 |
-ROW |75086 |1758 |35922 |0 |2 |F63100|0 |2 |0 |
-ROW |75087 |1758 |35914 |0 |3 |A54F10|0 |2 |0 |
-ROW |75088 |1758 |35923 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75089 |1758 |35915 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75090 |1759 |35921 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75091 |1759 |35913 |0 |1 |2774A4|0 |2 |0 |
-ROW |75092 |1760 |35911 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75093 |1760 |35919 |0 |1 |2774A4|0 |2 |0 |
-ROW |75094 |1761 |35926 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75095 |1762 |35934 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75096 |1763 |35935 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75097 |1764 |35894 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75098 |1765 |35952 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75099 |1766 |35964 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75100 |1766 |35956 |0 |1 |2774A4|0 |2 |0 |
-ROW |75101 |1766 |35966 |0 |2 |F63100|0 |2 |0 |
-ROW |75102 |1766 |35958 |0 |3 |A54F10|0 |2 |0 |
-ROW |75103 |1766 |35967 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75104 |1766 |35959 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75105 |1767 |35965 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75106 |1767 |35957 |0 |1 |2774A4|0 |2 |0 |
-ROW |75107 |1768 |35955 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75108 |1768 |35963 |0 |1 |2774A4|0 |2 |0 |
-ROW |75109 |1769 |35970 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75110 |1770 |35978 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75111 |1771 |35979 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75112 |1772 |35938 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75113 |1773 |35996 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75114 |1774 |36008 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75115 |1774 |36000 |0 |1 |2774A4|0 |2 |0 |
-ROW |75116 |1774 |36010 |0 |2 |F63100|0 |2 |0 |
-ROW |75117 |1774 |36002 |0 |3 |A54F10|0 |2 |0 |
-ROW |75118 |1774 |36011 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75119 |1774 |36003 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75120 |1775 |36009 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75121 |1775 |36001 |0 |1 |2774A4|0 |2 |0 |
-ROW |75122 |1776 |35999 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75123 |1776 |36007 |0 |1 |2774A4|0 |2 |0 |
-ROW |75124 |1777 |36014 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75125 |1778 |36022 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75126 |1779 |36023 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75127 |1780 |35982 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75128 |1781 |36041 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75129 |1782 |36053 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75130 |1782 |36045 |0 |1 |2774A4|0 |2 |0 |
-ROW |75131 |1782 |36055 |0 |2 |F63100|0 |2 |0 |
-ROW |75132 |1782 |36047 |0 |3 |A54F10|0 |2 |0 |
-ROW |75133 |1782 |36056 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75134 |1782 |36048 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75135 |1783 |36054 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75136 |1783 |36046 |0 |1 |2774A4|0 |2 |0 |
-ROW |75137 |1784 |36044 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75138 |1784 |36052 |0 |1 |2774A4|0 |2 |0 |
-ROW |75139 |1785 |36059 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75140 |1786 |36067 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75141 |1787 |36068 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75142 |1788 |36026 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75143 |1789 |36086 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75144 |1790 |36098 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75145 |1790 |36090 |0 |1 |2774A4|0 |2 |0 |
-ROW |75146 |1790 |36100 |0 |2 |F63100|0 |2 |0 |
-ROW |75147 |1790 |36092 |0 |3 |A54F10|0 |2 |0 |
-ROW |75148 |1790 |36101 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75149 |1790 |36093 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75150 |1791 |36099 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75151 |1791 |36091 |0 |1 |2774A4|0 |2 |0 |
-ROW |75152 |1792 |36089 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75153 |1792 |36097 |0 |1 |2774A4|0 |2 |0 |
-ROW |75154 |1793 |36104 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75155 |1794 |36112 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75156 |1795 |36113 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75157 |1796 |36071 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75158 |1797 |36131 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75159 |1798 |36144 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75160 |1798 |36136 |0 |1 |2774A4|0 |2 |0 |
-ROW |75161 |1798 |36146 |0 |2 |F63100|0 |2 |0 |
-ROW |75162 |1798 |36138 |0 |3 |A54F10|0 |2 |0 |
-ROW |75163 |1798 |36147 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75164 |1798 |36139 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75165 |1799 |36145 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75166 |1799 |36137 |0 |1 |2774A4|0 |2 |0 |
-ROW |75167 |1800 |36135 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75168 |1800 |36143 |0 |1 |2774A4|0 |2 |0 |
-ROW |75169 |1801 |36150 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75170 |1802 |36158 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75171 |1803 |36159 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75172 |1804 |36116 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75173 |1223 |31370 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75174 |1223 |31371 |5 |1 |2774A4|0 |2 |0 |
-ROW |75175 |1226 |31380 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75176 |1226 |31383 |5 |1 |2774A4|0 |2 |0 |
-ROW |75177 |1229 |31379 |0 |0 |1A7C11|1 |2 |0 |
-ROW |75178 |1229 |31382 |5 |1 |2774A4|0 |2 |0 |
-ROW |75179 |887 |29211 |0 |0 |969696|0 |9 |2 |
-ROW |75180 |887 |29210 |0 |1 |C80000|0 |9 |0 |
-ROW |75181 |899 |29216 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75182 |899 |29217 |2 |1 |2774A4|0 |2 |0 |
-ROW |75183 |899 |29218 |0 |2 |F63100|1 |2 |0 |
-ROW |75184 |899 |29219 |0 |3 |A54F10|1 |2 |0 |
-ROW |75185 |899 |29220 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |75186 |899 |29221 |0 |5 |6C59DC|1 |2 |0 |
-ROW |75187 |911 |29089 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75188 |911 |29102 |0 |1 |2774A4|0 |2 |0 |
-ROW |75189 |908 |29098 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75190 |908 |29097 |0 |1 |2774A4|0 |2 |0 |
-ROW |75191 |908 |29095 |0 |2 |F63100|0 |2 |0 |
-ROW |75192 |908 |29088 |0 |3 |A54F10|0 |2 |0 |
-ROW |75193 |908 |29094 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75194 |908 |29093 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75195 |908 |29092 |0 |6 |AC8C14|0 |2 |0 |
-ROW |75196 |908 |29091 |0 |7 |611F27|0 |2 |0 |
-ROW |75197 |908 |29090 |0 |8 |F230E0|0 |2 |0 |
-ROW |75198 |905 |29198 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75199 |917 |29104 |2 |0 |1A7C11|0 |2 |0 |
-ROW |75200 |917 |29105 |5 |1 |2774A4|0 |2 |0 |
-ROW |75201 |914 |31364 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75202 |923 |29118 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75203 |923 |29119 |0 |1 |2774A4|0 |2 |0 |
-ROW |75204 |923 |29117 |0 |2 |F63100|0 |2 |0 |
-ROW |75205 |920 |29107 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75206 |920 |29106 |0 |1 |2774A4|0 |2 |0 |
-ROW |75207 |902 |29096 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75208 |902 |29101 |0 |1 |2774A4|0 |2 |0 |
-ROW |75209 |902 |29100 |0 |2 |F63100|0 |2 |0 |
-ROW |75210 |902 |29087 |0 |3 |A54F10|1 |2 |0 |
-ROW |75211 |1279 |31902 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75212 |1279 |31903 |5 |1 |2774A4|0 |2 |0 |
-ROW |75213 |1281 |31933 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75214 |1281 |31936 |5 |1 |2774A4|0 |2 |0 |
-ROW |75215 |1283 |31932 |0 |0 |1A7C11|1 |2 |0 |
-ROW |75216 |1283 |31935 |5 |1 |2774A4|0 |2 |0 |
-ROW |75217 |1285 |31907 |0 |0 |969696|0 |9 |2 |
-ROW |75218 |1285 |31908 |0 |1 |C80000|0 |9 |0 |
-ROW |75219 |1287 |31911 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75220 |1287 |31914 |2 |1 |2774A4|0 |2 |0 |
-ROW |75221 |1287 |31913 |0 |2 |F63100|1 |2 |0 |
-ROW |75222 |1287 |31910 |0 |3 |A54F10|1 |2 |0 |
-ROW |75223 |1287 |31912 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |75224 |1287 |31909 |0 |5 |6C59DC|1 |2 |0 |
-ROW |75225 |1289 |31831 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75226 |1289 |31820 |0 |1 |2774A4|0 |2 |0 |
-ROW |75227 |1291 |31822 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75228 |1291 |31835 |0 |1 |2774A4|0 |2 |0 |
-ROW |75229 |1291 |31825 |0 |2 |F63100|0 |2 |0 |
-ROW |75230 |1291 |31826 |0 |3 |A54F10|0 |2 |0 |
-ROW |75231 |1291 |31823 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75232 |1291 |31827 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75233 |1291 |31824 |0 |6 |AC8C14|0 |2 |0 |
-ROW |75234 |1291 |31828 |0 |7 |611F27|0 |2 |0 |
-ROW |75235 |1291 |31830 |0 |8 |F230E0|0 |2 |0 |
-ROW |75236 |1293 |31892 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75237 |1295 |31855 |2 |0 |1A7C11|0 |2 |0 |
-ROW |75238 |1295 |31853 |5 |1 |2774A4|0 |2 |0 |
-ROW |75239 |1297 |31893 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75240 |1299 |31838 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75241 |1299 |31839 |0 |1 |2774A4|0 |2 |0 |
-ROW |75242 |1299 |31837 |0 |2 |F63100|0 |2 |0 |
-ROW |75243 |1301 |31850 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75244 |1301 |31852 |0 |1 |2774A4|0 |2 |0 |
-ROW |75245 |1303 |31829 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75246 |1303 |31833 |0 |1 |2774A4|0 |2 |0 |
-ROW |75247 |1303 |31834 |0 |2 |F63100|0 |2 |0 |
-ROW |75248 |1303 |31832 |0 |3 |A54F10|1 |2 |0 |
-ROW |75249 |952 |29436 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75250 |952 |29437 |2 |1 |2774A4|0 |2 |0 |
-ROW |75251 |952 |29438 |0 |2 |F63100|1 |2 |0 |
-ROW |75252 |952 |29439 |0 |3 |A54F10|1 |2 |0 |
-ROW |75253 |952 |29441 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |75254 |952 |29440 |0 |5 |6C59DC|1 |2 |0 |
-ROW |75255 |955 |29434 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75256 |955 |29435 |5 |1 |2774A4|0 |2 |0 |
-ROW |75257 |954 |29448 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75258 |954 |29449 |5 |1 |2774A4|0 |2 |0 |
-ROW |75259 |956 |29452 |0 |0 |1A7C11|1 |2 |0 |
-ROW |75260 |956 |29453 |5 |1 |2774A4|0 |2 |0 |
-ROW |75261 |953 |29446 |0 |0 |969696|0 |9 |2 |
-ROW |75262 |953 |29432 |0 |1 |C80000|0 |9 |0 |
-ROW |75263 |960 |29405 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75264 |960 |29406 |0 |1 |2774A4|0 |2 |0 |
-ROW |75265 |959 |29426 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75266 |959 |29413 |0 |1 |2774A4|0 |2 |0 |
-ROW |75267 |959 |29411 |0 |2 |F63100|0 |2 |0 |
-ROW |75268 |959 |29410 |0 |3 |A54F10|0 |2 |0 |
-ROW |75269 |959 |29399 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75270 |959 |29409 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75271 |959 |29412 |0 |6 |AC8C14|0 |2 |0 |
-ROW |75272 |959 |29408 |0 |7 |611F27|0 |2 |0 |
-ROW |75273 |959 |29407 |0 |8 |F230E0|0 |2 |0 |
-ROW |75274 |958 |29427 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75275 |962 |29403 |2 |0 |1A7C11|0 |2 |0 |
-ROW |75276 |962 |29402 |5 |1 |2774A4|0 |2 |0 |
-ROW |75277 |961 |29396 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75278 |963 |29400 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75279 |963 |29401 |0 |1 |2774A4|0 |2 |0 |
-ROW |75280 |957 |29420 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75281 |957 |29419 |0 |1 |2774A4|0 |2 |0 |
-ROW |75282 |957 |29418 |0 |2 |F63100|0 |2 |0 |
-ROW |75283 |957 |29417 |0 |3 |A54F10|1 |2 |0 |
-ROW |75284 |866 |29014 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75285 |866 |29015 |5 |1 |2774A4|0 |2 |0 |
-ROW |75286 |868 |29018 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75287 |868 |29019 |0 |1 |2774A4|0 |2 |0 |
-ROW |75288 |868 |29022 |0 |2 |F63100|0 |2 |0 |
-ROW |75289 |868 |29023 |0 |3 |A54F10|0 |2 |0 |
-ROW |75290 |868 |29020 |0 |4 |FC6EA3|0 |2 |0 |
-ROW |75291 |868 |29024 |0 |5 |6C59DC|0 |2 |0 |
-ROW |75292 |868 |29021 |0 |6 |AC8C14|0 |2 |0 |
-ROW |75293 |868 |29025 |0 |7 |611F27|0 |2 |0 |
-ROW |75294 |868 |29026 |0 |8 |F230E0|0 |2 |0 |
-ROW |75295 |870 |29048 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75296 |872 |29028 |0 |0 |969696|0 |9 |2 |
-ROW |75297 |872 |29027 |0 |1 |C80000|0 |9 |0 |
-ROW |75298 |882 |28992 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75299 |882 |28991 |0 |1 |2774A4|0 |2 |0 |
-ROW |75300 |876 |28982 |2 |0 |1A7C11|0 |2 |0 |
-ROW |75301 |876 |28983 |5 |1 |2774A4|0 |2 |0 |
-ROW |75302 |874 |28978 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75303 |878 |28985 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75304 |878 |28984 |0 |1 |2774A4|0 |2 |0 |
-ROW |75305 |880 |28987 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75306 |880 |28988 |0 |1 |2774A4|0 |2 |0 |
-ROW |75307 |880 |28989 |0 |2 |F63100|0 |2 |0 |
-ROW |75308 |880 |28990 |0 |3 |A54F10|1 |2 |0 |
-ROW |75309 |964 |29513 |0 |0 |969696|0 |9 |2 |
-ROW |75310 |964 |29512 |0 |1 |C80000|0 |9 |0 |
-ROW |75311 |1238 |31435 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75312 |1238 |31438 |2 |1 |2774A4|0 |2 |0 |
-ROW |75313 |1238 |31437 |0 |2 |F63100|1 |2 |0 |
-ROW |75314 |1238 |31434 |0 |3 |A54F10|1 |2 |0 |
-ROW |75315 |1238 |31436 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |75316 |1238 |31433 |0 |5 |6C59DC|1 |2 |0 |
-ROW |75317 |1488 |33321 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75318 |1488 |33324 |0 |1 |2774A4|0 |2 |0 |
-ROW |75319 |1490 |33322 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75320 |1490 |33323 |5 |1 |2774A4|0 |2 |0 |
-ROW |75321 |1240 |31441 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75322 |1240 |31442 |5 |1 |2774A4|0 |2 |0 |
-ROW |75323 |1242 |31440 |0 |0 |1A7C11|1 |2 |0 |
-ROW |75324 |1242 |31439 |5 |1 |2774A4|0 |2 |0 |
-ROW |75325 |974 |29456 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75326 |974 |29455 |0 |1 |2774A4|0 |2 |0 |
-ROW |75327 |976 |29458 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75328 |976 |29457 |0 |1 |2774A4|0 |2 |0 |
-ROW |75329 |972 |29454 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75330 |978 |29462 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75331 |980 |31421 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75332 |980 |29466 |0 |1 |2774A4|0 |2 |0 |
-ROW |75333 |1305 |32013 |0 |0 |969696|0 |9 |2 |
-ROW |75334 |1305 |32014 |0 |1 |C80000|0 |9 |0 |
-ROW |75335 |1307 |32017 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75336 |1307 |32020 |2 |1 |2774A4|0 |2 |0 |
-ROW |75337 |1307 |32019 |0 |2 |F63100|1 |2 |0 |
-ROW |75338 |1307 |32016 |0 |3 |A54F10|1 |2 |0 |
-ROW |75339 |1307 |32018 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |75340 |1307 |32015 |0 |5 |6C59DC|1 |2 |0 |
-ROW |75341 |1492 |33329 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75342 |1492 |33332 |0 |1 |2774A4|0 |2 |0 |
-ROW |75343 |1494 |33330 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75344 |1494 |33331 |5 |1 |2774A4|0 |2 |0 |
-ROW |75345 |1309 |32023 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75346 |1309 |32024 |5 |1 |2774A4|0 |2 |0 |
-ROW |75347 |1311 |32022 |0 |0 |1A7C11|1 |2 |0 |
-ROW |75348 |1311 |32021 |5 |1 |2774A4|0 |2 |0 |
-ROW |75349 |1313 |31952 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75350 |1313 |31949 |0 |1 |2774A4|0 |2 |0 |
-ROW |75351 |1315 |31951 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75352 |1315 |31950 |0 |1 |2774A4|0 |2 |0 |
-ROW |75353 |1317 |31954 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75354 |1319 |31973 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75355 |1321 |31969 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75356 |1321 |31970 |0 |1 |2774A4|0 |2 |0 |
-ROW |75357 |1583 |34451 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75358 |1584 |34465 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75359 |1584 |34463 |0 |1 |2774A4|0 |2 |0 |
-ROW |75360 |1585 |34466 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75361 |1585 |34462 |0 |1 |2774A4|0 |2 |0 |
-ROW |75362 |1586 |34499 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75363 |1587 |34513 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75364 |1587 |34511 |0 |1 |2774A4|0 |2 |0 |
-ROW |75365 |1588 |34514 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75366 |1588 |34510 |0 |1 |2774A4|0 |2 |0 |
-ROW |75367 |1589 |34547 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75368 |1590 |34561 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75369 |1590 |34559 |0 |1 |2774A4|0 |2 |0 |
-ROW |75370 |1591 |34562 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75371 |1591 |34558 |0 |1 |2774A4|0 |2 |0 |
-ROW |75372 |1592 |34595 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75373 |1593 |34609 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75374 |1593 |34607 |0 |1 |2774A4|0 |2 |0 |
-ROW |75375 |1594 |34610 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75376 |1594 |34606 |0 |1 |2774A4|0 |2 |0 |
-ROW |75377 |1595 |34643 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75378 |1596 |34657 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75379 |1596 |34655 |0 |1 |2774A4|0 |2 |0 |
-ROW |75380 |1597 |34658 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75381 |1597 |34654 |0 |1 |2774A4|0 |2 |0 |
-ROW |75382 |1619 |35016 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75383 |1620 |35030 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75384 |1620 |35028 |0 |1 |2774A4|0 |2 |0 |
-ROW |75385 |1621 |35031 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75386 |1621 |35027 |0 |1 |2774A4|0 |2 |0 |
-ROW |75387 |1601 |34739 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75388 |1602 |34753 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75389 |1602 |34751 |0 |1 |2774A4|0 |2 |0 |
-ROW |75390 |1603 |34754 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75391 |1603 |34750 |0 |1 |2774A4|0 |2 |0 |
-ROW |75392 |1604 |34787 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75393 |1569 |34192 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75394 |1569 |34180 |0 |1 |2774A4|0 |2 |0 |
-ROW |75395 |1570 |34194 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75396 |1570 |34190 |0 |1 |2774A4|0 |2 |0 |
-ROW |75397 |1605 |34793 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75398 |1606 |34807 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75399 |1606 |34805 |0 |1 |2774A4|0 |2 |0 |
-ROW |75400 |1607 |34808 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75401 |1607 |34804 |0 |1 |2774A4|0 |2 |0 |
-ROW |75402 |1608 |34841 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75403 |1609 |34855 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75404 |1609 |34853 |0 |1 |2774A4|0 |2 |0 |
-ROW |75405 |1610 |34856 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75406 |1610 |34852 |0 |1 |2774A4|0 |2 |0 |
-ROW |75407 |1611 |34889 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75408 |1612 |34903 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75409 |1612 |34901 |0 |1 |2774A4|0 |2 |0 |
-ROW |75410 |1613 |34904 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75411 |1613 |34900 |0 |1 |2774A4|0 |2 |0 |
-ROW |75412 |1518 |33705 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75413 |1519 |33724 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75414 |1519 |33722 |0 |1 |2774A4|0 |2 |0 |
-ROW |75415 |1519 |33726 |0 |2 |F63100|0 |2 |0 |
-ROW |75416 |1520 |33719 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75417 |1520 |33720 |0 |1 |2774A4|0 |2 |0 |
-ROW |75418 |1520 |33721 |0 |2 |F63100|0 |2 |0 |
-ROW |75419 |1521 |33725 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75420 |1521 |33723 |0 |1 |2774A4|0 |2 |0 |
-ROW |75421 |1521 |33727 |0 |2 |F63100|0 |2 |0 |
-ROW |75422 |1522 |33730 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75423 |1523 |33734 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75424 |1523 |33732 |0 |1 |2774A4|0 |2 |0 |
-ROW |75425 |1523 |33736 |0 |2 |F63100|0 |2 |0 |
-ROW |75426 |1524 |33735 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75427 |1524 |33733 |0 |1 |2774A4|0 |2 |0 |
-ROW |75428 |1524 |33737 |0 |2 |F63100|0 |2 |0 |
-ROW |75429 |1525 |33743 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75430 |1525 |33742 |0 |1 |2774A4|0 |2 |0 |
-ROW |75431 |1525 |33738 |0 |2 |F63100|0 |2 |0 |
-ROW |75432 |1526 |33692 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75433 |1526 |33693 |0 |1 |2774A4|0 |2 |0 |
-ROW |75434 |1571 |34269 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75435 |1571 |34270 |0 |1 |2774A4|0 |2 |0 |
-ROW |75436 |1571 |34271 |0 |2 |F63100|0 |2 |0 |
-ROW |75437 |1571 |34272 |0 |3 |A54F10|0 |2 |0 |
-ROW |75438 |1572 |34311 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75439 |1572 |34301 |0 |1 |2774A4|0 |2 |0 |
-ROW |75440 |1573 |34243 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75441 |1573 |34244 |0 |1 |2774A4|0 |2 |0 |
-ROW |75442 |1573 |34246 |0 |2 |F63100|0 |2 |0 |
-ROW |75443 |1573 |34245 |0 |3 |A54F10|0 |2 |0 |
-ROW |75444 |1574 |34239 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75445 |1574 |34227 |0 |1 |2774A4|0 |2 |0 |
-ROW |75446 |1574 |34236 |0 |2 |F63100|0 |2 |0 |
-ROW |75447 |1574 |34237 |0 |3 |A54F10|0 |2 |0 |
-ROW |75448 |1575 |34253 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75449 |1575 |34252 |0 |1 |2774A4|0 |2 |0 |
-ROW |75450 |1575 |34249 |0 |2 |F63100|0 |2 |0 |
-ROW |75451 |1575 |34251 |0 |3 |A54F10|0 |2 |0 |
-ROW |75452 |1496 |33368 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75453 |1497 |33371 |1 |0 |1A7C11|0 |2 |0 |
-ROW |75454 |1497 |33371 |1 |1 |2774A4|0 |2 |0 |
-ROW |75455 |1498 |33379 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75456 |1498 |33382 |2 |1 |2774A4|0 |2 |0 |
-ROW |75457 |1498 |33381 |0 |2 |F63100|1 |2 |0 |
-ROW |75458 |1498 |33378 |0 |3 |A54F10|1 |2 |0 |
-ROW |75459 |1498 |33380 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |75460 |1498 |33377 |0 |5 |6C59DC|1 |2 |0 |
-ROW |75461 |1142 |30689 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75462 |1805 |36187 |5 |0 |1A7C11|0 |2 |0 |
-ROW |75463 |1805 |36192 |2 |1 |2774A4|0 |2 |0 |
-ROW |75464 |1805 |36190 |0 |2 |F63100|1 |2 |0 |
-ROW |75465 |1805 |36185 |0 |3 |A54F10|1 |2 |0 |
-ROW |75466 |1805 |36189 |0 |4 |FC6EA3|1 |2 |0 |
-ROW |75467 |1805 |36184 |0 |5 |6C59DC|1 |2 |0 |
-ROW |75468 |1275 |31794 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75469 |1275 |31792 |0 |1 |2774A4|0 |2 |0 |
-ROW |75470 |1275 |31800 |0 |2 |F63100|1 |2 |0 |
-ROW |75471 |1276 |36771 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75472 |1276 |33390 |0 |1 |2774A4|0 |2 |0 |
-ROW |75473 |1276 |31799 |0 |2 |F63100|0 |2 |0 |
-ROW |75474 |1276 |31797 |0 |3 |A54F10|0 |2 |0 |
-ROW |75475 |1277 |36770 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75476 |1277 |33389 |0 |1 |2774A4|0 |2 |0 |
-ROW |75477 |1277 |31795 |0 |2 |F63100|0 |2 |0 |
-ROW |75478 |1278 |36769 |0 |0 |1A7C11|0 |2 |0 |
-ROW |75479 |1278 |31793 |0 |1 |2774A4|0 |2 |0 |
-ROW |75480 |1278 |31802 |0 |2 |F63100|0 |2 |0 |
-ROW |75481 |1278 |31790 |0 |3 |A54F10|0 |2 |0 |
-ROW |75482 |1278 |31791 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75483 |1397 |32451 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75484 |1397 |32450 |5 |1 |2774A4|0 |2 |0 |
+ROW |75485 |1398 |32452 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75486 |1398 |32449 |5 |1 |2774A4|0 |2 |0 |
+ROW |75487 |1399 |32444 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75488 |1399 |32446 |5 |1 |2774A4|0 |2 |0 |
+ROW |75489 |1399 |32448 |5 |2 |F63100|0 |2 |0 |
+ROW |75490 |1400 |32460 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75491 |1401 |32458 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75492 |1401 |32457 |5 |1 |2774A4|0 |2 |0 |
+ROW |75493 |1402 |32461 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75494 |1402 |32456 |5 |1 |2774A4|0 |2 |0 |
+ROW |75495 |1172 |30918 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75496 |1172 |30919 |0 |1 |2774A4|0 |2 |0 |
+ROW |75497 |1172 |30920 |0 |2 |F63100|0 |2 |0 |
+ROW |75498 |1172 |30921 |2 |3 |A54F10|0 |2 |0 |
+ROW |75499 |1173 |30922 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75500 |835 |28744 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75501 |835 |28745 |0 |1 |2774A4|0 |2 |0 |
+ROW |75502 |1174 |30913 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75503 |1175 |30906 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75504 |1175 |30908 |0 |1 |2774A4|0 |2 |0 |
+ROW |75505 |1175 |30915 |0 |2 |F63100|0 |2 |0 |
+ROW |75506 |1175 |30897 |0 |3 |A54F10|0 |2 |0 |
+ROW |75507 |1175 |30901 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75508 |1175 |30899 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75509 |1175 |30907 |0 |6 |AC8C14|0 |2 |0 |
+ROW |75510 |1175 |30905 |0 |7 |611F27|0 |2 |0 |
+ROW |75511 |1175 |30904 |0 |8 |F230E0|0 |2 |0 |
+ROW |75512 |1175 |30900 |0 |9 |FFAD40|0 |2 |0 |
+ROW |75513 |1175 |30898 |0 |10 |40CDFF|0 |2 |0 |
+ROW |75514 |1176 |30910 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75515 |1176 |30909 |0 |1 |2774A4|0 |2 |0 |
+ROW |75516 |836 |28798 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75517 |836 |28799 |0 |1 |2774A4|0 |2 |0 |
+ROW |75518 |836 |28800 |0 |2 |F63100|0 |2 |0 |
+ROW |75519 |836 |28801 |2 |3 |A54F10|0 |2 |0 |
+ROW |75520 |837 |28803 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75521 |838 |28793 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75522 |840 |28787 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75523 |840 |28784 |0 |1 |2774A4|0 |2 |0 |
+ROW |75524 |840 |28782 |0 |2 |F63100|0 |2 |0 |
+ROW |75525 |840 |28781 |0 |3 |A54F10|0 |2 |0 |
+ROW |75526 |840 |28780 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75527 |840 |28778 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75528 |840 |28786 |0 |6 |AC8C14|0 |2 |0 |
+ROW |75529 |840 |28785 |0 |7 |611F27|0 |2 |0 |
+ROW |75530 |840 |28783 |0 |8 |F230E0|0 |2 |0 |
+ROW |75531 |840 |28779 |0 |9 |FFAD40|0 |2 |0 |
+ROW |75532 |840 |28796 |0 |10 |40CDFF|0 |2 |0 |
+ROW |75533 |839 |28789 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75534 |839 |28788 |0 |1 |2774A4|0 |2 |0 |
+ROW |75535 |1339 |32172 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75536 |1339 |32173 |0 |1 |2774A4|0 |2 |0 |
+ROW |75537 |1403 |32511 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75538 |1403 |32514 |0 |1 |2774A4|0 |2 |0 |
+ROW |75539 |1404 |32512 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75540 |1404 |32515 |0 |1 |2774A4|0 |2 |0 |
+ROW |75541 |1405 |32507 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75542 |1405 |32508 |0 |1 |2774A4|0 |2 |0 |
+ROW |75543 |1405 |32513 |0 |2 |F63100|0 |2 |0 |
+ROW |75544 |1343 |32135 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75545 |1343 |32142 |0 |1 |2774A4|0 |2 |0 |
+ROW |75546 |1344 |32167 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75547 |1344 |32136 |0 |1 |2774A4|0 |2 |0 |
+ROW |75548 |1345 |32141 |1 |0 |1A7C11|0 |2 |0 |
+ROW |75549 |1345 |32138 |1 |1 |2774A4|0 |2 |0 |
+ROW |75550 |1346 |32156 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75551 |1346 |32158 |0 |1 |2774A4|0 |2 |0 |
+ROW |75552 |1346 |32159 |0 |2 |F63100|0 |2 |0 |
+ROW |75553 |1346 |32154 |2 |3 |A54F10|0 |2 |0 |
+ROW |75554 |1346 |32155 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75555 |1346 |32146 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75556 |1347 |32150 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75557 |1347 |32151 |0 |1 |2774A4|0 |2 |0 |
+ROW |75558 |1347 |32152 |0 |2 |F63100|0 |2 |0 |
+ROW |75559 |1622 |35078 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75560 |1622 |35091 |0 |1 |2774A4|0 |2 |0 |
+ROW |75561 |1622 |35098 |0 |2 |F63100|0 |2 |0 |
+ROW |75562 |1622 |35100 |0 |3 |A54F10|0 |2 |0 |
+ROW |75563 |1622 |35099 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75564 |1623 |35090 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75565 |1623 |35101 |0 |1 |2774A4|0 |2 |0 |
+ROW |75566 |1624 |35097 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75567 |1624 |35096 |0 |1 |2774A4|0 |2 |0 |
+ROW |75568 |1624 |35095 |0 |2 |F63100|0 |2 |0 |
+ROW |75569 |1625 |35089 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75570 |1625 |35088 |0 |1 |2774A4|0 |2 |0 |
+ROW |75571 |1625 |35087 |0 |2 |F63100|0 |2 |0 |
+ROW |75572 |1625 |35086 |0 |3 |A54F10|0 |2 |0 |
+ROW |75573 |1625 |35085 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75574 |1626 |35079 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75575 |1626 |35082 |0 |1 |2774A4|0 |2 |0 |
+ROW |75576 |1627 |35080 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75577 |1627 |35102 |0 |1 |2774A4|0 |2 |0 |
+ROW |75578 |1628 |35093 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75579 |1628 |35092 |0 |1 |2774A4|0 |2 |0 |
+ROW |75580 |1628 |35081 |0 |2 |F63100|0 |2 |0 |
+ROW |75581 |1628 |35084 |0 |3 |A54F10|0 |2 |0 |
+ROW |75582 |1628 |35083 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75583 |1121 |30606 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75584 |1121 |30590 |5 |1 |2774A4|0 |2 |0 |
+ROW |75585 |1121 |30582 |5 |2 |F63100|0 |2 |0 |
+ROW |75586 |1122 |30580 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75587 |1122 |30578 |5 |1 |2774A4|0 |2 |0 |
+ROW |75588 |1123 |30586 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75589 |1123 |30608 |2 |1 |2774A4|0 |2 |0 |
+ROW |75590 |1123 |30585 |2 |2 |F63100|0 |2 |0 |
+ROW |75591 |1123 |30589 |2 |3 |A54F10|0 |2 |0 |
+ROW |75592 |1123 |30584 |2 |4 |FC6EA3|0 |2 |0 |
+ROW |75593 |1123 |30588 |2 |5 |6C59DC|0 |2 |0 |
+ROW |75594 |1124 |30583 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75595 |1124 |30587 |2 |1 |2774A4|0 |2 |0 |
+ROW |75596 |1125 |30555 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75597 |1125 |30554 |2 |1 |2774A4|0 |2 |0 |
+ROW |75598 |1125 |30556 |2 |2 |F63100|0 |2 |0 |
+ROW |75599 |1125 |30557 |2 |3 |A54F10|0 |2 |0 |
+ROW |75600 |1126 |30565 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75601 |1127 |30567 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75602 |1127 |30568 |2 |1 |2774A4|0 |2 |0 |
+ROW |75603 |1128 |30536 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75604 |1129 |30566 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75605 |1129 |30549 |2 |1 |2774A4|0 |2 |0 |
+ROW |75606 |1129 |30553 |2 |2 |F63100|0 |2 |0 |
+ROW |75607 |1129 |30570 |2 |3 |A54F10|0 |2 |0 |
+ROW |75608 |1143 |30714 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75609 |1143 |30716 |0 |1 |2774A4|0 |2 |0 |
+ROW |75610 |1143 |30717 |0 |2 |F63100|0 |2 |0 |
+ROW |75611 |1143 |30715 |0 |3 |A54F10|0 |2 |0 |
+ROW |75612 |1144 |30753 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75613 |1144 |30738 |0 |1 |2774A4|0 |2 |0 |
+ROW |75614 |1145 |30718 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75615 |1145 |30737 |0 |1 |2774A4|0 |2 |0 |
+ROW |75616 |1145 |30727 |0 |2 |F63100|0 |2 |0 |
+ROW |75617 |1145 |30729 |0 |3 |A54F10|0 |2 |0 |
+ROW |75618 |1146 |30730 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75619 |1146 |30732 |0 |1 |2774A4|0 |2 |0 |
+ROW |75620 |1146 |30731 |0 |2 |F63100|0 |2 |0 |
+ROW |75621 |1146 |30733 |0 |3 |A54F10|0 |2 |0 |
+ROW |75622 |1147 |30734 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75623 |1147 |30736 |0 |1 |2774A4|0 |2 |0 |
+ROW |75624 |1147 |30735 |0 |2 |F63100|0 |2 |0 |
+ROW |75625 |1147 |30758 |0 |3 |A54F10|0 |2 |0 |
+ROW |75626 |1148 |30711 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75627 |1148 |30706 |0 |1 |2774A4|0 |2 |0 |
+ROW |75628 |1148 |30710 |0 |2 |F63100|0 |2 |0 |
+ROW |75629 |1148 |30712 |0 |3 |A54F10|0 |2 |0 |
+ROW |75630 |1148 |30702 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75631 |1148 |30707 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75632 |1148 |30704 |0 |6 |AC8C14|0 |2 |0 |
+ROW |75633 |1177 |30927 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75634 |1177 |30944 |2 |1 |2774A4|0 |2 |0 |
+ROW |75635 |1178 |30935 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75636 |1178 |30942 |0 |1 |2774A4|0 |2 |0 |
+ROW |75637 |1179 |30949 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75638 |1179 |30950 |0 |1 |2774A4|0 |2 |0 |
+ROW |75639 |1179 |30951 |0 |2 |F63100|0 |2 |0 |
+ROW |75640 |1180 |30952 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75641 |1180 |30954 |0 |1 |2774A4|0 |2 |0 |
+ROW |75642 |1180 |30955 |0 |2 |F63100|0 |2 |0 |
+ROW |75643 |1181 |30936 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75644 |1181 |30940 |5 |1 |2774A4|0 |2 |0 |
+ROW |75645 |1182 |30930 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75646 |1182 |30929 |0 |1 |2774A4|0 |2 |0 |
+ROW |75647 |1182 |30928 |0 |2 |F63100|0 |2 |0 |
+ROW |75648 |1182 |30931 |2 |3 |A54F10|1 |2 |0 |
+ROW |75649 |1183 |30934 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75650 |1183 |30941 |0 |1 |2774A4|0 |2 |0 |
+ROW |75651 |1406 |32532 |0 |0 |1A7C11|1 |2 |0 |
+ROW |75652 |1406 |32535 |0 |1 |2774A4|1 |2 |0 |
+ROW |75653 |1406 |32533 |0 |2 |F63100|0 |2 |0 |
+ROW |75654 |1406 |32534 |0 |3 |A54F10|0 |2 |0 |
+ROW |75655 |1406 |32536 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75656 |1406 |32537 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75657 |1407 |32543 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75658 |1407 |32544 |0 |1 |2774A4|0 |2 |0 |
+ROW |75659 |1408 |32518 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75660 |1408 |32521 |0 |1 |2774A4|0 |2 |0 |
+ROW |75661 |1408 |32523 |0 |2 |F63100|0 |2 |0 |
+ROW |75662 |1408 |32524 |0 |3 |A54F10|0 |2 |0 |
+ROW |75663 |1409 |32562 |0 |0 |1A7C11|1 |2 |0 |
+ROW |75664 |1409 |32565 |0 |1 |2774A4|1 |2 |0 |
+ROW |75665 |1409 |32563 |0 |2 |F63100|0 |2 |0 |
+ROW |75666 |1409 |32564 |0 |3 |A54F10|0 |2 |0 |
+ROW |75667 |1409 |32566 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75668 |1409 |32567 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75669 |1410 |32573 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75670 |1410 |32574 |0 |1 |2774A4|0 |2 |0 |
+ROW |75671 |1411 |32548 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75672 |1411 |32551 |0 |1 |2774A4|0 |2 |0 |
+ROW |75673 |1411 |32553 |0 |2 |F63100|0 |2 |0 |
+ROW |75674 |1411 |32554 |0 |3 |A54F10|0 |2 |0 |
+ROW |75675 |1250 |31527 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75676 |1250 |31529 |0 |1 |2774A4|0 |2 |0 |
+ROW |75677 |1250 |31499 |0 |2 |F63100|0 |2 |0 |
+ROW |75678 |1251 |31532 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75679 |1251 |31534 |0 |1 |2774A4|0 |2 |0 |
+ROW |75680 |1251 |31538 |0 |2 |F63100|0 |2 |0 |
+ROW |75681 |1251 |31536 |0 |3 |A54F10|0 |2 |0 |
+ROW |75682 |1251 |31528 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75683 |1251 |31542 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75684 |1252 |31552 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75685 |1252 |31551 |0 |1 |2774A4|0 |2 |0 |
+ROW |75686 |1252 |31541 |0 |2 |F63100|0 |2 |0 |
+ROW |75687 |1253 |31513 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75688 |1253 |31526 |0 |1 |2774A4|0 |2 |0 |
+ROW |75689 |1253 |31525 |0 |2 |F63100|0 |2 |0 |
+ROW |75690 |1254 |31502 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75691 |1254 |31501 |0 |1 |2774A4|0 |2 |0 |
+ROW |75692 |1254 |31503 |0 |2 |F63100|0 |2 |0 |
+ROW |75693 |1255 |31505 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75694 |1255 |31504 |0 |1 |2774A4|0 |2 |0 |
+ROW |75695 |1255 |31506 |0 |2 |F63100|0 |2 |0 |
+ROW |75696 |1256 |31508 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75697 |1256 |31507 |0 |1 |2774A4|0 |2 |0 |
+ROW |75698 |1256 |31509 |0 |2 |F63100|0 |2 |0 |
+ROW |75699 |1257 |31511 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75700 |1257 |31510 |0 |1 |2774A4|0 |2 |0 |
+ROW |75701 |1257 |31500 |0 |2 |F63100|0 |2 |0 |
+ROW |75702 |1258 |31514 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75703 |1258 |31512 |0 |1 |2774A4|0 |2 |0 |
+ROW |75704 |1258 |31515 |0 |2 |F63100|0 |2 |0 |
+ROW |75705 |1259 |31516 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75706 |1259 |31517 |0 |1 |2774A4|0 |2 |0 |
+ROW |75707 |1260 |31523 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75708 |1260 |31522 |0 |1 |2774A4|0 |2 |0 |
+ROW |75709 |1260 |31524 |0 |2 |F63100|0 |2 |0 |
+ROW |75710 |1412 |32601 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75711 |1412 |32602 |0 |1 |2774A4|0 |2 |0 |
+ROW |75712 |1412 |32603 |0 |2 |F63100|0 |2 |0 |
+ROW |75713 |1412 |32604 |0 |3 |A54F10|0 |2 |0 |
+ROW |75714 |1412 |32606 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75715 |1412 |32606 |2 |5 |6C59DC|0 |2 |0 |
+ROW |75716 |1413 |32608 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75717 |1413 |32610 |0 |1 |2774A4|0 |2 |0 |
+ROW |75718 |1413 |32611 |0 |2 |F63100|0 |2 |0 |
+ROW |75719 |1414 |32582 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75720 |1414 |32580 |2 |1 |2774A4|0 |2 |0 |
+ROW |75721 |1414 |32581 |2 |2 |F63100|0 |2 |0 |
+ROW |75722 |1414 |32597 |0 |3 |A54F10|1 |2 |0 |
+ROW |75723 |1414 |32599 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |75724 |1414 |32588 |0 |5 |6C59DC|1 |2 |0 |
+ROW |75725 |1415 |32583 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75726 |1415 |32584 |0 |1 |2774A4|0 |2 |0 |
+ROW |75727 |1415 |32585 |0 |2 |F63100|0 |2 |0 |
+ROW |75728 |1415 |32579 |2 |3 |A54F10|0 |2 |0 |
+ROW |75729 |1416 |32587 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75730 |1416 |32590 |0 |1 |2774A4|0 |2 |0 |
+ROW |75731 |1416 |32589 |0 |2 |F63100|0 |2 |0 |
+ROW |75732 |1417 |32673 |1 |0 |1A7C11|0 |2 |0 |
+ROW |75733 |1417 |32679 |1 |1 |2774A4|0 |2 |0 |
+ROW |75734 |1629 |35114 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75735 |1629 |35113 |5 |1 |2774A4|0 |2 |0 |
+ROW |75736 |1075 |30204 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75737 |1075 |30205 |0 |1 |2774A4|0 |2 |0 |
+ROW |75738 |1630 |35112 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75739 |1630 |35111 |0 |1 |2774A4|0 |2 |0 |
+ROW |75740 |1630 |35110 |0 |2 |F63100|0 |2 |0 |
+ROW |75741 |1630 |35108 |0 |3 |A54F10|0 |2 |0 |
+ROW |75742 |1630 |35105 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75743 |1076 |30209 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75744 |1076 |30208 |0 |1 |2774A4|0 |2 |0 |
+ROW |75745 |1077 |30206 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75746 |1077 |30207 |5 |1 |2774A4|0 |2 |0 |
+ROW |75747 |1078 |30216 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75748 |1078 |30215 |0 |1 |2774A4|0 |2 |0 |
+ROW |75749 |1079 |30210 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75750 |1079 |30211 |0 |1 |2774A4|0 |2 |0 |
+ROW |75751 |1079 |30212 |0 |2 |F63100|0 |2 |0 |
+ROW |75752 |1079 |30213 |0 |3 |A54F10|0 |2 |0 |
+ROW |75753 |1079 |30214 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75754 |1631 |35127 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75755 |1631 |35126 |5 |1 |2774A4|0 |2 |0 |
+ROW |75756 |1632 |35124 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75757 |1632 |35123 |0 |1 |2774A4|0 |2 |0 |
+ROW |75758 |1632 |35122 |0 |2 |F63100|0 |2 |0 |
+ROW |75759 |1632 |30222 |0 |3 |A54F10|0 |2 |0 |
+ROW |75760 |1632 |30223 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75761 |1080 |30226 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75762 |1080 |30225 |0 |1 |2774A4|0 |2 |0 |
+ROW |75763 |1633 |35139 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75764 |1633 |35138 |5 |1 |2774A4|0 |2 |0 |
+ROW |75765 |1081 |30247 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75766 |1081 |30248 |0 |1 |2774A4|0 |2 |0 |
+ROW |75767 |1634 |35137 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75768 |1634 |35136 |0 |1 |2774A4|0 |2 |0 |
+ROW |75769 |1634 |35135 |0 |2 |F63100|0 |2 |0 |
+ROW |75770 |1634 |35133 |0 |3 |A54F10|0 |2 |0 |
+ROW |75771 |1634 |35130 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75772 |1082 |30252 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75773 |1082 |30251 |0 |1 |2774A4|0 |2 |0 |
+ROW |75774 |1083 |30249 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75775 |1083 |30250 |5 |1 |2774A4|0 |2 |0 |
+ROW |75776 |1084 |30259 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75777 |1084 |30258 |0 |1 |2774A4|0 |2 |0 |
+ROW |75778 |1085 |30253 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75779 |1085 |30254 |0 |1 |2774A4|0 |2 |0 |
+ROW |75780 |1085 |30255 |0 |2 |F63100|0 |2 |0 |
+ROW |75781 |1085 |30256 |0 |3 |A54F10|0 |2 |0 |
+ROW |75782 |1085 |30257 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75783 |1635 |35152 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75784 |1635 |35151 |5 |1 |2774A4|0 |2 |0 |
+ROW |75785 |1636 |35149 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75786 |1636 |35148 |0 |1 |2774A4|0 |2 |0 |
+ROW |75787 |1636 |35147 |0 |2 |F63100|0 |2 |0 |
+ROW |75788 |1636 |30265 |0 |3 |A54F10|0 |2 |0 |
+ROW |75789 |1636 |30266 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75790 |1086 |30269 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75791 |1086 |30268 |0 |1 |2774A4|0 |2 |0 |
+ROW |75792 |1184 |30982 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75793 |1184 |30980 |5 |1 |2774A4|0 |2 |0 |
+ROW |75794 |1185 |30983 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75795 |1185 |30981 |0 |1 |2774A4|0 |2 |0 |
+ROW |75796 |1186 |30976 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75797 |1186 |30985 |0 |1 |2774A4|0 |2 |0 |
+ROW |75798 |1186 |30997 |0 |2 |F63100|0 |2 |0 |
+ROW |75799 |1186 |30970 |0 |3 |A54F10|0 |2 |0 |
+ROW |75800 |1186 |30973 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75801 |1186 |30995 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75802 |1186 |30998 |0 |6 |AC8C14|0 |2 |0 |
+ROW |75803 |1186 |30978 |0 |7 |611F27|0 |2 |0 |
+ROW |75804 |1187 |31024 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75805 |1187 |31022 |5 |1 |2774A4|0 |2 |0 |
+ROW |75806 |1188 |31025 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75807 |1188 |31023 |0 |1 |2774A4|0 |2 |0 |
+ROW |75808 |1189 |31018 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75809 |1189 |31027 |0 |1 |2774A4|0 |2 |0 |
+ROW |75810 |1189 |31039 |0 |2 |F63100|0 |2 |0 |
+ROW |75811 |1189 |31012 |0 |3 |A54F10|0 |2 |0 |
+ROW |75812 |1189 |31015 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75813 |1189 |31037 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75814 |1189 |31040 |0 |6 |AC8C14|0 |2 |0 |
+ROW |75815 |1189 |31020 |0 |7 |611F27|0 |2 |0 |
+ROW |75816 |1499 |33478 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75817 |1499 |33467 |0 |1 |2774A4|0 |2 |0 |
+ROW |75818 |1500 |33468 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75819 |1500 |33479 |0 |1 |2774A4|0 |2 |0 |
+ROW |75820 |1501 |33442 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75821 |1501 |33441 |0 |1 |2774A4|0 |2 |0 |
+ROW |75822 |1501 |33440 |0 |2 |F63100|0 |2 |0 |
+ROW |75823 |1502 |33423 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75824 |1502 |33419 |0 |1 |2774A4|0 |2 |0 |
+ROW |75825 |1502 |33422 |0 |2 |F63100|0 |2 |0 |
+ROW |75826 |1502 |33421 |0 |3 |A54F10|0 |2 |0 |
+ROW |75827 |1502 |33412 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75828 |1418 |32700 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75829 |1418 |32699 |0 |1 |2774A4|0 |2 |0 |
+ROW |75830 |1419 |32710 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75831 |1419 |32709 |0 |1 |2774A4|0 |2 |0 |
+ROW |75832 |1420 |32693 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75833 |1420 |32724 |0 |1 |2774A4|0 |2 |0 |
+ROW |75834 |1421 |32730 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75835 |1421 |32731 |0 |1 |2774A4|0 |2 |0 |
+ROW |75836 |1421 |32728 |0 |2 |F63100|0 |2 |0 |
+ROW |75837 |1421 |32729 |0 |3 |A54F10|0 |2 |0 |
+ROW |75838 |1422 |32705 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75839 |1422 |32706 |0 |1 |2774A4|0 |2 |0 |
+ROW |75840 |1423 |32702 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75841 |1423 |32703 |0 |1 |2774A4|0 |2 |0 |
+ROW |75842 |1424 |32708 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75843 |1424 |32722 |2 |1 |2774A4|0 |2 |0 |
+ROW |75844 |1424 |32695 |0 |2 |F63100|0 |2 |0 |
+ROW |75845 |1424 |32753 |0 |3 |A54F10|0 |2 |0 |
+ROW |75846 |1424 |32740 |2 |4 |FC6EA3|0 |2 |0 |
+ROW |75847 |1424 |32723 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75848 |1424 |32747 |0 |6 |AC8C14|0 |2 |0 |
+ROW |75849 |1424 |32748 |2 |7 |611F27|0 |2 |0 |
+ROW |75850 |1424 |32749 |0 |8 |F230E0|0 |2 |0 |
+ROW |75851 |1424 |32750 |0 |9 |FFAD40|0 |2 |0 |
+ROW |75852 |1424 |32751 |2 |10 |40CDFF|0 |2 |0 |
+ROW |75853 |1424 |32752 |0 |11 |40FFA0|0 |2 |0 |
+ROW |75854 |1425 |32746 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75855 |1425 |32745 |2 |1 |2774A4|0 |2 |0 |
+ROW |75856 |1425 |32744 |0 |2 |F63100|0 |2 |0 |
+ROW |75857 |1425 |32743 |0 |3 |A54F10|0 |2 |0 |
+ROW |75858 |1425 |32743 |2 |4 |FC6EA3|0 |2 |0 |
+ROW |75859 |1425 |32742 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75860 |1426 |32720 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75861 |1426 |32721 |0 |1 |2774A4|0 |2 |0 |
+ROW |75862 |1426 |32719 |0 |2 |F63100|0 |2 |0 |
+ROW |75863 |1426 |32718 |0 |3 |A54F10|0 |2 |0 |
+ROW |75864 |1130 |30613 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75865 |1130 |30635 |0 |1 |2774A4|0 |2 |0 |
+ROW |75866 |1130 |30625 |0 |2 |F63100|0 |2 |0 |
+ROW |75867 |1131 |30632 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75868 |1131 |30633 |5 |1 |2774A4|0 |2 |0 |
+ROW |75869 |1131 |30629 |5 |2 |F63100|0 |2 |0 |
+ROW |75870 |1132 |30630 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75871 |1132 |30628 |2 |1 |2774A4|0 |2 |0 |
+ROW |75872 |1132 |30631 |2 |2 |F63100|0 |2 |0 |
+ROW |75873 |1133 |30619 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75874 |1133 |30618 |0 |1 |2774A4|0 |2 |0 |
+ROW |75875 |1134 |30623 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75876 |1134 |30622 |5 |1 |2774A4|0 |2 |0 |
+ROW |75877 |1135 |30615 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75878 |841 |28813 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75879 |841 |28811 |0 |1 |2774A4|0 |2 |0 |
+ROW |75880 |841 |28812 |0 |2 |F63100|0 |2 |0 |
+ROW |75881 |841 |28814 |0 |3 |A54F10|0 |2 |0 |
+ROW |75882 |842 |28817 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75883 |842 |28815 |0 |1 |2774A4|0 |2 |0 |
+ROW |75884 |842 |28816 |0 |2 |F63100|0 |2 |0 |
+ROW |75885 |844 |28808 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75886 |844 |28807 |0 |1 |2774A4|0 |2 |0 |
+ROW |75887 |843 |28818 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75888 |845 |28829 |2 |0 |1A7C11|0 |2 |0 |
+ROW |75889 |845 |28831 |0 |1 |2774A4|0 |2 |0 |
+ROW |75890 |845 |28832 |0 |2 |F63100|0 |2 |0 |
+ROW |75891 |845 |28830 |0 |3 |A54F10|0 |2 |0 |
+ROW |75892 |846 |28826 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75893 |846 |28828 |0 |1 |2774A4|0 |2 |0 |
+ROW |75894 |846 |28827 |0 |2 |F63100|0 |2 |0 |
+ROW |75895 |847 |28825 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75896 |1637 |35187 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75897 |1638 |35189 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75898 |1638 |35188 |5 |1 |2774A4|0 |2 |0 |
+ROW |75899 |1638 |35190 |5 |2 |F63100|0 |2 |0 |
+ROW |75900 |1638 |35191 |5 |3 |A54F10|0 |2 |0 |
+ROW |75901 |1638 |35192 |5 |4 |FC6EA3|0 |2 |0 |
+ROW |75902 |1639 |35198 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75903 |1640 |35200 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75904 |1640 |35199 |5 |1 |2774A4|0 |2 |0 |
+ROW |75905 |1640 |35201 |5 |2 |F63100|0 |2 |0 |
+ROW |75906 |1640 |35202 |5 |3 |A54F10|0 |2 |0 |
+ROW |75907 |1640 |35203 |5 |4 |FC6EA3|0 |2 |0 |
+ROW |75908 |1641 |35221 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75909 |1641 |35220 |5 |1 |2774A4|0 |2 |0 |
+ROW |75910 |1641 |35219 |5 |2 |F63100|0 |2 |0 |
+ROW |75911 |1642 |35214 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75912 |1642 |35216 |5 |1 |2774A4|0 |2 |0 |
+ROW |75913 |1642 |35207 |5 |2 |F63100|0 |2 |0 |
+ROW |75914 |1642 |35213 |5 |3 |A54F10|0 |2 |0 |
+ROW |75915 |1642 |35212 |5 |4 |FC6EA3|0 |2 |0 |
+ROW |75916 |1643 |35228 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75917 |1643 |35229 |5 |1 |2774A4|0 |2 |0 |
+ROW |75918 |1643 |35227 |5 |2 |F63100|0 |2 |0 |
+ROW |75919 |1644 |35231 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75920 |1644 |35230 |5 |1 |2774A4|0 |2 |0 |
+ROW |75921 |1644 |35235 |5 |2 |F63100|0 |2 |0 |
+ROW |75922 |1644 |35233 |5 |3 |A54F10|0 |2 |0 |
+ROW |75923 |1644 |35232 |5 |4 |FC6EA3|0 |2 |0 |
+ROW |75924 |1644 |35234 |5 |5 |6C59DC|0 |2 |0 |
+ROW |75925 |1644 |35236 |5 |6 |AC8C14|0 |2 |0 |
+ROW |75926 |1644 |35237 |5 |7 |611F27|0 |2 |0 |
+ROW |75927 |1645 |35243 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75928 |1645 |35244 |5 |1 |2774A4|0 |2 |0 |
+ROW |75929 |1645 |35245 |5 |2 |F63100|0 |2 |0 |
+ROW |75930 |1646 |35252 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75931 |1646 |35253 |5 |1 |2774A4|0 |2 |0 |
+ROW |75932 |1646 |35254 |5 |2 |F63100|0 |2 |0 |
+ROW |75933 |1647 |35172 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75934 |1647 |35168 |5 |1 |2774A4|0 |2 |0 |
+ROW |75935 |1647 |35164 |5 |2 |F63100|0 |2 |0 |
+ROW |75936 |1647 |35163 |5 |3 |A54F10|0 |2 |0 |
+ROW |75937 |1648 |35170 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75938 |1649 |35167 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75939 |1649 |35166 |5 |1 |2774A4|0 |2 |0 |
+ROW |75940 |1649 |35165 |5 |2 |F63100|0 |2 |0 |
+ROW |75941 |1650 |35176 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75942 |1262 |31592 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75943 |1262 |31584 |0 |1 |2774A4|0 |2 |0 |
+ROW |75944 |1262 |31582 |0 |2 |F63100|0 |2 |0 |
+ROW |75945 |1262 |31585 |0 |3 |A54F10|0 |2 |0 |
+ROW |75946 |1263 |31591 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75947 |1263 |31583 |0 |1 |2774A4|0 |2 |0 |
+ROW |75948 |1263 |31590 |0 |2 |F63100|0 |2 |0 |
+ROW |75949 |1264 |31602 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75950 |1264 |31597 |0 |1 |2774A4|0 |2 |0 |
+ROW |75951 |1264 |31601 |0 |2 |F63100|0 |2 |0 |
+ROW |75952 |1264 |31604 |0 |3 |A54F10|0 |2 |0 |
+ROW |75953 |1265 |31609 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75954 |1265 |31610 |0 |1 |2774A4|0 |2 |0 |
+ROW |75955 |1265 |31608 |0 |2 |F63100|0 |2 |0 |
+ROW |75956 |1001 |29729 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75957 |1001 |29728 |0 |1 |2774A4|0 |2 |0 |
+ROW |75958 |1001 |29727 |0 |2 |F63100|0 |2 |0 |
+ROW |75959 |1001 |29725 |0 |3 |A54F10|0 |2 |0 |
+ROW |75960 |1001 |29723 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75961 |1001 |29733 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75962 |1001 |29737 |0 |6 |AC8C14|0 |2 |0 |
+ROW |75963 |1001 |29731 |0 |7 |611F27|0 |2 |0 |
+ROW |75964 |1000 |29720 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75965 |1000 |29730 |0 |1 |2774A4|0 |2 |0 |
+ROW |75966 |1000 |29721 |0 |2 |F63100|0 |2 |0 |
+ROW |75967 |1000 |29726 |0 |3 |A54F10|0 |2 |0 |
+ROW |75968 |1000 |29724 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75969 |1000 |29734 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75970 |1000 |29722 |0 |6 |AC8C14|0 |2 |0 |
+ROW |75971 |1000 |29732 |0 |7 |611F27|0 |2 |0 |
+ROW |75972 |1027 |30022 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75973 |1027 |30021 |0 |1 |2774A4|0 |2 |0 |
+ROW |75974 |1027 |30019 |0 |2 |F63100|0 |2 |0 |
+ROW |75975 |1008 |29698 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75976 |1008 |29700 |2 |1 |FF0000|0 |2 |0 |
+ROW |75977 |1007 |29691 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75978 |1013 |29657 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75979 |1013 |29658 |0 |1 |2774A4|0 |2 |0 |
+ROW |75980 |1009 |29687 |5 |0 |1A7C11|0 |2 |0 |
+ROW |75981 |1009 |29694 |2 |1 |FF0000|0 |2 |0 |
+ROW |75982 |1029 |30017 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75983 |1029 |30016 |0 |1 |2774A4|0 |2 |0 |
+ROW |75984 |1029 |30015 |0 |2 |F63100|0 |2 |0 |
+ROW |75985 |1031 |30007 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75986 |1031 |30013 |0 |1 |2774A4|0 |2 |0 |
+ROW |75987 |1031 |30011 |0 |2 |F63100|0 |2 |0 |
+ROW |75988 |1031 |30009 |0 |3 |A54F10|0 |2 |0 |
+ROW |75989 |1031 |30005 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75990 |1031 |30003 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75991 |1031 |30023 |0 |6 |AC8C14|0 |2 |0 |
+ROW |75992 |1031 |30001 |0 |7 |611F27|0 |2 |0 |
+ROW |75993 |1030 |30008 |0 |0 |1A7C11|0 |2 |0 |
+ROW |75994 |1030 |30014 |0 |1 |2774A4|0 |2 |0 |
+ROW |75995 |1030 |30012 |0 |2 |F63100|0 |2 |0 |
+ROW |75996 |1030 |30010 |0 |3 |A54F10|0 |2 |0 |
+ROW |75997 |1030 |30006 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |75998 |1030 |30004 |0 |5 |6C59DC|0 |2 |0 |
+ROW |75999 |1030 |30000 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76000 |1030 |30002 |0 |7 |611F27|0 |2 |0 |
+ROW |76001 |1011 |29695 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76002 |1028 |30020 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76003 |1010 |29701 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76004 |1010 |29697 |0 |1 |2774A4|0 |2 |0 |
+ROW |76005 |1012 |29692 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76006 |1015 |29812 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76007 |1015 |29811 |0 |1 |2774A4|0 |2 |0 |
+ROW |76008 |1015 |29810 |0 |2 |F63100|0 |2 |0 |
+ROW |76009 |1015 |29808 |0 |3 |A54F10|0 |2 |0 |
+ROW |76010 |1015 |29806 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76011 |1015 |29816 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76012 |1015 |29820 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76013 |1015 |29814 |0 |7 |611F27|0 |2 |0 |
+ROW |76014 |1014 |29803 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76015 |1014 |29813 |0 |1 |2774A4|0 |2 |0 |
+ROW |76016 |1014 |29804 |0 |2 |F63100|0 |2 |0 |
+ROW |76017 |1014 |29809 |0 |3 |A54F10|0 |2 |0 |
+ROW |76018 |1014 |29807 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76019 |1014 |29817 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76020 |1014 |29805 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76021 |1014 |29815 |0 |7 |611F27|0 |2 |0 |
+ROW |76022 |1016 |29768 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76023 |1016 |29767 |0 |1 |2774A4|0 |2 |0 |
+ROW |76024 |1016 |29765 |0 |2 |F63100|0 |2 |0 |
+ROW |76025 |1022 |29782 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76026 |1022 |29781 |2 |1 |FF0000|0 |2 |0 |
+ROW |76027 |1021 |29783 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76028 |1023 |29780 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76029 |1023 |29784 |2 |1 |FF0000|0 |2 |0 |
+ROW |76030 |1018 |29763 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76031 |1018 |29762 |0 |1 |2774A4|0 |2 |0 |
+ROW |76032 |1018 |29761 |0 |2 |F63100|0 |2 |0 |
+ROW |76033 |1020 |29753 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76034 |1020 |29759 |0 |1 |2774A4|0 |2 |0 |
+ROW |76035 |1020 |29757 |0 |2 |F63100|0 |2 |0 |
+ROW |76036 |1020 |29755 |0 |3 |A54F10|0 |2 |0 |
+ROW |76037 |1020 |29751 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76038 |1020 |29749 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76039 |1020 |29769 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76040 |1020 |29747 |0 |7 |611F27|0 |2 |0 |
+ROW |76041 |1019 |29754 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76042 |1019 |29760 |0 |1 |2774A4|0 |2 |0 |
+ROW |76043 |1019 |29758 |0 |2 |F63100|0 |2 |0 |
+ROW |76044 |1019 |29756 |0 |3 |A54F10|0 |2 |0 |
+ROW |76045 |1019 |29752 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76046 |1019 |29750 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76047 |1019 |29746 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76048 |1019 |29748 |0 |7 |611F27|0 |2 |0 |
+ROW |76049 |1025 |29775 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76050 |1017 |29766 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76051 |1024 |29776 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76052 |1024 |29777 |0 |1 |2774A4|0 |2 |0 |
+ROW |76053 |1026 |29772 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76054 |1356 |32276 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76055 |1356 |32275 |0 |1 |2774A4|0 |2 |0 |
+ROW |76056 |1357 |32281 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76057 |1357 |32267 |0 |1 |2774A4|0 |2 |0 |
+ROW |76058 |1357 |32279 |0 |2 |F63100|0 |2 |0 |
+ROW |76059 |1358 |32268 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76060 |1358 |32274 |0 |1 |2774A4|0 |2 |0 |
+ROW |76061 |1358 |32271 |0 |2 |F63100|0 |2 |0 |
+ROW |76062 |1359 |32288 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76063 |1359 |32291 |0 |1 |2774A4|0 |2 |0 |
+ROW |76064 |1360 |32247 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76065 |1360 |32245 |0 |1 |2774A4|0 |2 |0 |
+ROW |76066 |1360 |32246 |0 |2 |F63100|0 |2 |0 |
+ROW |76067 |1361 |32248 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76068 |1361 |32249 |0 |1 |2774A4|0 |2 |0 |
+ROW |76069 |1361 |32250 |0 |2 |F63100|0 |2 |0 |
+ROW |76070 |1362 |32240 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76071 |1362 |32273 |0 |1 |2774A4|0 |2 |0 |
+ROW |76072 |1363 |32282 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76073 |1363 |32283 |0 |1 |2774A4|0 |2 |0 |
+ROW |76074 |1363 |32289 |0 |2 |F63100|0 |2 |0 |
+ROW |76075 |1363 |32290 |0 |3 |A54F10|0 |2 |0 |
+ROW |76076 |1363 |32286 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76077 |1363 |32287 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76078 |1363 |32241 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76079 |1363 |32242 |0 |7 |611F27|0 |2 |0 |
+ROW |76080 |1363 |32243 |0 |8 |F230E0|0 |2 |0 |
+ROW |76081 |1363 |32244 |0 |9 |FFAD40|0 |2 |0 |
+ROW |76082 |1363 |32277 |0 |10 |40CDFF|0 |2 |0 |
+ROW |76083 |1363 |32278 |0 |11 |40FFA0|0 |2 |0 |
+ROW |76084 |1427 |32768 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76085 |1427 |32767 |5 |1 |2774A4|0 |2 |0 |
+ROW |76086 |1428 |32774 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76087 |1428 |32772 |5 |1 |2774A4|0 |2 |0 |
+ROW |76088 |1428 |32775 |5 |2 |F63100|0 |2 |0 |
+ROW |76089 |1428 |32773 |5 |3 |A54F10|0 |2 |0 |
+ROW |76090 |1429 |32779 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76091 |1429 |32777 |5 |1 |2774A4|0 |2 |0 |
+ROW |76092 |1429 |32778 |5 |2 |F63100|0 |2 |0 |
+ROW |76093 |1806 |36785 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76094 |1806 |36786 |0 |1 |2774A4|0 |2 |0 |
+ROW |76095 |1806 |36787 |0 |2 |F63100|0 |2 |0 |
+ROW |76096 |1430 |32837 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76097 |1430 |32836 |2 |1 |2774A4|0 |2 |0 |
+ROW |76098 |1430 |32835 |2 |2 |F63100|0 |2 |0 |
+ROW |76099 |1431 |32856 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76100 |1432 |32828 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76101 |1433 |32847 |5 |0 |34bdeb|0 |2 |0 |
+ROW |76102 |1434 |32797 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76103 |1434 |32796 |5 |1 |2774A4|0 |2 |0 |
+ROW |76104 |1434 |32801 |2 |2 |F63100|0 |2 |0 |
+ROW |76105 |1435 |32834 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76106 |1436 |32819 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76107 |1437 |32826 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76108 |1614 |34976 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76109 |1614 |34975 |0 |1 |2774A4|0 |2 |0 |
+ROW |76110 |1614 |34978 |0 |2 |F63100|0 |2 |0 |
+ROW |76111 |1614 |34979 |0 |3 |A54F10|0 |2 |0 |
+ROW |76112 |1614 |34980 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76113 |1615 |34982 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76114 |1615 |34997 |0 |1 |2774A4|0 |2 |0 |
+ROW |76115 |1615 |35001 |0 |2 |F63100|0 |2 |0 |
+ROW |76116 |1615 |35000 |0 |3 |A54F10|0 |2 |0 |
+ROW |76117 |1615 |34998 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76118 |1615 |34996 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76119 |1616 |35015 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76120 |1616 |35014 |0 |1 |2774A4|0 |2 |0 |
+ROW |76121 |1617 |35012 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76122 |1617 |35013 |0 |1 |2774A4|0 |2 |0 |
+ROW |76123 |1618 |34951 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76124 |1618 |34952 |0 |1 |2774A4|0 |2 |0 |
+ROW |76125 |1618 |34953 |0 |2 |F63100|0 |2 |0 |
+ROW |76126 |1618 |34954 |0 |3 |A54F10|0 |2 |0 |
+ROW |76127 |1618 |34956 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76128 |1618 |34950 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76129 |1618 |34957 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76130 |1618 |34959 |0 |7 |611F27|0 |2 |0 |
+ROW |76131 |1618 |34965 |0 |8 |F230E0|0 |2 |0 |
+ROW |76132 |1445 |22404 |0 |0 |990099|0 |2 |0 |
+ROW |76133 |1445 |22399 |0 |1 |990000|0 |2 |0 |
+ROW |76134 |1445 |22416 |0 |2 |0000EE|0 |2 |0 |
+ROW |76135 |1445 |25366 |0 |3 |FF33FF|0 |2 |0 |
+ROW |76136 |1445 |22418 |0 |4 |009600|0 |2 |0 |
+ROW |76137 |1445 |22402 |0 |5 |003300|0 |2 |0 |
+ROW |76138 |1445 |22400 |0 |6 |33FFFF|0 |2 |0 |
+ROW |76139 |1445 |22689 |0 |7 |DD0000|0 |2 |0 |
+ROW |76140 |1445 |23171 |0 |8 |000099|0 |2 |0 |
+ROW |76141 |1445 |22401 |0 |9 |00FF00|0 |2 |0 |
+ROW |76142 |1445 |33023 |0 |10 |5A2B57|0 |2 |0 |
+ROW |76143 |1651 |22406 |0 |0 |00EE00|0 |2 |0 |
+ROW |76144 |1651 |25665 |0 |1 |0000EE|0 |2 |0 |
+ROW |76145 |1651 |25666 |0 |2 |FFAA00|0 |2 |0 |
+ROW |76146 |1651 |28537 |0 |3 |00EEEE|0 |2 |0 |
+ROW |76147 |1651 |28535 |0 |4 |990099|0 |2 |0 |
+ROW |76148 |1652 |22426 |0 |0 |00EE00|0 |2 |0 |
+ROW |76149 |1652 |22408 |0 |1 |FFAA00|0 |2 |0 |
+ROW |76150 |1652 |22412 |0 |2 |990099|0 |2 |0 |
+ROW |76151 |1652 |22414 |0 |3 |FF66FF|0 |2 |0 |
+ROW |76152 |1652 |23663 |0 |4 |009999|0 |2 |0 |
+ROW |76153 |1652 |33022 |0 |5 |2B5429|0 |2 |0 |
+ROW |76154 |1652 |22430 |0 |6 |8048B4|0 |2 |0 |
+ROW |76155 |1652 |22420 |0 |7 |FD5434|0 |2 |0 |
+ROW |76156 |1653 |22422 |0 |0 |00EE00|0 |2 |0 |
+ROW |76157 |1653 |22424 |0 |1 |0000EE|0 |2 |0 |
+ROW |76158 |1653 |25370 |0 |2 |FFAA00|0 |2 |0 |
+ROW |76159 |1653 |29822 |0 |3 |00EEEE|0 |2 |0 |
+ROW |76160 |1653 |34317 |0 |4 |990099|0 |2 |0 |
+ROW |76161 |1653 |34316 |0 |5 |EE0000|0 |2 |0 |
+ROW |76162 |1654 |33021 |0 |0 |C80000|0 |2 |0 |
+ROW |76163 |1654 |33020 |0 |1 |00C800|0 |2 |0 |
+ROW |76164 |527 |22199 |0 |0 |C80000|0 |2 |0 |
+ROW |76165 |527 |22196 |0 |1 |00C800|0 |2 |0 |
+ROW |76166 |410 |22185 |0 |0 |009900|0 |2 |0 |
+ROW |76167 |410 |22189 |0 |1 |DD0000|0 |2 |0 |
+ROW |76168 |410 |22396 |0 |2 |00DDDD|0 |2 |0 |
+ROW |76169 |410 |22183 |0 |3 |3333FF|0 |2 |0 |
+ROW |76170 |410 |22191 |0 |4 |999900|0 |2 |0 |
+ROW |76171 |410 |23634 |0 |5 |00FF00|0 |2 |0 |
+ROW |76172 |404 |22404 |0 |0 |990099|0 |2 |0 |
+ROW |76173 |404 |22399 |0 |1 |990000|0 |2 |0 |
+ROW |76174 |404 |22416 |0 |2 |0000EE|0 |2 |0 |
+ROW |76175 |404 |22430 |0 |3 |FF33FF|0 |2 |0 |
+ROW |76176 |404 |22418 |0 |4 |009600|0 |2 |0 |
+ROW |76177 |404 |22402 |0 |5 |003300|0 |2 |0 |
+ROW |76178 |404 |22420 |0 |6 |CCCC00|0 |2 |0 |
+ROW |76179 |404 |22400 |0 |7 |33FFFF|0 |2 |0 |
+ROW |76180 |404 |22689 |0 |8 |DD0000|0 |2 |0 |
+ROW |76181 |404 |23171 |0 |9 |000099|0 |2 |0 |
+ROW |76182 |404 |22401 |0 |10 |00FF00|0 |2 |0 |
+ROW |76183 |404 |33023 |0 |11 |5A2B57|0 |2 |0 |
+ROW |76184 |406 |22426 |0 |1 |00EE00|0 |2 |0 |
+ROW |76185 |406 |22422 |0 |2 |0000EE|0 |2 |0 |
+ROW |76186 |406 |22408 |0 |3 |FFAA00|0 |2 |0 |
+ROW |76187 |406 |22424 |0 |4 |00EEEE|0 |2 |0 |
+ROW |76188 |406 |22412 |0 |5 |990099|0 |2 |0 |
+ROW |76189 |406 |22406 |0 |6 |EE0000|0 |2 |0 |
+ROW |76190 |406 |22414 |0 |7 |FF66FF|0 |2 |0 |
+ROW |76191 |406 |23663 |0 |8 |009999|0 |2 |0 |
+ROW |76192 |406 |25366 |0 |9 |BBBB00|0 |2 |0 |
+ROW |76193 |406 |25370 |0 |10 |AA0000|0 |2 |0 |
+ROW |76194 |406 |25665 |0 |11 |990000|0 |2 |0 |
+ROW |76195 |406 |25666 |0 |12 |008800|0 |2 |0 |
+ROW |76196 |406 |28535 |0 |13 |80B0E0|0 |2 |0 |
+ROW |76197 |406 |28537 |0 |14 |4080B0|0 |2 |0 |
+ROW |76198 |406 |29822 |0 |15 |8000FF|0 |2 |0 |
+ROW |76199 |406 |33022 |0 |16 |2B5429|0 |2 |0 |
+ROW |76200 |406 |34317 |0 |17 |8048B4|0 |2 |0 |
+ROW |76201 |406 |34316 |0 |18 |FD5434|0 |2 |0 |
+ROW |76202 |406 |35274 |0 |19 |790E1F|0 |2 |0 |
+ROW |76203 |406 |35272 |0 |20 |87AC4D|0 |2 |0 |
+ROW |76204 |788 |28248 |0 |0 |008800|0 |2 |0 |
+ROW |76205 |788 |28533 |0 |1 |EE0000|0 |2 |0 |
+ROW |76206 |392 |22187 |5 |0 |00C800|0 |2 |0 |
+ROW |76207 |392 |23251 |0 |1 |F63100|0 |2 |0 |
+ROW |76208 |1444 |28581 |0 |0 |990099|0 |2 |0 |
+ROW |76209 |1444 |28574 |0 |1 |990000|0 |2 |0 |
+ROW |76210 |1444 |28571 |0 |2 |0000EE|0 |2 |0 |
+ROW |76211 |1444 |28562 |0 |3 |FF33FF|0 |2 |0 |
+ROW |76212 |1444 |28570 |0 |4 |009600|0 |2 |0 |
+ROW |76213 |1444 |28569 |0 |5 |003300|0 |2 |0 |
+ROW |76214 |1444 |28552 |0 |6 |33FFFF|0 |2 |0 |
+ROW |76215 |1444 |28573 |0 |7 |DD0000|0 |2 |0 |
+ROW |76216 |1444 |28579 |0 |8 |000099|0 |2 |0 |
+ROW |76217 |1444 |28559 |0 |9 |00FF00|0 |2 |0 |
+ROW |76218 |1444 |33017 |0 |10 |5A2B57|0 |2 |0 |
+ROW |76219 |1659 |28567 |0 |0 |00EE00|0 |2 |0 |
+ROW |76220 |1659 |28575 |0 |1 |0000EE|0 |2 |0 |
+ROW |76221 |1659 |28576 |0 |2 |FFAA00|0 |2 |0 |
+ROW |76222 |1659 |28583 |0 |3 |00EEEE|0 |2 |0 |
+ROW |76223 |1659 |28582 |0 |4 |990099|0 |2 |0 |
+ROW |76224 |1660 |28572 |0 |0 |00EE00|0 |2 |0 |
+ROW |76225 |1660 |28568 |0 |1 |FFAA00|0 |2 |0 |
+ROW |76226 |1660 |28564 |0 |2 |990099|0 |2 |0 |
+ROW |76227 |1660 |28578 |0 |3 |FF66FF|0 |2 |0 |
+ROW |76228 |1660 |28580 |0 |4 |009999|0 |2 |0 |
+ROW |76229 |1660 |33016 |0 |5 |2B5429|0 |2 |0 |
+ROW |76230 |1660 |28565 |0 |6 |8048B4|0 |2 |0 |
+ROW |76231 |1660 |28577 |0 |7 |FD5434|0 |2 |0 |
+ROW |76232 |1661 |28566 |0 |0 |00EE00|0 |2 |0 |
+ROW |76233 |1661 |28561 |0 |1 |0000EE|0 |2 |0 |
+ROW |76234 |1661 |28563 |0 |2 |FFAA00|0 |2 |0 |
+ROW |76235 |1661 |29821 |0 |3 |00EEEE|0 |2 |0 |
+ROW |76236 |1661 |34314 |0 |4 |990099|0 |2 |0 |
+ROW |76237 |1661 |34315 |0 |5 |EE0000|0 |2 |0 |
+ROW |76238 |1662 |33015 |0 |0 |C80000|0 |2 |0 |
+ROW |76239 |1662 |33014 |0 |1 |00C800|0 |2 |0 |
+ROW |76240 |797 |28546 |0 |0 |C80000|0 |2 |0 |
+ROW |76241 |797 |28545 |0 |1 |00C800|0 |2 |0 |
+ROW |76242 |798 |28551 |0 |0 |009900|0 |2 |0 |
+ROW |76243 |798 |28543 |0 |1 |DD0000|0 |2 |0 |
+ROW |76244 |798 |28542 |0 |2 |00DDDD|0 |2 |0 |
+ROW |76245 |798 |28549 |0 |3 |3333FF|0 |2 |0 |
+ROW |76246 |798 |28544 |0 |4 |999900|0 |2 |0 |
+ROW |76247 |798 |28548 |0 |5 |00FF00|0 |2 |0 |
+ROW |76248 |799 |28581 |0 |0 |990099|0 |2 |0 |
+ROW |76249 |799 |28574 |0 |1 |990000|0 |2 |0 |
+ROW |76250 |799 |28571 |0 |2 |0000EE|0 |2 |0 |
+ROW |76251 |799 |28565 |0 |3 |FF33FF|0 |2 |0 |
+ROW |76252 |799 |28570 |0 |4 |009600|0 |2 |0 |
+ROW |76253 |799 |28569 |0 |5 |003300|0 |2 |0 |
+ROW |76254 |799 |28577 |0 |6 |CCCC00|0 |2 |0 |
+ROW |76255 |799 |28552 |0 |7 |33FFFF|0 |2 |0 |
+ROW |76256 |799 |28573 |0 |8 |DD0000|0 |2 |0 |
+ROW |76257 |799 |28579 |0 |9 |000099|0 |2 |0 |
+ROW |76258 |799 |28559 |0 |10 |00FF00|0 |2 |0 |
+ROW |76259 |799 |33017 |0 |11 |5A2B57|0 |2 |0 |
+ROW |76260 |800 |28572 |0 |1 |00EE00|0 |2 |0 |
+ROW |76261 |800 |28566 |0 |2 |0000EE|0 |2 |0 |
+ROW |76262 |800 |28568 |0 |3 |FFAA00|0 |2 |0 |
+ROW |76263 |800 |28561 |0 |4 |00EEEE|0 |2 |0 |
+ROW |76264 |800 |28564 |0 |5 |990099|0 |2 |0 |
+ROW |76265 |800 |28567 |0 |6 |EE0000|0 |2 |0 |
+ROW |76266 |800 |28578 |0 |7 |FF66FF|0 |2 |0 |
+ROW |76267 |800 |28580 |0 |8 |009999|0 |2 |0 |
+ROW |76268 |800 |28562 |0 |9 |BBBB00|0 |2 |0 |
+ROW |76269 |800 |28563 |0 |10 |AA0000|0 |2 |0 |
+ROW |76270 |800 |28575 |0 |11 |990000|0 |2 |0 |
+ROW |76271 |800 |28576 |0 |12 |008800|0 |2 |0 |
+ROW |76272 |800 |28582 |0 |13 |80B0E0|0 |2 |0 |
+ROW |76273 |800 |28583 |0 |14 |4080B0|0 |2 |0 |
+ROW |76274 |800 |29821 |0 |15 |8000FF|0 |2 |0 |
+ROW |76275 |800 |33016 |0 |16 |2B5429|0 |2 |0 |
+ROW |76276 |800 |34314 |0 |17 |8048B4|0 |2 |0 |
+ROW |76277 |800 |34315 |0 |18 |FD5434|0 |2 |0 |
+ROW |76278 |800 |35279 |0 |19 |790E1F|0 |2 |0 |
+ROW |76279 |800 |35278 |0 |20 |87AC4D|0 |2 |0 |
+ROW |76280 |801 |28560 |0 |0 |008800|0 |2 |0 |
+ROW |76281 |801 |28584 |0 |1 |EE0000|0 |2 |0 |
+ROW |76282 |802 |28550 |5 |0 |00C800|0 |2 |0 |
+ROW |76283 |802 |28540 |0 |1 |F63100|0 |2 |0 |
+ROW |76284 |1438 |33001 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76285 |1438 |33002 |0 |1 |2774A4|0 |2 |0 |
+ROW |76286 |1438 |33000 |2 |2 |F63100|0 |2 |0 |
+ROW |76287 |1439 |33005 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76288 |1439 |33004 |0 |1 |2774A4|0 |2 |0 |
+ROW |76289 |1440 |32980 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76290 |1440 |32970 |0 |1 |2774A4|0 |2 |0 |
+ROW |76291 |1441 |32967 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76292 |1441 |32968 |0 |1 |2774A4|0 |2 |0 |
+ROW |76293 |1441 |32995 |2 |2 |F63100|0 |2 |0 |
+ROW |76294 |1442 |32997 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76295 |1442 |32984 |0 |1 |2774A4|0 |2 |0 |
+ROW |76296 |1443 |32973 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76297 |1443 |32971 |0 |1 |2774A4|0 |2 |0 |
+ROW |76298 |1503 |33518 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76299 |1504 |33501 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76300 |803 |28599 |0 |0 |DD0000|0 |2 |0 |
+ROW |76301 |803 |28596 |0 |1 |00DDDD|0 |2 |0 |
+ROW |76302 |803 |28597 |0 |2 |3333FF|0 |2 |0 |
+ROW |76303 |803 |28598 |0 |3 |00FF00|0 |2 |0 |
+ROW |76304 |804 |28602 |0 |1 |990099|0 |2 |0 |
+ROW |76305 |804 |28606 |0 |2 |990000|0 |2 |0 |
+ROW |76306 |804 |28608 |0 |3 |0000EE|0 |2 |0 |
+ROW |76307 |804 |28615 |0 |4 |FF33FF|0 |2 |0 |
+ROW |76308 |804 |28610 |0 |5 |00EE00|0 |2 |0 |
+ROW |76309 |804 |28611 |0 |6 |003300|0 |2 |0 |
+ROW |76310 |804 |28616 |0 |7 |33FFFF|0 |2 |0 |
+ROW |76311 |804 |28607 |0 |8 |DD0000|0 |2 |0 |
+ROW |76312 |804 |28604 |0 |9 |000099|0 |2 |0 |
+ROW |76313 |804 |28588 |0 |10 |00FF00|0 |2 |0 |
+ROW |76314 |804 |33013 |0 |11 |BB2A02|0 |2 |0 |
+ROW |76315 |805 |28612 |0 |1 |FFAA00|0 |2 |0 |
+ROW |76316 |805 |28600 |0 |2 |990099|0 |2 |0 |
+ROW |76317 |805 |28613 |0 |3 |EE0000|0 |2 |0 |
+ROW |76318 |805 |28605 |0 |4 |FF66FF|0 |2 |0 |
+ROW |76319 |805 |28614 |0 |5 |960000|0 |2 |0 |
+ROW |76320 |805 |28601 |0 |6 |009600|0 |2 |0 |
+ROW |76321 |805 |28603 |0 |7 |009999|0 |2 |0 |
+ROW |76322 |805 |28609 |0 |8 |BBBB00|0 |2 |0 |
+ROW |76323 |805 |33012 |0 |9 |F230E0|0 |2 |0 |
+ROW |76324 |806 |28595 |0 |0 |00C800|0 |2 |0 |
+ROW |76325 |806 |28586 |0 |1 |C80000|0 |2 |0 |
+ROW |76326 |529 |23357 |0 |0 |DD0000|0 |2 |0 |
+ROW |76327 |529 |23341 |0 |1 |00DDDD|0 |2 |0 |
+ROW |76328 |529 |23342 |0 |2 |3333FF|0 |2 |0 |
+ROW |76329 |529 |28251 |0 |3 |00FF00|0 |2 |0 |
+ROW |76330 |530 |23345 |0 |1 |990099|0 |2 |0 |
+ROW |76331 |530 |23348 |0 |2 |990000|0 |2 |0 |
+ROW |76332 |530 |23355 |0 |3 |0000EE|0 |2 |0 |
+ROW |76333 |530 |23352 |0 |4 |FF33FF|0 |2 |0 |
+ROW |76334 |530 |23356 |0 |5 |007700|0 |2 |0 |
+ROW |76335 |530 |23354 |0 |6 |003300|0 |2 |0 |
+ROW |76336 |530 |23346 |0 |7 |33FFFF|0 |2 |0 |
+ROW |76337 |530 |23349 |0 |8 |DD0000|0 |2 |0 |
+ROW |76338 |530 |23344 |0 |9 |000099|0 |7 |0 |
+ROW |76339 |530 |28250 |0 |10 |00FF00|0 |2 |0 |
+ROW |76340 |530 |33019 |0 |11 |BB2A02|0 |2 |0 |
+ROW |76341 |531 |23353 |0 |1 |FFAA00|0 |2 |0 |
+ROW |76342 |531 |23347 |0 |2 |990099|0 |2 |0 |
+ROW |76343 |531 |23350 |0 |3 |EE0000|0 |2 |0 |
+ROW |76344 |531 |23343 |0 |4 |FF66FF|0 |2 |0 |
+ROW |76345 |531 |23351 |0 |5 |0000EE|0 |2 |0 |
+ROW |76346 |531 |23360 |0 |6 |00EE00|0 |2 |0 |
+ROW |76347 |531 |25369 |0 |7 |009999|0 |2 |0 |
+ROW |76348 |531 |25368 |0 |8 |BBBB00|0 |2 |0 |
+ROW |76349 |531 |28618 |0 |9 |990000|0 |2 |0 |
+ROW |76350 |531 |28619 |0 |10 |008800|0 |2 |0 |
+ROW |76351 |531 |33018 |0 |11 |BB2A02|0 |2 |0 |
+ROW |76352 |807 |28617 |0 |0 |008800|0 |2 |0 |
+ROW |76353 |532 |23340 |5 |0 |00C800|0 |2 |0 |
+ROW |76354 |532 |23358 |5 |1 |C80000|1 |2 |0 |
+ROW |76355 |472 |22945 |5 |0 |00AA00|0 |2 |0 |
+ROW |76356 |472 |22946 |5 |1 |3333FF|0 |2 |0 |
+ROW |76357 |473 |22950 |0 |0 |C80000|0 |2 |2 |
+ROW |76358 |473 |22948 |0 |1 |00C800|0 |2 |0 |
+ROW |76359 |471 |22924 |0 |0 |009900|0 |2 |0 |
+ROW |76360 |471 |22920 |0 |1 |000099|0 |2 |0 |
+ROW |76361 |469 |22922 |0 |0 |009900|0 |2 |0 |
+ROW |76362 |469 |22923 |0 |1 |000099|0 |2 |0 |
+ROW |76363 |469 |22921 |0 |2 |990000|0 |2 |0 |
+ROW |76364 |498 |23109 |0 |0 |009999|0 |2 |0 |
+ROW |76365 |498 |23112 |0 |1 |990099|0 |2 |0 |
+ROW |76366 |498 |23115 |0 |2 |999900|0 |2 |0 |
+ROW |76367 |498 |23113 |0 |3 |990000|0 |2 |0 |
+ROW |76368 |498 |23114 |0 |4 |000099|0 |2 |0 |
+ROW |76369 |498 |23110 |0 |5 |009900|0 |2 |0 |
+ROW |76370 |540 |22942 |5 |0 |00C800|0 |2 |0 |
+ROW |76371 |492 |23073 |5 |0 |00AA00|0 |2 |0 |
+ROW |76372 |492 |23074 |5 |1 |3333FF|0 |2 |0 |
+ROW |76373 |467 |22910 |0 |0 |C80000|0 |2 |2 |
+ROW |76374 |467 |22908 |0 |1 |00C800|0 |2 |0 |
+ROW |76375 |465 |22884 |0 |0 |009900|0 |2 |0 |
+ROW |76376 |465 |22880 |0 |1 |000099|0 |2 |0 |
+ROW |76377 |463 |22882 |0 |0 |009900|0 |2 |0 |
+ROW |76378 |463 |22883 |0 |1 |000099|0 |2 |0 |
+ROW |76379 |463 |22881 |0 |2 |990000|0 |2 |0 |
+ROW |76380 |462 |22886 |1 |0 |009999|0 |2 |0 |
+ROW |76381 |462 |22888 |1 |1 |990099|0 |2 |0 |
+ROW |76382 |462 |22891 |1 |2 |990000|0 |2 |0 |
+ROW |76383 |462 |22892 |1 |3 |000099|0 |2 |0 |
+ROW |76384 |462 |22885 |1 |4 |009900|0 |2 |0 |
+ROW |76385 |541 |22902 |5 |0 |00C800|0 |2 |0 |
+ROW |76386 |464 |22897 |0 |0 |AA0000|0 |2 |2 |
+ROW |76387 |464 |22895 |0 |1 |00AA00|0 |2 |0 |
+ROW |76388 |478 |22985 |5 |0 |00AA00|0 |2 |0 |
+ROW |76389 |478 |22986 |5 |1 |3333FF|0 |2 |0 |
+ROW |76390 |479 |22990 |0 |0 |C80000|0 |2 |2 |
+ROW |76391 |479 |22988 |0 |1 |00C800|0 |2 |0 |
+ROW |76392 |475 |22962 |0 |0 |009900|0 |2 |0 |
+ROW |76393 |475 |22963 |0 |1 |000099|0 |2 |0 |
+ROW |76394 |475 |22961 |0 |2 |990000|0 |2 |0 |
+ROW |76395 |474 |22968 |1 |0 |990099|0 |2 |0 |
+ROW |76396 |474 |22971 |1 |1 |990000|0 |2 |0 |
+ROW |76397 |474 |22972 |1 |2 |000099|0 |2 |0 |
+ROW |76398 |474 |22965 |1 |3 |009900|0 |2 |0 |
+ROW |76399 |542 |22982 |5 |0 |00C800|0 |2 |0 |
+ROW |76400 |491 |23070 |0 |0 |C80000|0 |2 |2 |
+ROW |76401 |491 |23068 |0 |1 |00C800|0 |2 |0 |
+ROW |76402 |487 |23042 |0 |0 |009900|0 |2 |0 |
+ROW |76403 |487 |23043 |0 |1 |000099|0 |2 |0 |
+ROW |76404 |487 |23041 |0 |2 |990000|0 |2 |0 |
+ROW |76405 |543 |23062 |5 |0 |00C800|0 |2 |0 |
+ROW |76406 |494 |23077 |5 |0 |00AA00|0 |2 |0 |
+ROW |76407 |494 |23078 |5 |1 |3333FF|0 |2 |0 |
+ROW |76408 |493 |23075 |5 |0 |00AA00|0 |2 |0 |
+ROW |76409 |493 |23076 |5 |1 |3333FF|0 |2 |0 |
+ROW |76410 |461 |22870 |0 |0 |C80000|0 |2 |2 |
+ROW |76411 |461 |22868 |0 |1 |00C800|0 |2 |0 |
+ROW |76412 |459 |22844 |0 |0 |009900|0 |2 |0 |
+ROW |76413 |459 |22840 |0 |1 |000099|0 |2 |0 |
+ROW |76414 |457 |22842 |0 |0 |009900|0 |2 |0 |
+ROW |76415 |457 |22843 |0 |1 |000099|0 |2 |0 |
+ROW |76416 |457 |22841 |0 |2 |990000|0 |2 |0 |
+ROW |76417 |456 |22846 |1 |0 |009999|0 |2 |0 |
+ROW |76418 |456 |22848 |1 |1 |990099|0 |2 |0 |
+ROW |76419 |456 |22851 |1 |2 |990000|0 |2 |0 |
+ROW |76420 |456 |22852 |1 |3 |000099|0 |2 |0 |
+ROW |76421 |456 |22845 |1 |4 |009900|0 |2 |0 |
+ROW |76422 |544 |22862 |5 |0 |00C800|0 |2 |0 |
+ROW |76423 |458 |22857 |0 |0 |AA0000|0 |2 |2 |
+ROW |76424 |458 |22855 |0 |1 |00AA00|0 |2 |0 |
+ROW |76425 |484 |23025 |5 |0 |00AA00|0 |2 |0 |
+ROW |76426 |484 |23026 |5 |1 |3333FF|0 |2 |0 |
+ROW |76427 |485 |23030 |0 |0 |C80000|0 |2 |2 |
+ROW |76428 |485 |23028 |0 |1 |00C800|0 |2 |0 |
+ROW |76429 |483 |23004 |0 |0 |009900|0 |2 |0 |
+ROW |76430 |483 |23000 |0 |1 |000099|0 |2 |0 |
+ROW |76431 |481 |23002 |0 |0 |009900|0 |2 |0 |
+ROW |76432 |481 |23003 |0 |1 |000099|0 |2 |0 |
+ROW |76433 |481 |23001 |0 |2 |990000|0 |2 |0 |
+ROW |76434 |480 |23007 |1 |0 |999900|0 |2 |0 |
+ROW |76435 |480 |23011 |1 |1 |990000|0 |2 |0 |
+ROW |76436 |480 |23012 |1 |2 |000099|0 |2 |0 |
+ROW |76437 |480 |23005 |1 |3 |009900|0 |2 |0 |
+ROW |76438 |545 |23022 |5 |0 |00C800|0 |2 |0 |
+ROW |76439 |482 |23017 |0 |0 |AA0000|0 |2 |2 |
+ROW |76440 |482 |23015 |0 |1 |00AA00|0 |2 |0 |
+ROW |76441 |651 |26928 |5 |0 |EE0000|0 |2 |0 |
+ROW |76442 |651 |26927 |0 |1 |000000|1 |2 |0 |
+ROW |76443 |652 |26925 |2 |0 |880000|0 |2 |0 |
+ROW |76444 |652 |26932 |0 |1 |009900|0 |2 |0 |
+ROW |76445 |652 |26930 |0 |2 |00CCCC|0 |2 |0 |
+ROW |76446 |652 |26931 |0 |3 |000000|0 |2 |0 |
+ROW |76447 |652 |26929 |0 |4 |3333FF|0 |2 |0 |
+ROW |76448 |652 |26926 |0 |5 |777700|0 |2 |0 |
+ROW |76449 |653 |26933 |2 |0 |EE0000|0 |2 |0 |
+ROW |76450 |653 |26943 |2 |1 |EE00EE|0 |2 |0 |
+ROW |76451 |653 |26935 |0 |2 |000000|1 |2 |0 |
+ROW |76452 |653 |26936 |4 |3 |000000|1 |2 |0 |
+ROW |76453 |654 |26934 |2 |0 |880000|0 |2 |0 |
+ROW |76454 |654 |26939 |0 |1 |009900|0 |2 |0 |
+ROW |76455 |654 |26942 |0 |2 |00CCCC|0 |2 |0 |
+ROW |76456 |654 |26938 |0 |3 |000000|0 |2 |0 |
+ROW |76457 |654 |26937 |0 |4 |3333FF|0 |2 |0 |
+ROW |76458 |1447 |33113 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76459 |1447 |33112 |0 |1 |2774A4|0 |2 |0 |
+ROW |76460 |1447 |33099 |0 |2 |F63100|0 |2 |0 |
+ROW |76461 |1447 |33098 |0 |3 |A54F10|0 |2 |0 |
+ROW |76462 |1448 |33125 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76463 |1448 |33110 |0 |1 |2774A4|0 |2 |0 |
+ROW |76464 |1449 |33080 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76465 |1449 |33081 |2 |1 |2774A4|0 |2 |0 |
+ROW |76466 |1450 |33089 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76467 |1450 |33085 |2 |1 |2774A4|0 |2 |0 |
+ROW |76468 |1451 |33082 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76469 |1451 |33086 |2 |1 |2774A4|0 |2 |0 |
+ROW |76470 |1451 |33083 |0 |2 |F63100|0 |2 |0 |
+ROW |76471 |1451 |33084 |0 |3 |A54F10|0 |2 |0 |
+ROW |76472 |1451 |33087 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76473 |1451 |33088 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76474 |1452 |33093 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76475 |1452 |33092 |2 |1 |2774A4|0 |2 |0 |
+ROW |76476 |1453 |33077 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76477 |1453 |33063 |2 |1 |2774A4|0 |2 |0 |
+ROW |76478 |1454 |33094 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76479 |1454 |33059 |0 |1 |2774A4|0 |2 |0 |
+ROW |76480 |1455 |33066 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76481 |1455 |33071 |2 |1 |2774A4|0 |2 |0 |
+ROW |76482 |1455 |33067 |0 |2 |F63100|0 |2 |0 |
+ROW |76483 |1455 |33068 |0 |3 |A54F10|0 |2 |0 |
+ROW |76484 |1455 |33072 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76485 |1455 |33073 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76486 |1159 |30886 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76487 |1159 |30887 |0 |1 |2774A4|0 |2 |0 |
+ROW |76488 |1160 |30888 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76489 |1160 |30882 |0 |1 |2774A4|0 |2 |0 |
+ROW |76490 |1160 |30890 |0 |2 |F63100|0 |2 |0 |
+ROW |76491 |1160 |30881 |0 |3 |A54F10|0 |2 |0 |
+ROW |76492 |1160 |30889 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76493 |1161 |30847 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76494 |1161 |30872 |2 |1 |2774A4|0 |2 |0 |
+ROW |76495 |1162 |30853 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76496 |1162 |30849 |2 |1 |2774A4|0 |2 |0 |
+ROW |76497 |1162 |30852 |2 |2 |F63100|0 |2 |0 |
+ROW |76498 |1162 |30851 |2 |3 |A54F10|0 |2 |0 |
+ROW |76499 |1162 |30848 |2 |4 |FC6EA3|0 |2 |0 |
+ROW |76500 |1163 |30856 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76501 |1163 |30855 |0 |1 |2774A4|0 |2 |0 |
+ROW |76502 |1163 |30854 |2 |2 |F63100|1 |2 |0 |
+ROW |76503 |1164 |30859 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76504 |1164 |30870 |2 |1 |2774A4|0 |2 |0 |
+ROW |76505 |1165 |30860 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76506 |1165 |30871 |2 |1 |2774A4|0 |2 |0 |
+ROW |76507 |1166 |30868 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76508 |1166 |30869 |0 |1 |2774A4|0 |2 |0 |
+ROW |76509 |1166 |30867 |0 |2 |F63100|0 |2 |0 |
+ROW |76510 |1166 |30866 |0 |3 |A54F10|0 |2 |0 |
+ROW |76511 |1166 |30865 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76512 |1167 |30850 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76513 |1167 |30863 |5 |1 |2774A4|0 |2 |0 |
+ROW |76514 |1167 |30861 |5 |2 |F63100|0 |2 |0 |
+ROW |76515 |1168 |30833 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76516 |1168 |30841 |2 |1 |2774A4|0 |2 |0 |
+ROW |76517 |1168 |30857 |2 |2 |F63100|0 |2 |0 |
+ROW |76518 |1169 |30834 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76519 |1169 |30831 |2 |1 |2774A4|0 |2 |0 |
+ROW |76520 |1170 |30846 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76521 |1576 |34320 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76522 |1576 |30845 |0 |1 |2774A4|0 |2 |0 |
+ROW |76523 |1576 |30842 |0 |2 |F63100|0 |2 |0 |
+ROW |76524 |1576 |30873 |2 |3 |A54F10|1 |2 |0 |
+ROW |76525 |1663 |35291 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76526 |1663 |35300 |0 |1 |2774A4|0 |2 |0 |
+ROW |76527 |1664 |35295 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76528 |1664 |35296 |0 |1 |2774A4|0 |2 |0 |
+ROW |76529 |1665 |35301 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76530 |1665 |35306 |0 |1 |2774A4|0 |2 |0 |
+ROW |76531 |1665 |35304 |0 |2 |F63100|0 |2 |0 |
+ROW |76532 |1665 |35302 |0 |3 |A54F10|0 |2 |0 |
+ROW |76533 |1666 |35308 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76534 |1666 |35310 |0 |1 |2774A4|0 |2 |0 |
+ROW |76535 |1666 |35309 |0 |2 |F63100|0 |2 |0 |
+ROW |76536 |1667 |35322 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76537 |1667 |35320 |0 |1 |2774A4|0 |2 |0 |
+ROW |76538 |1668 |35329 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76539 |1668 |35330 |0 |1 |2774A4|0 |2 |0 |
+ROW |76540 |1669 |35332 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76541 |1669 |35334 |0 |1 |2774A4|0 |2 |0 |
+ROW |76542 |1670 |35335 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76543 |1670 |35333 |0 |1 |2774A4|0 |2 |0 |
+ROW |76544 |1671 |35338 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76545 |1671 |35341 |0 |1 |2774A4|0 |2 |0 |
+ROW |76546 |1671 |35339 |0 |2 |F63100|0 |2 |0 |
+ROW |76547 |1671 |35340 |0 |3 |A54F10|0 |2 |0 |
+ROW |76548 |1672 |35347 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76549 |1672 |35346 |0 |1 |2774A4|0 |2 |0 |
+ROW |76550 |1672 |35345 |0 |2 |F63100|0 |2 |0 |
+ROW |76551 |1673 |35350 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76552 |1673 |35351 |0 |1 |2774A4|0 |2 |0 |
+ROW |76553 |1674 |35349 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76554 |1674 |35352 |0 |1 |2774A4|0 |2 |0 |
+ROW |76555 |1674 |35353 |0 |2 |F63100|0 |2 |0 |
+ROW |76556 |1675 |35355 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76557 |1675 |35356 |0 |1 |2774A4|0 |2 |0 |
+ROW |76558 |1505 |33553 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76559 |1505 |33562 |0 |1 |2774A4|0 |2 |0 |
+ROW |76560 |1506 |33557 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76561 |1506 |33558 |0 |1 |2774A4|0 |2 |0 |
+ROW |76562 |1507 |33563 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76563 |1507 |33568 |0 |1 |2774A4|0 |2 |0 |
+ROW |76564 |1507 |33566 |0 |2 |F63100|0 |2 |0 |
+ROW |76565 |1507 |33564 |0 |3 |A54F10|0 |2 |0 |
+ROW |76566 |1508 |33570 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76567 |1508 |33572 |0 |1 |2774A4|0 |2 |0 |
+ROW |76568 |1508 |33571 |0 |2 |F63100|0 |2 |0 |
+ROW |76569 |1509 |33584 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76570 |1509 |33582 |0 |1 |2774A4|0 |2 |0 |
+ROW |76571 |1510 |33591 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76572 |1510 |33592 |0 |1 |2774A4|0 |2 |0 |
+ROW |76573 |1511 |33594 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76574 |1511 |33596 |0 |1 |2774A4|0 |2 |0 |
+ROW |76575 |1512 |33597 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76576 |1512 |33595 |0 |1 |2774A4|0 |2 |0 |
+ROW |76577 |1513 |33600 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76578 |1513 |33603 |0 |1 |2774A4|0 |2 |0 |
+ROW |76579 |1513 |33601 |0 |2 |F63100|0 |2 |0 |
+ROW |76580 |1513 |33602 |0 |3 |A54F10|0 |2 |0 |
+ROW |76581 |1514 |33609 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76582 |1514 |33608 |0 |1 |2774A4|0 |2 |0 |
+ROW |76583 |1514 |33607 |0 |2 |F63100|0 |2 |0 |
+ROW |76584 |1515 |33612 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76585 |1515 |33613 |0 |1 |2774A4|0 |2 |0 |
+ROW |76586 |1516 |33611 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76587 |1516 |33614 |0 |1 |2774A4|0 |2 |0 |
+ROW |76588 |1516 |33615 |0 |2 |F63100|0 |2 |0 |
+ROW |76589 |1517 |33617 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76590 |1517 |33618 |0 |1 |2774A4|0 |2 |0 |
+ROW |76591 |1807 |36817 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76592 |1807 |36816 |0 |1 |2774A4|0 |2 |0 |
+ROW |76593 |1808 |36815 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76594 |1808 |36814 |0 |1 |2774A4|0 |2 |0 |
+ROW |76595 |1808 |36818 |0 |2 |F63100|0 |2 |0 |
+ROW |76596 |1808 |36819 |0 |3 |A54F10|0 |2 |0 |
+ROW |76597 |1809 |36805 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76598 |1809 |36804 |0 |1 |2774A4|0 |2 |0 |
+ROW |76599 |1527 |33819 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76600 |1527 |33839 |0 |1 |2774A4|0 |2 |0 |
+ROW |76601 |1528 |33820 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76602 |1528 |33816 |0 |1 |2774A4|0 |2 |0 |
+ROW |76603 |1529 |33826 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76604 |1529 |33831 |0 |1 |2774A4|0 |2 |0 |
+ROW |76605 |1529 |33829 |0 |2 |F63100|0 |2 |0 |
+ROW |76606 |1529 |33821 |0 |3 |A54F10|0 |2 |0 |
+ROW |76607 |1529 |33825 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76608 |1529 |33833 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76609 |1529 |33823 |2 |6 |AC8C14|0 |2 |0 |
+ROW |76610 |1530 |33828 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76611 |1530 |33832 |0 |1 |2774A4|0 |2 |0 |
+ROW |76612 |1530 |33830 |0 |2 |F63100|0 |2 |0 |
+ROW |76613 |1530 |33822 |0 |3 |A54F10|0 |2 |0 |
+ROW |76614 |1530 |33815 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76615 |1530 |33834 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76616 |1530 |33824 |2 |6 |AC8C14|0 |2 |0 |
+ROW |76617 |1531 |33840 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76618 |1531 |33845 |0 |1 |2774A4|0 |2 |0 |
+ROW |76619 |1532 |33844 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76620 |1532 |33847 |0 |1 |2774A4|0 |2 |0 |
+ROW |76621 |1532 |33843 |0 |2 |F63100|0 |2 |0 |
+ROW |76622 |1532 |33841 |0 |3 |A54F10|0 |2 |0 |
+ROW |76623 |1533 |33863 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76624 |1534 |33792 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76625 |1534 |33791 |0 |1 |2774A4|0 |2 |0 |
+ROW |76626 |1534 |33793 |0 |2 |F63100|0 |2 |0 |
+ROW |76627 |1535 |33802 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76628 |1535 |33770 |0 |1 |2774A4|0 |2 |0 |
+ROW |76629 |1536 |33800 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76630 |1536 |33799 |0 |1 |2774A4|0 |2 |0 |
+ROW |76631 |1536 |33801 |0 |2 |F63100|0 |2 |0 |
+ROW |76632 |1537 |33798 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76633 |1537 |33806 |0 |1 |2774A4|0 |2 |0 |
+ROW |76634 |1537 |33774 |0 |2 |F63100|0 |2 |0 |
+ROW |76635 |1538 |33769 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76636 |1538 |33787 |0 |1 |2774A4|0 |2 |0 |
+ROW |76637 |1538 |33789 |0 |2 |F63100|0 |2 |0 |
+ROW |76638 |1538 |33790 |0 |3 |A54F10|0 |2 |0 |
+ROW |76639 |1539 |33785 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76640 |1539 |33772 |0 |1 |2774A4|0 |2 |0 |
+ROW |76641 |1539 |33773 |0 |2 |F63100|0 |2 |0 |
+ROW |76642 |1539 |33771 |0 |3 |A54F10|0 |2 |0 |
+ROW |76643 |1540 |33776 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76644 |1540 |33775 |0 |1 |2774A4|0 |2 |0 |
+ROW |76645 |1541 |33782 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76646 |1541 |33781 |0 |1 |2774A4|0 |2 |0 |
+ROW |76647 |1541 |33780 |0 |2 |F63100|0 |2 |0 |
+ROW |76648 |1541 |33783 |0 |3 |A54F10|0 |2 |0 |
+ROW |76649 |1541 |33777 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76650 |1541 |33778 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76651 |1542 |33804 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76652 |1542 |33803 |2 |1 |2774A4|0 |2 |0 |
+ROW |76653 |1542 |33805 |2 |2 |F63100|0 |2 |0 |
+ROW |76654 |1543 |33937 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76655 |1543 |33940 |0 |1 |2774A4|0 |2 |0 |
+ROW |76656 |1543 |33936 |0 |2 |F63100|0 |2 |0 |
+ROW |76657 |1543 |33934 |0 |3 |A54F10|0 |2 |0 |
+ROW |76658 |1544 |33915 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76659 |1544 |33911 |0 |1 |2774A4|0 |2 |0 |
+ROW |76660 |1544 |33912 |0 |2 |F63100|0 |2 |0 |
+ROW |76661 |1544 |33910 |0 |3 |A54F10|0 |2 |0 |
+ROW |76662 |1544 |33914 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76663 |1545 |33918 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76664 |1545 |33905 |0 |1 |2774A4|0 |2 |0 |
+ROW |76665 |1545 |33917 |0 |2 |F63100|0 |2 |0 |
+ROW |76666 |1545 |33916 |2 |3 |A54F10|1 |2 |0 |
+ROW |76667 |1546 |33908 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76668 |1546 |33909 |0 |1 |2774A4|0 |2 |0 |
+ROW |76669 |1546 |33902 |0 |2 |F63100|0 |2 |0 |
+ROW |76670 |1547 |33893 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76671 |1547 |33892 |0 |1 |2774A4|0 |2 |0 |
+ROW |76672 |1548 |33899 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76673 |1548 |33898 |2 |1 |2774A4|0 |2 |0 |
+ROW |76674 |1548 |33895 |2 |2 |F63100|0 |2 |0 |
+ROW |76675 |1548 |33900 |2 |3 |A54F10|0 |2 |0 |
+ROW |76676 |1548 |33896 |2 |4 |FC6EA3|0 |2 |0 |
+ROW |76677 |1548 |33891 |2 |5 |6C59DC|0 |2 |0 |
+ROW |76678 |1190 |31140 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76679 |1190 |31141 |0 |1 |2774A4|0 |2 |0 |
+ROW |76680 |1261 |31145 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76681 |1261 |31146 |0 |1 |2774A4|0 |2 |0 |
+ROW |76682 |1261 |31147 |0 |2 |F63100|0 |2 |0 |
+ROW |76683 |1191 |31138 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76684 |1192 |31157 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76685 |1192 |31158 |0 |1 |2774A4|0 |2 |0 |
+ROW |76686 |1193 |31092 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76687 |1193 |31108 |0 |1 |2774A4|0 |2 |0 |
+ROW |76688 |1193 |31110 |0 |2 |F63100|0 |2 |0 |
+ROW |76689 |1193 |31067 |0 |3 |A54F10|0 |2 |0 |
+ROW |76690 |1193 |31086 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76691 |1193 |31087 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76692 |1194 |31120 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76693 |1194 |31105 |0 |1 |2774A4|0 |2 |0 |
+ROW |76694 |1194 |31071 |0 |2 |F63100|0 |2 |0 |
+ROW |76695 |1194 |31081 |0 |3 |A54F10|0 |2 |0 |
+ROW |76696 |1195 |31098 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76697 |1195 |31099 |0 |1 |2774A4|0 |2 |0 |
+ROW |76698 |1196 |31072 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76699 |1196 |31072 |0 |1 |2774A4|0 |2 |0 |
+ROW |76700 |1197 |31103 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76701 |1197 |31074 |0 |1 |2774A4|0 |2 |0 |
+ROW |76702 |1198 |31104 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76703 |1198 |31063 |0 |1 |2774A4|0 |2 |0 |
+ROW |76704 |1198 |31111 |0 |2 |F63100|0 |2 |0 |
+ROW |76705 |1198 |31112 |0 |3 |A54F10|0 |2 |0 |
+ROW |76706 |1198 |31084 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76707 |1199 |31115 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76708 |1199 |31116 |0 |1 |2774A4|0 |2 |0 |
+ROW |76709 |1199 |31062 |0 |2 |F63100|0 |2 |0 |
+ROW |76710 |1199 |31118 |0 |3 |A54F10|0 |2 |0 |
+ROW |76711 |1199 |31056 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76712 |1200 |31107 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76713 |1200 |31090 |0 |1 |2774A4|0 |2 |0 |
+ROW |76714 |1201 |31097 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76715 |1201 |31096 |0 |1 |2774A4|0 |2 |0 |
+ROW |76716 |1202 |31089 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76717 |1202 |31061 |0 |1 |2774A4|0 |2 |0 |
+ROW |76718 |1203 |31064 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76719 |1204 |31065 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76720 |1204 |31066 |0 |1 |2774A4|0 |2 |0 |
+ROW |76721 |1204 |31068 |0 |2 |F63100|0 |2 |0 |
+ROW |76722 |1204 |31070 |0 |3 |A54F10|0 |2 |0 |
+ROW |76723 |1204 |31101 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76724 |1204 |31106 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76725 |1204 |31114 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76726 |1205 |31069 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76727 |1206 |31076 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76728 |1206 |31078 |0 |1 |2774A4|0 |2 |0 |
+ROW |76729 |1206 |31109 |0 |2 |F63100|0 |2 |0 |
+ROW |76730 |1206 |31075 |0 |3 |A54F10|0 |2 |0 |
+ROW |76731 |1207 |31080 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76732 |1207 |31095 |0 |1 |2774A4|0 |2 |0 |
+ROW |76733 |1208 |31113 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76734 |1208 |31118 |0 |1 |2774A4|0 |2 |0 |
+ROW |76735 |1209 |31058 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76736 |1209 |31077 |0 |1 |2774A4|0 |2 |0 |
+ROW |76737 |1209 |31056 |0 |2 |F63100|0 |2 |0 |
+ROW |76738 |1209 |31117 |0 |3 |A54F10|0 |2 |0 |
+ROW |76739 |1109 |30453 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76740 |1109 |30455 |5 |1 |2774A4|0 |2 |0 |
+ROW |76741 |1110 |30471 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76742 |1110 |30470 |0 |1 |2774A4|0 |2 |0 |
+ROW |76743 |1110 |30466 |0 |2 |F63100|0 |2 |0 |
+ROW |76744 |1110 |30441 |0 |3 |A54F10|0 |2 |0 |
+ROW |76745 |1111 |30463 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76746 |1111 |30452 |0 |1 |2774A4|0 |2 |0 |
+ROW |76747 |1111 |30451 |0 |2 |F63100|0 |2 |0 |
+ROW |76748 |1111 |30437 |0 |3 |A54F10|0 |2 |0 |
+ROW |76749 |1112 |30456 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76750 |1112 |30457 |0 |1 |2774A4|0 |2 |0 |
+ROW |76751 |1112 |30458 |0 |2 |F63100|0 |2 |0 |
+ROW |76752 |1112 |30459 |0 |3 |A54F10|0 |2 |0 |
+ROW |76753 |1113 |30442 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76754 |1113 |30444 |0 |1 |2774A4|0 |2 |0 |
+ROW |76755 |1113 |30445 |0 |2 |F63100|0 |2 |0 |
+ROW |76756 |1114 |30446 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76757 |1114 |30447 |0 |1 |2774A4|0 |2 |0 |
+ROW |76758 |1114 |31168 |0 |2 |F63100|0 |2 |0 |
+ROW |76759 |1114 |30449 |0 |3 |A54F10|0 |2 |0 |
+ROW |76760 |1136 |30659 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76761 |1136 |30661 |5 |1 |2774A4|0 |2 |0 |
+ROW |76762 |1137 |30677 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76763 |1137 |30676 |0 |1 |2774A4|0 |2 |0 |
+ROW |76764 |1137 |30672 |0 |2 |F63100|0 |2 |0 |
+ROW |76765 |1137 |30647 |0 |3 |A54F10|0 |2 |0 |
+ROW |76766 |1138 |30669 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76767 |1138 |30658 |0 |1 |2774A4|0 |2 |0 |
+ROW |76768 |1138 |30657 |0 |2 |F63100|0 |2 |0 |
+ROW |76769 |1138 |30643 |0 |3 |A54F10|0 |2 |0 |
+ROW |76770 |1139 |30662 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76771 |1139 |30663 |0 |1 |2774A4|0 |2 |0 |
+ROW |76772 |1139 |30664 |0 |2 |F63100|0 |2 |0 |
+ROW |76773 |1139 |30665 |0 |3 |A54F10|0 |2 |0 |
+ROW |76774 |1140 |30648 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76775 |1140 |30650 |0 |1 |2774A4|0 |2 |0 |
+ROW |76776 |1140 |30651 |0 |2 |F63100|0 |2 |0 |
+ROW |76777 |1141 |30652 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76778 |1141 |30653 |0 |1 |2774A4|0 |2 |0 |
+ROW |76779 |1141 |31172 |0 |2 |F63100|0 |2 |0 |
+ROW |76780 |1141 |30655 |0 |3 |A54F10|0 |2 |0 |
+ROW |76781 |1115 |30506 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76782 |1115 |30507 |5 |1 |2774A4|0 |2 |0 |
+ROW |76783 |1116 |30504 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76784 |1116 |30505 |0 |1 |2774A4|0 |2 |0 |
+ROW |76785 |1116 |30518 |0 |2 |F63100|0 |2 |0 |
+ROW |76786 |1116 |30492 |0 |3 |A54F10|0 |2 |0 |
+ROW |76787 |1117 |30493 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76788 |1117 |30500 |0 |1 |2774A4|0 |2 |0 |
+ROW |76789 |1117 |30486 |0 |2 |F63100|0 |2 |0 |
+ROW |76790 |1117 |30488 |0 |3 |A54F10|0 |2 |0 |
+ROW |76791 |1118 |30508 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76792 |1118 |30509 |0 |1 |2774A4|0 |2 |0 |
+ROW |76793 |1118 |30503 |0 |2 |F63100|0 |2 |0 |
+ROW |76794 |1118 |30510 |0 |3 |A54F10|0 |2 |0 |
+ROW |76795 |1119 |30491 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76796 |1119 |30494 |0 |1 |2774A4|0 |2 |0 |
+ROW |76797 |1119 |30495 |0 |2 |F63100|0 |2 |0 |
+ROW |76798 |1120 |30496 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76799 |1120 |30497 |0 |1 |2774A4|0 |2 |0 |
+ROW |76800 |1120 |31176 |0 |2 |F63100|0 |2 |0 |
+ROW |76801 |1120 |30499 |0 |3 |A54F10|0 |2 |0 |
+ROW |76802 |1266 |31773 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76803 |1266 |31774 |0 |1 |2774A4|0 |2 |0 |
+ROW |76804 |1267 |31777 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76805 |1267 |31779 |0 |1 |2774A4|0 |2 |0 |
+ROW |76806 |1267 |33168 |0 |2 |F63100|0 |2 |0 |
+ROW |76807 |1268 |31685 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76808 |1268 |31738 |0 |1 |2774A4|0 |2 |0 |
+ROW |76809 |1269 |31723 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76810 |1269 |31757 |0 |1 |2774A4|0 |2 |0 |
+ROW |76811 |1269 |31721 |0 |2 |F63100|0 |2 |0 |
+ROW |76812 |1270 |31728 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76813 |1270 |31759 |0 |1 |2774A4|0 |2 |0 |
+ROW |76814 |1271 |31745 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76815 |1271 |31727 |0 |1 |2774A4|0 |2 |0 |
+ROW |76816 |1272 |31687 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76817 |1272 |31710 |0 |1 |2774A4|0 |2 |0 |
+ROW |76818 |1273 |31705 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76819 |1273 |31703 |0 |1 |2774A4|0 |2 |0 |
+ROW |76820 |1273 |31706 |0 |2 |F63100|0 |2 |0 |
+ROW |76821 |1273 |31701 |0 |3 |A54F10|0 |2 |0 |
+ROW |76822 |1273 |31708 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76823 |1274 |31715 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76824 |1274 |31726 |0 |1 |2774A4|0 |2 |0 |
+ROW |76825 |1274 |31717 |0 |2 |F63100|0 |2 |0 |
+ROW |76826 |1274 |31716 |0 |3 |A54F10|0 |2 |0 |
+ROW |76827 |1274 |31714 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76828 |1274 |31713 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76829 |1210 |31261 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76830 |1210 |31262 |0 |1 |2774A4|0 |2 |0 |
+ROW |76831 |1211 |31269 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76832 |1211 |31271 |0 |1 |2774A4|0 |2 |0 |
+ROW |76833 |1211 |33170 |0 |2 |F63100|0 |2 |0 |
+ROW |76834 |1212 |31233 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76835 |1212 |31234 |0 |1 |2774A4|0 |2 |0 |
+ROW |76836 |1213 |31216 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76837 |1213 |31237 |0 |1 |2774A4|0 |2 |0 |
+ROW |76838 |1213 |31214 |0 |2 |F63100|0 |2 |0 |
+ROW |76839 |1214 |31191 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76840 |1214 |31221 |0 |1 |2774A4|0 |2 |0 |
+ROW |76841 |1215 |31206 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76842 |1215 |31220 |0 |1 |2774A4|0 |2 |0 |
+ROW |76843 |1216 |31192 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76844 |1216 |31193 |0 |1 |2774A4|0 |2 |0 |
+ROW |76845 |1217 |31200 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76846 |1217 |31197 |0 |1 |2774A4|0 |2 |0 |
+ROW |76847 |1217 |31201 |0 |2 |F63100|0 |2 |0 |
+ROW |76848 |1217 |31198 |0 |3 |A54F10|0 |2 |0 |
+ROW |76849 |1217 |31202 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76850 |1218 |31207 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76851 |1218 |31208 |0 |1 |2774A4|0 |2 |0 |
+ROW |76852 |1218 |31210 |0 |2 |F63100|0 |2 |0 |
+ROW |76853 |1218 |31209 |0 |3 |A54F10|0 |2 |0 |
+ROW |76854 |1218 |31219 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76855 |1218 |31205 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76856 |1380 |32423 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76857 |1380 |32421 |0 |1 |2774A4|0 |2 |0 |
+ROW |76858 |1381 |32405 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76859 |1382 |32426 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76860 |1382 |32408 |0 |1 |2774A4|0 |2 |0 |
+ROW |76861 |1382 |32422 |0 |2 |F63100|0 |2 |0 |
+ROW |76862 |1382 |32425 |0 |3 |A54F10|0 |2 |0 |
+ROW |76863 |1383 |32409 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76864 |1384 |32419 |0 |0 |1A7C11|1 |2 |0 |
+ROW |76865 |1384 |32416 |0 |1 |2774A4|1 |2 |0 |
+ROW |76866 |1384 |32413 |0 |2 |F63100|1 |2 |0 |
+ROW |76867 |1384 |32418 |5 |3 |A54F10|0 |2 |0 |
+ROW |76868 |1384 |32415 |5 |4 |FC6EA3|0 |2 |0 |
+ROW |76869 |1384 |32412 |5 |5 |6C59DC|0 |2 |0 |
+ROW |76870 |1385 |32420 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76871 |1385 |32417 |0 |1 |2774A4|0 |2 |0 |
+ROW |76872 |1385 |32414 |0 |2 |F63100|0 |2 |0 |
+ROW |76873 |1386 |32433 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76874 |1386 |32432 |0 |1 |2774A4|1 |2 |0 |
+ROW |76875 |1387 |32431 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76876 |1387 |32430 |0 |1 |2774A4|0 |2 |0 |
+ROW |76877 |1387 |32429 |0 |2 |F63100|0 |2 |0 |
+ROW |76878 |1387 |32428 |0 |3 |A54F10|0 |2 |0 |
+ROW |76879 |1387 |32427 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76880 |1388 |32386 |0 |0 |1A7C11|1 |2 |0 |
+ROW |76881 |1388 |32391 |0 |1 |2774A4|1 |2 |0 |
+ROW |76882 |1388 |32387 |0 |2 |F63100|1 |2 |0 |
+ROW |76883 |1388 |32390 |0 |3 |A54F10|1 |2 |0 |
+ROW |76884 |1388 |32395 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76885 |1388 |32389 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76886 |1389 |32393 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76887 |1389 |32392 |0 |1 |2774A4|0 |2 |0 |
+ROW |76888 |1389 |32394 |0 |2 |F63100|1 |2 |0 |
+ROW |76889 |1389 |32388 |0 |3 |A54F10|1 |2 |0 |
+ROW |76890 |1390 |32401 |5 |0 |1A7C11|1 |2 |0 |
+ROW |76891 |1390 |32402 |0 |1 |2774A4|0 |2 |0 |
+ROW |76892 |1390 |32397 |0 |2 |F63100|1 |2 |0 |
+ROW |76893 |1390 |32398 |0 |3 |A54F10|1 |2 |0 |
+ROW |76894 |1390 |32399 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |76895 |1390 |32400 |0 |5 |6C59DC|1 |2 |0 |
+ROW |76896 |1390 |32396 |0 |6 |AC8C14|1 |2 |0 |
+ROW |76897 |1391 |32367 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76898 |1391 |32366 |0 |1 |2774A4|1 |2 |0 |
+ROW |76899 |1392 |32370 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76900 |1393 |32382 |0 |0 |1A7C11|1 |2 |0 |
+ROW |76901 |1393 |32381 |0 |1 |2774A4|1 |2 |0 |
+ROW |76902 |1393 |32383 |0 |2 |F63100|1 |2 |0 |
+ROW |76903 |1393 |32384 |0 |3 |A54F10|1 |2 |0 |
+ROW |76904 |1394 |32377 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76905 |1394 |32374 |0 |1 |2774A4|1 |2 |0 |
+ROW |76906 |1395 |32403 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76907 |1395 |32385 |0 |1 |2774A4|1 |2 |0 |
+ROW |76908 |1219 |31363 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76909 |1219 |31346 |0 |1 |2774A4|0 |2 |0 |
+ROW |76910 |1219 |31345 |0 |2 |F63100|0 |2 |0 |
+ROW |76911 |1219 |31344 |0 |3 |A54F10|0 |2 |0 |
+ROW |76912 |1219 |31343 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76913 |1219 |31342 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76914 |1219 |31340 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76915 |1219 |31339 |0 |7 |611F27|0 |2 |0 |
+ROW |76916 |1219 |31341 |0 |8 |F230E0|0 |2 |0 |
+ROW |76917 |1219 |31341 |0 |9 |FFAD40|0 |2 |0 |
+ROW |76918 |1220 |31337 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76919 |1221 |31360 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76920 |1221 |31359 |0 |1 |2774A4|0 |2 |0 |
+ROW |76921 |1221 |31357 |0 |2 |F63100|0 |2 |0 |
+ROW |76922 |1221 |31356 |0 |3 |A54F10|0 |2 |0 |
+ROW |76923 |1221 |31354 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |76924 |1221 |31353 |0 |5 |6C59DC|0 |2 |0 |
+ROW |76925 |1221 |31352 |0 |6 |AC8C14|0 |2 |0 |
+ROW |76926 |1221 |31350 |0 |7 |611F27|0 |2 |0 |
+ROW |76927 |1221 |31351 |0 |8 |F230E0|0 |2 |0 |
+ROW |76928 |1221 |31338 |0 |9 |FFAD40|0 |2 |0 |
+ROW |76929 |1221 |31349 |0 |10 |40CDFF|0 |2 |0 |
+ROW |76930 |1221 |31348 |0 |11 |40FFA0|0 |2 |0 |
+ROW |76931 |1221 |31347 |0 |12 |AE4500|0 |2 |0 |
+ROW |76932 |1222 |31336 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76933 |1456 |33178 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76934 |1456 |33179 |0 |1 |2774A4|0 |2 |0 |
+ROW |76935 |1456 |33180 |0 |2 |F63100|0 |2 |0 |
+ROW |76936 |1087 |30346 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76937 |1087 |30345 |0 |1 |2774A4|0 |2 |0 |
+ROW |76938 |1088 |30350 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76939 |1088 |30349 |5 |1 |2774A4|0 |2 |0 |
+ROW |76940 |1089 |30396 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76941 |1090 |30398 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76942 |1091 |30322 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76943 |1091 |30277 |5 |1 |2774A4|0 |2 |0 |
+ROW |76944 |1092 |30284 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76945 |1093 |30313 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76946 |1093 |30314 |0 |1 |2774A4|0 |2 |0 |
+ROW |76947 |1093 |30315 |5 |2 |F63100|0 |2 |0 |
+ROW |76948 |1093 |30316 |0 |3 |A54F10|0 |2 |0 |
+ROW |76949 |1094 |30279 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76950 |1094 |30280 |2 |1 |2774A4|0 |2 |0 |
+ROW |76951 |1095 |30290 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76952 |1095 |30293 |0 |1 |2774A4|0 |2 |0 |
+ROW |76953 |1096 |30318 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76954 |1096 |30308 |2 |1 |2774A4|0 |2 |0 |
+ROW |76955 |1096 |30320 |2 |2 |F63100|0 |2 |0 |
+ROW |76956 |1097 |30317 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76957 |1098 |30289 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76958 |1098 |30291 |5 |1 |2774A4|0 |2 |0 |
+ROW |76959 |1099 |30334 |2 |0 |1A7C11|0 |2 |0 |
+ROW |76960 |1099 |30325 |2 |1 |2774A4|0 |2 |0 |
+ROW |76961 |1100 |30306 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76962 |1101 |30274 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76963 |1102 |30281 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76964 |1577 |34351 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76965 |1577 |34350 |0 |1 |2774A4|0 |2 |0 |
+ROW |76966 |1578 |34387 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76967 |1578 |34388 |2 |1 |2774A4|0 |2 |0 |
+ROW |76968 |1579 |34393 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76969 |1579 |34386 |0 |1 |2774A4|0 |2 |0 |
+ROW |76970 |1580 |34370 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76971 |1580 |34384 |0 |1 |2774A4|0 |2 |0 |
+ROW |76972 |1580 |34383 |0 |2 |F63100|0 |2 |0 |
+ROW |76973 |1581 |34438 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76974 |1581 |34413 |0 |1 |2774A4|0 |2 |0 |
+ROW |76975 |1581 |34427 |0 |2 |F63100|0 |2 |0 |
+ROW |76976 |1582 |34420 |0 |0 |1A7C11|0 |2 |0 |
+ROW |76977 |1582 |34419 |0 |1 |2774A4|0 |2 |0 |
+ROW |76978 |1582 |34418 |0 |2 |F63100|0 |2 |0 |
+ROW |76979 |1060 |30159 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76980 |1065 |30161 |0 |0 |969696|0 |9 |2 |
+ROW |76981 |1065 |30162 |0 |1 |C80000|0 |9 |0 |
+ROW |76982 |1070 |30142 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76983 |741 |27084 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76984 |741 |27085 |2 |1 |2774A4|0 |2 |0 |
+ROW |76985 |741 |27083 |0 |2 |F63100|1 |2 |0 |
+ROW |76986 |741 |27086 |0 |3 |A54F10|1 |2 |0 |
+ROW |76987 |741 |27082 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |76988 |741 |27079 |0 |5 |6C59DC|1 |2 |0 |
+ROW |76989 |745 |27104 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76990 |745 |27105 |2 |1 |2774A4|0 |2 |0 |
+ROW |76991 |745 |27103 |0 |2 |F63100|1 |2 |0 |
+ROW |76992 |745 |27106 |0 |3 |A54F10|1 |2 |0 |
+ROW |76993 |745 |27102 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |76994 |745 |27099 |0 |5 |6C59DC|1 |2 |0 |
+ROW |76995 |766 |27124 |5 |0 |1A7C11|0 |2 |0 |
+ROW |76996 |766 |27125 |2 |1 |2774A4|0 |2 |0 |
+ROW |76997 |766 |27123 |0 |2 |F63100|1 |2 |0 |
+ROW |76998 |766 |27126 |0 |3 |A54F10|1 |2 |0 |
+ROW |76999 |766 |27122 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77000 |766 |27119 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77001 |668 |27208 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77002 |1032 |30088 |2 |0 |1A7C11|0 |2 |0 |
+ROW |77003 |1032 |30087 |5 |1 |2774A4|0 |2 |0 |
+ROW |77004 |1033 |30089 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77005 |671 |27240 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77006 |1034 |30093 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77007 |675 |27294 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77008 |1035 |30094 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77009 |1676 |35369 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77010 |1677 |35372 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77011 |1678 |35379 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77012 |1678 |35386 |0 |1 |2774A4|0 |2 |0 |
+ROW |77013 |1678 |35377 |0 |2 |F63100|0 |2 |0 |
+ROW |77014 |1678 |35384 |0 |3 |A54F10|0 |2 |0 |
+ROW |77015 |1678 |35376 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77016 |1678 |35383 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77017 |1679 |35387 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77018 |1679 |35380 |0 |1 |2774A4|0 |2 |0 |
+ROW |77019 |1680 |35378 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77020 |1680 |35385 |0 |1 |2774A4|0 |2 |0 |
+ROW |77021 |1681 |35403 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77022 |1681 |35404 |0 |1 |2774A4|0 |2 |0 |
+ROW |77023 |1549 |33966 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77024 |1550 |33971 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77025 |1551 |33974 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77026 |1551 |33977 |2 |1 |2774A4|0 |2 |0 |
+ROW |77027 |1551 |33976 |0 |2 |F63100|1 |2 |0 |
+ROW |77028 |1551 |33973 |0 |3 |A54F10|1 |2 |0 |
+ROW |77029 |1551 |33975 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77030 |1551 |33972 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77031 |1552 |34007 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77032 |1553 |34012 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77033 |1554 |34015 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77034 |1554 |34018 |2 |1 |2774A4|0 |2 |0 |
+ROW |77035 |1554 |34017 |0 |2 |F63100|1 |2 |0 |
+ROW |77036 |1554 |34014 |0 |3 |A54F10|1 |2 |0 |
+ROW |77037 |1554 |34016 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77038 |1554 |34013 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77039 |1555 |34048 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77040 |1556 |34053 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77041 |1557 |34056 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77042 |1557 |34059 |2 |1 |2774A4|0 |2 |0 |
+ROW |77043 |1557 |34058 |0 |2 |F63100|1 |2 |0 |
+ROW |77044 |1557 |34055 |0 |3 |A54F10|1 |2 |0 |
+ROW |77045 |1557 |34057 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77046 |1557 |34054 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77047 |1558 |34089 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77048 |1559 |34094 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77049 |1560 |34097 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77050 |1560 |34100 |2 |1 |2774A4|0 |2 |0 |
+ROW |77051 |1560 |34099 |0 |2 |F63100|1 |2 |0 |
+ROW |77052 |1560 |34096 |0 |3 |A54F10|1 |2 |0 |
+ROW |77053 |1560 |34098 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77054 |1560 |34095 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77055 |1561 |34130 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77056 |1562 |34135 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77057 |1563 |34138 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77058 |1563 |34141 |2 |1 |2774A4|0 |2 |0 |
+ROW |77059 |1563 |34140 |0 |2 |F63100|1 |2 |0 |
+ROW |77060 |1563 |34137 |0 |3 |A54F10|1 |2 |0 |
+ROW |77061 |1563 |34139 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77062 |1563 |34136 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77063 |1038 |30101 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77064 |786 |28246 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77065 |687 |27417 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77066 |691 |27376 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77067 |694 |27478 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77068 |1042 |30105 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77069 |1043 |30107 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77070 |698 |27511 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77071 |1044 |30108 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77072 |701 |27547 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77073 |1045 |27591 |2 |0 |1A7C11|0 |2 |0 |
+ROW |77074 |1045 |30110 |5 |1 |2774A4|0 |2 |0 |
+ROW |77075 |1046 |30111 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77076 |704 |27586 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77077 |1682 |35439 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77078 |1683 |35441 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77079 |1684 |35443 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77080 |1685 |35446 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77081 |1686 |35450 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77082 |1686 |35465 |0 |1 |2774A4|0 |2 |0 |
+ROW |77083 |1686 |35456 |0 |2 |F63100|0 |2 |0 |
+ROW |77084 |1686 |35447 |0 |3 |A54F10|0 |2 |0 |
+ROW |77085 |1686 |35468 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77086 |1686 |35471 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77087 |1686 |35459 |0 |6 |AC8C14|0 |2 |0 |
+ROW |77088 |1687 |35449 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77089 |1687 |35464 |0 |1 |2774A4|0 |2 |0 |
+ROW |77090 |1687 |35455 |0 |2 |F63100|0 |2 |0 |
+ROW |77091 |1687 |35461 |0 |3 |A54F10|0 |2 |0 |
+ROW |77092 |1687 |35467 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77093 |1687 |35470 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77094 |1687 |35457 |0 |6 |AC8C14|0 |2 |0 |
+ROW |77095 |1688 |35473 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77096 |1688 |35463 |0 |1 |2774A4|0 |2 |0 |
+ROW |77097 |1688 |35454 |0 |2 |F63100|0 |2 |0 |
+ROW |77098 |1688 |35472 |0 |3 |A54F10|0 |2 |0 |
+ROW |77099 |1688 |35466 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77100 |1688 |35469 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77101 |1688 |35458 |0 |6 |AC8C14|0 |2 |0 |
+ROW |77102 |1689 |35474 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77103 |1690 |35476 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77104 |1691 |35478 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77105 |1691 |35480 |0 |1 |2774A4|0 |2 |0 |
+ROW |77106 |1692 |35487 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77107 |1692 |35484 |0 |1 |2774A4|0 |2 |0 |
+ROW |77108 |1693 |35486 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77109 |1693 |35483 |0 |1 |2774A4|0 |2 |0 |
+ROW |77110 |1694 |35490 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77111 |1694 |35488 |0 |1 |2774A4|0 |2 |0 |
+ROW |77112 |1694 |35489 |0 |2 |F63100|0 |2 |0 |
+ROW |77113 |1695 |35497 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77114 |1695 |35493 |0 |1 |2774A4|1 |2 |0 |
+ROW |77115 |1695 |35503 |0 |2 |F63100|0 |2 |0 |
+ROW |77116 |1695 |35499 |0 |3 |A54F10|1 |2 |0 |
+ROW |77117 |1695 |35496 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77118 |1695 |35502 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77119 |1696 |35508 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77120 |1696 |35507 |0 |1 |2774A4|1 |2 |0 |
+ROW |77121 |1696 |35510 |0 |2 |F63100|0 |2 |0 |
+ROW |77122 |1696 |35509 |0 |3 |A54F10|1 |2 |0 |
+ROW |77123 |1697 |35516 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77124 |1697 |35515 |0 |1 |2774A4|1 |2 |0 |
+ROW |77125 |1697 |35518 |0 |2 |F63100|0 |2 |0 |
+ROW |77126 |1697 |35517 |0 |3 |A54F10|1 |2 |0 |
+ROW |77127 |1698 |35524 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77128 |1698 |35523 |0 |1 |2774A4|1 |2 |0 |
+ROW |77129 |1698 |35526 |0 |2 |F63100|0 |2 |0 |
+ROW |77130 |1698 |35525 |0 |3 |A54F10|1 |2 |0 |
+ROW |77131 |1699 |35531 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77132 |1699 |35529 |0 |1 |2774A4|0 |2 |0 |
+ROW |77133 |1699 |35530 |0 |2 |F63100|0 |2 |0 |
+ROW |77134 |1700 |35411 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77135 |1700 |35409 |0 |1 |2774A4|0 |2 |0 |
+ROW |77136 |1700 |35407 |0 |2 |F63100|0 |2 |0 |
+ROW |77137 |1700 |35413 |0 |3 |A54F10|0 |2 |0 |
+ROW |77138 |1700 |35412 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77139 |1700 |35410 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77140 |708 |27671 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77141 |1047 |30112 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77142 |1048 |30114 |2 |0 |1A7C11|0 |2 |0 |
+ROW |77143 |1048 |30113 |5 |1 |2774A4|0 |2 |0 |
+ROW |77144 |1049 |30115 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77145 |775 |28143 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77146 |714 |27753 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77147 |1050 |30116 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77148 |856 |28894 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77149 |1051 |30118 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77150 |1564 |34166 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77151 |1564 |34169 |2 |1 |2774A4|0 |2 |0 |
+ROW |77152 |1564 |34168 |0 |2 |F63100|1 |2 |0 |
+ROW |77153 |1564 |34165 |0 |3 |A54F10|1 |2 |0 |
+ROW |77154 |1564 |34167 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77155 |1564 |34164 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77156 |1565 |34174 |0 |0 |969696|0 |9 |2 |
+ROW |77157 |1565 |34175 |0 |1 |C80000|0 |9 |0 |
+ROW |77158 |1566 |34178 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77159 |1567 |34154 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77160 |1811 |36861 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77161 |1812 |36867 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77162 |1812 |36865 |0 |1 |2774A4|0 |2 |0 |
+ROW |77163 |1812 |36864 |0 |2 |F63100|0 |2 |0 |
+ROW |77164 |1812 |36866 |0 |3 |A54F10|0 |2 |0 |
+ROW |77165 |1813 |36878 |0 |0 |969696|0 |9 |2 |
+ROW |77166 |1813 |36879 |0 |1 |C80000|0 |9 |0 |
+ROW |77167 |1814 |36853 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77168 |1816 |36915 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77169 |1817 |36921 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77170 |1817 |36919 |0 |1 |2774A4|0 |2 |0 |
+ROW |77171 |1817 |36918 |0 |2 |F63100|0 |2 |0 |
+ROW |77172 |1817 |36920 |0 |3 |A54F10|0 |2 |0 |
+ROW |77173 |1818 |36932 |0 |0 |969696|0 |9 |2 |
+ROW |77174 |1818 |36933 |0 |1 |C80000|0 |9 |0 |
+ROW |77175 |1819 |36907 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77176 |1821 |36969 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77177 |1822 |36975 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77178 |1822 |36973 |0 |1 |2774A4|0 |2 |0 |
+ROW |77179 |1822 |36972 |0 |2 |F63100|0 |2 |0 |
+ROW |77180 |1822 |36974 |0 |3 |A54F10|0 |2 |0 |
+ROW |77181 |1823 |36986 |0 |0 |969696|0 |9 |2 |
+ROW |77182 |1823 |36987 |0 |1 |C80000|0 |9 |0 |
+ROW |77183 |1824 |36961 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77184 |1826 |37023 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77185 |1827 |37029 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77186 |1827 |37027 |0 |1 |2774A4|0 |2 |0 |
+ROW |77187 |1827 |37026 |0 |2 |F63100|0 |2 |0 |
+ROW |77188 |1827 |37028 |0 |3 |A54F10|0 |2 |0 |
+ROW |77189 |1828 |37040 |0 |0 |969696|0 |9 |2 |
+ROW |77190 |1828 |37041 |0 |1 |C80000|0 |9 |0 |
+ROW |77191 |1829 |37015 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77192 |1831 |37077 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77193 |1832 |37083 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77194 |1832 |37081 |0 |1 |2774A4|0 |2 |0 |
+ROW |77195 |1832 |37080 |0 |2 |F63100|0 |2 |0 |
+ROW |77196 |1832 |37082 |0 |3 |A54F10|0 |2 |0 |
+ROW |77197 |1833 |37094 |0 |0 |969696|0 |9 |2 |
+ROW |77198 |1833 |37095 |0 |1 |C80000|0 |9 |0 |
+ROW |77199 |1834 |37069 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77200 |1836 |37131 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77201 |1837 |37137 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77202 |1837 |37135 |0 |1 |2774A4|0 |2 |0 |
+ROW |77203 |1837 |37134 |0 |2 |F63100|0 |2 |0 |
+ROW |77204 |1837 |37136 |0 |3 |A54F10|0 |2 |0 |
+ROW |77205 |1838 |37148 |0 |0 |969696|0 |9 |2 |
+ROW |77206 |1838 |37149 |0 |1 |C80000|0 |9 |0 |
+ROW |77207 |1839 |37123 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77208 |1841 |37185 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77209 |1842 |37191 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77210 |1842 |37189 |0 |1 |2774A4|0 |2 |0 |
+ROW |77211 |1842 |37188 |0 |2 |F63100|0 |2 |0 |
+ROW |77212 |1842 |37190 |0 |3 |A54F10|0 |2 |0 |
+ROW |77213 |1843 |37202 |0 |0 |969696|0 |9 |2 |
+ROW |77214 |1843 |37203 |0 |1 |C80000|0 |9 |0 |
+ROW |77215 |1844 |37177 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77216 |1846 |37239 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77217 |1847 |37245 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77218 |1847 |37243 |0 |1 |2774A4|0 |2 |0 |
+ROW |77219 |1847 |37242 |0 |2 |F63100|0 |2 |0 |
+ROW |77220 |1847 |37244 |0 |3 |A54F10|0 |2 |0 |
+ROW |77221 |1848 |37256 |0 |0 |969696|0 |9 |2 |
+ROW |77222 |1848 |37257 |0 |1 |C80000|0 |9 |0 |
+ROW |77223 |1849 |37231 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77224 |1851 |37293 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77225 |1852 |37299 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77226 |1852 |37297 |0 |1 |2774A4|0 |2 |0 |
+ROW |77227 |1852 |37296 |0 |2 |F63100|0 |2 |0 |
+ROW |77228 |1852 |37298 |0 |3 |A54F10|0 |2 |0 |
+ROW |77229 |1853 |37310 |0 |0 |969696|0 |9 |2 |
+ROW |77230 |1853 |37311 |0 |1 |C80000|0 |9 |0 |
+ROW |77231 |1854 |37285 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77232 |1856 |37347 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77233 |1857 |37353 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77234 |1857 |37351 |0 |1 |2774A4|0 |2 |0 |
+ROW |77235 |1857 |37350 |0 |2 |F63100|0 |2 |0 |
+ROW |77236 |1857 |37352 |0 |3 |A54F10|0 |2 |0 |
+ROW |77237 |1858 |37364 |0 |0 |969696|0 |9 |2 |
+ROW |77238 |1858 |37365 |0 |1 |C80000|0 |9 |0 |
+ROW |77239 |1859 |37339 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77240 |1861 |37401 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77241 |1862 |37407 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77242 |1862 |37405 |0 |1 |2774A4|0 |2 |0 |
+ROW |77243 |1862 |37404 |0 |2 |F63100|0 |2 |0 |
+ROW |77244 |1862 |37406 |0 |3 |A54F10|0 |2 |0 |
+ROW |77245 |1863 |37418 |0 |0 |969696|0 |9 |2 |
+ROW |77246 |1863 |37419 |0 |1 |C80000|0 |9 |0 |
+ROW |77247 |1864 |37393 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77248 |1866 |37455 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77249 |1867 |37461 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77250 |1867 |37459 |0 |1 |2774A4|0 |2 |0 |
+ROW |77251 |1867 |37458 |0 |2 |F63100|0 |2 |0 |
+ROW |77252 |1867 |37460 |0 |3 |A54F10|0 |2 |0 |
+ROW |77253 |1868 |37472 |0 |0 |969696|0 |9 |2 |
+ROW |77254 |1868 |37473 |0 |1 |C80000|0 |9 |0 |
+ROW |77255 |1869 |37447 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77256 |1871 |37509 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77257 |1872 |37515 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77258 |1872 |37513 |0 |1 |2774A4|0 |2 |0 |
+ROW |77259 |1872 |37512 |0 |2 |F63100|0 |2 |0 |
+ROW |77260 |1872 |37514 |0 |3 |A54F10|0 |2 |0 |
+ROW |77261 |1873 |37526 |0 |0 |969696|0 |9 |2 |
+ROW |77262 |1873 |37527 |0 |1 |C80000|0 |9 |0 |
+ROW |77263 |1874 |37501 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77264 |1876 |37563 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77265 |1877 |37569 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77266 |1877 |37567 |0 |1 |2774A4|0 |2 |0 |
+ROW |77267 |1877 |37566 |0 |2 |F63100|0 |2 |0 |
+ROW |77268 |1877 |37568 |0 |3 |A54F10|0 |2 |0 |
+ROW |77269 |1878 |37580 |0 |0 |969696|0 |9 |2 |
+ROW |77270 |1878 |37581 |0 |1 |C80000|0 |9 |0 |
+ROW |77271 |1879 |37555 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77272 |1881 |37617 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77273 |1882 |37623 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77274 |1882 |37621 |0 |1 |2774A4|0 |2 |0 |
+ROW |77275 |1882 |37620 |0 |2 |F63100|0 |2 |0 |
+ROW |77276 |1882 |37622 |0 |3 |A54F10|0 |2 |0 |
+ROW |77277 |1883 |37634 |0 |0 |969696|0 |9 |2 |
+ROW |77278 |1883 |37635 |0 |1 |C80000|0 |9 |0 |
+ROW |77279 |1884 |37609 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77280 |1886 |37671 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77281 |1887 |37677 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77282 |1887 |37675 |0 |1 |2774A4|0 |2 |0 |
+ROW |77283 |1887 |37674 |0 |2 |F63100|0 |2 |0 |
+ROW |77284 |1887 |37676 |0 |3 |A54F10|0 |2 |0 |
+ROW |77285 |1888 |37688 |0 |0 |969696|0 |9 |2 |
+ROW |77286 |1888 |37689 |0 |1 |C80000|0 |9 |0 |
+ROW |77287 |1889 |37663 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77288 |1891 |37725 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77289 |1892 |37731 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77290 |1892 |37729 |0 |1 |2774A4|0 |2 |0 |
+ROW |77291 |1892 |37728 |0 |2 |F63100|0 |2 |0 |
+ROW |77292 |1892 |37730 |0 |3 |A54F10|0 |2 |0 |
+ROW |77293 |1893 |37742 |0 |0 |969696|0 |9 |2 |
+ROW |77294 |1893 |37743 |0 |1 |C80000|0 |9 |0 |
+ROW |77295 |1894 |37717 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77296 |1896 |37779 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77297 |1897 |37785 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77298 |1897 |37783 |0 |1 |2774A4|0 |2 |0 |
+ROW |77299 |1897 |37782 |0 |2 |F63100|0 |2 |0 |
+ROW |77300 |1897 |37784 |0 |3 |A54F10|0 |2 |0 |
+ROW |77301 |1898 |37796 |0 |0 |969696|0 |9 |2 |
+ROW |77302 |1898 |37797 |0 |1 |C80000|0 |9 |0 |
+ROW |77303 |1899 |37771 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77304 |1901 |37833 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77305 |1902 |37839 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77306 |1902 |37837 |0 |1 |2774A4|0 |2 |0 |
+ROW |77307 |1902 |37836 |0 |2 |F63100|0 |2 |0 |
+ROW |77308 |1902 |37838 |0 |3 |A54F10|0 |2 |0 |
+ROW |77309 |1903 |37850 |0 |0 |969696|0 |9 |2 |
+ROW |77310 |1903 |37851 |0 |1 |C80000|0 |9 |0 |
+ROW |77311 |1904 |37825 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77312 |1906 |37887 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77313 |1907 |37893 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77314 |1907 |37891 |0 |1 |2774A4|0 |2 |0 |
+ROW |77315 |1907 |37890 |0 |2 |F63100|0 |2 |0 |
+ROW |77316 |1907 |37892 |0 |3 |A54F10|0 |2 |0 |
+ROW |77317 |1908 |37904 |0 |0 |969696|0 |9 |2 |
+ROW |77318 |1908 |37905 |0 |1 |C80000|0 |9 |0 |
+ROW |77319 |1909 |37879 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77320 |1911 |37941 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77321 |1912 |37947 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77322 |1912 |37945 |0 |1 |2774A4|0 |2 |0 |
+ROW |77323 |1912 |37944 |0 |2 |F63100|0 |2 |0 |
+ROW |77324 |1912 |37946 |0 |3 |A54F10|0 |2 |0 |
+ROW |77325 |1913 |37958 |0 |0 |969696|0 |9 |2 |
+ROW |77326 |1913 |37959 |0 |1 |C80000|0 |9 |0 |
+ROW |77327 |1914 |37933 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77328 |1916 |37995 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77329 |1917 |38001 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77330 |1917 |37999 |0 |1 |2774A4|0 |2 |0 |
+ROW |77331 |1917 |37998 |0 |2 |F63100|0 |2 |0 |
+ROW |77332 |1917 |38000 |0 |3 |A54F10|0 |2 |0 |
+ROW |77333 |1918 |38012 |0 |0 |969696|0 |9 |2 |
+ROW |77334 |1918 |38013 |0 |1 |C80000|0 |9 |0 |
+ROW |77335 |1919 |37987 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77336 |1921 |38049 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77337 |1922 |38055 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77338 |1922 |38053 |0 |1 |2774A4|0 |2 |0 |
+ROW |77339 |1922 |38052 |0 |2 |F63100|0 |2 |0 |
+ROW |77340 |1922 |38054 |0 |3 |A54F10|0 |2 |0 |
+ROW |77341 |1923 |38066 |0 |0 |969696|0 |9 |2 |
+ROW |77342 |1923 |38067 |0 |1 |C80000|0 |9 |0 |
+ROW |77343 |1924 |38041 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77344 |1926 |38103 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77345 |1927 |38109 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77346 |1927 |38107 |0 |1 |2774A4|0 |2 |0 |
+ROW |77347 |1927 |38106 |0 |2 |F63100|0 |2 |0 |
+ROW |77348 |1927 |38108 |0 |3 |A54F10|0 |2 |0 |
+ROW |77349 |1928 |38120 |0 |0 |969696|0 |9 |2 |
+ROW |77350 |1928 |38121 |0 |1 |C80000|0 |9 |0 |
+ROW |77351 |1929 |38095 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77352 |1931 |38157 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77353 |1932 |38163 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77354 |1932 |38161 |0 |1 |2774A4|0 |2 |0 |
+ROW |77355 |1932 |38160 |0 |2 |F63100|0 |2 |0 |
+ROW |77356 |1932 |38162 |0 |3 |A54F10|0 |2 |0 |
+ROW |77357 |1933 |38174 |0 |0 |969696|0 |9 |2 |
+ROW |77358 |1933 |38175 |0 |1 |C80000|0 |9 |0 |
+ROW |77359 |1934 |38149 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77360 |1936 |38211 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77361 |1937 |38217 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77362 |1937 |38215 |0 |1 |2774A4|0 |2 |0 |
+ROW |77363 |1937 |38214 |0 |2 |F63100|0 |2 |0 |
+ROW |77364 |1937 |38216 |0 |3 |A54F10|0 |2 |0 |
+ROW |77365 |1938 |38228 |0 |0 |969696|0 |9 |2 |
+ROW |77366 |1938 |38229 |0 |1 |C80000|0 |9 |0 |
+ROW |77367 |1939 |38203 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77368 |1941 |38265 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77369 |1942 |38271 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77370 |1942 |38269 |0 |1 |2774A4|0 |2 |0 |
+ROW |77371 |1942 |38268 |0 |2 |F63100|0 |2 |0 |
+ROW |77372 |1942 |38270 |0 |3 |A54F10|0 |2 |0 |
+ROW |77373 |1943 |38282 |0 |0 |969696|0 |9 |2 |
+ROW |77374 |1943 |38283 |0 |1 |C80000|0 |9 |0 |
+ROW |77375 |1944 |38257 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77376 |1946 |38319 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77377 |1947 |38325 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77378 |1947 |38323 |0 |1 |2774A4|0 |2 |0 |
+ROW |77379 |1947 |38322 |0 |2 |F63100|0 |2 |0 |
+ROW |77380 |1947 |38324 |0 |3 |A54F10|0 |2 |0 |
+ROW |77381 |1948 |38336 |0 |0 |969696|0 |9 |2 |
+ROW |77382 |1948 |38337 |0 |1 |C80000|0 |9 |0 |
+ROW |77383 |1949 |38311 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77384 |1951 |38373 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77385 |1952 |38379 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77386 |1952 |38377 |0 |1 |2774A4|0 |2 |0 |
+ROW |77387 |1952 |38376 |0 |2 |F63100|0 |2 |0 |
+ROW |77388 |1952 |38378 |0 |3 |A54F10|0 |2 |0 |
+ROW |77389 |1953 |38390 |0 |0 |969696|0 |9 |2 |
+ROW |77390 |1953 |38391 |0 |1 |C80000|0 |9 |0 |
+ROW |77391 |1954 |38365 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77392 |1956 |38427 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77393 |1957 |38433 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77394 |1957 |38431 |0 |1 |2774A4|0 |2 |0 |
+ROW |77395 |1957 |38430 |0 |2 |F63100|0 |2 |0 |
+ROW |77396 |1957 |38432 |0 |3 |A54F10|0 |2 |0 |
+ROW |77397 |1958 |38444 |0 |0 |969696|0 |9 |2 |
+ROW |77398 |1958 |38445 |0 |1 |C80000|0 |9 |0 |
+ROW |77399 |1959 |38419 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77400 |1961 |38481 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77401 |1962 |38487 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77402 |1962 |38485 |0 |1 |2774A4|0 |2 |0 |
+ROW |77403 |1962 |38484 |0 |2 |F63100|0 |2 |0 |
+ROW |77404 |1962 |38486 |0 |3 |A54F10|0 |2 |0 |
+ROW |77405 |1963 |38498 |0 |0 |969696|0 |9 |2 |
+ROW |77406 |1963 |38499 |0 |1 |C80000|0 |9 |0 |
+ROW |77407 |1964 |38473 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77408 |1966 |38535 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77409 |1967 |38541 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77410 |1967 |38539 |0 |1 |2774A4|0 |2 |0 |
+ROW |77411 |1967 |38538 |0 |2 |F63100|0 |2 |0 |
+ROW |77412 |1967 |38540 |0 |3 |A54F10|0 |2 |0 |
+ROW |77413 |1968 |38552 |0 |0 |969696|0 |9 |2 |
+ROW |77414 |1968 |38553 |0 |1 |C80000|0 |9 |0 |
+ROW |77415 |1969 |38527 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77416 |1971 |38589 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77417 |1972 |38595 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77418 |1972 |38593 |0 |1 |2774A4|0 |2 |0 |
+ROW |77419 |1972 |38592 |0 |2 |F63100|0 |2 |0 |
+ROW |77420 |1972 |38594 |0 |3 |A54F10|0 |2 |0 |
+ROW |77421 |1973 |38606 |0 |0 |969696|0 |9 |2 |
+ROW |77422 |1973 |38607 |0 |1 |C80000|0 |9 |0 |
+ROW |77423 |1974 |38581 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77424 |1976 |38643 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77425 |1977 |38649 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77426 |1977 |38647 |0 |1 |2774A4|0 |2 |0 |
+ROW |77427 |1977 |38646 |0 |2 |F63100|0 |2 |0 |
+ROW |77428 |1977 |38648 |0 |3 |A54F10|0 |2 |0 |
+ROW |77429 |1978 |38660 |0 |0 |969696|0 |9 |2 |
+ROW |77430 |1978 |38661 |0 |1 |C80000|0 |9 |0 |
+ROW |77431 |1979 |38635 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77432 |1981 |38697 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77433 |1982 |38703 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77434 |1982 |38701 |0 |1 |2774A4|0 |2 |0 |
+ROW |77435 |1982 |38700 |0 |2 |F63100|0 |2 |0 |
+ROW |77436 |1982 |38702 |0 |3 |A54F10|0 |2 |0 |
+ROW |77437 |1983 |38714 |0 |0 |969696|0 |9 |2 |
+ROW |77438 |1983 |38715 |0 |1 |C80000|0 |9 |0 |
+ROW |77439 |1984 |38689 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77440 |1986 |38751 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77441 |1987 |38757 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77442 |1987 |38755 |0 |1 |2774A4|0 |2 |0 |
+ROW |77443 |1987 |38754 |0 |2 |F63100|0 |2 |0 |
+ROW |77444 |1987 |38756 |0 |3 |A54F10|0 |2 |0 |
+ROW |77445 |1988 |38768 |0 |0 |969696|0 |9 |2 |
+ROW |77446 |1988 |38769 |0 |1 |C80000|0 |9 |0 |
+ROW |77447 |1989 |38743 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77448 |1991 |38805 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77449 |1992 |38811 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77450 |1992 |38809 |0 |1 |2774A4|0 |2 |0 |
+ROW |77451 |1992 |38808 |0 |2 |F63100|0 |2 |0 |
+ROW |77452 |1992 |38810 |0 |3 |A54F10|0 |2 |0 |
+ROW |77453 |1993 |38822 |0 |0 |969696|0 |9 |2 |
+ROW |77454 |1993 |38823 |0 |1 |C80000|0 |9 |0 |
+ROW |77455 |1994 |38797 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77456 |1996 |38859 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77457 |1997 |38865 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77458 |1997 |38863 |0 |1 |2774A4|0 |2 |0 |
+ROW |77459 |1997 |38862 |0 |2 |F63100|0 |2 |0 |
+ROW |77460 |1997 |38864 |0 |3 |A54F10|0 |2 |0 |
+ROW |77461 |1998 |38876 |0 |0 |969696|0 |9 |2 |
+ROW |77462 |1998 |38877 |0 |1 |C80000|0 |9 |0 |
+ROW |77463 |1999 |38851 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77464 |2001 |38913 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77465 |2002 |38919 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77466 |2002 |38917 |0 |1 |2774A4|0 |2 |0 |
+ROW |77467 |2002 |38916 |0 |2 |F63100|0 |2 |0 |
+ROW |77468 |2002 |38918 |0 |3 |A54F10|0 |2 |0 |
+ROW |77469 |2003 |38930 |0 |0 |969696|0 |9 |2 |
+ROW |77470 |2003 |38931 |0 |1 |C80000|0 |9 |0 |
+ROW |77471 |2004 |38905 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77472 |2006 |38967 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77473 |2007 |38973 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77474 |2007 |38971 |0 |1 |2774A4|0 |2 |0 |
+ROW |77475 |2007 |38970 |0 |2 |F63100|0 |2 |0 |
+ROW |77476 |2007 |38972 |0 |3 |A54F10|0 |2 |0 |
+ROW |77477 |2008 |38984 |0 |0 |969696|0 |9 |2 |
+ROW |77478 |2008 |38985 |0 |1 |C80000|0 |9 |0 |
+ROW |77479 |2009 |38959 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77480 |2011 |39021 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77481 |2012 |39027 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77482 |2012 |39025 |0 |1 |2774A4|0 |2 |0 |
+ROW |77483 |2012 |39024 |0 |2 |F63100|0 |2 |0 |
+ROW |77484 |2012 |39026 |0 |3 |A54F10|0 |2 |0 |
+ROW |77485 |2013 |39038 |0 |0 |969696|0 |9 |2 |
+ROW |77486 |2013 |39039 |0 |1 |C80000|0 |9 |0 |
+ROW |77487 |2014 |39013 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77488 |2016 |39075 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77489 |2017 |39081 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77490 |2017 |39079 |0 |1 |2774A4|0 |2 |0 |
+ROW |77491 |2017 |39078 |0 |2 |F63100|0 |2 |0 |
+ROW |77492 |2017 |39080 |0 |3 |A54F10|0 |2 |0 |
+ROW |77493 |2018 |39092 |0 |0 |969696|0 |9 |2 |
+ROW |77494 |2018 |39093 |0 |1 |C80000|0 |9 |0 |
+ROW |77495 |2019 |39067 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77496 |2021 |39129 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77497 |2022 |39135 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77498 |2022 |39133 |0 |1 |2774A4|0 |2 |0 |
+ROW |77499 |2022 |39132 |0 |2 |F63100|0 |2 |0 |
+ROW |77500 |2022 |39134 |0 |3 |A54F10|0 |2 |0 |
+ROW |77501 |2023 |39146 |0 |0 |969696|0 |9 |2 |
+ROW |77502 |2023 |39147 |0 |1 |C80000|0 |9 |0 |
+ROW |77503 |2024 |39121 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77504 |2026 |39183 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77505 |2027 |39189 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77506 |2027 |39187 |0 |1 |2774A4|0 |2 |0 |
+ROW |77507 |2027 |39186 |0 |2 |F63100|0 |2 |0 |
+ROW |77508 |2027 |39188 |0 |3 |A54F10|0 |2 |0 |
+ROW |77509 |2028 |39200 |0 |0 |969696|0 |9 |2 |
+ROW |77510 |2028 |39201 |0 |1 |C80000|0 |9 |0 |
+ROW |77511 |2029 |39175 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77512 |2031 |39237 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77513 |2032 |39243 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77514 |2032 |39241 |0 |1 |2774A4|0 |2 |0 |
+ROW |77515 |2032 |39240 |0 |2 |F63100|0 |2 |0 |
+ROW |77516 |2032 |39242 |0 |3 |A54F10|0 |2 |0 |
+ROW |77517 |2033 |39254 |0 |0 |969696|0 |9 |2 |
+ROW |77518 |2033 |39255 |0 |1 |C80000|0 |9 |0 |
+ROW |77519 |2034 |39229 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77520 |2036 |39291 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77521 |2037 |39297 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77522 |2037 |39295 |0 |1 |2774A4|0 |2 |0 |
+ROW |77523 |2037 |39294 |0 |2 |F63100|0 |2 |0 |
+ROW |77524 |2037 |39296 |0 |3 |A54F10|0 |2 |0 |
+ROW |77525 |2038 |39308 |0 |0 |969696|0 |9 |2 |
+ROW |77526 |2038 |39309 |0 |1 |C80000|0 |9 |0 |
+ROW |77527 |2039 |39283 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77528 |2041 |39345 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77529 |2042 |39351 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77530 |2042 |39349 |0 |1 |2774A4|0 |2 |0 |
+ROW |77531 |2042 |39348 |0 |2 |F63100|0 |2 |0 |
+ROW |77532 |2042 |39350 |0 |3 |A54F10|0 |2 |0 |
+ROW |77533 |2043 |39362 |0 |0 |969696|0 |9 |2 |
+ROW |77534 |2043 |39363 |0 |1 |C80000|0 |9 |0 |
+ROW |77535 |2044 |39337 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77536 |2046 |39399 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77537 |2047 |39405 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77538 |2047 |39403 |0 |1 |2774A4|0 |2 |0 |
+ROW |77539 |2047 |39402 |0 |2 |F63100|0 |2 |0 |
+ROW |77540 |2047 |39404 |0 |3 |A54F10|0 |2 |0 |
+ROW |77541 |2048 |39416 |0 |0 |969696|0 |9 |2 |
+ROW |77542 |2048 |39417 |0 |1 |C80000|0 |9 |0 |
+ROW |77543 |2049 |39391 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77544 |2051 |39453 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77545 |2052 |39459 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77546 |2052 |39457 |0 |1 |2774A4|0 |2 |0 |
+ROW |77547 |2052 |39456 |0 |2 |F63100|0 |2 |0 |
+ROW |77548 |2052 |39458 |0 |3 |A54F10|0 |2 |0 |
+ROW |77549 |2053 |39470 |0 |0 |969696|0 |9 |2 |
+ROW |77550 |2053 |39471 |0 |1 |C80000|0 |9 |0 |
+ROW |77551 |2054 |39445 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77552 |2056 |39507 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77553 |2057 |39513 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77554 |2057 |39511 |0 |1 |2774A4|0 |2 |0 |
+ROW |77555 |2057 |39510 |0 |2 |F63100|0 |2 |0 |
+ROW |77556 |2057 |39512 |0 |3 |A54F10|0 |2 |0 |
+ROW |77557 |2058 |39524 |0 |0 |969696|0 |9 |2 |
+ROW |77558 |2058 |39525 |0 |1 |C80000|0 |9 |0 |
+ROW |77559 |2059 |39499 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77560 |2061 |39561 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77561 |2062 |39567 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77562 |2062 |39565 |0 |1 |2774A4|0 |2 |0 |
+ROW |77563 |2062 |39564 |0 |2 |F63100|0 |2 |0 |
+ROW |77564 |2062 |39566 |0 |3 |A54F10|0 |2 |0 |
+ROW |77565 |2063 |39578 |0 |0 |969696|0 |9 |2 |
+ROW |77566 |2063 |39579 |0 |1 |C80000|0 |9 |0 |
+ROW |77567 |2064 |39553 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77568 |2066 |39615 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77569 |2067 |39621 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77570 |2067 |39619 |0 |1 |2774A4|0 |2 |0 |
+ROW |77571 |2067 |39618 |0 |2 |F63100|0 |2 |0 |
+ROW |77572 |2067 |39620 |0 |3 |A54F10|0 |2 |0 |
+ROW |77573 |2068 |39632 |0 |0 |969696|0 |9 |2 |
+ROW |77574 |2068 |39633 |0 |1 |C80000|0 |9 |0 |
+ROW |77575 |2069 |39607 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77576 |2071 |39669 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77577 |2072 |39675 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77578 |2072 |39673 |0 |1 |2774A4|0 |2 |0 |
+ROW |77579 |2072 |39672 |0 |2 |F63100|0 |2 |0 |
+ROW |77580 |2072 |39674 |0 |3 |A54F10|0 |2 |0 |
+ROW |77581 |2073 |39686 |0 |0 |969696|0 |9 |2 |
+ROW |77582 |2073 |39687 |0 |1 |C80000|0 |9 |0 |
+ROW |77583 |2074 |39661 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77584 |2076 |39723 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77585 |2077 |39729 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77586 |2077 |39727 |0 |1 |2774A4|0 |2 |0 |
+ROW |77587 |2077 |39726 |0 |2 |F63100|0 |2 |0 |
+ROW |77588 |2077 |39728 |0 |3 |A54F10|0 |2 |0 |
+ROW |77589 |2078 |39740 |0 |0 |969696|0 |9 |2 |
+ROW |77590 |2078 |39741 |0 |1 |C80000|0 |9 |0 |
+ROW |77591 |2079 |39715 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77592 |724 |27904 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77593 |1396 |32439 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77594 |1396 |32437 |0 |1 |2774A4|0 |2 |0 |
+ROW |77595 |1396 |32436 |0 |2 |F63100|0 |2 |0 |
+ROW |77596 |1396 |32438 |0 |3 |A54F10|0 |2 |0 |
+ROW |77597 |1052 |27907 |0 |0 |969696|0 |9 |2 |
+ROW |77598 |1052 |27908 |0 |1 |C80000|0 |9 |0 |
+ROW |77599 |1053 |30120 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77600 |1457 |33206 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77601 |1457 |33193 |5 |1 |2774A4|0 |2 |0 |
+ROW |77602 |1458 |33195 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77603 |1458 |33203 |5 |1 |2774A4|0 |2 |0 |
+ROW |77604 |1458 |33202 |5 |2 |F63100|0 |2 |0 |
+ROW |77605 |1459 |33200 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77606 |1459 |33194 |5 |1 |2774A4|0 |2 |0 |
+ROW |77607 |1460 |33187 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77608 |1460 |33186 |5 |1 |2774A4|0 |2 |0 |
+ROW |77609 |1460 |33204 |5 |2 |F63100|0 |2 |0 |
+ROW |77610 |1461 |33226 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77611 |1461 |33215 |5 |1 |2774A4|0 |2 |0 |
+ROW |77612 |1462 |33207 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77613 |1463 |33223 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77614 |1463 |33218 |5 |1 |2774A4|0 |2 |0 |
+ROW |77615 |1464 |33210 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77616 |1464 |33209 |5 |1 |2774A4|0 |2 |0 |
+ROW |77617 |1464 |33224 |5 |2 |F63100|0 |2 |0 |
+ROW |77618 |1465 |33249 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77619 |1465 |33236 |5 |1 |2774A4|0 |2 |0 |
+ROW |77620 |1466 |33238 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77621 |1466 |33246 |5 |1 |2774A4|0 |2 |0 |
+ROW |77622 |1466 |33245 |5 |2 |F63100|0 |2 |0 |
+ROW |77623 |1467 |33243 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77624 |1467 |33237 |5 |1 |2774A4|0 |2 |0 |
+ROW |77625 |1468 |33230 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77626 |1468 |33229 |5 |1 |2774A4|0 |2 |0 |
+ROW |77627 |1468 |33247 |5 |2 |F63100|0 |2 |0 |
+ROW |77628 |1469 |33258 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77629 |1470 |33251 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77630 |1471 |33256 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77631 |1472 |33277 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77632 |1473 |33274 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77633 |1473 |33273 |5 |1 |2774A4|0 |2 |0 |
+ROW |77634 |1473 |33272 |5 |2 |F63100|0 |2 |0 |
+ROW |77635 |1474 |33270 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77636 |1475 |33269 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77637 |1476 |33261 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77638 |1476 |33275 |5 |1 |2774A4|0 |2 |0 |
+ROW |77639 |1477 |33296 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77640 |1478 |33293 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77641 |1478 |33292 |5 |1 |2774A4|0 |2 |0 |
+ROW |77642 |1478 |33291 |5 |2 |F63100|0 |2 |0 |
+ROW |77643 |1479 |33289 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77644 |1480 |33288 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77645 |1481 |33280 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77646 |1481 |33294 |5 |1 |2774A4|0 |2 |0 |
+ROW |77647 |1482 |33312 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77648 |1483 |33313 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77649 |1484 |33314 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77650 |1485 |33319 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77651 |1486 |33320 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77652 |1487 |33304 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77653 |1487 |33305 |5 |1 |2774A4|0 |2 |0 |
+ROW |77654 |727 |27936 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77655 |1054 |27935 |2 |0 |1A7C11|0 |2 |0 |
+ROW |77656 |1054 |30122 |5 |1 |2774A4|0 |2 |0 |
+ROW |77657 |1055 |30123 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77658 |730 |27975 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77659 |1056 |30126 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77660 |733 |28003 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77661 |1057 |30131 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77662 |736 |28031 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77663 |1058 |30136 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77664 |2080 |39768 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77665 |2080 |39769 |0 |1 |2774A4|0 |2 |0 |
+ROW |77666 |2080 |39770 |0 |2 |F63100|0 |2 |0 |
+ROW |77667 |2080 |39771 |0 |3 |A54F10|0 |2 |0 |
+ROW |77668 |2081 |39772 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77669 |2081 |39773 |0 |1 |2774A4|0 |2 |0 |
+ROW |77670 |2082 |39774 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77671 |2082 |39775 |0 |1 |2774A4|0 |2 |0 |
+ROW |77672 |2082 |39780 |0 |2 |F63100|0 |2 |0 |
+ROW |77673 |2083 |39777 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77674 |2083 |39778 |0 |1 |2774A4|0 |2 |0 |
+ROW |77675 |2083 |39781 |0 |2 |F63100|0 |2 |0 |
+ROW |77676 |2084 |39792 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77677 |2084 |39790 |0 |1 |2774A4|0 |2 |0 |
+ROW |77678 |2084 |39793 |0 |2 |F63100|0 |2 |0 |
+ROW |77679 |2084 |39795 |0 |3 |A54F10|0 |2 |0 |
+ROW |77680 |2084 |39796 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77681 |1701 |35553 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77682 |1701 |35556 |0 |1 |2774A4|0 |2 |0 |
+ROW |77683 |1702 |35558 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77684 |1702 |35561 |0 |1 |2774A4|0 |2 |0 |
+ROW |77685 |1703 |35562 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77686 |1704 |35563 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77687 |1705 |35592 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77688 |1705 |35584 |0 |1 |2774A4|0 |2 |0 |
+ROW |77689 |1705 |35594 |0 |2 |F63100|0 |2 |0 |
+ROW |77690 |1705 |35586 |0 |3 |A54F10|0 |2 |0 |
+ROW |77691 |1705 |35595 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77692 |1705 |35587 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77693 |1706 |35593 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77694 |1706 |35585 |0 |1 |2774A4|0 |2 |0 |
+ROW |77695 |1707 |35583 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77696 |1707 |35591 |0 |1 |2774A4|0 |2 |0 |
+ROW |77697 |1708 |35598 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77698 |1709 |35606 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77699 |1710 |35607 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77700 |1711 |35566 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77701 |1712 |35622 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77702 |1713 |35634 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77703 |1713 |35626 |0 |1 |2774A4|0 |2 |0 |
+ROW |77704 |1713 |35636 |0 |2 |F63100|0 |2 |0 |
+ROW |77705 |1713 |35628 |0 |3 |A54F10|0 |2 |0 |
+ROW |77706 |1713 |35637 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77707 |1713 |35629 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77708 |1714 |35635 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77709 |1714 |35627 |0 |1 |2774A4|0 |2 |0 |
+ROW |77710 |1715 |35625 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77711 |1715 |35633 |0 |1 |2774A4|0 |2 |0 |
+ROW |77712 |1716 |35640 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77713 |1717 |35641 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77714 |1718 |35610 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77715 |1719 |35658 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77716 |1720 |35659 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77717 |1721 |35660 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77718 |1722 |35661 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77719 |1723 |35669 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77720 |1723 |35679 |0 |1 |2774A4|0 |2 |0 |
+ROW |77721 |1723 |35670 |0 |2 |F63100|0 |2 |0 |
+ROW |77722 |1723 |35665 |0 |3 |A54F10|0 |2 |0 |
+ROW |77723 |1723 |35672 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77724 |1723 |35666 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77725 |1724 |35663 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77726 |1724 |35664 |0 |1 |2774A4|0 |2 |0 |
+ROW |77727 |1725 |35686 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77728 |1725 |35693 |0 |1 |2774A4|0 |2 |0 |
+ROW |77729 |1725 |35684 |0 |2 |F63100|0 |2 |0 |
+ROW |77730 |1725 |35691 |0 |3 |A54F10|0 |2 |0 |
+ROW |77731 |1725 |35683 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77732 |1725 |35690 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77733 |1726 |35685 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77734 |1726 |35692 |0 |1 |2774A4|0 |2 |0 |
+ROW |77735 |1727 |35694 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77736 |1727 |35687 |0 |1 |2774A4|0 |2 |0 |
+ROW |77737 |1728 |35707 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77738 |1729 |35708 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77739 |1730 |35725 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77740 |1731 |35726 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77741 |1732 |35727 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77742 |1733 |35728 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77743 |1734 |35736 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77744 |1734 |35746 |0 |1 |2774A4|0 |2 |0 |
+ROW |77745 |1734 |35737 |0 |2 |F63100|0 |2 |0 |
+ROW |77746 |1734 |35732 |0 |3 |A54F10|0 |2 |0 |
+ROW |77747 |1734 |35739 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77748 |1734 |35733 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77749 |1735 |35730 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77750 |1735 |35731 |0 |1 |2774A4|0 |2 |0 |
+ROW |77751 |1736 |35753 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77752 |1736 |35760 |0 |1 |2774A4|0 |2 |0 |
+ROW |77753 |1736 |35751 |0 |2 |F63100|0 |2 |0 |
+ROW |77754 |1736 |35758 |0 |3 |A54F10|0 |2 |0 |
+ROW |77755 |1736 |35750 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77756 |1736 |35757 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77757 |1737 |35752 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77758 |1737 |35759 |0 |1 |2774A4|0 |2 |0 |
+ROW |77759 |1738 |35761 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77760 |1738 |35754 |0 |1 |2774A4|0 |2 |0 |
+ROW |77761 |1739 |35774 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77762 |1740 |35775 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77763 |1741 |35791 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77764 |1742 |35799 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77765 |1742 |35802 |0 |1 |2774A4|0 |2 |0 |
+ROW |77766 |1743 |35804 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77767 |1743 |35807 |0 |1 |2774A4|0 |2 |0 |
+ROW |77768 |1744 |35808 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77769 |1745 |35809 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77770 |1746 |35834 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77771 |1746 |35826 |0 |1 |2774A4|0 |2 |0 |
+ROW |77772 |1746 |35836 |0 |2 |F63100|0 |2 |0 |
+ROW |77773 |1746 |35828 |0 |3 |A54F10|0 |2 |0 |
+ROW |77774 |1746 |35837 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77775 |1746 |35829 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77776 |1747 |35835 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77777 |1747 |35827 |0 |1 |2774A4|0 |2 |0 |
+ROW |77778 |1748 |35825 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77779 |1748 |35833 |0 |1 |2774A4|0 |2 |0 |
+ROW |77780 |1749 |35840 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77781 |1750 |35812 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77782 |1751 |35876 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77783 |1751 |35868 |0 |1 |2774A4|0 |2 |0 |
+ROW |77784 |1751 |35878 |0 |2 |F63100|0 |2 |0 |
+ROW |77785 |1751 |35870 |0 |3 |A54F10|0 |2 |0 |
+ROW |77786 |1751 |35879 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77787 |1751 |35871 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77788 |1752 |35877 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77789 |1752 |35869 |0 |1 |2774A4|0 |2 |0 |
+ROW |77790 |1753 |35867 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77791 |1753 |35875 |0 |1 |2774A4|0 |2 |0 |
+ROW |77792 |1754 |35882 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77793 |1755 |35890 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77794 |1756 |35891 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77795 |1757 |35850 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77796 |1758 |35920 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77797 |1758 |35912 |0 |1 |2774A4|0 |2 |0 |
+ROW |77798 |1758 |35922 |0 |2 |F63100|0 |2 |0 |
+ROW |77799 |1758 |35914 |0 |3 |A54F10|0 |2 |0 |
+ROW |77800 |1758 |35923 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77801 |1758 |35915 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77802 |1759 |35921 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77803 |1759 |35913 |0 |1 |2774A4|0 |2 |0 |
+ROW |77804 |1760 |35911 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77805 |1760 |35919 |0 |1 |2774A4|0 |2 |0 |
+ROW |77806 |1761 |35926 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77807 |1762 |35934 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77808 |1763 |35935 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77809 |1764 |35894 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77810 |1765 |35952 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77811 |1766 |35964 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77812 |1766 |35956 |0 |1 |2774A4|0 |2 |0 |
+ROW |77813 |1766 |35966 |0 |2 |F63100|0 |2 |0 |
+ROW |77814 |1766 |35958 |0 |3 |A54F10|0 |2 |0 |
+ROW |77815 |1766 |35967 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77816 |1766 |35959 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77817 |1767 |35965 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77818 |1767 |35957 |0 |1 |2774A4|0 |2 |0 |
+ROW |77819 |1768 |35955 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77820 |1768 |35963 |0 |1 |2774A4|0 |2 |0 |
+ROW |77821 |1769 |35970 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77822 |1770 |35978 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77823 |1771 |35979 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77824 |1772 |35938 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77825 |1773 |35996 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77826 |1774 |36008 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77827 |1774 |36000 |0 |1 |2774A4|0 |2 |0 |
+ROW |77828 |1774 |36010 |0 |2 |F63100|0 |2 |0 |
+ROW |77829 |1774 |36002 |0 |3 |A54F10|0 |2 |0 |
+ROW |77830 |1774 |36011 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77831 |1774 |36003 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77832 |1775 |36009 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77833 |1775 |36001 |0 |1 |2774A4|0 |2 |0 |
+ROW |77834 |1776 |35999 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77835 |1776 |36007 |0 |1 |2774A4|0 |2 |0 |
+ROW |77836 |1777 |36014 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77837 |1778 |36022 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77838 |1779 |36023 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77839 |1780 |35982 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77840 |1781 |36041 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77841 |1782 |36053 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77842 |1782 |36045 |0 |1 |2774A4|0 |2 |0 |
+ROW |77843 |1782 |36055 |0 |2 |F63100|0 |2 |0 |
+ROW |77844 |1782 |36047 |0 |3 |A54F10|0 |2 |0 |
+ROW |77845 |1782 |36056 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77846 |1782 |36048 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77847 |1783 |36054 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77848 |1783 |36046 |0 |1 |2774A4|0 |2 |0 |
+ROW |77849 |1784 |36044 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77850 |1784 |36052 |0 |1 |2774A4|0 |2 |0 |
+ROW |77851 |1785 |36059 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77852 |1786 |36067 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77853 |1787 |36068 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77854 |1788 |36026 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77855 |1789 |36086 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77856 |1790 |36098 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77857 |1790 |36090 |0 |1 |2774A4|0 |2 |0 |
+ROW |77858 |1790 |36100 |0 |2 |F63100|0 |2 |0 |
+ROW |77859 |1790 |36092 |0 |3 |A54F10|0 |2 |0 |
+ROW |77860 |1790 |36101 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77861 |1790 |36093 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77862 |1791 |36099 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77863 |1791 |36091 |0 |1 |2774A4|0 |2 |0 |
+ROW |77864 |1792 |36089 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77865 |1792 |36097 |0 |1 |2774A4|0 |2 |0 |
+ROW |77866 |1793 |36104 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77867 |1794 |36112 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77868 |1795 |36113 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77869 |1796 |36071 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77870 |1797 |36131 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77871 |1798 |36144 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77872 |1798 |36136 |0 |1 |2774A4|0 |2 |0 |
+ROW |77873 |1798 |36146 |0 |2 |F63100|0 |2 |0 |
+ROW |77874 |1798 |36138 |0 |3 |A54F10|0 |2 |0 |
+ROW |77875 |1798 |36147 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77876 |1798 |36139 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77877 |1799 |36145 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77878 |1799 |36137 |0 |1 |2774A4|0 |2 |0 |
+ROW |77879 |1800 |36135 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77880 |1800 |36143 |0 |1 |2774A4|0 |2 |0 |
+ROW |77881 |1801 |36150 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77882 |1802 |36158 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77883 |1803 |36159 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77884 |1804 |36116 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77885 |1223 |31370 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77886 |1223 |31371 |5 |1 |2774A4|0 |2 |0 |
+ROW |77887 |1226 |31380 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77888 |1226 |31383 |5 |1 |2774A4|0 |2 |0 |
+ROW |77889 |1229 |31379 |0 |0 |1A7C11|1 |2 |0 |
+ROW |77890 |1229 |31382 |5 |1 |2774A4|0 |2 |0 |
+ROW |77891 |887 |29211 |0 |0 |969696|0 |9 |2 |
+ROW |77892 |887 |29210 |0 |1 |C80000|0 |9 |0 |
+ROW |77893 |899 |29216 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77894 |899 |29217 |2 |1 |2774A4|0 |2 |0 |
+ROW |77895 |899 |29218 |0 |2 |F63100|1 |2 |0 |
+ROW |77896 |899 |29219 |0 |3 |A54F10|1 |2 |0 |
+ROW |77897 |899 |29220 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77898 |899 |29221 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77899 |911 |29089 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77900 |911 |29102 |0 |1 |2774A4|0 |2 |0 |
+ROW |77901 |908 |29098 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77902 |908 |29097 |0 |1 |2774A4|0 |2 |0 |
+ROW |77903 |908 |29095 |0 |2 |F63100|0 |2 |0 |
+ROW |77904 |908 |29088 |0 |3 |A54F10|0 |2 |0 |
+ROW |77905 |908 |29094 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77906 |908 |29093 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77907 |908 |29092 |0 |6 |AC8C14|0 |2 |0 |
+ROW |77908 |908 |29091 |0 |7 |611F27|0 |2 |0 |
+ROW |77909 |908 |29090 |0 |8 |F230E0|0 |2 |0 |
+ROW |77910 |905 |29198 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77911 |917 |29104 |2 |0 |1A7C11|0 |2 |0 |
+ROW |77912 |917 |29105 |5 |1 |2774A4|0 |2 |0 |
+ROW |77913 |914 |31364 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77914 |923 |29118 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77915 |923 |29119 |0 |1 |2774A4|0 |2 |0 |
+ROW |77916 |923 |29117 |0 |2 |F63100|0 |2 |0 |
+ROW |77917 |920 |29107 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77918 |920 |29106 |0 |1 |2774A4|0 |2 |0 |
+ROW |77919 |902 |29096 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77920 |902 |29101 |0 |1 |2774A4|0 |2 |0 |
+ROW |77921 |902 |29100 |0 |2 |F63100|0 |2 |0 |
+ROW |77922 |902 |29087 |0 |3 |A54F10|1 |2 |0 |
+ROW |77923 |1279 |31902 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77924 |1279 |31903 |5 |1 |2774A4|0 |2 |0 |
+ROW |77925 |1281 |31933 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77926 |1281 |31936 |5 |1 |2774A4|0 |2 |0 |
+ROW |77927 |1283 |31932 |0 |0 |1A7C11|1 |2 |0 |
+ROW |77928 |1283 |31935 |5 |1 |2774A4|0 |2 |0 |
+ROW |77929 |1285 |31907 |0 |0 |969696|0 |9 |2 |
+ROW |77930 |1285 |31908 |0 |1 |C80000|0 |9 |0 |
+ROW |77931 |1287 |31911 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77932 |1287 |31914 |2 |1 |2774A4|0 |2 |0 |
+ROW |77933 |1287 |31913 |0 |2 |F63100|1 |2 |0 |
+ROW |77934 |1287 |31910 |0 |3 |A54F10|1 |2 |0 |
+ROW |77935 |1287 |31912 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77936 |1287 |31909 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77937 |1289 |31831 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77938 |1289 |31820 |0 |1 |2774A4|0 |2 |0 |
+ROW |77939 |1291 |31822 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77940 |1291 |31835 |0 |1 |2774A4|0 |2 |0 |
+ROW |77941 |1291 |31825 |0 |2 |F63100|0 |2 |0 |
+ROW |77942 |1291 |31826 |0 |3 |A54F10|0 |2 |0 |
+ROW |77943 |1291 |31823 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77944 |1291 |31827 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77945 |1291 |31824 |0 |6 |AC8C14|0 |2 |0 |
+ROW |77946 |1291 |31828 |0 |7 |611F27|0 |2 |0 |
+ROW |77947 |1291 |31830 |0 |8 |F230E0|0 |2 |0 |
+ROW |77948 |1293 |31892 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77949 |1295 |31855 |2 |0 |1A7C11|0 |2 |0 |
+ROW |77950 |1295 |31853 |5 |1 |2774A4|0 |2 |0 |
+ROW |77951 |1297 |31893 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77952 |1299 |31838 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77953 |1299 |31839 |0 |1 |2774A4|0 |2 |0 |
+ROW |77954 |1299 |31837 |0 |2 |F63100|0 |2 |0 |
+ROW |77955 |1301 |31850 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77956 |1301 |31852 |0 |1 |2774A4|0 |2 |0 |
+ROW |77957 |1303 |31829 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77958 |1303 |31833 |0 |1 |2774A4|0 |2 |0 |
+ROW |77959 |1303 |31834 |0 |2 |F63100|0 |2 |0 |
+ROW |77960 |1303 |31832 |0 |3 |A54F10|1 |2 |0 |
+ROW |77961 |952 |29436 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77962 |952 |29437 |2 |1 |2774A4|0 |2 |0 |
+ROW |77963 |952 |29438 |0 |2 |F63100|1 |2 |0 |
+ROW |77964 |952 |29439 |0 |3 |A54F10|1 |2 |0 |
+ROW |77965 |952 |29441 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |77966 |952 |29440 |0 |5 |6C59DC|1 |2 |0 |
+ROW |77967 |955 |29434 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77968 |955 |29435 |5 |1 |2774A4|0 |2 |0 |
+ROW |77969 |954 |29448 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77970 |954 |29449 |5 |1 |2774A4|0 |2 |0 |
+ROW |77971 |956 |29452 |0 |0 |1A7C11|1 |2 |0 |
+ROW |77972 |956 |29453 |5 |1 |2774A4|0 |2 |0 |
+ROW |77973 |953 |29446 |0 |0 |969696|0 |9 |2 |
+ROW |77974 |953 |29432 |0 |1 |C80000|0 |9 |0 |
+ROW |77975 |960 |29405 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77976 |960 |29406 |0 |1 |2774A4|0 |2 |0 |
+ROW |77977 |959 |29426 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77978 |959 |29413 |0 |1 |2774A4|0 |2 |0 |
+ROW |77979 |959 |29411 |0 |2 |F63100|0 |2 |0 |
+ROW |77980 |959 |29410 |0 |3 |A54F10|0 |2 |0 |
+ROW |77981 |959 |29399 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |77982 |959 |29409 |0 |5 |6C59DC|0 |2 |0 |
+ROW |77983 |959 |29412 |0 |6 |AC8C14|0 |2 |0 |
+ROW |77984 |959 |29408 |0 |7 |611F27|0 |2 |0 |
+ROW |77985 |959 |29407 |0 |8 |F230E0|0 |2 |0 |
+ROW |77986 |958 |29427 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77987 |962 |29403 |2 |0 |1A7C11|0 |2 |0 |
+ROW |77988 |962 |29402 |5 |1 |2774A4|0 |2 |0 |
+ROW |77989 |961 |29396 |5 |0 |1A7C11|0 |2 |0 |
+ROW |77990 |963 |29400 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77991 |963 |29401 |0 |1 |2774A4|0 |2 |0 |
+ROW |77992 |957 |29420 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77993 |957 |29419 |0 |1 |2774A4|0 |2 |0 |
+ROW |77994 |957 |29418 |0 |2 |F63100|0 |2 |0 |
+ROW |77995 |957 |29417 |0 |3 |A54F10|1 |2 |0 |
+ROW |77996 |866 |29014 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77997 |866 |29015 |5 |1 |2774A4|0 |2 |0 |
+ROW |77998 |868 |29018 |0 |0 |1A7C11|0 |2 |0 |
+ROW |77999 |868 |29019 |0 |1 |2774A4|0 |2 |0 |
+ROW |78000 |868 |29022 |0 |2 |F63100|0 |2 |0 |
+ROW |78001 |868 |29023 |0 |3 |A54F10|0 |2 |0 |
+ROW |78002 |868 |29020 |0 |4 |FC6EA3|0 |2 |0 |
+ROW |78003 |868 |29024 |0 |5 |6C59DC|0 |2 |0 |
+ROW |78004 |868 |29021 |0 |6 |AC8C14|0 |2 |0 |
+ROW |78005 |868 |29025 |0 |7 |611F27|0 |2 |0 |
+ROW |78006 |868 |29026 |0 |8 |F230E0|0 |2 |0 |
+ROW |78007 |870 |29048 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78008 |872 |29028 |0 |0 |969696|0 |9 |2 |
+ROW |78009 |872 |29027 |0 |1 |C80000|0 |9 |0 |
+ROW |78010 |882 |28992 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78011 |882 |28991 |0 |1 |2774A4|0 |2 |0 |
+ROW |78012 |876 |28982 |2 |0 |1A7C11|0 |2 |0 |
+ROW |78013 |876 |28983 |5 |1 |2774A4|0 |2 |0 |
+ROW |78014 |874 |28978 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78015 |878 |28985 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78016 |878 |28984 |0 |1 |2774A4|0 |2 |0 |
+ROW |78017 |880 |28987 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78018 |880 |28988 |0 |1 |2774A4|0 |2 |0 |
+ROW |78019 |880 |28989 |0 |2 |F63100|0 |2 |0 |
+ROW |78020 |880 |28990 |0 |3 |A54F10|1 |2 |0 |
+ROW |78021 |964 |29513 |0 |0 |969696|0 |9 |2 |
+ROW |78022 |964 |29512 |0 |1 |C80000|0 |9 |0 |
+ROW |78023 |1238 |31435 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78024 |1238 |31438 |2 |1 |2774A4|0 |2 |0 |
+ROW |78025 |1238 |31437 |0 |2 |F63100|1 |2 |0 |
+ROW |78026 |1238 |31434 |0 |3 |A54F10|1 |2 |0 |
+ROW |78027 |1238 |31436 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |78028 |1238 |31433 |0 |5 |6C59DC|1 |2 |0 |
+ROW |78029 |1488 |33321 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78030 |1488 |33324 |0 |1 |2774A4|0 |2 |0 |
+ROW |78031 |1490 |33322 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78032 |1490 |33323 |5 |1 |2774A4|0 |2 |0 |
+ROW |78033 |1240 |31441 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78034 |1240 |31442 |5 |1 |2774A4|0 |2 |0 |
+ROW |78035 |1242 |31440 |0 |0 |1A7C11|1 |2 |0 |
+ROW |78036 |1242 |31439 |5 |1 |2774A4|0 |2 |0 |
+ROW |78037 |974 |29456 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78038 |974 |29455 |0 |1 |2774A4|0 |2 |0 |
+ROW |78039 |976 |29458 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78040 |976 |29457 |0 |1 |2774A4|0 |2 |0 |
+ROW |78041 |972 |29454 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78042 |978 |29462 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78043 |980 |31421 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78044 |980 |29466 |0 |1 |2774A4|0 |2 |0 |
+ROW |78045 |1305 |32013 |0 |0 |969696|0 |9 |2 |
+ROW |78046 |1305 |32014 |0 |1 |C80000|0 |9 |0 |
+ROW |78047 |1307 |32017 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78048 |1307 |32020 |2 |1 |2774A4|0 |2 |0 |
+ROW |78049 |1307 |32019 |0 |2 |F63100|1 |2 |0 |
+ROW |78050 |1307 |32016 |0 |3 |A54F10|1 |2 |0 |
+ROW |78051 |1307 |32018 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |78052 |1307 |32015 |0 |5 |6C59DC|1 |2 |0 |
+ROW |78053 |1492 |33329 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78054 |1492 |33332 |0 |1 |2774A4|0 |2 |0 |
+ROW |78055 |1494 |33330 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78056 |1494 |33331 |5 |1 |2774A4|0 |2 |0 |
+ROW |78057 |1309 |32023 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78058 |1309 |32024 |5 |1 |2774A4|0 |2 |0 |
+ROW |78059 |1311 |32022 |0 |0 |1A7C11|1 |2 |0 |
+ROW |78060 |1311 |32021 |5 |1 |2774A4|0 |2 |0 |
+ROW |78061 |1313 |31952 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78062 |1313 |31949 |0 |1 |2774A4|0 |2 |0 |
+ROW |78063 |1315 |31951 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78064 |1315 |31950 |0 |1 |2774A4|0 |2 |0 |
+ROW |78065 |1317 |31954 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78066 |1319 |31973 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78067 |1321 |31969 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78068 |1321 |31970 |0 |1 |2774A4|0 |2 |0 |
+ROW |78069 |1583 |34451 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78070 |1584 |34465 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78071 |1584 |34463 |0 |1 |2774A4|0 |2 |0 |
+ROW |78072 |1585 |34466 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78073 |1585 |34462 |0 |1 |2774A4|0 |2 |0 |
+ROW |78074 |1586 |34499 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78075 |1587 |34513 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78076 |1587 |34511 |0 |1 |2774A4|0 |2 |0 |
+ROW |78077 |1588 |34514 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78078 |1588 |34510 |0 |1 |2774A4|0 |2 |0 |
+ROW |78079 |1589 |34547 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78080 |1590 |34561 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78081 |1590 |34559 |0 |1 |2774A4|0 |2 |0 |
+ROW |78082 |1591 |34562 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78083 |1591 |34558 |0 |1 |2774A4|0 |2 |0 |
+ROW |78084 |1592 |34595 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78085 |1593 |34609 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78086 |1593 |34607 |0 |1 |2774A4|0 |2 |0 |
+ROW |78087 |1594 |34610 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78088 |1594 |34606 |0 |1 |2774A4|0 |2 |0 |
+ROW |78089 |1595 |34643 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78090 |1596 |34657 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78091 |1596 |34655 |0 |1 |2774A4|0 |2 |0 |
+ROW |78092 |1597 |34658 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78093 |1597 |34654 |0 |1 |2774A4|0 |2 |0 |
+ROW |78094 |1619 |35016 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78095 |1620 |35030 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78096 |1620 |35028 |0 |1 |2774A4|0 |2 |0 |
+ROW |78097 |1621 |35031 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78098 |1621 |35027 |0 |1 |2774A4|0 |2 |0 |
+ROW |78099 |1601 |34739 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78100 |1602 |34753 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78101 |1602 |34751 |0 |1 |2774A4|0 |2 |0 |
+ROW |78102 |1603 |34754 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78103 |1603 |34750 |0 |1 |2774A4|0 |2 |0 |
+ROW |78104 |1604 |34787 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78105 |1569 |34192 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78106 |1569 |34180 |0 |1 |2774A4|0 |2 |0 |
+ROW |78107 |1570 |34194 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78108 |1570 |34190 |0 |1 |2774A4|0 |2 |0 |
+ROW |78109 |1605 |34793 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78110 |1606 |34807 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78111 |1606 |34805 |0 |1 |2774A4|0 |2 |0 |
+ROW |78112 |1607 |34808 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78113 |1607 |34804 |0 |1 |2774A4|0 |2 |0 |
+ROW |78114 |1608 |34841 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78115 |1609 |34855 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78116 |1609 |34853 |0 |1 |2774A4|0 |2 |0 |
+ROW |78117 |1610 |34856 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78118 |1610 |34852 |0 |1 |2774A4|0 |2 |0 |
+ROW |78119 |1611 |34889 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78120 |1612 |34903 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78121 |1612 |34901 |0 |1 |2774A4|0 |2 |0 |
+ROW |78122 |1613 |34904 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78123 |1613 |34900 |0 |1 |2774A4|0 |2 |0 |
+ROW |78124 |1518 |33705 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78125 |1519 |33724 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78126 |1519 |33722 |0 |1 |2774A4|0 |2 |0 |
+ROW |78127 |1519 |33726 |0 |2 |F63100|0 |2 |0 |
+ROW |78128 |1520 |33719 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78129 |1520 |33720 |0 |1 |2774A4|0 |2 |0 |
+ROW |78130 |1520 |33721 |0 |2 |F63100|0 |2 |0 |
+ROW |78131 |1521 |33725 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78132 |1521 |33723 |0 |1 |2774A4|0 |2 |0 |
+ROW |78133 |1521 |33727 |0 |2 |F63100|0 |2 |0 |
+ROW |78134 |1522 |33730 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78135 |1523 |33734 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78136 |1523 |33732 |0 |1 |2774A4|0 |2 |0 |
+ROW |78137 |1523 |33736 |0 |2 |F63100|0 |2 |0 |
+ROW |78138 |1524 |33735 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78139 |1524 |33733 |0 |1 |2774A4|0 |2 |0 |
+ROW |78140 |1524 |33737 |0 |2 |F63100|0 |2 |0 |
+ROW |78141 |1525 |33743 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78142 |1525 |33742 |0 |1 |2774A4|0 |2 |0 |
+ROW |78143 |1525 |33738 |0 |2 |F63100|0 |2 |0 |
+ROW |78144 |1526 |33692 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78145 |1526 |33693 |0 |1 |2774A4|0 |2 |0 |
+ROW |78146 |1571 |34269 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78147 |1571 |34270 |0 |1 |2774A4|0 |2 |0 |
+ROW |78148 |1571 |34271 |0 |2 |F63100|0 |2 |0 |
+ROW |78149 |1571 |34272 |0 |3 |A54F10|0 |2 |0 |
+ROW |78150 |1572 |34311 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78151 |1572 |34301 |0 |1 |2774A4|0 |2 |0 |
+ROW |78152 |1573 |34243 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78153 |1573 |34244 |0 |1 |2774A4|0 |2 |0 |
+ROW |78154 |1573 |34246 |0 |2 |F63100|0 |2 |0 |
+ROW |78155 |1573 |34245 |0 |3 |A54F10|0 |2 |0 |
+ROW |78156 |1574 |34239 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78157 |1574 |34227 |0 |1 |2774A4|0 |2 |0 |
+ROW |78158 |1574 |34236 |0 |2 |F63100|0 |2 |0 |
+ROW |78159 |1574 |34237 |0 |3 |A54F10|0 |2 |0 |
+ROW |78160 |1575 |34253 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78161 |1575 |34252 |0 |1 |2774A4|0 |2 |0 |
+ROW |78162 |1575 |34249 |0 |2 |F63100|0 |2 |0 |
+ROW |78163 |1575 |34251 |0 |3 |A54F10|0 |2 |0 |
+ROW |78164 |1496 |33368 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78165 |1497 |33371 |1 |0 |1A7C11|0 |2 |0 |
+ROW |78166 |1497 |33371 |1 |1 |2774A4|0 |2 |0 |
+ROW |78167 |1498 |33379 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78168 |1498 |33382 |2 |1 |2774A4|0 |2 |0 |
+ROW |78169 |1498 |33381 |0 |2 |F63100|1 |2 |0 |
+ROW |78170 |1498 |33378 |0 |3 |A54F10|1 |2 |0 |
+ROW |78171 |1498 |33380 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |78172 |1498 |33377 |0 |5 |6C59DC|1 |2 |0 |
+ROW |78173 |1142 |30689 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78174 |1805 |36187 |5 |0 |1A7C11|0 |2 |0 |
+ROW |78175 |1805 |36192 |2 |1 |2774A4|0 |2 |0 |
+ROW |78176 |1805 |36190 |0 |2 |F63100|1 |2 |0 |
+ROW |78177 |1805 |36185 |0 |3 |A54F10|1 |2 |0 |
+ROW |78178 |1805 |36189 |0 |4 |FC6EA3|1 |2 |0 |
+ROW |78179 |1805 |36184 |0 |5 |6C59DC|1 |2 |0 |
+ROW |78180 |1275 |31794 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78181 |1275 |31792 |0 |1 |2774A4|0 |2 |0 |
+ROW |78182 |1275 |31800 |0 |2 |F63100|1 |2 |0 |
+ROW |78183 |1276 |36771 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78184 |1276 |33390 |0 |1 |2774A4|0 |2 |0 |
+ROW |78185 |1276 |31799 |0 |2 |F63100|0 |2 |0 |
+ROW |78186 |1276 |31797 |0 |3 |A54F10|0 |2 |0 |
+ROW |78187 |1277 |36770 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78188 |1277 |33389 |0 |1 |2774A4|0 |2 |0 |
+ROW |78189 |1277 |31795 |0 |2 |F63100|0 |2 |0 |
+ROW |78190 |1278 |36769 |0 |0 |1A7C11|0 |2 |0 |
+ROW |78191 |1278 |31793 |0 |1 |2774A4|0 |2 |0 |
+ROW |78192 |1278 |31802 |0 |2 |F63100|0 |2 |0 |
+ROW |78193 |1278 |31790 |0 |3 |A54F10|0 |2 |0 |
+ROW |78194 |1278 |31791 |0 |4 |FC6EA3|0 |2 |0 |
TABLE |hostmacro
FIELDS|hostmacroid|hostid|macro |value |description |type|
@@ -59866,6 +59866,10 @@ ROW |87807 |39818 |1 |12 |$.data.ha[?(@.id=="{#NODE.ID}")].lastacce
ROW |87808 |39819 |1 |12 |$.data.ha[?(@.id=="{#NODE.ID}")].lastaccess.first() |0 | |
ROW |87809 |39820 |1 |12 |$.data.ha[?(@.id=="{#NODE.ID}")].status.first() |0 | |
ROW |87810 |39820 |2 |20 |12h |0 | |
+ROW |87811 |31439 |1 |21 |return (100 - value) |0 | |
+ROW |87812 |31443 |1 |21 |return (100 - value) |0 | |
+ROW |87813 |32021 |1 |21 |return (100 - value) |0 | |
+ROW |87814 |32035 |1 |21 |return (100 - value) |0 | |
TABLE |sysmap_shape
FIELDS|sysmap_shapeid|sysmapid|type|x |y |width|height|text |font|font_size|font_color|text_halign|text_valign|border_type|border_width|border_color|background_color|zindex|
@@ -59996,436 +60000,436 @@ TABLE |lld_override
FIELDS|lld_overrideid|itemid|name |step|evaltype|formula|stop|
ROW |195 |34718 |Temp |1 |0 | |0 |
ROW |196 |34719 |Temp |1 |0 | |0 |
-ROW |727 |30961 |trigger |1 |0 | |0 |
-ROW |728 |30193 |Discard HTTP status codes |1 |0 | |0 |
-ROW |729 |30194 |Discard HTTP status codes |1 |0 | |0 |
-ROW |730 |30195 |Discard HTTP status codes |1 |0 | |0 |
-ROW |731 |30236 |Discard HTTP status codes |1 |0 | |0 |
-ROW |732 |30237 |Discard HTTP status codes |1 |0 | |0 |
-ROW |733 |30238 |Discard HTTP status codes |1 |0 | |0 |
-ROW |734 |33521 |trigger disabled non main channels |1 |0 | |0 |
-ROW |735 |33810 |Primary metrics |1 |0 | |0 |
-ROW |736 |33810 |Arbiter metrics |2 |0 | |0 |
-ROW |737 |34346 |Too many missed regions trigger |1 |0 | |0 |
-ROW |738 |34346 |Unresponsive peers trigger |2 |0 | |0 |
-ROW |739 |34403 |Failed GC-related operations trigger |1 |0 | |0 |
-ROW |740 |34443 |Too many unreachable messages trigger |1 |0 | |0 |
-ROW |741 |33657 |ID filter |1 |0 | |0 |
-ROW |742 |33658 |Not NVMe |2 |0 | |0 |
-ROW |743 |33658 |Self-test |1 |0 | |0 |
-ROW |744 |33669 |ID filter |1 |0 | |0 |
-ROW |745 |33670 |Not NVMe |2 |0 | |0 |
-ROW |746 |33670 |Self-test |1 |0 | |0 |
-ROW |747 |28306 |trigger THRESHOLD_HI_CRIT |4 |0 | |0 |
-ROW |748 |28306 |trigger THRESHOLD_HI_WARN |3 |0 | |0 |
-ROW |749 |28306 |trigger THRESHOLD_LO_CRIT |2 |0 | |0 |
-ROW |750 |28306 |trigger THRESHOLD_LO_WARN |1 |0 | |0 |
-ROW |751 |28307 |trigger THRESHOLD_HI_CRIT |4 |0 | |0 |
-ROW |752 |28307 |trigger THRESHOLD_HI_WARN |3 |0 | |0 |
-ROW |753 |28307 |trigger THRESHOLD_LO_CRIT |2 |0 | |0 |
-ROW |754 |28307 |trigger THRESHOLD_LO_WARN |1 |0 | |0 |
-ROW |755 |33182 |trigger THRESHOLD_HI_CRIT |4 |0 | |0 |
-ROW |756 |33182 |trigger THRESHOLD_HI_WARN |3 |0 | |0 |
-ROW |757 |33182 |trigger THRESHOLD_LO_CRIT |2 |0 | |0 |
-ROW |758 |33182 |trigger THRESHOLD_LO_WARN |1 |0 | |0 |
-ROW |759 |35366 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |760 |35542 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |761 |35543 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |762 |35575 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |763 |35619 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |764 |35653 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |765 |35654 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |766 |35720 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |767 |35721 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |768 |35787 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |769 |35788 |Trigger disabled |1 |0 | |0 |
-ROW |770 |35788 |Trigger enabled |2 |0 | |0 |
-ROW |771 |35820 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |772 |35859 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |773 |35903 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |774 |35947 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |775 |35991 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |776 |36036 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |777 |36081 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |778 |36126 |Don't create triggers for matching interface|1 |0 | |0 |
-ROW |779 |34478 |Temp |1 |0 | |0 |
-ROW |780 |34479 |Temp |1 |0 | |0 |
-ROW |781 |34526 |Temp |1 |0 | |0 |
-ROW |782 |34527 |Temp |1 |0 | |0 |
-ROW |783 |34574 |Temp |1 |0 | |0 |
-ROW |784 |34575 |Temp |1 |0 | |0 |
-ROW |785 |34622 |Temp |1 |0 | |0 |
-ROW |786 |34623 |Temp |1 |0 | |0 |
-ROW |787 |34670 |Temp |1 |0 | |0 |
-ROW |788 |34671 |Temp |1 |0 | |0 |
-ROW |789 |35043 |Temp |1 |0 | |0 |
-ROW |790 |35044 |Temp |1 |0 | |0 |
-ROW |791 |34766 |Temp |1 |0 | |0 |
-ROW |792 |34767 |Temp |1 |0 | |0 |
-ROW |793 |34209 |Temp |1 |0 | |0 |
-ROW |794 |34210 |Temp |1 |0 | |0 |
-ROW |795 |34820 |Temp |1 |0 | |0 |
-ROW |796 |34821 |Temp |1 |0 | |0 |
-ROW |797 |34868 |Temp |1 |0 | |0 |
-ROW |798 |34869 |Temp |1 |0 | |0 |
-ROW |799 |34916 |Temp |1 |0 | |0 |
-ROW |800 |34917 |Temp |1 |0 | |0 |
-ROW |801 |33354 |Do not discover aggregate metrics |1 |0 | |0 |
-ROW |802 |30687 |trigger SENSOR_HI_CRIT |5 |0 | |0 |
-ROW |803 |30687 |trigger SENSOR_HI_DISAST |6 |0 | |0 |
-ROW |804 |30687 |trigger SENSOR_HI_WARN |4 |0 | |0 |
-ROW |805 |30687 |trigger SENSOR_LO_CRIT |2 |0 | |0 |
-ROW |806 |30687 |trigger SENSOR_LO_DISAST |3 |0 | |0 |
-ROW |807 |30687 |trigger SENSOR_LO_WARN |1 |0 | |0 |
+ROW |808 |30961 |trigger |1 |0 | |0 |
+ROW |809 |30193 |Discard HTTP status codes |1 |0 | |0 |
+ROW |810 |30194 |Discard HTTP status codes |1 |0 | |0 |
+ROW |811 |30195 |Discard HTTP status codes |1 |0 | |0 |
+ROW |812 |30236 |Discard HTTP status codes |1 |0 | |0 |
+ROW |813 |30237 |Discard HTTP status codes |1 |0 | |0 |
+ROW |814 |30238 |Discard HTTP status codes |1 |0 | |0 |
+ROW |815 |33521 |trigger disabled non main channels |1 |0 | |0 |
+ROW |816 |33810 |Primary metrics |1 |0 | |0 |
+ROW |817 |33810 |Arbiter metrics |2 |0 | |0 |
+ROW |818 |34346 |Too many missed regions trigger |1 |0 | |0 |
+ROW |819 |34346 |Unresponsive peers trigger |2 |0 | |0 |
+ROW |820 |34403 |Failed GC-related operations trigger |1 |0 | |0 |
+ROW |821 |34443 |Too many unreachable messages trigger |1 |0 | |0 |
+ROW |822 |33657 |ID filter |1 |0 | |0 |
+ROW |823 |33658 |Not NVMe |2 |0 | |0 |
+ROW |824 |33658 |Self-test |1 |0 | |0 |
+ROW |825 |33669 |ID filter |1 |0 | |0 |
+ROW |826 |33670 |Not NVMe |2 |0 | |0 |
+ROW |827 |33670 |Self-test |1 |0 | |0 |
+ROW |828 |28306 |trigger THRESHOLD_HI_CRIT |4 |0 | |0 |
+ROW |829 |28306 |trigger THRESHOLD_HI_WARN |3 |0 | |0 |
+ROW |830 |28306 |trigger THRESHOLD_LO_CRIT |2 |0 | |0 |
+ROW |831 |28306 |trigger THRESHOLD_LO_WARN |1 |0 | |0 |
+ROW |832 |28307 |trigger THRESHOLD_HI_CRIT |4 |0 | |0 |
+ROW |833 |28307 |trigger THRESHOLD_HI_WARN |3 |0 | |0 |
+ROW |834 |28307 |trigger THRESHOLD_LO_CRIT |2 |0 | |0 |
+ROW |835 |28307 |trigger THRESHOLD_LO_WARN |1 |0 | |0 |
+ROW |836 |33182 |trigger THRESHOLD_HI_CRIT |4 |0 | |0 |
+ROW |837 |33182 |trigger THRESHOLD_HI_WARN |3 |0 | |0 |
+ROW |838 |33182 |trigger THRESHOLD_LO_CRIT |2 |0 | |0 |
+ROW |839 |33182 |trigger THRESHOLD_LO_WARN |1 |0 | |0 |
+ROW |840 |35366 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |841 |35542 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |842 |35543 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |843 |35575 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |844 |35619 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |845 |35653 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |846 |35654 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |847 |35720 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |848 |35721 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |849 |35787 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |850 |35788 |Trigger disabled |1 |0 | |0 |
+ROW |851 |35788 |Trigger enabled |2 |0 | |0 |
+ROW |852 |35820 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |853 |35859 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |854 |35903 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |855 |35947 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |856 |35991 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |857 |36036 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |858 |36081 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |859 |36126 |Don't create triggers for matching interface|1 |0 | |0 |
+ROW |860 |34478 |Temp |1 |0 | |0 |
+ROW |861 |34479 |Temp |1 |0 | |0 |
+ROW |862 |34526 |Temp |1 |0 | |0 |
+ROW |863 |34527 |Temp |1 |0 | |0 |
+ROW |864 |34574 |Temp |1 |0 | |0 |
+ROW |865 |34575 |Temp |1 |0 | |0 |
+ROW |866 |34622 |Temp |1 |0 | |0 |
+ROW |867 |34623 |Temp |1 |0 | |0 |
+ROW |868 |34670 |Temp |1 |0 | |0 |
+ROW |869 |34671 |Temp |1 |0 | |0 |
+ROW |870 |35043 |Temp |1 |0 | |0 |
+ROW |871 |35044 |Temp |1 |0 | |0 |
+ROW |872 |34766 |Temp |1 |0 | |0 |
+ROW |873 |34767 |Temp |1 |0 | |0 |
+ROW |874 |34209 |Temp |1 |0 | |0 |
+ROW |875 |34210 |Temp |1 |0 | |0 |
+ROW |876 |34820 |Temp |1 |0 | |0 |
+ROW |877 |34821 |Temp |1 |0 | |0 |
+ROW |878 |34868 |Temp |1 |0 | |0 |
+ROW |879 |34869 |Temp |1 |0 | |0 |
+ROW |880 |34916 |Temp |1 |0 | |0 |
+ROW |881 |34917 |Temp |1 |0 | |0 |
+ROW |882 |33354 |Do not discover aggregate metrics |1 |0 | |0 |
+ROW |883 |30687 |trigger SENSOR_HI_CRIT |5 |0 | |0 |
+ROW |884 |30687 |trigger SENSOR_HI_DISAST |6 |0 | |0 |
+ROW |885 |30687 |trigger SENSOR_HI_WARN |4 |0 | |0 |
+ROW |886 |30687 |trigger SENSOR_LO_CRIT |2 |0 | |0 |
+ROW |887 |30687 |trigger SENSOR_LO_DISAST |3 |0 | |0 |
+ROW |888 |30687 |trigger SENSOR_LO_WARN |1 |0 | |0 |
TABLE |lld_override_condition
FIELDS|lld_override_conditionid|lld_overrideid|operator|macro |value |
ROW |116 |195 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
ROW |117 |196 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |614 |727 |8 |{#GRPC.CODE} |{$ETCD.GRPC_CODE.TRIGGER.MATCHES} |
-ROW |615 |728 |8 |{#MODE} |tcp |
-ROW |616 |729 |8 |{#MODE} |tcp |
-ROW |617 |730 |8 |{#MODE} |tcp |
-ROW |618 |731 |8 |{#MODE} |tcp |
-ROW |619 |732 |8 |{#MODE} |tcp |
-ROW |620 |733 |8 |{#MODE} |tcp |
-ROW |621 |734 |9 |{#CHANNEL_ID} |{$HIKVISION_MAIN_CHANNEL_ID} |
-ROW |622 |735 |8 |{#NODE_STATE} |1 |
-ROW |623 |736 |8 |{#NODE_STATE} |7 |
-ROW |624 |737 |8 |{#TYPE} |miss_peer_region_count |
-ROW |625 |738 |8 |{#TYPE} |down_peer_region_count |
-ROW |626 |739 |8 |{#TYPE} |failed |
-ROW |627 |740 |8 |{#TYPE} |unreachable |
-ROW |628 |741 |8 |{#ID} |{$SMART.ATTRIBUTE.ID.MATCHES} |
-ROW |629 |741 |8 |{#NAME} |{$SMART.DISK.NAME.MATCHES} |
-ROW |630 |742 |9 |{#DISKTYPE} |nvme |
-ROW |631 |743 |8 |{#DISKTYPE} |nvme |
-ROW |632 |744 |8 |{#ID} |{$SMART.ATTRIBUTE.ID.MATCHES} |
-ROW |633 |744 |8 |{#NAME} |{$SMART.DISK.NAME.MATCHES} |
-ROW |634 |745 |9 |{#DISKTYPE} |nvme |
-ROW |635 |746 |8 |{#DISKTYPE} |nvme |
-ROW |636 |747 |8 |{#THRESHOLD_HI_CRIT} |^$ |
-ROW |637 |748 |8 |{#THRESHOLD_HI_WARN} |^$ |
-ROW |638 |749 |8 |{#THRESHOLD_LO_CRIT} |^$ |
-ROW |639 |750 |8 |{#THRESHOLD_LO_WARN} |^$ |
-ROW |640 |751 |8 |{#THRESHOLD_HI_CRIT} |^$ |
-ROW |641 |752 |8 |{#THRESHOLD_HI_WARN} |^$ |
-ROW |642 |753 |8 |{#THRESHOLD_LO_CRIT} |^$ |
-ROW |643 |754 |8 |{#THRESHOLD_LO_WARN} |^$ |
-ROW |644 |755 |8 |{#THRESHOLD_HI_CRIT} |^$ |
-ROW |645 |756 |8 |{#THRESHOLD_HI_WARN} |^$ |
-ROW |646 |757 |8 |{#THRESHOLD_LO_CRIT} |^$ |
-ROW |647 |758 |8 |{#THRESHOLD_LO_WARN} |^$ |
-ROW |648 |759 |9 |{#CISCO.IF.NAME} |{$CISCO.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |649 |760 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |650 |761 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |651 |762 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |652 |763 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |653 |764 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |654 |765 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |655 |766 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |656 |767 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |657 |768 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |658 |769 |8 |{#ZYXEL.IF.NAME} |.* |
-ROW |659 |770 |8 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |660 |771 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |661 |772 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |662 |773 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |663 |774 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |664 |775 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |665 |776 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |666 |777 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |667 |778 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
-ROW |668 |779 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |669 |780 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |670 |781 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |671 |782 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |672 |783 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |673 |784 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |674 |785 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |675 |786 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |676 |787 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |677 |788 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |678 |789 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |679 |790 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |680 |791 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |681 |792 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |682 |793 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |683 |794 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |684 |795 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |685 |796 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |686 |797 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |687 |798 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |688 |799 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
-ROW |689 |800 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
-ROW |690 |801 |8 |{#FSTYPE} |3&pipe;4 |
+ROW |691 |808 |8 |{#GRPC.CODE} |{$ETCD.GRPC_CODE.TRIGGER.MATCHES} |
+ROW |692 |809 |8 |{#MODE} |tcp |
+ROW |693 |810 |8 |{#MODE} |tcp |
+ROW |694 |811 |8 |{#MODE} |tcp |
+ROW |695 |812 |8 |{#MODE} |tcp |
+ROW |696 |813 |8 |{#MODE} |tcp |
+ROW |697 |814 |8 |{#MODE} |tcp |
+ROW |698 |815 |9 |{#CHANNEL_ID} |{$HIKVISION_MAIN_CHANNEL_ID} |
+ROW |699 |816 |8 |{#NODE_STATE} |1 |
+ROW |700 |817 |8 |{#NODE_STATE} |7 |
+ROW |701 |818 |8 |{#TYPE} |miss_peer_region_count |
+ROW |702 |819 |8 |{#TYPE} |down_peer_region_count |
+ROW |703 |820 |8 |{#TYPE} |failed |
+ROW |704 |821 |8 |{#TYPE} |unreachable |
+ROW |705 |822 |8 |{#ID} |{$SMART.ATTRIBUTE.ID.MATCHES} |
+ROW |706 |822 |8 |{#NAME} |{$SMART.DISK.NAME.MATCHES} |
+ROW |707 |823 |9 |{#DISKTYPE} |nvme |
+ROW |708 |824 |8 |{#DISKTYPE} |nvme |
+ROW |709 |825 |8 |{#ID} |{$SMART.ATTRIBUTE.ID.MATCHES} |
+ROW |710 |825 |8 |{#NAME} |{$SMART.DISK.NAME.MATCHES} |
+ROW |711 |826 |9 |{#DISKTYPE} |nvme |
+ROW |712 |827 |8 |{#DISKTYPE} |nvme |
+ROW |713 |828 |8 |{#THRESHOLD_HI_CRIT} |^$ |
+ROW |714 |829 |8 |{#THRESHOLD_HI_WARN} |^$ |
+ROW |715 |830 |8 |{#THRESHOLD_LO_CRIT} |^$ |
+ROW |716 |831 |8 |{#THRESHOLD_LO_WARN} |^$ |
+ROW |717 |832 |8 |{#THRESHOLD_HI_CRIT} |^$ |
+ROW |718 |833 |8 |{#THRESHOLD_HI_WARN} |^$ |
+ROW |719 |834 |8 |{#THRESHOLD_LO_CRIT} |^$ |
+ROW |720 |835 |8 |{#THRESHOLD_LO_WARN} |^$ |
+ROW |721 |836 |8 |{#THRESHOLD_HI_CRIT} |^$ |
+ROW |722 |837 |8 |{#THRESHOLD_HI_WARN} |^$ |
+ROW |723 |838 |8 |{#THRESHOLD_LO_CRIT} |^$ |
+ROW |724 |839 |8 |{#THRESHOLD_LO_WARN} |^$ |
+ROW |725 |840 |9 |{#CISCO.IF.NAME} |{$CISCO.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |726 |841 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |727 |842 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |728 |843 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |729 |844 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |730 |845 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |731 |846 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |732 |847 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |733 |848 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |734 |849 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |735 |850 |8 |{#ZYXEL.IF.NAME} |.* |
+ROW |736 |851 |8 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |737 |852 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |738 |853 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |739 |854 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |740 |855 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |741 |856 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |742 |857 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |743 |858 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |744 |859 |9 |{#ZYXEL.IF.NAME} |{$ZYXEL.LLD.FILTER.IF.CONTROL.MATCHES}|
+ROW |745 |860 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |746 |861 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |747 |862 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |748 |863 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |749 |864 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |750 |865 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |751 |866 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |752 |867 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |753 |868 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |754 |869 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |755 |870 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |756 |871 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |757 |872 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |758 |873 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |759 |874 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |760 |875 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |761 |876 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |762 |877 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |763 |878 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |764 |879 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |765 |880 |8 |{#EXTERNAL_SENSOR1_NAME}|Temp |
+ROW |766 |881 |8 |{#EXTERNAL_SENSOR2_NAME}|Temp |
+ROW |767 |882 |8 |{#FSTYPE} |3&pipe;4 |
TABLE |lld_override_operation
FIELDS|lld_override_operationid|lld_overrideid|operationobject|operator|value |
ROW |201 |195 |0 |2 |Humidity |
ROW |202 |196 |0 |2 |Humidity |
-ROW |754 |727 |1 |2 |Too many failed gRPC requests |
-ROW |755 |728 |0 |2 |Number of responses with codes |
-ROW |756 |729 |0 |2 |Number of responses with codes |
-ROW |757 |730 |0 |2 |Number of responses with codes |
-ROW |758 |731 |0 |2 |Number of responses with codes |
-ROW |759 |732 |0 |2 |Number of responses with codes |
-ROW |760 |733 |0 |2 |Number of responses with codes |
-ROW |761 |734 |1 |2 |Invalid video stream resolution parameters |
-ROW |762 |735 |0 |2 |Number of replicas |
-ROW |763 |735 |0 |2 |Unhealthy replicas |
-ROW |764 |735 |0 |2 |Number of unhealthy replicas |
-ROW |765 |735 |0 |2 |Replication lag |
-ROW |766 |736 |0 |2 |Replication lag |
-ROW |767 |737 |1 |2 |Too many missed regions |
-ROW |768 |738 |1 |2 |There are unresponsive peers |
-ROW |769 |739 |1 |2 |Too many failed GC-related operations |
-ROW |770 |740 |1 |2 |Too many failure messages |
-ROW |771 |741 |0 |8 | |
-ROW |772 |742 |0 |8 |Media&pipe;Percentage&pipe;Critical |
-ROW |773 |743 |0 |2 |Self-test |
-ROW |774 |744 |0 |8 | |
-ROW |775 |745 |0 |8 |Media&pipe;Percentage&pipe;Critical |
-ROW |776 |746 |0 |2 |Self-test |
-ROW |777 |747 |1 |8 |Temperature is above the critical threshold|
-ROW |778 |748 |1 |8 |Temperature is above the warning threshold |
-ROW |779 |749 |1 |8 |Temperature is below the critical threshold|
-ROW |780 |750 |1 |8 |Temperature is below the warning threshold |
-ROW |781 |751 |1 |8 |Fan speed is above the critical threshold |
-ROW |782 |752 |1 |8 |Fan speed is above the warning threshold |
-ROW |783 |753 |1 |8 |Fan speed is below the critical threshold |
-ROW |784 |754 |1 |8 |Fan speed is below the warning threshold |
-ROW |785 |755 |1 |8 |Voltage is above the critical threshold |
-ROW |786 |756 |1 |8 |Voltage is above the warning threshold |
-ROW |787 |757 |1 |8 |Voltage is below the critical threshold |
-ROW |788 |758 |1 |8 |Voltage is below the warning threshold |
-ROW |789 |759 |1 |8 |.* |
-ROW |790 |760 |1 |8 |.* |
-ROW |791 |761 |1 |8 |.* |
-ROW |792 |762 |1 |8 |.* |
-ROW |793 |763 |1 |8 |.* |
-ROW |794 |764 |1 |8 |.* |
-ROW |795 |765 |1 |8 |.* |
-ROW |796 |766 |1 |8 |.* |
-ROW |797 |767 |1 |8 |.* |
-ROW |798 |768 |1 |8 |.* |
-ROW |799 |769 |1 |8 |.* |
-ROW |800 |770 |1 |8 |.* |
-ROW |801 |771 |1 |8 |.* |
-ROW |802 |772 |1 |8 |.* |
-ROW |803 |773 |1 |8 |.* |
-ROW |804 |774 |1 |8 |.* |
-ROW |805 |775 |1 |8 |.* |
-ROW |806 |776 |1 |8 |.* |
-ROW |807 |777 |1 |8 |.* |
-ROW |808 |778 |1 |8 |.* |
-ROW |809 |779 |0 |2 |Humidity |
-ROW |810 |780 |0 |2 |Humidity |
-ROW |811 |781 |0 |2 |Humidity |
-ROW |812 |782 |0 |2 |Humidity |
-ROW |813 |783 |0 |2 |Humidity |
-ROW |814 |784 |0 |2 |Humidity |
-ROW |815 |785 |0 |2 |Humidity |
-ROW |816 |786 |0 |2 |Humidity |
-ROW |817 |787 |0 |2 |Humidity |
-ROW |818 |788 |0 |2 |Humidity |
-ROW |819 |789 |0 |2 |Humidity |
-ROW |820 |790 |0 |2 |Humidity |
-ROW |821 |791 |0 |2 |Humidity |
-ROW |822 |792 |0 |2 |Humidity |
-ROW |823 |793 |0 |2 |Humidity |
-ROW |824 |794 |0 |2 |Humidity |
-ROW |825 |795 |0 |2 |Humidity |
-ROW |826 |796 |0 |2 |Humidity |
-ROW |827 |797 |0 |2 |Humidity |
-ROW |828 |798 |0 |2 |Humidity |
-ROW |829 |799 |0 |2 |Humidity |
-ROW |830 |800 |0 |2 |Humidity |
-ROW |831 |801 |0 |2 |Saved |
-ROW |832 |802 |1 |2 |{#SENSOR_HI_CRIT} |
-ROW |833 |803 |1 |2 |{#SENSOR_HI_DISAST} |
-ROW |834 |804 |1 |2 |{#SENSOR_HI_WARN} |
-ROW |835 |805 |1 |2 |{#SENSOR_LO_CRIT} |
-ROW |836 |806 |1 |2 |{#SENSOR_LO_DISAST} |
-ROW |837 |807 |1 |2 |{#SENSOR_LO_WARN} |
+ROW |838 |808 |1 |2 |Too many failed gRPC requests |
+ROW |839 |809 |0 |2 |Number of responses with codes |
+ROW |840 |810 |0 |2 |Number of responses with codes |
+ROW |841 |811 |0 |2 |Number of responses with codes |
+ROW |842 |812 |0 |2 |Number of responses with codes |
+ROW |843 |813 |0 |2 |Number of responses with codes |
+ROW |844 |814 |0 |2 |Number of responses with codes |
+ROW |845 |815 |1 |2 |Invalid video stream resolution parameters |
+ROW |846 |816 |0 |2 |Number of replicas |
+ROW |847 |816 |0 |2 |Unhealthy replicas |
+ROW |848 |816 |0 |2 |Number of unhealthy replicas |
+ROW |849 |816 |0 |2 |Replication lag |
+ROW |850 |817 |0 |2 |Replication lag |
+ROW |851 |818 |1 |2 |Too many missed regions |
+ROW |852 |819 |1 |2 |There are unresponsive peers |
+ROW |853 |820 |1 |2 |Too many failed GC-related operations |
+ROW |854 |821 |1 |2 |Too many failure messages |
+ROW |855 |822 |0 |8 | |
+ROW |856 |823 |0 |8 |Media&pipe;Percentage&pipe;Critical |
+ROW |857 |824 |0 |2 |Self-test |
+ROW |858 |825 |0 |8 | |
+ROW |859 |826 |0 |8 |Media&pipe;Percentage&pipe;Critical |
+ROW |860 |827 |0 |2 |Self-test |
+ROW |861 |828 |1 |8 |Temperature is above the critical threshold|
+ROW |862 |829 |1 |8 |Temperature is above the warning threshold |
+ROW |863 |830 |1 |8 |Temperature is below the critical threshold|
+ROW |864 |831 |1 |8 |Temperature is below the warning threshold |
+ROW |865 |832 |1 |8 |Fan speed is above the critical threshold |
+ROW |866 |833 |1 |8 |Fan speed is above the warning threshold |
+ROW |867 |834 |1 |8 |Fan speed is below the critical threshold |
+ROW |868 |835 |1 |8 |Fan speed is below the warning threshold |
+ROW |869 |836 |1 |8 |Voltage is above the critical threshold |
+ROW |870 |837 |1 |8 |Voltage is above the warning threshold |
+ROW |871 |838 |1 |8 |Voltage is below the critical threshold |
+ROW |872 |839 |1 |8 |Voltage is below the warning threshold |
+ROW |873 |840 |1 |8 |.* |
+ROW |874 |841 |1 |8 |.* |
+ROW |875 |842 |1 |8 |.* |
+ROW |876 |843 |1 |8 |.* |
+ROW |877 |844 |1 |8 |.* |
+ROW |878 |845 |1 |8 |.* |
+ROW |879 |846 |1 |8 |.* |
+ROW |880 |847 |1 |8 |.* |
+ROW |881 |848 |1 |8 |.* |
+ROW |882 |849 |1 |8 |.* |
+ROW |883 |850 |1 |8 |.* |
+ROW |884 |851 |1 |8 |.* |
+ROW |885 |852 |1 |8 |.* |
+ROW |886 |853 |1 |8 |.* |
+ROW |887 |854 |1 |8 |.* |
+ROW |888 |855 |1 |8 |.* |
+ROW |889 |856 |1 |8 |.* |
+ROW |890 |857 |1 |8 |.* |
+ROW |891 |858 |1 |8 |.* |
+ROW |892 |859 |1 |8 |.* |
+ROW |893 |860 |0 |2 |Humidity |
+ROW |894 |861 |0 |2 |Humidity |
+ROW |895 |862 |0 |2 |Humidity |
+ROW |896 |863 |0 |2 |Humidity |
+ROW |897 |864 |0 |2 |Humidity |
+ROW |898 |865 |0 |2 |Humidity |
+ROW |899 |866 |0 |2 |Humidity |
+ROW |900 |867 |0 |2 |Humidity |
+ROW |901 |868 |0 |2 |Humidity |
+ROW |902 |869 |0 |2 |Humidity |
+ROW |903 |870 |0 |2 |Humidity |
+ROW |904 |871 |0 |2 |Humidity |
+ROW |905 |872 |0 |2 |Humidity |
+ROW |906 |873 |0 |2 |Humidity |
+ROW |907 |874 |0 |2 |Humidity |
+ROW |908 |875 |0 |2 |Humidity |
+ROW |909 |876 |0 |2 |Humidity |
+ROW |910 |877 |0 |2 |Humidity |
+ROW |911 |878 |0 |2 |Humidity |
+ROW |912 |879 |0 |2 |Humidity |
+ROW |913 |880 |0 |2 |Humidity |
+ROW |914 |881 |0 |2 |Humidity |
+ROW |915 |882 |0 |2 |Saved |
+ROW |916 |883 |1 |2 |{#SENSOR_HI_CRIT} |
+ROW |917 |884 |1 |2 |{#SENSOR_HI_DISAST} |
+ROW |918 |885 |1 |2 |{#SENSOR_HI_WARN} |
+ROW |919 |886 |1 |2 |{#SENSOR_LO_CRIT} |
+ROW |920 |887 |1 |2 |{#SENSOR_LO_DISAST} |
+ROW |921 |888 |1 |2 |{#SENSOR_LO_WARN} |
TABLE |lld_override_opstatus
FIELDS|lld_override_operationid|status|
ROW |201 |0 |
ROW |202 |0 |
-ROW |754 |0 |
-ROW |755 |0 |
-ROW |756 |0 |
-ROW |757 |0 |
-ROW |758 |0 |
-ROW |759 |0 |
-ROW |760 |0 |
-ROW |761 |0 |
-ROW |762 |0 |
-ROW |763 |0 |
-ROW |764 |0 |
-ROW |765 |0 |
-ROW |766 |0 |
-ROW |767 |0 |
-ROW |768 |0 |
-ROW |769 |0 |
-ROW |770 |0 |
-ROW |771 |0 |
-ROW |772 |0 |
-ROW |773 |0 |
-ROW |774 |0 |
-ROW |775 |0 |
-ROW |776 |0 |
-ROW |777 |0 |
-ROW |778 |0 |
-ROW |779 |0 |
-ROW |780 |0 |
-ROW |781 |0 |
-ROW |782 |0 |
-ROW |783 |0 |
-ROW |784 |0 |
-ROW |785 |0 |
-ROW |786 |0 |
-ROW |787 |0 |
-ROW |788 |0 |
-ROW |789 |0 |
-ROW |790 |0 |
-ROW |791 |0 |
-ROW |792 |0 |
-ROW |793 |0 |
-ROW |794 |0 |
-ROW |795 |0 |
-ROW |796 |0 |
-ROW |797 |0 |
-ROW |798 |0 |
-ROW |799 |0 |
-ROW |800 |0 |
-ROW |801 |0 |
-ROW |802 |0 |
-ROW |803 |0 |
-ROW |804 |0 |
-ROW |805 |0 |
-ROW |806 |0 |
-ROW |807 |0 |
-ROW |808 |0 |
-ROW |809 |0 |
-ROW |810 |0 |
-ROW |811 |0 |
-ROW |812 |0 |
-ROW |813 |0 |
-ROW |814 |0 |
-ROW |815 |0 |
-ROW |816 |0 |
-ROW |817 |0 |
-ROW |818 |0 |
-ROW |819 |0 |
-ROW |820 |0 |
-ROW |821 |0 |
-ROW |822 |0 |
-ROW |823 |0 |
-ROW |824 |0 |
-ROW |825 |0 |
-ROW |826 |0 |
-ROW |827 |0 |
-ROW |828 |0 |
-ROW |829 |0 |
-ROW |830 |0 |
-ROW |831 |0 |
-ROW |832 |0 |
-ROW |833 |0 |
-ROW |834 |0 |
-ROW |835 |0 |
-ROW |836 |0 |
-ROW |837 |0 |
+ROW |838 |0 |
+ROW |839 |0 |
+ROW |840 |0 |
+ROW |841 |0 |
+ROW |842 |0 |
+ROW |843 |0 |
+ROW |844 |0 |
+ROW |845 |0 |
+ROW |846 |0 |
+ROW |847 |0 |
+ROW |848 |0 |
+ROW |849 |0 |
+ROW |850 |0 |
+ROW |851 |0 |
+ROW |852 |0 |
+ROW |853 |0 |
+ROW |854 |0 |
+ROW |855 |0 |
+ROW |856 |0 |
+ROW |857 |0 |
+ROW |858 |0 |
+ROW |859 |0 |
+ROW |860 |0 |
+ROW |861 |0 |
+ROW |862 |0 |
+ROW |863 |0 |
+ROW |864 |0 |
+ROW |865 |0 |
+ROW |866 |0 |
+ROW |867 |0 |
+ROW |868 |0 |
+ROW |869 |0 |
+ROW |870 |0 |
+ROW |871 |0 |
+ROW |872 |0 |
+ROW |873 |0 |
+ROW |874 |0 |
+ROW |875 |0 |
+ROW |876 |0 |
+ROW |877 |0 |
+ROW |878 |0 |
+ROW |879 |0 |
+ROW |880 |0 |
+ROW |881 |0 |
+ROW |882 |0 |
+ROW |883 |0 |
+ROW |884 |0 |
+ROW |885 |0 |
+ROW |886 |0 |
+ROW |887 |0 |
+ROW |888 |0 |
+ROW |889 |0 |
+ROW |890 |0 |
+ROW |891 |0 |
+ROW |892 |0 |
+ROW |893 |0 |
+ROW |894 |0 |
+ROW |895 |0 |
+ROW |896 |0 |
+ROW |897 |0 |
+ROW |898 |0 |
+ROW |899 |0 |
+ROW |900 |0 |
+ROW |901 |0 |
+ROW |902 |0 |
+ROW |903 |0 |
+ROW |904 |0 |
+ROW |905 |0 |
+ROW |906 |0 |
+ROW |907 |0 |
+ROW |908 |0 |
+ROW |909 |0 |
+ROW |910 |0 |
+ROW |911 |0 |
+ROW |912 |0 |
+ROW |913 |0 |
+ROW |914 |0 |
+ROW |915 |0 |
+ROW |916 |0 |
+ROW |917 |0 |
+ROW |918 |0 |
+ROW |919 |0 |
+ROW |920 |0 |
+ROW |921 |0 |
TABLE |lld_override_opdiscover
FIELDS|lld_override_operationid|discover|
ROW |201 |1 |
ROW |202 |1 |
-ROW |754 |0 |
-ROW |755 |1 |
-ROW |756 |1 |
-ROW |757 |1 |
-ROW |758 |1 |
-ROW |759 |1 |
-ROW |760 |1 |
-ROW |761 |1 |
-ROW |762 |0 |
-ROW |763 |0 |
-ROW |764 |0 |
-ROW |765 |1 |
-ROW |766 |1 |
-ROW |767 |0 |
-ROW |768 |0 |
-ROW |769 |0 |
-ROW |770 |0 |
-ROW |771 |1 |
-ROW |772 |1 |
-ROW |773 |1 |
-ROW |774 |1 |
-ROW |775 |1 |
-ROW |776 |1 |
-ROW |777 |1 |
-ROW |778 |1 |
-ROW |779 |1 |
-ROW |780 |1 |
-ROW |781 |1 |
-ROW |782 |1 |
-ROW |783 |1 |
-ROW |784 |1 |
-ROW |785 |1 |
-ROW |786 |1 |
-ROW |787 |1 |
-ROW |788 |1 |
-ROW |789 |1 |
-ROW |790 |1 |
-ROW |791 |1 |
-ROW |792 |1 |
-ROW |793 |1 |
-ROW |794 |1 |
-ROW |795 |1 |
-ROW |796 |1 |
-ROW |797 |1 |
-ROW |798 |1 |
-ROW |799 |1 |
-ROW |800 |0 |
-ROW |801 |1 |
-ROW |802 |1 |
-ROW |803 |1 |
-ROW |804 |1 |
-ROW |805 |1 |
-ROW |806 |1 |
-ROW |807 |1 |
-ROW |808 |1 |
-ROW |809 |1 |
-ROW |810 |1 |
-ROW |811 |1 |
-ROW |812 |1 |
-ROW |813 |1 |
-ROW |814 |1 |
-ROW |815 |1 |
-ROW |816 |1 |
-ROW |817 |1 |
-ROW |818 |1 |
-ROW |819 |1 |
-ROW |820 |1 |
-ROW |821 |1 |
-ROW |822 |1 |
-ROW |823 |1 |
-ROW |824 |1 |
-ROW |825 |1 |
-ROW |826 |1 |
-ROW |827 |1 |
-ROW |828 |1 |
-ROW |829 |1 |
-ROW |830 |1 |
-ROW |831 |1 |
-ROW |832 |1 |
-ROW |833 |1 |
-ROW |834 |1 |
-ROW |835 |1 |
-ROW |836 |1 |
-ROW |837 |1 |
+ROW |838 |0 |
+ROW |839 |1 |
+ROW |840 |1 |
+ROW |841 |1 |
+ROW |842 |1 |
+ROW |843 |1 |
+ROW |844 |1 |
+ROW |845 |1 |
+ROW |846 |0 |
+ROW |847 |0 |
+ROW |848 |0 |
+ROW |849 |1 |
+ROW |850 |1 |
+ROW |851 |0 |
+ROW |852 |0 |
+ROW |853 |0 |
+ROW |854 |0 |
+ROW |855 |1 |
+ROW |856 |1 |
+ROW |857 |1 |
+ROW |858 |1 |
+ROW |859 |1 |
+ROW |860 |1 |
+ROW |861 |1 |
+ROW |862 |1 |
+ROW |863 |1 |
+ROW |864 |1 |
+ROW |865 |1 |
+ROW |866 |1 |
+ROW |867 |1 |
+ROW |868 |1 |
+ROW |869 |1 |
+ROW |870 |1 |
+ROW |871 |1 |
+ROW |872 |1 |
+ROW |873 |1 |
+ROW |874 |1 |
+ROW |875 |1 |
+ROW |876 |1 |
+ROW |877 |1 |
+ROW |878 |1 |
+ROW |879 |1 |
+ROW |880 |1 |
+ROW |881 |1 |
+ROW |882 |1 |
+ROW |883 |1 |
+ROW |884 |0 |
+ROW |885 |1 |
+ROW |886 |1 |
+ROW |887 |1 |
+ROW |888 |1 |
+ROW |889 |1 |
+ROW |890 |1 |
+ROW |891 |1 |
+ROW |892 |1 |
+ROW |893 |1 |
+ROW |894 |1 |
+ROW |895 |1 |
+ROW |896 |1 |
+ROW |897 |1 |
+ROW |898 |1 |
+ROW |899 |1 |
+ROW |900 |1 |
+ROW |901 |1 |
+ROW |902 |1 |
+ROW |903 |1 |
+ROW |904 |1 |
+ROW |905 |1 |
+ROW |906 |1 |
+ROW |907 |1 |
+ROW |908 |1 |
+ROW |909 |1 |
+ROW |910 |1 |
+ROW |911 |1 |
+ROW |912 |1 |
+ROW |913 |1 |
+ROW |914 |1 |
+ROW |915 |1 |
+ROW |916 |1 |
+ROW |917 |1 |
+ROW |918 |1 |
+ROW |919 |1 |
+ROW |920 |1 |
+ROW |921 |1 |
TABLE |item_parameter
FIELDS|item_parameterid|itemid|name |value |
diff --git a/include/cfg.h b/include/cfg.h
index c88430a4dcc..9ea287c67d5 100644
--- a/include/cfg.h
+++ b/include/cfg.h
@@ -39,6 +39,9 @@
#define ZBX_CFG_NOT_STRICT 0
#define ZBX_CFG_STRICT 1
+#define ZBX_CFG_EXIT_FAILURE 0
+#define ZBX_CFG_NO_EXIT_FAILURE 1
+
#define ZBX_PROXY_HEARTBEAT_FREQUENCY_MAX SEC_PER_HOUR
#define ZBX_PROXY_LASTACCESS_UPDATE_FREQUENCY 5
@@ -72,7 +75,7 @@ void zbx_addr_free(zbx_addr_t *addr);
typedef int (*cfg_custom_parameter_parser_t)(const char *value, struct cfg_line *cfg);
-int parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int optional, int strict);
+int parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int optional, int strict, int noexit);
int check_cfg_feature_int(const char *parameter, int value, const char *feature);
int check_cfg_feature_str(const char *parameter, const char *value, const char *feature);
diff --git a/include/common.h b/include/common.h
index 09537183871..76593df914c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -451,6 +451,7 @@ zbx_graph_yaxis_types_t;
#define ZBX_HA_STATUS "ha_status"
#define ZBX_HA_REMOVE_NODE "ha_remove_node"
#define ZBX_HA_SET_FAILOVER_DELAY "ha_set_failover_delay"
+#define ZBX_USER_PARAMETERS_RELOAD "userparameter_reload"
/* value for not supported items */
#define ZBX_NOTSUPPORTED "ZBX_NOTSUPPORTED"
@@ -720,6 +721,10 @@ const char *zbx_item_logtype_string(unsigned char logtype);
#define ACTION_PAUSE_SUPPRESSED_FALSE 0 /* process escalation for suppressed events */
#define ACTION_PAUSE_SUPPRESSED_TRUE 1 /* pause escalation for suppressed events */
+/* action escalation canceled notification mode */
+#define ACTION_NOTIFY_IF_CANCELED_TRUE 1 /* notify about canceled escalations for action (default) */
+#define ACTION_NOTIFY_IF_CANCELED_FALSE 0 /* do not notify about canceled escalations for action */
+
/* max number of retries for alerts */
#define ALERT_MAX_RETRIES 3
@@ -989,6 +994,7 @@ zbx_task_t;
#define ZBX_RTC_HA_STATUS 14
#define ZBX_RTC_HA_REMOVE_NODE 15
#define ZBX_RTC_HA_SET_FAILOVER_DELAY 16
+#define ZBX_RTC_USER_PARAMETERS_RELOAD 17
typedef enum
{
@@ -1152,7 +1158,7 @@ int str_n_in_list(const char *list, const char *value, size_t len, char delimite
char *str_linefeed(const char *src, size_t maxline, const char *delim);
void zbx_strarr_init(char ***arr);
void zbx_strarr_add(char ***arr, const char *entry);
-void zbx_strarr_free(char **arr);
+void zbx_strarr_free(char ***arr);
#if defined(__GNUC__) || defined(__clang__)
# define __zbx_attr_format_printf(idx1, idx2) __attribute__((__format__(__printf__, (idx1), (idx2))))
@@ -1189,6 +1195,7 @@ void zbx_setproctitle(const char *fmt, ...) __zbx_attr_format_printf(1, 2);
double zbx_time(void);
void zbx_timespec(zbx_timespec_t *ts);
double zbx_current_time(void);
+int zbx_is_leap_year(int year);
void zbx_get_time(struct tm *tm, long *milliseconds, zbx_timezone_t *tz);
long zbx_get_timezone_offset(time_t t, struct tm *tm);
struct tm *zbx_localtime(const time_t *time, const char *tz);
@@ -1698,6 +1705,7 @@ typedef enum
ZBX_TIME_UNIT_WEEK,
ZBX_TIME_UNIT_MONTH,
ZBX_TIME_UNIT_YEAR,
+ ZBX_TIME_UNIT_ISOYEAR,
ZBX_TIME_UNIT_COUNT
}
zbx_time_unit_t;
@@ -1710,6 +1718,8 @@ void zbx_tm_round_down(struct tm *tm, zbx_time_unit_t base);
const char *zbx_timespec_str(const zbx_timespec_t *ts);
+int zbx_get_week_number(const struct tm *tm);
+
zbx_time_unit_t zbx_tm_str_to_unit(const char *text);
int zbx_tm_parse_period(const char *period, size_t *len, int *multiplier, zbx_time_unit_t *base, char **error);
@@ -1780,4 +1790,6 @@ typedef enum
}
zbx_err_codes_t;
+void zbx_md5buf2str(const md5_byte_t *md5, char *str);
+int zbx_hex2bin(const unsigned char *p_hex, unsigned char *buf, int buf_len);
#endif
diff --git a/include/db.h b/include/db.h
index 3cc94ac50a1..7af98430402 100644
--- a/include/db.h
+++ b/include/db.h
@@ -490,6 +490,7 @@ typedef struct
unsigned char pause_suppressed;
unsigned char recovery;
unsigned char status;
+ unsigned char notify_if_canceled;
}
DB_ACTION;
diff --git a/include/dbcache.h b/include/dbcache.h
index e6fb0cd5aba..075d82e52a9 100644
--- a/include/dbcache.h
+++ b/include/dbcache.h
@@ -64,10 +64,8 @@ extern int CONFIG_UNREACHABLE_POLLER_FORKS;
extern int CONFIG_IPMIPOLLER_FORKS;
extern int CONFIG_JAVAPOLLER_FORKS;
extern int CONFIG_PINGER_FORKS;
-extern int CONFIG_UNAVAILABLE_DELAY;
extern int CONFIG_UNREACHABLE_PERIOD;
extern int CONFIG_UNREACHABLE_DELAY;
-extern int CONFIG_HISTSYNCER_FORKS;
extern int CONFIG_PROXYCONFIG_FREQUENCY;
extern int CONFIG_PROXYDATA_FREQUENCY;
extern int CONFIG_HISTORYPOLLER_FORKS;
diff --git a/include/sysinfo.h b/include/sysinfo.h
index 1c65bf659eb..41ec054186a 100644
--- a/include/sysinfo.h
+++ b/include/sysinfo.h
@@ -216,6 +216,7 @@ int process(const char *in_command, unsigned flags, AGENT_RESULT *result);
void set_user_parameter_dir(const char *path);
int add_user_parameter(const char *itemkey, char *command, char *error, size_t max_error_len);
+void remove_user_parameters(void);
int add_user_module(const char *key, int (*function)(void));
void test_parameters(void);
void test_parameter(const char *key);
diff --git a/include/version.h b/include/version.h
index 8d361827489..b3ce169e7af 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,7 +24,7 @@
#define ZBX_STR(str) ZBX_STR2(str)
#define APPLICATION_NAME "Zabbix Agent"
-#define ZABBIX_REVDATE "9 November 2021"
+#define ZABBIX_REVDATE "22 November 2021"
#define ZABBIX_VERSION_MAJOR 6
#define ZABBIX_VERSION_MINOR 0
#define ZABBIX_VERSION_PATCH 0
@@ -36,7 +36,7 @@
# define ZABBIX_VERSION_RC_NUM {ZABBIX_RC_NUM}
# endif
#endif
-#define ZABBIX_VERSION_RC "alpha7"
+#define ZABBIX_VERSION_RC "alpha8"
#define ZABBIX_VERSION ZBX_STR(ZABBIX_VERSION_MAJOR) "." ZBX_STR(ZABBIX_VERSION_MINOR) "." \
ZBX_STR(ZABBIX_VERSION_PATCH) ZABBIX_VERSION_RC
#define ZABBIX_REVISION ZBX_STR(ZABBIX_VERSION_REVISION)
diff --git a/include/zbxhistory.h b/include/zbxhistory.h
index b536cb125eb..4ffdd09e7eb 100644
--- a/include/zbxhistory.h
+++ b/include/zbxhistory.h
@@ -33,6 +33,8 @@ zbx_history_record_t;
ZBX_VECTOR_DECL(history_record, zbx_history_record_t)
+int history_record_float_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2);
+
void zbx_history_record_vector_clean(zbx_vector_history_record_t *vector, int value_type);
void zbx_history_record_vector_destroy(zbx_vector_history_record_t *vector, int value_type);
void zbx_history_record_clear(zbx_history_record_t *value, int value_type);
diff --git a/include/zbxtrends.h b/include/zbxtrends.h
index 3fdba11c0c7..cb99096aeeb 100644
--- a/include/zbxtrends.h
+++ b/include/zbxtrends.h
@@ -24,6 +24,16 @@
#include "common.h"
#include "dbcache.h"
+typedef enum
+{
+ ZBX_TREND_STATE_UNKNOWN,
+ ZBX_TREND_STATE_NORMAL,
+ ZBX_TREND_STATE_NODATA,
+ ZBX_TREND_STATE_OVERFLOW,
+ ZBX_TREND_STATE_COUNT
+}
+zbx_trend_state_t;
+
int zbx_trends_parse_base(const char *params, zbx_time_unit_t *base, char **error);
int zbx_parse_timeshift(time_t from, const char *timeshift, struct tm *tm, char **error);
@@ -51,4 +61,10 @@ void zbx_tfc_destroy(void);
int zbx_tfc_get_stats(zbx_tfc_stats_t *stats, char **error);
void zbx_tfc_invalidate_trends(ZBX_DC_TREND *trends, int trends_num);
+int zbx_baseline_get_data(zbx_uint64_t itemid, unsigned char value_type, time_t now, const char *period,
+ int season_num, zbx_time_unit_t season_unit, int skip, zbx_vector_dbl_t *values,
+ zbx_vector_uint64_t *index, char **error);
+
+zbx_trend_state_t zbx_trends_get_avg(const char *table, zbx_uint64_t itemid, int start, int end, double *value);
+const char *zbx_trends_error(zbx_trend_state_t state);
#endif
diff --git a/man/zabbix_agent2.man b/man/zabbix_agent2.man
index a27f5bcc3c5..da00693f474 100644
--- a/man/zabbix_agent2.man
+++ b/man/zabbix_agent2.man
@@ -76,6 +76,11 @@ Perform administrative functions according to \fIruntime\-option\fR.
Runtime control options
.RS 4
.TP 4
+\fBuserparameter_reload\fR
+Reload user parameters from the configuration file
+.RE
+.RS 4
+.TP 4
\fBloglevel increase\fR
Increase log level
.RE
diff --git a/man/zabbix_agentd.man b/man/zabbix_agentd.man
index 2bee4c11985..4ec3ae591b5 100644
--- a/man/zabbix_agentd.man
+++ b/man/zabbix_agentd.man
@@ -76,6 +76,11 @@ Perform administrative functions according to \fIruntime\-option\fR.
Runtime control options
.RS 4
.TP 4
+\fBuserparameter_reload
+Reload user parameters from the configuration file
+.RE
+.RS 4
+.TP 4
\fBlog_level_increase\fR[=\fItarget\fR]
Increase log level, affects all processes if target is not specified
.RE
diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss
index 751b9885c36..5ab45c18f0e 100644
--- a/sass/stylesheets/sass/screen.scss
+++ b/sass/stylesheets/sass/screen.scss
@@ -6414,6 +6414,22 @@ z-select,
}
}
+.linked-templates {
+ > .table-forms {
+ margin-bottom: 5px;
+ line-height: 24px;
+
+ td, th {
+ padding: 0 5px 0 0;
+
+ &:last-child {
+ width: 0;
+ padding-right: 0;
+ }
+ }
+ }
+}
+
// Report -> Audit details styles.
.audit-details-popup-wrapper {
diff --git a/src/go/cmd/zabbix_agent2/zabbix_agent2.go b/src/go/cmd/zabbix_agent2/zabbix_agent2.go
index 51aec4321ee..b7590fffe58 100644
--- a/src/go/cmd/zabbix_agent2/zabbix_agent2.go
+++ b/src/go/cmd/zabbix_agent2/zabbix_agent2.go
@@ -48,6 +48,10 @@ import (
"zabbix.com/pkg/zbxlib"
)
+type AgentUserParamOption struct {
+ UserParameter []string `conf:"optional"`
+}
+
const remoteCommandSendingTimeout = time.Second
var manager *scheduler.Manager
@@ -96,12 +100,37 @@ func processHelpCommand(c *remotecontrol.Client) (err error) {
help := `Remote control interface, available commands:
log_level_increase - Increase log level
log_level_decrease - Decrease log level
+ userparameter_reload - Reload user parameters
metrics - List available metrics
version - Display Agent version
help - Display this help message`
return c.Reply(help)
}
+func processUserParamReloadCommand(c *remotecontrol.Client) (err error) {
+ var userparams AgentUserParamOption
+
+ if err = conf.LoadUserParams(&userparams); err != nil {
+ err = fmt.Errorf("Cannot load user parameters: %s", err)
+ log.Infof(err.Error())
+ return
+ }
+
+ agent.Options.UserParameter = userparams.UserParameter
+
+ if res := manager.QueryUserParams(); res != "ok" {
+ err = fmt.Errorf("Failed to reload user parameters: %s", res)
+ log.Infof(err.Error())
+ return
+ }
+
+ message := "User parameters reloaded"
+ log.Infof(message)
+ err = c.Reply(message)
+
+ return
+}
+
func processRemoteCommand(c *remotecontrol.Client) (err error) {
params := strings.Fields(c.Request())
switch len(params) {
@@ -123,6 +152,8 @@ func processRemoteCommand(c *remotecontrol.Client) (err error) {
err = processMetricsCommand(c)
case "version":
err = processVersionCommand(c)
+ case "userparameter_reload":
+ err = processUserParamReloadCommand(c)
default:
return errors.New("Unknown command")
}
@@ -335,7 +366,7 @@ func main() {
fatalExit("failed to load key access rules", err)
}
- if err = agent.InitUserParameterPlugin(agent.Options.UserParameter, agent.Options.UnsafeUserParameters,
+ if _, err = agent.InitUserParameterPlugin(agent.Options.UserParameter, agent.Options.UnsafeUserParameters,
agent.Options.UserParameterDir); err != nil {
fatalExit("cannot initialize user parameters", err)
}
@@ -451,7 +482,7 @@ func main() {
os.Exit(1)
}
- if err = agent.InitUserParameterPlugin(agent.Options.UserParameter, agent.Options.UnsafeUserParameters,
+ if _, err = agent.InitUserParameterPlugin(agent.Options.UserParameter, agent.Options.UnsafeUserParameters,
agent.Options.UserParameterDir); err != nil {
fatalExit("cannot initialize user parameters", err)
}
diff --git a/src/go/internal/agent/plugin_userparameter.go b/src/go/internal/agent/plugin_userparameter.go
index af2ddf17625..a61018a0a1b 100644
--- a/src/go/internal/agent/plugin_userparameter.go
+++ b/src/go/internal/agent/plugin_userparameter.go
@@ -41,7 +41,7 @@ type UserParameterPlugin struct {
plugin.Base
parameters map[string]*parameterInfo
unsafeUserParameters int
- userParameterDir string
+ userParameterDir string
}
var userParameter UserParameterPlugin
@@ -124,7 +124,7 @@ func (p *UserParameterPlugin) Export(key string, params []string, ctx plugin.Con
return stdoutStderr, nil
}
-func InitUserParameterPlugin(userParameterConfig []string, unsafeUserParameters int, userParameterDir string) error {
+func InitUserParameterPlugin(userParameterConfig []string, unsafeUserParameters int, userParameterDir string) (keys []string, err error) {
userParameter.parameters = make(map[string]*parameterInfo)
userParameter.unsafeUserParameters = unsafeUserParameters
userParameter.userParameterDir = userParameterDir
@@ -133,20 +133,20 @@ func InitUserParameterPlugin(userParameterConfig []string, unsafeUserParameters
s := strings.SplitN(userParameterConfig[i], ",", 2)
if len(s) != 2 {
- return fmt.Errorf("cannot add user parameter \"%s\": not comma-separated", userParameterConfig[i])
+ return nil, fmt.Errorf("cannot add user parameter \"%s\": not comma-separated", userParameterConfig[i])
}
key, p, err := itemutil.ParseKey(s[0])
if err != nil {
- return fmt.Errorf("cannot add user parameter \"%s\": %s", userParameterConfig[i], err)
+ return nil, fmt.Errorf("cannot add user parameter \"%s\": %s", userParameterConfig[i], err)
}
if acc, _ := plugin.Get(key); acc != nil {
- return fmt.Errorf(`cannot register user parameter "%s": key already used`, userParameterConfig[i])
+ return nil, fmt.Errorf(`cannot register user parameter "%s": key already used`, userParameterConfig[i])
}
if len(strings.TrimSpace(s[1])) == 0 {
- return fmt.Errorf("cannot add user parameter \"%s\": command is missing", userParameterConfig[i])
+ return nil, fmt.Errorf("cannot add user parameter \"%s\": command is missing", userParameterConfig[i])
}
parameter := &parameterInfo{cmd: s[1]}
@@ -154,12 +154,13 @@ func InitUserParameterPlugin(userParameterConfig []string, unsafeUserParameters
if len(p) == 1 && p[0] == "*" {
parameter.flexible = true
} else if len(p) != 0 {
- return fmt.Errorf("cannot add user parameter \"%s\": syntax error", userParameterConfig[i])
+ return nil, fmt.Errorf("cannot add user parameter \"%s\": syntax error", userParameterConfig[i])
}
userParameter.parameters[key] = parameter
plugin.RegisterMetrics(&userParameter, "UserParameter", key, fmt.Sprintf("User parameter: %s.", s[1]))
+ keys = append(keys, key)
}
- return nil
+ return keys, nil
}
diff --git a/src/go/internal/agent/plugin_userparameter_test.go b/src/go/internal/agent/plugin_userparameter_test.go
index 720fa29cc12..5911a4a834e 100644
--- a/src/go/internal/agent/plugin_userparameter_test.go
+++ b/src/go/internal/agent/plugin_userparameter_test.go
@@ -50,7 +50,7 @@ func TestUserParameterPlugin(t *testing.T) {
t.Run(results[i].data[0], func(t *testing.T) {
plugin.Metrics = make(map[string]*plugin.Metric)
- if err := InitUserParameterPlugin(results[i].data, results[i].unsafeUserParameters, ""); err != nil {
+ if _, err := InitUserParameterPlugin(results[i].data, results[i].unsafeUserParameters, ""); err != nil {
if !results[i].failed {
t.Errorf("Expected success while got error %s", err)
}
@@ -209,7 +209,7 @@ func TestCmd(t *testing.T) {
t.Run(resultsCmd[i].data[0], func(t *testing.T) {
plugin.Metrics = make(map[string]*plugin.Metric)
- if err := InitUserParameterPlugin(resultsCmd[i].data, resultsCmd[i].unsafeUserParameters, ""); err != nil {
+ if _, err := InitUserParameterPlugin(resultsCmd[i].data, resultsCmd[i].unsafeUserParameters, ""); err != nil {
t.Errorf("Plugin init failed: %s", err)
}
@@ -238,7 +238,7 @@ func TestUnsafeCmd(t *testing.T) {
t.Run("", func(t *testing.T) {
plugin.Metrics = make(map[string]*plugin.Metric)
- if err := InitUserParameterPlugin([]string{"a[*],echo $1"}, 0, ""); err != nil {
+ if _, err := InitUserParameterPlugin([]string{"a[*],echo $1"}, 0, ""); err != nil {
t.Errorf("Plugin init failed: %s", err)
}
@@ -251,7 +251,7 @@ func TestUnsafeCmd(t *testing.T) {
plugin.Metrics = make(map[string]*plugin.Metric)
- if err := InitUserParameterPlugin([]string{"a[*],echo $1"}, 1, ""); err != nil {
+ if _, err := InitUserParameterPlugin([]string{"a[*],echo $1"}, 1, ""); err != nil {
t.Errorf("Plugin init failed: %s", err)
}
diff --git a/src/go/internal/agent/scheduler/manager.go b/src/go/internal/agent/scheduler/manager.go
index 5b66df51698..6abbda8818b 100644
--- a/src/go/internal/agent/scheduler/manager.go
+++ b/src/go/internal/agent/scheduler/manager.go
@@ -72,12 +72,18 @@ type queryRequest struct {
sink chan string
}
+// queryRequestUserParams contains status user parameters query request.
+type queryRequestUserParams struct {
+ sink chan string
+}
+
type Scheduler interface {
UpdateTasks(clientID uint64, writer plugin.ResultWriter, expressions []*glexpr.Expression,
requests []*plugin.Request)
FinishTask(task performer)
PerformTask(key string, timeout time.Duration, clientID uint64) (result string, err error)
Query(command string) (status string)
+ QueryUserParams() (status string)
}
// cleanupClient performs deactivation of plugins the client is not using anymore.
@@ -242,6 +248,31 @@ func (m *Manager) processQueue(now time.Time) {
}
}
+// processAndFlushUserParamQueue processes queued user parameters plugins/tasks and/or removes them
+func (m *Manager) processAndFlushUserParamQueue(now time.Time) {
+ seconds := now.Unix()
+ for p := m.pluginQueue.Peek(); p != nil; p = m.pluginQueue.Peek() {
+ if !p.usrprm {
+ heap.Pop(&m.pluginQueue)
+ continue
+ }
+
+ if task := p.peekTask(); task != nil {
+ heap.Pop(&m.pluginQueue)
+ if !p.hasCapacity() || task.getScheduled().Unix() > seconds {
+ m.pluginQueue.Remove(p)
+ continue
+ }
+
+ m.activeTasksNum++
+ p.reserveCapacity(p.popTask())
+ task.perform(m)
+ }
+
+ m.pluginQueue.Remove(p)
+ }
+}
+
// processFinishRequest handles finished tasks
func (m *Manager) processFinishRequest(task performer) {
m.activeTasksNum--
@@ -368,6 +399,30 @@ run:
} else {
v.sink <- response
}
+ case *queryRequestUserParams:
+ var keys []string
+ var rerr error
+
+ m.processAndFlushUserParamQueue(time.Now())
+ plugin.ClearUserParamMetrics()
+
+ for k, plg := range m.plugins {
+ if plg.usrprm {
+ delete(m.plugins, k)
+ }
+ }
+
+ if keys, rerr = agent.InitUserParameterPlugin(agent.Options.UserParameter,
+ agent.Options.UnsafeUserParameters, agent.Options.UserParameterDir); rerr != nil {
+ v.sink <- "cannot process user parameters request: " + rerr.Error()
+ continue
+ }
+
+ for _, key := range keys {
+ m.addUserParamsPlugin(key)
+ }
+
+ v.sink <- "ok"
}
}
}
@@ -426,6 +481,7 @@ func (m *Manager) init() {
usedCapacity: 0,
index: -1,
refcount: 0,
+ usrprm: metric.UsrPrm,
}
interfaces := ""
@@ -522,6 +578,12 @@ func (m *Manager) Query(command string) (status string) {
return <-request.sink
}
+func (m *Manager) QueryUserParams() (status string) {
+ request := &queryRequestUserParams{sink: make(chan string)}
+ m.input <- request
+ return <-request.sink
+}
+
func (m *Manager) validatePlugins(options *agent.AgentOptions) (err error) {
for _, p := range plugin.Plugins {
if c, ok := p.(plugin.Configurator); ok {
@@ -546,3 +608,27 @@ func NewManager(options *agent.AgentOptions) (mannager *Manager, err error) {
}
return &m, m.configure(options)
}
+
+func (m *Manager) addUserParamsPlugin(key string) {
+ var metric *plugin.Metric
+
+ for _, metric = range plugin.Metrics {
+ if metric.Key == key {
+ break
+ }
+ }
+
+ capacity := metric.Plugin.Capacity()
+
+ pagent := &pluginAgent{
+ impl: metric.Plugin,
+ tasks: make(performerHeap, 0),
+ maxCapacity: capacity,
+ usedCapacity: 0,
+ index: -1,
+ refcount: 0,
+ usrprm: metric.UsrPrm,
+ }
+
+ m.plugins[key] = pagent
+}
diff --git a/src/go/internal/agent/scheduler/plugin.go b/src/go/internal/agent/scheduler/plugin.go
index 21b613a7edc..fab1e7e8699 100644
--- a/src/go/internal/agent/scheduler/plugin.go
+++ b/src/go/internal/agent/scheduler/plugin.go
@@ -39,6 +39,8 @@ type pluginAgent struct {
index int
// refcount us used to track plugin usage by clients
refcount int
+ // usrprm is used to indicate that plugin is user parameter
+ usrprm bool
}
// peekTask() returns next task in the queue without removing it from queue or nil
diff --git a/src/go/pkg/conf/conf.go b/src/go/pkg/conf/conf.go
index 95461c25b84..a28e6a952b8 100644
--- a/src/go/pkg/conf/conf.go
+++ b/src/go/pkg/conf/conf.go
@@ -628,6 +628,22 @@ func Load(filename string, v interface{}) (err error) {
return Unmarshal(buf.Bytes(), v)
}
+func LoadUserParams(v interface{}) (err error) {
+ var file std.File
+
+ if file, err = stdOs.Open(currentConfigPath); err != nil {
+ return fmt.Errorf(`cannot open configuration file: %s`, err.Error())
+ }
+ defer file.Close()
+
+ buf := bytes.Buffer{}
+ if _, err = buf.ReadFrom(file); err != nil {
+ return fmt.Errorf("cannot load configuration: %s", err.Error())
+ }
+
+ return Unmarshal(buf.Bytes(), v, false)
+}
+
var stdOs std.Os
func init() {
diff --git a/src/go/pkg/plugin/registry.go b/src/go/pkg/plugin/registry.go
index ddd3029bac5..7d762b8986f 100644
--- a/src/go/pkg/plugin/registry.go
+++ b/src/go/pkg/plugin/registry.go
@@ -30,12 +30,15 @@ type Metric struct {
Plugin Accessor
Key string
Description string
+ UsrPrm bool
}
var Metrics map[string]*Metric = make(map[string]*Metric)
var Plugins map[string]Accessor = make(map[string]Accessor)
func registerMetric(plugin Accessor, name string, key string, description string) {
+ var usrprm bool
+
if ok, _ := regexp.MatchString(`^[A-Za-z0-9\._-]+$`, key); !ok {
panic(fmt.Sprintf(`cannot register metric "%s" having invalid format`, key))
}
@@ -97,7 +100,13 @@ func registerMetric(plugin Accessor, name string, key string, description string
plugin.Init(name)
}
- Metrics[key] = &Metric{Plugin: plugin, Key: key, Description: description}
+ if name == "UserParameter" {
+ usrprm = true
+ } else {
+ usrprm = false
+ }
+
+ Metrics[key] = &Metric{Plugin: plugin, Key: key, Description: description, UsrPrm: usrprm}
}
func RegisterMetrics(impl Accessor, name string, params ...string) {
@@ -123,3 +132,11 @@ func ClearRegistry() {
Metrics = make(map[string]*Metric)
Plugins = make(map[string]Accessor)
}
+
+func ClearUserParamMetrics() {
+ for k, _ := range Metrics {
+ if Metrics[k].UsrPrm {
+ delete(Metrics, k)
+ }
+ }
+}
diff --git a/src/go/pkg/procfs/procfs.go b/src/go/pkg/procfs/procfs.go
index 1cdb32a5c80..81e38f03c40 100644
--- a/src/go/pkg/procfs/procfs.go
+++ b/src/go/pkg/procfs/procfs.go
@@ -89,7 +89,7 @@ func ReadAll(filename string) (data []byte, err error) {
// ByteFromProcFileData returns the value in bytes of the provided value name from the provided
// process file data. Returns true if the value is found, and false if it is not or if there is an
-// error. Returns an error if the there is an issue with parsing values.
+// error. Returns an error if there is an issue with parsing values.
func ByteFromProcFileData(data []byte, valueName string) (uint64, bool, error) {
for _, line := range strings.Split(string(data), "\n") {
i := strings.Index(line, ":")
diff --git a/src/go/pkg/version/version.go b/src/go/pkg/version/version.go
index 19411cf668c..a19e94c5dcc 100644
--- a/src/go/pkg/version/version.go
+++ b/src/go/pkg/version/version.go
@@ -26,11 +26,11 @@ import (
)
const (
- ZABBIX_REVDATE = "9 November 2021"
+ ZABBIX_REVDATE = "22 November 2021"
ZABBIX_VERSION_MAJOR = 6
ZABBIX_VERSION_MINOR = 0
ZABBIX_VERSION_PATCH = 0
- ZABBIX_VERSION_RC = "alpha7"
+ ZABBIX_VERSION_RC = "alpha8"
ZABBIX_VERSION_RC_NUM = "{ZABBIX_RC_NUM}"
ZABBIX_VERSION_REVISION = "{ZABBIX_REVISION}"
copyrightMessage = "Copyright (C) 2021 Zabbix SIA\n" +
diff --git a/src/go/pkg/zbxcmd/zbxcmd_windows.go b/src/go/pkg/zbxcmd/zbxcmd_windows.go
index e8d0fd6fb3b..f9aa3544c39 100644
--- a/src/go/pkg/zbxcmd/zbxcmd_windows.go
+++ b/src/go/pkg/zbxcmd/zbxcmd_windows.go
@@ -108,7 +108,10 @@ func execute(s string, timeout time.Duration, path string, strict bool) (out str
}
func ExecuteBackground(s string) error {
- cmd := exec.Command("cmd", "/C", s)
+ cmd := exec.Command("cmd")
+ cmd.SysProcAttr = &windows.SysProcAttr{
+ CmdLine: fmt.Sprintf(`/C %s`, s),
+ }
if err := cmd.Start(); err != nil {
return fmt.Errorf("Cannot execute command: %s", err)
diff --git a/src/go/pkg/zbxlib/globals_windows.go b/src/go/pkg/zbxlib/globals_windows.go
index ca7a4f6a85c..f8c0da62165 100644
--- a/src/go/pkg/zbxlib/globals_windows.go
+++ b/src/go/pkg/zbxlib/globals_windows.go
@@ -41,6 +41,7 @@ package zbxlib
#cgo LDFLAGS: ${SRCDIR}/../../../../build/mingw/output/vector.o
#cgo LDFLAGS: ${SRCDIR}/../../../../build/mingw/output/zbxregexp.o
#cgo LDFLAGS: ${SRCDIR}/../../../../build/mingw/output/algodefs.o
+#cgo LDFLAGS: ${SRCDIR}/../../../../build/mingw/output/persistent_state.o
#cgo LDFLAGS: ${SRCDIR}/../../../../build/mingw/output/logfiles.o
#cgo LDFLAGS: ${SRCDIR}/../../../../build/mingw/output/json.o
#cgo LDFLAGS: ${SRCDIR}/../../../../build/mingw/output/json_parser.o
diff --git a/src/go/pkg/zbxlib/logfile.go b/src/go/pkg/zbxlib/logfile.go
index 4ef28f59d48..d5df472534e 100644
--- a/src/go/pkg/zbxlib/logfile.go
+++ b/src/go/pkg/zbxlib/logfile.go
@@ -33,6 +33,7 @@ extern int CONFIG_MAX_LINES_PER_SECOND;
typedef ZBX_ACTIVE_METRIC* ZBX_ACTIVE_METRIC_LP;
typedef zbx_vector_ptr_t * zbx_vector_ptr_lp_t;
typedef char * char_lp_t;
+typedef zbx_vector_pre_persistent_t * zbx_vector_pre_persistent_lp_t;
ZBX_ACTIVE_METRIC *new_metric(char *key, zbx_uint64_t lastlogsize, int mtime, int flags)
{
@@ -43,8 +44,9 @@ ZBX_ACTIVE_METRIC *new_metric(char *key, zbx_uint64_t lastlogsize, int mtime, in
metric->key_orig = zbx_strdup(NULL, key);
metric->lastlogsize = lastlogsize;
metric->mtime = mtime;
- metric->flags = flags;
+ metric->flags = (unsigned char)flags;
metric->skip_old_data = (0 != metric->lastlogsize ? 0 : 1);
+ metric->persistent_file_name = NULL; // initialized but not used in Agent2
return metric;
}
@@ -95,6 +97,9 @@ void metric_free(ZBX_ACTIVE_METRIC *metric)
{
int i;
+ if (NULL == metric)
+ return;
+
zbx_free(metric->key);
zbx_free(metric->key_orig);
@@ -102,6 +107,7 @@ void metric_free(ZBX_ACTIVE_METRIC *metric)
zbx_free(metric->logfiles[i].filename);
zbx_free(metric->logfiles);
+ zbx_free(metric->persistent_file_name);
zbx_free(metric);
}
@@ -182,6 +188,23 @@ int process_value_cb(zbx_vector_ptr_t *addrs, const char *host, const char *key,
add_log_value(result, value, state, *lastlogsize, *mtime);
return SUCCEED;
}
+
+static zbx_vector_pre_persistent_lp_t new_prep_vec(void)
+{
+ zbx_vector_pre_persistent_lp_t vect;
+
+ vect = (zbx_vector_pre_persistent_lp_t)zbx_malloc(NULL, sizeof(zbx_vector_pre_persistent_t));
+ zbx_vector_pre_persistent_create(vect);
+ return vect;
+}
+
+static void free_prep_vec(zbx_vector_pre_persistent_lp_t vect)
+{
+ // In Agent2 this vector is expected to be empty because 'persistent directory' parameter is not allowed.
+ // Therefore a simplified cleanup is used.
+ zbx_vector_pre_persistent_destroy(vect);
+ zbx_free(vect);
+}
*/
import "C"
@@ -225,12 +248,24 @@ func NewActiveMetric(key string, params []string, lastLogsize uint64, mtime int3
flags := MetricFlagNew | MetricFlagPersistent
switch key {
case "log":
+ if len(params) >= 9 && params[8] != "" {
+ return nil, errors.New("The ninth parameter (persistent directory) is not supported by Agent2.")
+ }
flags |= MetricFlagLogLog
case "logrt":
+ if len(params) >= 9 && params[8] != "" {
+ return nil, errors.New("The ninth parameter (persistent directory) is not supported by Agent2.")
+ }
flags |= MetricFlagLogLogrt
case "log.count":
+ if len(params) >= 8 && params[7] != "" {
+ return nil, errors.New("The eighth parameter (persistent directory) is not supported by Agent2.")
+ }
flags |= MetricFlagLogCount | MetricFlagLogLog
case "logrt.count":
+ if len(params) >= 8 && params[7] != "" {
+ return nil, errors.New("The eighth parameter (persistent directory) is not supported by Agent2.")
+ }
flags |= MetricFlagLogCount | MetricFlagLogLogrt
case "eventlog":
flags |= MetricFlagLogEventlog
@@ -257,9 +292,11 @@ func ProcessLogCheck(data unsafe.Pointer, item *LogItem, refresh int, cblob unsa
result := C.new_log_result(C.int(item.Output.PersistSlotsAvailable()))
var cerrmsg *C.char
+ cprepVec := C.new_prep_vec() // In Agent2 it is always empty vector. Not used but required for linking.
ret := C.process_log_check(C.zbx_vector_ptr_lp_t(unsafe.Pointer(result)), C.zbx_vector_ptr_lp_t(cblob),
- C.ZBX_ACTIVE_METRIC_LP(data), C.zbx_process_value_func_t(C.process_value_cb), &clastLogsizeSent, &cmtimeSent,
- &cerrmsg)
+ C.ZBX_ACTIVE_METRIC_LP(data), C.zbx_process_value_func_t(C.process_value_cb), &clastLogsizeSent,
+ &cmtimeSent, &cerrmsg, cprepVec)
+ C.free_prep_vec(cprepVec)
// add cached results
var cvalue *C.char
diff --git a/src/go/plugins/postgres/handler_archive.go b/src/go/plugins/postgres/handler_archive.go
index a68eb6a01de..b30625f6250 100644
--- a/src/go/plugins/postgres/handler_archive.go
+++ b/src/go/plugins/postgres/handler_archive.go
@@ -39,14 +39,23 @@ func archiveHandler(ctx context.Context, conn PostgresClient,
queryArchiveSize := `SELECT row_to_json(T)
FROM (
- SELECT count(name) AS count_files ,
- coalesce(sum((pg_stat_file('./pg_wal/' || rtrim(ready.name,'.ready'))).size),0) AS size_files
- FROM (
- SELECT name
- FROM pg_ls_dir('./pg_wal/archive_status') name
- WHERE right( name,6)= '.ready'
- ) ready
- ) T;`
+ WITH values AS (
+ SELECT
+ 4096/(ceil(pg_settings.setting::numeric/1024/1024))::int AS segment_parts_count,
+ setting::bigint AS segment_size,
+ ('x' || substring(pg_stat_archiver.last_archived_wal from 9 for 8))::bit(32)::int AS last_wal_div,
+ ('x' || substring(pg_stat_archiver.last_archived_wal from 17 for 8))::bit(32)::int AS last_wal_mod,
+ CASE WHEN pg_is_in_recovery() THEN NULL
+ ELSE ('x' || substring(pg_walfile_name(pg_current_wal_lsn()) from 9 for 8))::bit(32)::int END AS current_wal_div,
+ CASE WHEN pg_is_in_recovery() THEN NULL
+ ELSE ('x' || substring(pg_walfile_name(pg_current_wal_lsn()) from 17 for 8))::bit(32)::int END AS current_wal_mod
+ FROM pg_settings, pg_stat_archiver
+ WHERE pg_settings.name = 'wal_segment_size')
+ SELECT
+ greatest(coalesce((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1, 0), 0) AS count_files,
+ greatest(coalesce(((segment_parts_count - last_wal_mod) + ((current_wal_div - last_wal_div - 1) * segment_parts_count) + current_wal_mod - 1) * segment_size, 0), 0) AS size_files
+ FROM values
+ ) T;`
row, err := conn.QueryRow(ctx, queryArchiveCount)
if err != nil {
diff --git a/src/go/plugins/postgres/handler_connections.go b/src/go/plugins/postgres/handler_connections.go
index e8bb5be0a78..6ade372b9dd 100644
--- a/src/go/plugins/postgres/handler_connections.go
+++ b/src/go/plugins/postgres/handler_connections.go
@@ -45,7 +45,7 @@ func connectionsHandler(ctx context.Context, conn PostgresClient,
count(*)*100/(SELECT current_setting('max_connections')::int) AS total_pct,
sum(CASE WHEN wait_event IS NOT NULL THEN 1 ELSE 0 END) AS waiting,
(SELECT count(*) FROM pg_prepared_xacts) AS prepared
- FROM pg_stat_activity WHERE datid is not NULL) T;`
+ FROM pg_stat_activity WHERE datid IS NOT NULL AND state IS NOT NULL) T;`
row, err := conn.QueryRow(ctx, query)
if err != nil {
diff --git a/src/go/plugins/postgres/handler_replication.go b/src/go/plugins/postgres/handler_replication.go
index 38346fa14cb..bb6b044b7ca 100644
--- a/src/go/plugins/postgres/handler_replication.go
+++ b/src/go/plugins/postgres/handler_replication.go
@@ -74,10 +74,10 @@ func replicationHandler(ctx context.Context, conn PostgresClient,
case keyReplicationLagSec:
query = `SELECT
- CASE
- WHEN pg_last_wal_receive_lsn() = pg_last_wal_replay_lsn() THEN 0
- ELSE COALESCE(EXTRACT(EPOCH FROM now() - pg_last_xact_replay_timestamp())::integer, 0)
- END as lag`
+ CASE
+ WHEN NOT pg_is_in_recovery() OR pg_last_wal_receive_lsn() = pg_last_wal_replay_lsn() THEN 0
+ ELSE COALESCE(EXTRACT(EPOCH FROM now() - pg_last_xact_replay_timestamp())::integer, 0)
+ END AS lag;`
case keyReplicationLagB:
row, err := conn.QueryRow(ctx, `SELECT pg_is_in_recovery()`)
if err != nil {
@@ -94,8 +94,7 @@ func replicationHandler(ctx context.Context, conn PostgresClient,
}
if inRecovery {
- query = `SELECT pg_catalog.pg_wal_lsn_diff (received_lsn, pg_last_wal_replay_lsn())
- FROM pg_stat_wal_receiver;`
+ query = `SELECT pg_catalog.pg_wal_lsn_diff (pg_last_wal_receive_lsn(), pg_last_wal_replay_lsn());`
row, err = conn.QueryRow(ctx, query)
if err != nil {
@@ -120,16 +119,16 @@ func replicationHandler(ctx context.Context, conn PostgresClient,
query = `SELECT pg_is_in_recovery()::int`
case keyReplicationCount:
- query = `SELECT count(*) FROM pg_stat_replication`
+ query = `SELECT COUNT(DISTINCT client_addr) + COALESCE(SUM(CASE WHEN client_addr IS NULL THEN 1 ELSE 0 END), 0) FROM pg_stat_replication;`
case keyReplicationProcessInfo:
query = `SELECT json_object_agg(application_name, row_to_json(T))
FROM (
SELECT
- CONCAT(application_name, ' ', pid) AS application_name,
- EXTRACT(epoch FROM COALESCE(flush_lag,'0'::interval)) as flush_lag,
- EXTRACT(epoch FROM COALESCE(replay_lag,'0'::interval)) as replay_lag,
- EXTRACT(epoch FROM COALESCE(write_lag, '0'::interval)) as write_lag
+ application_name,
+ EXTRACT(epoch FROM COALESCE(flush_lag,'0'::interval)) AS flush_lag,
+ EXTRACT(epoch FROM COALESCE(replay_lag,'0'::interval)) AS replay_lag,
+ EXTRACT(epoch FROM COALESCE(write_lag, '0'::interval)) AS write_lag
FROM pg_stat_replication
) T; `
row, err := conn.QueryRow(ctx, query)
diff --git a/src/go/plugins/postgres/handler_replication_process_name_discovery.go b/src/go/plugins/postgres/handler_replication_process_name_discovery.go
index b9f5f8a352b..113cc8bb2c4 100644
--- a/src/go/plugins/postgres/handler_replication_process_name_discovery.go
+++ b/src/go/plugins/postgres/handler_replication_process_name_discovery.go
@@ -34,7 +34,7 @@ func processNameDiscoveryHandler(ctx context.Context, conn PostgresClient,
var appNameJSON string
query := `SELECT
- json_build_object('data',json_agg(json_build_object('{#APPLICATION_NAME}',CONCAT(application_name, ' ', pid))))
+ json_build_object('data',COALESCE(json_agg(json_build_object('{#APPLICATION_NAME}',application_name)), '[]'))
FROM pg_stat_replication`
row, err := conn.QueryRow(ctx, query)
diff --git a/src/go/plugins/postgres/handler_wal.go b/src/go/plugins/postgres/handler_wal.go
index 1b1ce93b619..55659ee0e2b 100644
--- a/src/go/plugins/postgres/handler_wal.go
+++ b/src/go/plugins/postgres/handler_wal.go
@@ -35,9 +35,16 @@ func walHandler(ctx context.Context, conn PostgresClient,
query := `SELECT row_to_json(T)
FROM (
SELECT
- pg_wal_lsn_diff(pg_current_wal_lsn(),'0/00000000') AS WRITE,
+ CASE
+ WHEN pg_is_in_recovery() THEN 0
+ ELSE pg_wal_lsn_diff(pg_current_wal_lsn(),'0/00000000')
+ END AS WRITE,
+ CASE
+ WHEN NOT pg_is_in_recovery() THEN 0
+ ELSE pg_wal_lsn_diff(pg_last_wal_receive_lsn(),'0/00000000')
+ END AS RECEIVE,
count(*)
- FROM pg_ls_waldir() AS COUNT
+ FROM pg_ls_waldir() AS COUNT
) T;`
row, err := conn.QueryRow(ctx, query)
diff --git a/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c
index ef533f6af52..c564cc28bd0 100644
--- a/src/libs/zbxcommon/misc.c
+++ b/src/libs/zbxcommon/misc.c
@@ -314,13 +314,13 @@ double zbx_current_time(void)
/******************************************************************************
* *
- * Function: is_leap_year *
+ * Function: zbx_is_leap_year *
* *
* Return value: SUCCEED - year is a leap year *
* FAIL - year is not a leap year *
* *
******************************************************************************/
-static int is_leap_year(int year)
+int zbx_is_leap_year(int year)
{
return 0 == year % 4 && (0 != year % 100 || 0 == year % 400) ? SUCCEED : FAIL;
}
@@ -410,10 +410,10 @@ long zbx_get_timezone_offset(time_t t, struct tm *tm)
(tm->tm_min - tm_utc.tm_min) * SEC_PER_MIN; /* assuming seconds are equal */
while (tm->tm_year > tm_utc.tm_year)
- offset += (SUCCEED == is_leap_year(tm_utc.tm_year++) ? SEC_PER_YEAR + SEC_PER_DAY : SEC_PER_YEAR);
+ offset += (SUCCEED == zbx_is_leap_year(tm_utc.tm_year++) ? SEC_PER_YEAR + SEC_PER_DAY : SEC_PER_YEAR);
while (tm->tm_year < tm_utc.tm_year)
- offset -= (SUCCEED == is_leap_year(--tm_utc.tm_year) ? SEC_PER_YEAR + SEC_PER_DAY : SEC_PER_YEAR);
+ offset -= (SUCCEED == zbx_is_leap_year(--tm_utc.tm_year) ? SEC_PER_YEAR + SEC_PER_DAY : SEC_PER_YEAR);
#endif
return offset;
@@ -529,7 +529,7 @@ int zbx_day_in_month(int year, int mon)
static const unsigned char month[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
if (1 <= mon && mon <= 12) /* add one day in February of a leap year */
- return month[mon - 1] + (2 == mon && SUCCEED == is_leap_year(year) ? 1 : 0);
+ return month[mon - 1] + (2 == mon && SUCCEED == zbx_is_leap_year(year) ? 1 : 0);
return 30;
}
@@ -3571,6 +3571,9 @@ zbx_function_type_t zbx_get_function_type(const char *func)
if (0 == strncmp(func, "trend", 5))
return ZBX_FUNCTION_TYPE_TRENDS;
+ if (0 == strncmp(func, "baseline", 8))
+ return ZBX_FUNCTION_TYPE_TRENDS;
+
if (0 == strcmp(func, "nodata"))
return ZBX_FUNCTION_TYPE_TIMER;
@@ -3883,7 +3886,7 @@ void zbx_update_env(double time_now)
* *
* Function: zbx_dc_get_agent_item_nextcheck *
* *
- * Purpose: calculate item nextcheck for zabix agent type items *
+ * Purpose: calculate item nextcheck for Zabbix agent type items *
* *
******************************************************************************/
int zbx_get_agent_item_nextcheck(zbx_uint64_t itemid, const char *delay, int now,
@@ -3983,3 +3986,82 @@ void zbx_free_tag(zbx_tag_t *tag)
zbx_free(tag->value);
zbx_free(tag);
}
+
+/******************************************************************************
+ * *
+ * Function: zbx_md5buf2str *
+ * *
+ * Purpose: get a textual representation of md5 sum *
+ * *
+ * Parameters: *
+ * md5 - [IN] buffer with md5 sum *
+ * str - [OUT] preallocated string with a text representation of MD5 *
+ * sum. String size must be at least *
+ * ZBX_MD5_PRINT_BUF_LEN bytes. *
+ * *
+ ******************************************************************************/
+void zbx_md5buf2str(const md5_byte_t *md5, char *str)
+{
+ const char *hex = "0123456789abcdef";
+ char *p = str;
+ int i;
+
+ for (i = 0; i < MD5_DIGEST_SIZE; i++)
+ {
+ *p++ = hex[md5[i] >> 4];
+ *p++ = hex[md5[i] & 15];
+ }
+
+ *p = '\0';
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_hex2bin *
+ * *
+ * Purpose: *
+ * convert ASCII hex digit string to a binary representation (byte *
+ * string) *
+ * *
+ * Parameters: *
+ * p_hex - [IN] null-terminated input string *
+ * buf - [OUT] output buffer *
+ * buf_len - [IN] output buffer size *
+ * *
+ * Return value: *
+ * Number of bytes written into 'buf' on successful conversion. *
+ * -1 - an error occurred. *
+ * *
+ * Comments: *
+ * In case of error incomplete useless data may be written into 'buf'. *
+ * *
+ ******************************************************************************/
+int zbx_hex2bin(const unsigned char *p_hex, unsigned char *buf, int buf_len)
+{
+ unsigned char *q = buf;
+ int len = 0;
+
+ while ('\0' != *p_hex)
+ {
+ if (0 != isxdigit(*p_hex) && 0 != isxdigit(*(p_hex + 1)) && buf_len > len)
+ {
+ unsigned char hi = *p_hex & 0x0f;
+ unsigned char lo;
+
+ if ('9' < *p_hex++)
+ hi = (unsigned char)(hi + 9u);
+
+ lo = *p_hex & 0x0f;
+
+ if ('9' < *p_hex++)
+ lo = (unsigned char)(lo + 9u);
+
+ *q++ = (unsigned char)(hi << 4 | lo);
+ len++;
+ }
+ else
+ return -1;
+ }
+
+ return len;
+}
diff --git a/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c
index 11ecbb076cc..0d2a04eafe4 100644
--- a/src/libs/zbxcommon/str.c
+++ b/src/libs/zbxcommon/str.c
@@ -2707,13 +2707,13 @@ void zbx_strarr_add(char ***arr, const char *entry)
* Author: Vladimir Levijev *
* *
******************************************************************************/
-void zbx_strarr_free(char **arr)
+void zbx_strarr_free(char ***arr)
{
char **p;
- for (p = arr; NULL != *p; p++)
+ for (p = *arr; NULL != *p; p++)
zbx_free(*p);
- zbx_free(arr);
+ zbx_free(*arr);
}
/******************************************************************************
diff --git a/src/libs/zbxcommon/time.c b/src/libs/zbxcommon/time.c
index 50fbb9a078e..81c78fa5290 100644
--- a/src/libs/zbxcommon/time.c
+++ b/src/libs/zbxcommon/time.c
@@ -23,7 +23,7 @@ static void tm_add(struct tm *tm, int multiplier, zbx_time_unit_t base);
static void tm_sub(struct tm *tm, int multiplier, zbx_time_unit_t base);
static int time_unit_seconds[ZBX_TIME_UNIT_COUNT] = {0, 1, SEC_PER_MIN, SEC_PER_HOUR, SEC_PER_DAY, SEC_PER_WEEK, 0,
- 0};
+ 0, 0};
zbx_time_unit_t zbx_tm_str_to_unit(const char *text)
{
@@ -193,8 +193,16 @@ static void tm_add(struct tm *tm, int multiplier, zbx_time_unit_t base)
void zbx_tm_add(struct tm *tm, int multiplier, zbx_time_unit_t base)
{
if (ZBX_TIME_UNIT_MONTH == base || ZBX_TIME_UNIT_YEAR == base)
+ {
+ int days_max;
+
tm_add(tm, multiplier, base);
+ days_max = zbx_day_in_month(tm->tm_year + 1900, tm->tm_mon + 1);
+ if (tm->tm_mday > days_max)
+ tm->tm_mday = days_max;
+ }
+
tm_add_seconds(tm, multiplier * time_unit_seconds[base]);
return;
@@ -297,9 +305,31 @@ static void tm_sub(struct tm *tm, int multiplier, zbx_time_unit_t base)
******************************************************************************/
void zbx_tm_sub(struct tm *tm, int multiplier, zbx_time_unit_t base)
{
- if (ZBX_TIME_UNIT_MONTH == base || ZBX_TIME_UNIT_YEAR == base)
+ if (ZBX_TIME_UNIT_ISOYEAR == base)
+ {
+ int week_num, total_weeks;
+
+ week_num = zbx_get_week_number(tm);
+
+ /* use zbx_tm_sub instead of tm_sub to force weekday recalculation */
+ zbx_tm_sub(tm, week_num, ZBX_TIME_UNIT_WEEK);
+
+ total_weeks = zbx_get_week_number(tm);
+ if (week_num > total_weeks)
+ week_num--;
+ tm_sub(tm, zbx_get_week_number(tm) - week_num, ZBX_TIME_UNIT_WEEK);
+ }
+ else if (ZBX_TIME_UNIT_MONTH == base || ZBX_TIME_UNIT_YEAR == base)
+ {
+ int days_max;
+
tm_sub(tm, multiplier, base);
+ days_max = zbx_day_in_month(tm->tm_year + 1900, tm->tm_mon + 1);
+ if (tm->tm_mday > days_max)
+ tm->tm_mday = days_max;
+ }
+
tm_add_seconds(tm, -multiplier * time_unit_seconds[base]);
return;
@@ -397,6 +427,10 @@ void zbx_tm_round_down(struct tm *tm, zbx_time_unit_t base)
tm->tm_min = 0;
tm->tm_sec = 0;
break;
+ case ZBX_TIME_UNIT_ISOYEAR:
+ zbx_tm_round_down(tm, ZBX_TIME_UNIT_WEEK);
+ zbx_tm_sub(tm, zbx_get_week_number(tm) - 1, ZBX_TIME_UNIT_WEEK);
+ break;
case ZBX_TIME_UNIT_YEAR:
tm->tm_mon = 0;
ZBX_FALLTHROUGH;
@@ -429,8 +463,48 @@ const char *zbx_timespec_str(const zbx_timespec_t *ts)
struct tm tm;
localtime_r(&ts_time, &tm);
- zbx_snprintf(str, sizeof(str), "%04d.%02d.%02d %02d:%02d:%02d %09d", tm.tm_year + 1900, tm.tm_mon + 1,
+ zbx_snprintf(str, sizeof(str), "%04d.%02d.%02d %02d:%02d:%02d.%09d", tm.tm_year + 1900, tm.tm_mon + 1,
tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, ts->ns);
return str;
}
+
+static int get_week_days(int yday, int wday)
+{
+ return yday - (yday - wday + 382) % 7 + 3;
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_get_week_number *
+ * *
+ * Purpose: get ISO 8061 week number (1-53) *
+ * *
+ ******************************************************************************/
+int zbx_get_week_number(const struct tm *tm)
+{
+ int days;
+
+ if (0 > (days = get_week_days(tm->tm_yday, tm->tm_wday)))
+ {
+ int d = tm->tm_yday + 365;
+
+ if (SUCCEED == zbx_is_leap_year(tm->tm_year + 1899))
+ d++;
+
+ days = get_week_days(d, tm->tm_wday);
+ }
+ else
+ {
+ int days_next, d;
+
+ d = tm->tm_yday - 365;
+ if (SUCCEED == zbx_is_leap_year(tm->tm_year + 1900))
+ d--;
+
+ if (0 <= (days_next = get_week_days(d, tm->tm_wday)))
+ days = days_next;
+ }
+
+ return days / 7 + 1;
+}
diff --git a/src/libs/zbxconf/cfg.c b/src/libs/zbxconf/cfg.c
index 5be1c9db769..46fd3598fec 100644
--- a/src/libs/zbxconf/cfg.c
+++ b/src/libs/zbxconf/cfg.c
@@ -33,7 +33,8 @@ int CONFIG_LOG_FILE_SIZE = 1;
int CONFIG_ALLOW_ROOT = 0;
int CONFIG_TIMEOUT = 3;
-static int __parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int level, int optional, int strict);
+static int __parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int level, int optional, int strict,
+ int noexit);
/******************************************************************************
* *
@@ -207,13 +208,15 @@ trim:
* cfg - pointer to configuration parameter structure *
* level - a level of included file *
* strict - treat unknown parameters as error *
+ * noexit - on error return FAIL instead of EXIT_FAILURE *
* *
* Return value: SUCCEED - parsed successfully *
* FAIL - error processing directory *
* *
******************************************************************************/
#ifdef _WINDOWS
-static int parse_cfg_dir(const char *path, const char *pattern, struct cfg_line *cfg, int level, int strict)
+static int parse_cfg_dir(const char *path, const char *pattern, struct cfg_line *cfg, int level, int strict,
+ int noexit)
{
WIN32_FIND_DATAW find_file_data;
HANDLE h_find;
@@ -244,7 +247,7 @@ static int parse_cfg_dir(const char *path, const char *pattern, struct cfg_line
zbx_free(file_name);
- if (SUCCEED != __parse_cfg_file(file, cfg, level, ZBX_CFG_FILE_REQUIRED, strict))
+ if (SUCCEED != __parse_cfg_file(file, cfg, level, ZBX_CFG_FILE_REQUIRED, strict, noexit))
goto close;
}
@@ -259,7 +262,8 @@ clean:
return ret;
}
#else
-static int parse_cfg_dir(const char *path, const char *pattern, struct cfg_line *cfg, int level, int strict)
+static int parse_cfg_dir(const char *path, const char *pattern, struct cfg_line *cfg, int level, int strict,
+ int noexit)
{
DIR *dir;
struct dirent *d;
@@ -283,7 +287,7 @@ static int parse_cfg_dir(const char *path, const char *pattern, struct cfg_line
if (NULL != pattern && SUCCEED != match_glob(d->d_name, pattern))
continue;
- if (SUCCEED != __parse_cfg_file(file, cfg, level, ZBX_CFG_FILE_REQUIRED, strict))
+ if (SUCCEED != __parse_cfg_file(file, cfg, level, ZBX_CFG_FILE_REQUIRED, strict, noexit))
goto close;
}
@@ -311,12 +315,13 @@ out:
* cfg - pointer to configuration parameter structure *
* level - a level of included file *
* strict - treat unknown parameters as error *
+ * noexit - on error return FAIL instead of EXIT_FAILURE *
* *
* Return value: SUCCEED - parsed successfully *
* FAIL - error processing object *
* *
******************************************************************************/
-static int parse_cfg_object(const char *cfg_file, struct cfg_line *cfg, int level, int strict)
+static int parse_cfg_object(const char *cfg_file, struct cfg_line *cfg, int level, int strict, int noexit)
{
int ret = FAIL;
char *path = NULL, *pattern = NULL;
@@ -335,7 +340,7 @@ static int parse_cfg_object(const char *cfg_file, struct cfg_line *cfg, int leve
{
if (NULL == pattern)
{
- ret = __parse_cfg_file(path, cfg, level, ZBX_CFG_FILE_REQUIRED, strict);
+ ret = __parse_cfg_file(path, cfg, level, ZBX_CFG_FILE_REQUIRED, strict, noexit);
goto clean;
}
@@ -343,7 +348,7 @@ static int parse_cfg_object(const char *cfg_file, struct cfg_line *cfg, int leve
goto clean;
}
- ret = parse_cfg_dir(path, pattern, cfg, level, strict);
+ ret = parse_cfg_dir(path, pattern, cfg, level, strict, noexit);
clean:
zbx_free(pattern);
zbx_free(path);
@@ -362,6 +367,7 @@ clean:
* level - a level of included file *
* optional - do not treat missing configuration file as error *
* strict - treat unknown parameters as error *
+ * noexit - on error return FAIL instead of EXIT_FAILURE *
* *
* Return value: SUCCEED - parsed successfully *
* FAIL - error processing config file *
@@ -369,7 +375,7 @@ clean:
* Author: Alexei Vladishev, Eugene Grigorjev *
* *
******************************************************************************/
-static int __parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int level, int optional, int strict)
+static int __parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int level, int optional, int strict, int noexit)
{
#define ZBX_MAX_INCLUDE_LEVEL 10
@@ -433,7 +439,7 @@ static int __parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int leve
if (0 == strcmp(parameter, "Include"))
{
- if (FAIL == parse_cfg_object(value, cfg, level, strict))
+ if (FAIL == parse_cfg_object(value, cfg, level, strict, noexit))
{
fclose(file);
goto error;
@@ -561,12 +567,15 @@ unknown_parameter:
missing_mandatory:
zbx_error("missing mandatory parameter \"%s\" in config file \"%s\"", cfg[i].parameter, cfg_file);
error:
- exit(EXIT_FAILURE);
+ if (0 == noexit)
+ exit(EXIT_FAILURE);
+
+ return FAIL;
}
-int parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int optional, int strict)
+int parse_cfg_file(const char *cfg_file, struct cfg_line *cfg, int optional, int strict, int noexit)
{
- return __parse_cfg_file(cfg_file, cfg, 0, optional, strict);
+ return __parse_cfg_file(cfg_file, cfg, 0, optional, strict, noexit);
}
int check_cfg_feature_int(const char *parameter, int value, const char *feature)
diff --git a/src/libs/zbxcrypto/tls.c b/src/libs/zbxcrypto/tls.c
index ab6e22331c1..c7bcd3f4220 100644
--- a/src/libs/zbxcrypto/tls.c
+++ b/src/libs/zbxcrypto/tls.c
@@ -979,58 +979,6 @@ void zbx_tls_validate_config(void)
}
}
-/******************************************************************************
- * *
- * Function: zbx_psk_hex2bin *
- * *
- * Purpose: *
- * convert a pre-shared key from a textual representation (ASCII hex *
- * digit string) to a binary representation (byte string) *
- * *
- * Parameters: *
- * p_hex - [IN] null-terminated input PSK hex-string *
- * buf - [OUT] output buffer *
- * buf_len - [IN] output buffer size *
- * *
- * Return value: *
- * Number of PSK bytes written into 'buf' on successful conversion. *
- * -1 - an error occurred. *
- * *
- * Comments: *
- * In case of error incomplete useless data may be written into 'buf'. *
- * *
- ******************************************************************************/
-static int zbx_psk_hex2bin(const unsigned char *p_hex, unsigned char *buf, int buf_len)
-{
- unsigned char *q, hi, lo;
- int len = 0;
-
- q = buf;
-
- while ('\0' != *p_hex)
- {
- if (0 != isxdigit(*p_hex) && 0 != isxdigit(*(p_hex + 1)) && buf_len > len)
- {
- hi = *p_hex & 0x0f;
-
- if ('9' < *p_hex++)
- hi += 9u;
-
- lo = *p_hex & 0x0f;
-
- if ('9' < *p_hex++)
- lo += 9u;
-
- *q++ = hi << 4 | lo;
- len++;
- }
- else
- return -1;
- }
-
- return len;
-}
-
static void zbx_psk_warn_misconfig(const char *psk_identity)
{
zabbix_log(LOG_LEVEL_WARNING, "same PSK identity \"%s\" but different PSK values used in proxy configuration"
@@ -1079,7 +1027,7 @@ static int zbx_psk_cb(gnutls_session_t session, const char *psk_identity, gnutls
if (0 < find_psk_in_cache((const unsigned char *)psk_identity, tls_psk_hex, &psk_usage))
{
/* The PSK is in configuration cache. Convert PSK to binary form. */
- if (0 >= (psk_bin_len = zbx_psk_hex2bin(tls_psk_hex, psk_buf, sizeof(psk_buf))))
+ if (0 >= (psk_bin_len = zbx_hex2bin(tls_psk_hex, psk_buf, sizeof(psk_buf))))
{
/* this should have been prevented by validation in frontend or API */
zabbix_log(LOG_LEVEL_WARNING, "cannot convert PSK to binary form for PSK identity"
@@ -1250,7 +1198,7 @@ static unsigned int zbx_psk_server_cb(SSL *ssl, const char *identity, unsigned c
if (0 < find_psk_in_cache((const unsigned char *)identity, tls_psk_hex, &psk_usage))
{
/* The PSK is in configuration cache. Convert PSK to binary form. */
- if (0 >= (psk_bin_len = zbx_psk_hex2bin(tls_psk_hex, psk_buf, sizeof(psk_buf))))
+ if (0 >= (psk_bin_len = zbx_hex2bin(tls_psk_hex, psk_buf, sizeof(psk_buf))))
{
/* this should have been prevented by validation in frontend or API */
zabbix_log(LOG_LEVEL_WARNING, "cannot convert PSK to binary form for PSK identity"
@@ -1403,7 +1351,7 @@ static void zbx_read_psk_file(void)
goto out;
}
- if (0 >= (len_bin = zbx_psk_hex2bin((unsigned char *)buf, (unsigned char *)buf_bin, sizeof(buf_bin))))
+ if (0 >= (len_bin = zbx_hex2bin((unsigned char *)buf, (unsigned char *)buf_bin, sizeof(buf_bin))))
{
zabbix_log(LOG_LEVEL_CRIT, "invalid PSK in file \"%s\"", CONFIG_TLS_PSK_FILE);
goto out;
@@ -3381,7 +3329,7 @@ int zbx_tls_connect(zbx_socket_t *s, unsigned int tls_connect, const char *tls_a
int psk_len;
unsigned char psk_buf[HOST_TLS_PSK_LEN / 2];
- if (0 >= (psk_len = zbx_psk_hex2bin((const unsigned char *)tls_arg2, psk_buf, sizeof(psk_buf))))
+ if (0 >= (psk_len = zbx_hex2bin((const unsigned char *)tls_arg2, psk_buf, sizeof(psk_buf))))
{
*error = zbx_strdup(*error, "invalid PSK");
goto out;
@@ -3623,7 +3571,7 @@ int zbx_tls_connect(zbx_socket_t *s, unsigned int tls_connect, const char *tls_a
int psk_len;
- if (0 >= (psk_len = zbx_psk_hex2bin((const unsigned char *)tls_arg2, (unsigned char *)psk_buf,
+ if (0 >= (psk_len = zbx_hex2bin((const unsigned char *)tls_arg2, (unsigned char *)psk_buf,
sizeof(psk_buf))))
{
*error = zbx_strdup(*error, "invalid PSK");
diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c
index d9b04da5b83..c03b29ca777 100644
--- a/src/libs/zbxdbcache/dbconfig.c
+++ b/src/libs/zbxdbcache/dbconfig.c
@@ -3969,9 +3969,11 @@ static int dc_function_calculate_nextcheck(const zbx_trigger_timer_t *timer, tim
time_t nextcheck;
int offsets[ZBX_TIME_UNIT_COUNT] = {0, 0, 0, SEC_PER_MIN * 10,
SEC_PER_HOUR + SEC_PER_MIN * 10, SEC_PER_HOUR + SEC_PER_MIN * 10,
- SEC_PER_HOUR + SEC_PER_MIN * 10, SEC_PER_HOUR + SEC_PER_MIN * 10};
+ SEC_PER_HOUR + SEC_PER_MIN * 10, SEC_PER_HOUR + SEC_PER_MIN * 10,
+ SEC_PER_HOUR + SEC_PER_MIN * 10};
int periods[ZBX_TIME_UNIT_COUNT] = {0, 0, 0, SEC_PER_MIN * 10, SEC_PER_HOUR,
- SEC_PER_HOUR * 11, SEC_PER_DAY - SEC_PER_HOUR, SEC_PER_DAY - SEC_PER_HOUR};
+ SEC_PER_HOUR * 11, SEC_PER_DAY - SEC_PER_HOUR, SEC_PER_DAY - SEC_PER_HOUR,
+ SEC_PER_DAY - SEC_PER_HOUR};
if (ZBX_TIME_UNIT_HOUR == timer->trend_base)
{
@@ -3990,9 +3992,10 @@ static int dc_function_calculate_nextcheck(const zbx_trigger_timer_t *timer, tim
else
{
int ret = FAIL;
- char *error = NULL, *period_shift;
+ char *error = NULL, *period_shift, *param = NULL;
- if (NULL != (period_shift = strchr(timer->parameter, ':')))
+ if (NULL != (param = zbx_function_get_param_dyn(timer->parameter, 1)) &&
+ NULL != (period_shift = strchr(param, ':')))
{
period_shift++;
ret = dc_function_calculate_trends_nextcheck(from, period_shift, timer->trend_base,
@@ -4001,6 +4004,8 @@ static int dc_function_calculate_nextcheck(const zbx_trigger_timer_t *timer, tim
else
error = zbx_dsprintf(NULL, "invalid first parameter");
+ zbx_free(param);
+
if (FAIL == ret)
{
zabbix_log(LOG_LEVEL_WARNING, "cannot calculate trend function \"" ZBX_FS_UI64
diff --git a/src/libs/zbxdbcache/dbconfig_maintenance.c b/src/libs/zbxdbcache/dbconfig_maintenance.c
index bed3a796a95..4d834306251 100644
--- a/src/libs/zbxdbcache/dbconfig_maintenance.c
+++ b/src/libs/zbxdbcache/dbconfig_maintenance.c
@@ -1545,6 +1545,8 @@ int zbx_dc_get_event_maintenances(zbx_vector_ptr_t *event_queries, const zbx_vec
for (j = 0; j < query->functionids.values_num; j++)
{
+ ZBX_DC_HOST *dc_host;
+
if (NULL == (function = (ZBX_DC_FUNCTION *)zbx_hashset_search(&config->functions,
&query->functionids.values[j])))
{
@@ -1554,6 +1556,12 @@ int zbx_dc_get_event_maintenances(zbx_vector_ptr_t *event_queries, const zbx_vec
if (NULL == (item = (ZBX_DC_ITEM *)zbx_hashset_search(&config->items, &function->itemid)))
continue;
+ if (NULL == (dc_host = (ZBX_DC_HOST *)zbx_hashset_search(&config->hosts, &item->hostid)))
+ continue;
+
+ if (HOST_MAINTENANCE_STATUS_OFF == dc_host->maintenance_status)
+ goto skip;
+
zbx_vector_uint64_append(&hostids, item->hostid);
}
@@ -1596,7 +1604,7 @@ int zbx_dc_get_event_maintenances(zbx_vector_ptr_t *event_queries, const zbx_vec
ret = SUCCEED;
}
}
-
+skip:
zbx_vector_uint64_clear(&hostids);
}
unlock:
diff --git a/src/libs/zbxdbcache/valuecache.c b/src/libs/zbxdbcache/valuecache.c
index 6a6c0a22726..9750205928f 100644
--- a/src/libs/zbxdbcache/valuecache.c
+++ b/src/libs/zbxdbcache/valuecache.c
@@ -2661,8 +2661,8 @@ int zbx_vc_get_values(zbx_uint64_t itemid, int value_type, zbx_vector_history_re
zbx_vc_item_t *item, new_item;
int ret = FAIL, cache_used = 1;
- zabbix_log(LOG_LEVEL_DEBUG, "In %s() itemid:" ZBX_FS_UI64 " value_type:%d seconds:%d count:%d sec:%d ns:%d",
- __func__, itemid, value_type, seconds, count, ts->sec, ts->ns);
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s() itemid:" ZBX_FS_UI64 " value_type:%d count:%d period:%d end_timestamp"
+ " '%s'", __func__, itemid, value_type, count, seconds, zbx_timespec_str(ts));
RDLOCK_CACHE;
diff --git a/src/libs/zbxdbhigh/trigger_linking.c b/src/libs/zbxdbhigh/trigger_linking.c
index a81d08a864d..fe64c7e4f1a 100644
--- a/src/libs/zbxdbhigh/trigger_linking.c
+++ b/src/libs/zbxdbhigh/trigger_linking.c
@@ -1158,18 +1158,20 @@ static int execute_triggers_inserts(zbx_vector_trigger_copies_insert_t *trigger_
{
zbx_eval_context_t ctx, ctx_r;
zbx_trigger_copy_t *trigger_copy_template = trigger_copies_insert->values[i];
+ zbx_uint64_t parse_rules = ZBX_EVAL_PARSE_TRIGGER_EXPRESSSION | ZBX_EVAL_COMPOSE_FUNCTIONID;
- if (SUCCEED != (res = zbx_eval_parse_expression(&ctx, trigger_copy_template->expression,
- ZBX_EVAL_PARSE_TRIGGER_EXPRESSSION | ZBX_EVAL_COMPOSE_FUNCTIONID, error)))
+ if (0 != (trigger_copy_template->flags & ZBX_FLAG_DISCOVERY_PROTOTYPE))
+ parse_rules |= ZBX_EVAL_PARSE_LLDMACRO | ZBX_EVAL_COMPOSE_LLD;
+
+ if (SUCCEED != (res = zbx_eval_parse_expression(&ctx, trigger_copy_template->expression, parse_rules,
+ error)))
{
goto func_out;
}
if (TRIGGER_RECOVERY_MODE_RECOVERY_EXPRESSION == (int)trigger_copy_template->recovery_mode &&
(SUCCEED != (res = zbx_eval_parse_expression(&ctx_r,
- trigger_copy_template->recovery_expression,
- ZBX_EVAL_PARSE_TRIGGER_EXPRESSSION | ZBX_EVAL_COMPOSE_FUNCTIONID,
- error))))
+ trigger_copy_template->recovery_expression, parse_rules, error))))
{
zbx_eval_clear(&ctx);
goto func_out;
diff --git a/src/libs/zbxdbupgrade/dbupgrade_5050.c b/src/libs/zbxdbupgrade/dbupgrade_5050.c
index 28c5cc153ee..d94ef094605 100644
--- a/src/libs/zbxdbupgrade/dbupgrade_5050.c
+++ b/src/libs/zbxdbupgrade/dbupgrade_5050.c
@@ -1189,6 +1189,22 @@ static int DBpatch_5050111(void)
static int DBpatch_5050112(void)
{
+ const ZBX_FIELD field = {"notify_if_canceled", "1", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
+
+ return DBadd_field("actions", &field);
+}
+
+static int DBpatch_5050113(void)
+{
+ const ZBX_FIELD old_field = {"formula", "", NULL, NULL, 255, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+ const ZBX_FIELD new_field = {"formula", "", NULL, NULL, 1024, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
+
+ return DBmodify_field_type("actions", &new_field, &old_field);
+}
+
+
+static int DBpatch_5050114(void)
+{
const ZBX_TABLE table =
{"sla", "slaid", 0,
{
@@ -1208,12 +1224,12 @@ static int DBpatch_5050112(void)
return DBcreate_table(&table);
}
-static int DBpatch_5050113(void)
+static int DBpatch_5050115(void)
{
return DBcreate_index("sla", "sla_1", "name", 1);
}
-static int DBpatch_5050114(void)
+static int DBpatch_5050116(void)
{
const ZBX_TABLE table =
{"sla_service_tag", "sla_service_tagid", 0,
@@ -1231,19 +1247,19 @@ static int DBpatch_5050114(void)
return DBcreate_table(&table);
}
-static int DBpatch_5050115(void)
+static int DBpatch_5050117(void)
{
return DBcreate_index("sla_service_tag", "sla_service_tag_1", "slaid", 0);
}
-static int DBpatch_5050116(void)
+static int DBpatch_5050118(void)
{
const ZBX_FIELD field = {"slaid", NULL, "sla", "slaid", 0, ZBX_TYPE_ID, ZBX_NOTNULL, ZBX_FK_CASCADE_DELETE};
return DBadd_foreign_key("sla_service_tag", 1, &field);
}
-static int DBpatch_5050117(void)
+static int DBpatch_5050119(void)
{
const ZBX_TABLE table =
{"sla_schedule", "sla_scheduleid", 0,
@@ -1260,19 +1276,19 @@ static int DBpatch_5050117(void)
return DBcreate_table(&table);
}
-static int DBpatch_5050118(void)
+static int DBpatch_5050120(void)
{
return DBcreate_index("sla_schedule", "sla_schedule_1", "slaid", 0);
}
-static int DBpatch_5050119(void)
+static int DBpatch_5050121(void)
{
const ZBX_FIELD field = {"slaid", NULL, "sla", "slaid", 0, ZBX_TYPE_ID, ZBX_NOTNULL, ZBX_FK_CASCADE_DELETE};
return DBadd_foreign_key("sla_schedule", 1, &field);
}
-static int DBpatch_5050120(void)
+static int DBpatch_5050122(void)
{
const ZBX_TABLE table =
{"sla_excluded_downtime", "sla_excluded_downtimeid", 0,
@@ -1290,26 +1306,26 @@ static int DBpatch_5050120(void)
return DBcreate_table(&table);
}
-static int DBpatch_5050121(void)
+static int DBpatch_5050123(void)
{
return DBcreate_index("sla_excluded_downtime", "sla_excluded_downtime_1", "slaid", 0);
}
-static int DBpatch_5050122(void)
+static int DBpatch_5050124(void)
{
const ZBX_FIELD field = {"slaid", NULL, "sla", "slaid", 0, ZBX_TYPE_ID, ZBX_NOTNULL, ZBX_FK_CASCADE_DELETE};
return DBadd_foreign_key("sla_excluded_downtime", 1, &field);
}
-static int DBpatch_5050123(void)
+static int DBpatch_5050125(void)
{
const ZBX_FIELD field = {"description", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0};
return DBadd_field("services", &field);
}
-static int DBpatch_5050124(void)
+static int DBpatch_5050126(void)
{
const ZBX_FIELD field = {"uuid", "", NULL, NULL, 32, ZBX_TYPE_CHAR, ZBX_NOTNULL, 0};
@@ -1538,7 +1554,7 @@ static void services_times_convert_downtime(zbx_vector_services_times_t *service
zbx_vector_services_times_destroy(&services_times_converted);
}
-static int DBpatch_5050125(void)
+static int DBpatch_5050127(void)
{
DB_RESULT result;
DB_ROW row;
@@ -1642,22 +1658,22 @@ static int DBpatch_5050125(void)
return ret;
}
-static int DBpatch_5050126(void)
+static int DBpatch_5050128(void)
{
return DBdrop_table("services_times");
}
-static int DBpatch_5050127(void)
+static int DBpatch_5050129(void)
{
return DBdrop_field("services", "showsla");
}
-static int DBpatch_5050128(void)
+static int DBpatch_5050130(void)
{
return DBdrop_field("services", "goodsla");
}
-static int DBpatch_5050129(void)
+static int DBpatch_5050131(void)
{
int ret = SUCCEED;
char *uuid, *sql = NULL;
@@ -1691,7 +1707,7 @@ out:
return ret;
}
-static int DBpatch_5050130(void)
+static int DBpatch_5050132(void)
{
if (ZBX_DB_OK > DBexecute("update role_rule set name='ui.services.services' where name='ui.monitoring.services'"))
return FAIL;
@@ -1699,19 +1715,19 @@ static int DBpatch_5050130(void)
return SUCCEED;
}
-static int DBpatch_5050131(void)
+static int DBpatch_5050133(void)
{
const ZBX_FIELD field = {"value_serviceid", NULL, NULL, NULL, 0, ZBX_TYPE_ID, 0, 0};
return DBadd_field("widget_field", &field);
}
-static int DBpatch_5050132(void)
+static int DBpatch_5050134(void)
{
return DBcreate_index("widget_field", "widget_field_7", "value_serviceid", 0);
}
-static int DBpatch_5050133(void)
+static int DBpatch_5050135(void)
{
const ZBX_FIELD field = {"value_serviceid", NULL, "services", "serviceid", 0, ZBX_TYPE_ID, 0,
ZBX_FK_CASCADE_DELETE};
@@ -1719,33 +1735,33 @@ static int DBpatch_5050133(void)
return DBadd_foreign_key("widget_field", 7, &field);
}
-static int DBpatch_5050134(void)
+static int DBpatch_5050136(void)
{
const ZBX_FIELD field = {"value_slaid", NULL, NULL, NULL, 0, ZBX_TYPE_ID, 0, 0};
return DBadd_field("widget_field", &field);
}
-static int DBpatch_5050135(void)
+static int DBpatch_5050137(void)
{
return DBcreate_index("widget_field", "widget_field_8", "value_slaid", 0);
}
-static int DBpatch_5050136(void)
+static int DBpatch_5050138(void)
{
const ZBX_FIELD field = {"value_slaid", NULL, "sla", "slaid", 0, ZBX_TYPE_ID, 0, ZBX_FK_CASCADE_DELETE};
return DBadd_foreign_key("widget_field", 8, &field);
}
-static int DBpatch_5050137(void)
+static int DBpatch_5050139(void)
{
const ZBX_FIELD field = {"created_at", "0", NULL, NULL, 0, ZBX_TYPE_INT, ZBX_NOTNULL, 0};
return DBadd_field("services", &field);
}
-static int DBpatch_5050138(void)
+static int DBpatch_5050140(void)
{
if (ZBX_DB_OK <= DBexecute("update services set created_at=%d", SERVICE_INITIAL_EFFECTIVE_DATE))
return SUCCEED;
@@ -1884,5 +1900,7 @@ DBPATCH_ADD(5050135, 0, 1)
DBPATCH_ADD(5050136, 0, 1)
DBPATCH_ADD(5050137, 0, 1)
DBPATCH_ADD(5050138, 0, 1)
+DBPATCH_ADD(5050139, 0, 1)
+DBPATCH_ADD(5050140, 0, 1)
DBPATCH_END()
diff --git a/src/libs/zbxembed/duktape.c b/src/libs/zbxembed/duktape.c
index 0d9af216a21..ef20238425c 100644
--- a/src/libs/zbxembed/duktape.c
+++ b/src/libs/zbxembed/duktape.c
@@ -19971,7 +19971,7 @@ DUK_EXTERNAL void *duk_require_buffer(duk_hthread *thr, duk_idx_t idx, duk_size_
}
/* Get the active buffer data area for a plain buffer or a buffer object.
- * Return NULL if the the value is not a buffer. Note that a buffer may
+ * Return NULL if the value is not a buffer. Note that a buffer may
* have a NULL data pointer when its size is zero, the optional 'out_isbuffer'
* argument allows caller to detect this reliably.
*/
@@ -56863,7 +56863,7 @@ DUK_INTERNAL duk_uint_fast32_t duk_hobject_pc2line_query(duk_hthread *thr, duk_i
* duk_tval copies is not problematic with respect to side effects;
* care must be taken when holding and using argument duk_tval pointers.
*
- * - If a finalizer is executed, it may operate on the the same object
+ * - If a finalizer is executed, it may operate on the same object
* we're currently dealing with. For instance, the finalizer might
* delete a certain property which has already been looked up and
* confirmed to exist. Ideally finalizers would be disabled if GC
diff --git a/src/libs/zbxembed/embed.c b/src/libs/zbxembed/embed.c
index c2d6b5ebbb3..8d7f682542e 100644
--- a/src/libs/zbxembed/embed.c
+++ b/src/libs/zbxembed/embed.c
@@ -534,6 +534,8 @@ int zbx_es_execute(zbx_es_t *es, const char *script, const char *code, int size,
*error = zbx_strdup(*error, "undefined return value");
}
}
+ else
+ ret = SUCCEED;
duk_pop(es->env->ctx);
es->env->rt_error_num = 0;
diff --git a/src/libs/zbxembed/httprequest.c b/src/libs/zbxembed/httprequest.c
index 91290973ad3..4c911925a72 100644
--- a/src/libs/zbxembed/httprequest.c
+++ b/src/libs/zbxembed/httprequest.c
@@ -25,6 +25,7 @@
#include "httprequest.h"
#include "embed.h"
#include "duktape.h"
+#include "zbxalgo.h"
#ifdef HAVE_LIBCURL
@@ -522,6 +523,32 @@ static duk_ret_t es_httprequest_status(duk_context *ctx)
/******************************************************************************
* *
+ * Function: parse_header *
+ * *
+ * Purpose: retrieves value of a header *
+ * *
+ * Parameters: header - [IN] the http header to extract value from *
+ * value_out - [OUT] the value *
+ * *
+ ******************************************************************************/
+static int parse_header(char *header, char **value_out)
+{
+ char *value;
+
+ if (NULL == (value = strchr(header, ':')))
+ return FAIL;
+
+ *value++ = '\0';
+ while (' ' == *value || '\t' == *value)
+ value++;
+
+ *value_out = value;
+
+ return SUCCEED;
+}
+
+/******************************************************************************
+ * *
* Function: es_obj_put_http_header *
* *
* Purpose: puts http header <field>: <value> as object property/value *
@@ -535,13 +562,9 @@ static void es_put_header(duk_context *ctx, int idx, char *header)
{
char *value;
- if (NULL == (value = strchr(header, ':')))
+ if (FAIL == parse_header(header, &value))
return;
- *value++ = '\0';
- while (' ' == *value || '\t' == *value)
- value++;
-
duk_push_string(ctx, value);
/* duk_put_prop_string() throws error on failure, no need to check return code */
@@ -550,19 +573,18 @@ static void es_put_header(duk_context *ctx, int idx, char *header)
/******************************************************************************
* *
- * Function: es_httprequest_get_headers *
+ * Function: get_headers_as_strings *
+ * *
+ * Purpose: retrieve headers from request in form of strings *
* *
- * Purpose: HttpRequest.Get / CurlHttpRequest.GetHeaders method *
+ * Parameters: ctx - [IN] the duktape context *
+ * request - [IN] the request to retrieve headers from *
* *
******************************************************************************/
-static duk_ret_t es_httprequest_get_headers(duk_context *ctx)
+static duk_ret_t get_headers_as_strings(duk_context *ctx, zbx_es_httprequest_t *request)
{
- zbx_es_httprequest_t *request;
- duk_idx_t idx;
char *ptr, *header;
-
- if (NULL == (request = es_httprequest(ctx)))
- return duk_error(ctx, DUK_RET_EVAL_ERROR, "internal scripting error: null object");
+ duk_idx_t idx;
idx = duk_push_object(ctx);
@@ -578,6 +600,132 @@ static duk_ret_t es_httprequest_get_headers(duk_context *ctx)
return 1;
}
+typedef struct
+{
+ char *name;
+ zbx_vector_str_t values;
+}
+zbx_cached_header_t;
+
+static void cached_headers_free(zbx_cached_header_t *header)
+{
+ zbx_vector_str_clear_ext(&header->values, zbx_str_free);
+ zbx_vector_str_destroy(&header->values);
+ zbx_free(header->name);
+ zbx_free(header);
+}
+
+/******************************************************************************
+ * *
+ * Function: get_headers_as_arrays *
+ * *
+ * Purpose: retrieve headers from request in form of arrays *
+ * *
+ * Parameters: ctx - [IN] the duktape context *
+ * request - [IN] the request to retrieve headers from *
+ * *
+ ******************************************************************************/
+static duk_ret_t get_headers_as_arrays(duk_context *ctx, zbx_es_httprequest_t *request)
+{
+ char *ptr, *header;
+ zbx_vector_ptr_t headers;
+ duk_idx_t idx;
+ int i;
+
+ zbx_vector_ptr_create(&headers);
+
+ idx = duk_push_object(ctx);
+
+ if (0 == request->headers_in_offset)
+ goto out;
+
+ for (ptr = request->headers_in; NULL != (header = zbx_http_parse_header(&ptr)); )
+ {
+ char *value;
+ zbx_cached_header_t *existing_header = NULL;
+
+ if (FAIL == parse_header(header, &value))
+ {
+ zbx_free(header);
+ continue;
+ }
+
+ for (int j = 0; j < headers.values_num; j++)
+ {
+ zbx_cached_header_t *h = (zbx_cached_header_t*)headers.values[j];
+
+ if (0 == strcmp(header, h->name))
+ {
+ existing_header = h;
+ zbx_vector_str_append(&existing_header->values, zbx_strdup(NULL, value));
+ zbx_free(header);
+
+ break;
+ }
+ }
+
+ if (NULL == existing_header)
+ {
+ zbx_cached_header_t *cached_header;
+
+ cached_header = zbx_malloc(NULL, sizeof(zbx_cached_header_t));
+
+ cached_header->name = header;
+ zbx_vector_str_create(&cached_header->values);
+ zbx_vector_str_append(&cached_header->values, zbx_strdup(NULL, value));
+ zbx_vector_ptr_append(&headers, cached_header);
+ }
+ }
+
+ for (i = 0; i < headers.values_num; i++) {
+ zbx_cached_header_t *h = (zbx_cached_header_t*)headers.values[i];
+ duk_idx_t arr_idx;
+ int j;
+
+ arr_idx = duk_push_array(ctx);
+
+ for (j = 0; j < h->values.values_num; j++)
+ {
+ duk_push_string(ctx, h->values.values[j]);
+ duk_put_prop_index(ctx, arr_idx, (duk_uarridx_t)j);
+ }
+
+ (void)duk_put_prop_string(ctx, idx, h->name);
+ }
+
+out:
+ zbx_vector_ptr_clear_ext(&headers, (zbx_mem_free_func_t)cached_headers_free);
+ zbx_vector_ptr_destroy(&headers);
+ return 1;
+}
+
+/******************************************************************************
+ * *
+ * Function: es_httprequest_get_headers *
+ * *
+ * Purpose: HttpRequest.getHeaders / CurlHttpRequest.GetHeaders method *
+ * *
+ ******************************************************************************/
+static duk_ret_t es_httprequest_get_headers(duk_context *ctx)
+{
+ zbx_es_httprequest_t *request;
+
+ if (NULL == (request = es_httprequest(ctx)))
+ return duk_error(ctx, DUK_RET_EVAL_ERROR, "internal scripting error: null object");
+
+ if (0 == duk_is_null_or_undefined(ctx, 0))
+ {
+ duk_bool_t as_array;
+
+ as_array = duk_to_boolean(ctx, 0);
+
+ if (0 != as_array)
+ return get_headers_as_arrays(ctx, request);
+ }
+
+ return get_headers_as_strings(ctx, request);
+}
+
/******************************************************************************
* *
* Function: es_httprequest_set_httpauth *
@@ -645,7 +793,7 @@ static const duk_function_list_entry curlhttprequest_methods[] = {
{"Delete", es_httprequest_delete, 2},
{"Status", es_httprequest_status, 0},
{"SetProxy", es_httprequest_set_proxy, 1},
- {"GetHeaders", es_httprequest_get_headers, 0},
+ {"GetHeaders", es_httprequest_get_headers, 1},
{"SetHttpAuth", es_httprequest_set_httpauth, 3},
{NULL, NULL, 0}
};
@@ -664,7 +812,7 @@ static const duk_function_list_entry httprequest_methods[] = {
{"connect", es_httprequest_connect, 2},
{"getStatus", es_httprequest_status, 0},
{"setProxy", es_httprequest_set_proxy, 1},
- {"getHeaders", es_httprequest_get_headers, 0},
+ {"getHeaders", es_httprequest_get_headers, 1},
{"setHttpAuth", es_httprequest_set_httpauth, 3},
{"customRequest", es_httprequest_customrequest, 3},
{NULL, NULL, 0}
diff --git a/src/libs/zbxicmpping/icmpping.c b/src/libs/zbxicmpping/icmpping.c
index 074d95d95cb..e69a8bf2daf 100644
--- a/src/libs/zbxicmpping/icmpping.c
+++ b/src/libs/zbxicmpping/icmpping.c
@@ -91,8 +91,8 @@ static void get_source_ip_option(const char *fping, const char **option, unsigne
* *
* Purpose: detect minimal possible fping packet interval *
* *
- * Parameters: fping - [IN] the the location of fping program *
- * dst - [IN] the the ip address for test *
+ * Parameters: fping - [IN] the location of fping program *
+ * dst - [IN] the ip address for test *
* value - [OUT] interval between sending ping packets *
* (in millisec) *
* error - [OUT] error string if function fails *
@@ -231,8 +231,8 @@ out:
* *
* Purpose: check fping supports IPv6 *
* *
- * Parameters: fping - [IN] the the location of fping program *
- * dst - [IN] the the ip address for test *
+ * Parameters: fping - [IN] the location of fping program *
+ * dst - [IN] the ip address for test *
* *
* Return value: SUCCEED - IPv6 is supported *
* FAIL - IPv6 is not supported *
diff --git a/src/libs/zbxnix/control.c b/src/libs/zbxnix/control.c
index bda4f206dfa..ffd25a7c024 100644
--- a/src/libs/zbxnix/control.c
+++ b/src/libs/zbxnix/control.c
@@ -231,6 +231,12 @@ int parse_rtc_options(const char *opt, unsigned char program_type, int *message)
scope = 0;
data = 0;
}
+ else if (0 != (program_type & (ZBX_PROGRAM_TYPE_AGENTD)) && 0 == strcmp(opt, ZBX_USER_PARAMETERS_RELOAD))
+ {
+ command = ZBX_RTC_USER_PARAMETERS_RELOAD;
+ scope = 0;
+ data = 0;
+ }
else if (0 != (program_type & (ZBX_PROGRAM_TYPE_SERVER)) && 0 == strcmp(opt, ZBX_HA_STATUS))
{
command = ZBX_RTC_HA_STATUS;
diff --git a/src/libs/zbxnix/daemon.c b/src/libs/zbxnix/daemon.c
index a0b25d7680c..e2fac4731cd 100644
--- a/src/libs/zbxnix/daemon.c
+++ b/src/libs/zbxnix/daemon.c
@@ -272,6 +272,10 @@ static void user1_signal_handler(int sig, siginfo_t *siginfo, void *context)
case ZBX_RTC_SERVICE_CACHE_RELOAD:
zbx_signal_process_by_type(ZBX_PROCESS_TYPE_SERVICEMAN, ZBX_RTC_GET_DATA(flags), flags);
break;
+ case ZBX_RTC_USER_PARAMETERS_RELOAD:
+ zbx_signal_process_by_type(ZBX_PROCESS_TYPE_ACTIVE_CHECKS, ZBX_RTC_GET_DATA(flags), flags);
+ zbx_signal_process_by_type(ZBX_PROCESS_TYPE_LISTENER, ZBX_RTC_GET_DATA(flags), flags);
+ break;
default:
if (NULL != zbx_sigusr_handler)
zbx_sigusr_handler(flags);
diff --git a/src/libs/zbxserver/Makefile.am b/src/libs/zbxserver/Makefile.am
index 9762c2ea93c..cddc941abd9 100644
--- a/src/libs/zbxserver/Makefile.am
+++ b/src/libs/zbxserver/Makefile.am
@@ -3,8 +3,12 @@
noinst_LIBRARIES = libzbxserver.a libzbxserver_server.a libzbxserver_proxy.a
libzbxserver_a_SOURCES = \
+ evalfunc_common.c \
+ evalfunc_common.h \
evalfunc.c \
evalfunc.h \
+ anomalystl.c \
+ anomalystl.h \
expression.c \
expression.h \
macrofunc.c \
diff --git a/src/libs/zbxserver/anomalystl.c b/src/libs/zbxserver/anomalystl.c
new file mode 100644
index 00000000000..5528880f490
--- /dev/null
+++ b/src/libs/zbxserver/anomalystl.c
@@ -0,0 +1,873 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#include "common.h"
+#include "db.h"
+#include "log.h"
+#include "zbxserver.h"
+#include "zbxregexp.h"
+#include "valuecache.h"
+#include "zbxtrends.h"
+#include "../zbxalgo/vectorimpl.h"
+
+#include "anomalystl.h"
+
+ZBX_PTR_VECTOR_DECL(VV, zbx_vector_history_record_t *)
+ZBX_PTR_VECTOR_IMPL(VV, zbx_vector_history_record_t *)
+
+/*******************************************************************************
+ * *
+ * Function: zbx_get_percentage_of_deviations_in_remainder *
+ * *
+ * Purpose: finds how many values in stl remainder are outliers *
+ * *
+ * Parameters: remainder - [IN] stl remainder values vector *
+ * deviations_count - [IN] how much a value can be away from the *
+ * (mad, stdevsamp or stdevpop) to get *
+ * counted as an outlier *
+ * devalg - [IN] function (mad, stdevsamp or stdevpop) *
+ * to evaluate a single deviation unit *
+ * detect_period_start - [IN] evaluate number of deviations in *
+ * remainder starting from this time *
+ * detect_period - [IN] evaluate number of deviations in *
+ * remainder until this time *
+ * result - [OUT] result - double, a percentage how *
+ * many outliers are in remainder *
+ * error - [OUT] the error message *
+ * *
+ * Return value: SUCCEED - evaluated successfully, 'result' contains new value *
+ * FAIL - evaluation failed, 'result' contains old value *
+ * *
+ *******************************************************************************/
+int zbx_get_percentage_of_deviations_in_stl_remainder(const zbx_vector_history_record_t *remainder,
+ double deviations_count, const char* devalg, int detect_period_start, int detect_period_end,
+ double *result, char **error)
+{
+ int i, total_values_count = 0, deviations_detected_count = 0, ret = FAIL;
+ double remainder_deviation, deviation_limit;
+ zbx_statistical_func_t stat_func;
+ zbx_vector_dbl_t remainder_values_dbl;
+
+ zbx_vector_dbl_create(&remainder_values_dbl);
+
+ if (0 == remainder->values_num)
+ {
+ *error = zbx_strdup(*error, "empty remainder");
+ goto out;
+ }
+
+ if (0 == strcmp("mad", devalg))
+ {
+ stat_func = zbx_eval_calc_mad;
+ }
+ else if (0 == strcmp("stddevpop", devalg))
+ {
+ stat_func = zbx_eval_calc_stddevpop;
+ }
+ else if (0 == strcmp("stddevsamp", devalg))
+ {
+ stat_func = zbx_eval_calc_stddevsamp;
+ }
+ else
+ {
+ *error = zbx_dsprintf(*error, "undefined devalg parameter: \"%s\"", devalg);
+ THIS_SHOULD_NEVER_HAPPEN;
+ goto out;
+ }
+
+ zbx_vector_dbl_reserve(&remainder_values_dbl, (size_t)remainder->values_num);
+
+ for (i = 0; i < remainder->values_num; i++)
+ zbx_vector_dbl_append(&remainder_values_dbl, remainder->values[i].value.dbl);
+
+ if (SUCCEED != (ret = stat_func(&remainder_values_dbl, &remainder_deviation, error)))
+ goto out;
+
+ deviation_limit = remainder_deviation * deviations_count;
+
+ for (i = 0; i < remainder->values_num; i++)
+ {
+ if (remainder->values[i].timestamp.sec >= detect_period_start &&
+ remainder->values[i].timestamp.sec <= detect_period_end)
+ {
+ total_values_count++;
+
+ if (fabs(remainder->values[i].value.dbl) > deviation_limit)
+ deviations_detected_count++;
+ }
+ }
+
+ if (0 == total_values_count)
+ *result = 0;
+ else
+ *result = (double)deviations_detected_count / total_values_count;
+out:
+ zbx_vector_dbl_destroy(&remainder_values_dbl);
+
+ return ret;
+}
+
+static double nextodd(double x)
+{
+ x = round(x);
+
+ if (SUCCEED == zbx_double_compare(0, remainder(x, 2.0)))
+ x += 1;
+
+ return x;
+}
+
+static void VV_clear(zbx_vector_history_record_t *v)
+{
+ zbx_history_record_vector_destroy(v, ITEM_VALUE_TYPE_FLOAT);
+ zbx_free(v);
+}
+
+static int eval_loess_regression_curve(const zbx_vector_history_record_t *y, int n, int length, int ideg, int xs,
+ int nleft, int nright, const zbx_vector_history_record_t *w, int userw,
+ const zbx_vector_history_record_t *rw, double *ret)
+{
+ int i, ret_status = FAIL, count_mid = 0;
+ double h;
+ zbx_vector_dbl_t r;
+ zbx_vector_uint64_t low_mask, high_mask, mid_mask, lowmid_mask, window, low, high, mid, lowmid;
+ double a = 0;
+
+ h = MAX(xs - nleft, nright - xs);
+
+ if (length > n)
+ h += (length - n);
+
+ zbx_vector_dbl_create(&r);
+ zbx_vector_uint64_create(&window);
+ zbx_vector_uint64_create(&mid_mask);
+ zbx_vector_uint64_create(&low_mask);
+ zbx_vector_uint64_create(&high_mask);
+ zbx_vector_uint64_create(&lowmid_mask);
+ zbx_vector_uint64_create(&low);
+ zbx_vector_uint64_create(&high);
+ zbx_vector_uint64_create(&mid);
+ zbx_vector_uint64_create(&lowmid);
+
+ for (i = nleft - xs; i < nright - xs + 1; i++)
+ zbx_vector_dbl_append(&r, abs(i));
+
+ for (i = nleft - 1; i < nright; i++)
+ zbx_vector_uint64_append(&window, (zbx_uint64_t)i);
+
+ for (i = 0; i < r.values_num; i++)
+ zbx_vector_uint64_append(&low_mask, (0.001 * h >= r.values[i]) ? 1 : 0);
+
+ for (i = 0; i < r.values_num; i++)
+ zbx_vector_uint64_append(&high_mask, (0.999 * h < r.values[i]) ? 1 : 0);
+
+ for (i = 0; i < low_mask.values_num; i++)
+ zbx_vector_uint64_append(&mid_mask, !(low_mask.values[i] | high_mask.values[i]));
+
+ for (i = 0; i < high_mask.values_num; i++)
+ zbx_vector_uint64_append(&lowmid_mask, !(high_mask.values[i]));
+
+ /* filter out false entries */
+ for (i = 0; i < low_mask.values_num; i++)
+ {
+ if (1 == low_mask.values[i])
+ zbx_vector_uint64_append(&low, window.values[i]);
+ }
+
+ for (i = 0; i < high_mask.values_num; i++)
+ {
+ if (1 == high_mask.values[i])
+ zbx_vector_uint64_append(&high, window.values[i]);
+ }
+
+ for (i = 0; i < mid_mask.values_num; i++)
+ {
+ if (1 == mid_mask.values[i])
+ zbx_vector_uint64_append(&mid, window.values[i]);
+ }
+
+ for (i = 0; i < lowmid_mask.values_num; i++)
+ {
+ if (1 == lowmid_mask.values[i])
+ zbx_vector_uint64_append(&lowmid, window.values[i]);
+ }
+
+ for (i = 0; i < low.values_num; i++)
+ w->values[low.values[i]].value.dbl = 1;
+
+ for (i = 0; i < mid_mask.values_num; i++)
+ {
+ if (1 == mid_mask.values[i])
+ {
+ w->values[mid.values[count_mid]].value.dbl = pow(1 - pow(r.values[i] / h, 3), 3);
+ count_mid++;
+ }
+ }
+
+ if (1 == userw)
+ {
+ for (i = 0; i < lowmid.values_num; i++)
+ w->values[lowmid.values[i]].value.dbl *= rw->values[lowmid.values[i]].value.dbl;
+ }
+
+ for (i = 0; i < lowmid.values_num; i++)
+ a += w->values[lowmid.values[i]].value.dbl;
+
+ for (i = 0; i < high.values_num; i++)
+ w->values[high.values[i]].value.dbl = 0;
+
+ if (0 < a)
+ {
+ ret_status = SUCCEED;
+
+ for (i = nleft - 1; i < nright; i++)
+ w->values[i].value.dbl /= a;
+
+ if (0 < h && 0 < ideg)
+ {
+ double c, b;
+
+ a = 0;
+
+ for (i = nleft - 1; i < nright; i++)
+ a += (w->values[i].value.dbl * (i + 1));
+
+ b = xs - a;
+ c = 0;
+
+ for (i = nleft - 1; i < nright; i++)
+ c += (w->values[i].value.dbl * pow((i + 1 - a), 2));
+
+ if (sqrt(c) > 0.001 * (n - 1))
+ {
+ b /= c;
+
+ for (i = nleft - 1; i < nright; i++)
+ w->values[i].value.dbl *= ((b * ((i + 1) - a)) + 1);
+ }
+ }
+
+ *ret = 0;
+
+ for (i = nleft - 1; i < nright; i++)
+ *ret += w->values[i].value.dbl * y->values[i].value.dbl;
+ }
+
+ zbx_vector_dbl_destroy(&r);
+ zbx_vector_uint64_destroy(&window);
+ zbx_vector_uint64_destroy(&high_mask);
+ zbx_vector_uint64_destroy(&low_mask);
+ zbx_vector_uint64_destroy(&mid_mask);
+ zbx_vector_uint64_destroy(&lowmid_mask);
+ zbx_vector_uint64_destroy(&low);
+ zbx_vector_uint64_destroy(&high);
+ zbx_vector_uint64_destroy(&mid);
+ zbx_vector_uint64_destroy(&lowmid);
+
+ return ret_status;
+}
+
+static void apply_loess_smoothing(const zbx_vector_history_record_t *y, int n, int length, int ideg, int njump,
+ int userw, const zbx_vector_history_record_t *rw, zbx_vector_history_record_t *ys,
+ const zbx_vector_history_record_t *res)
+{
+ int newnj, i, nleft, nright;
+
+ if (n < 2)
+ {
+ ys->values[0].value.dbl = y->values[0].value.dbl;
+ return;
+ }
+
+ newnj = MIN(njump, n - 1);
+
+ if (length >= n)
+ {
+ nleft = 1;
+ nright = n;
+
+ for (i = 0; i < n; i = i + newnj)
+ {
+ double nys;
+
+ if (SUCCEED == eval_loess_regression_curve(y, n, length, ideg, i + 1, nleft, nright, res,
+ userw, rw, &nys))
+ {
+ ys->values[i].value.dbl = nys;
+ }
+ else
+ {
+ ys->values[i].value.dbl = y->values[i].value.dbl;
+ }
+ }
+ }
+ else
+ {
+ if (1 == newnj)
+ {
+ int nsh;
+
+ nsh = (int)((length + 1) / 2);
+ nleft = 1;
+ nright = length;
+
+ for (i = 0; i < n; i++)
+ {
+ double nys;
+
+ if ((i + 1) > nsh && nright != n)
+ {
+ nleft += 1;
+ nright += 1;
+ }
+
+ if (SUCCEED == eval_loess_regression_curve(y, n, length, ideg, i + 1, nleft, nright,
+ res, userw, rw, &nys))
+ {
+ ys->values[i].value.dbl = nys;
+ }
+ else
+ {
+ ys->values[i].value.dbl = y->values[i].value.dbl;
+ }
+ }
+ }
+ else
+ {
+ int nsh;
+
+ nsh = (int)((length + 1) / 2);
+
+ for (i = 1; i < n + 1; i = i + newnj)
+ {
+ double nys;
+
+ if (i < nsh)
+ {
+ nleft = 1;
+ nright = length;
+ }
+ else if (i >= (n - nsh + 1))
+ {
+ nleft = n - length + 1;
+ nright = n;
+ }
+ else
+ {
+ nleft = i - nsh + 1;
+ nright = length + i - nsh;
+ }
+
+ if (SUCCEED == eval_loess_regression_curve(y, n, length, ideg, i, nleft, nright,
+ res, userw, rw, &nys))
+ {
+ ys->values[i - 1].value.dbl = nys;
+ }
+ else
+ {
+ ys->values[i - 1].value.dbl = y->values[i - 1].value.dbl;
+ }
+ }
+ }
+ }
+
+ if (1 != newnj)
+ {
+ int k;
+ double delta;
+
+ for (i = 0; i < n - newnj; i = i + newnj)
+ {
+ int j;
+
+ delta = (ys->values[i + newnj].value.dbl - ys->values[i].value.dbl) / newnj;
+
+ for (j = i + 1; j < i + newnj; j++)
+ ys->values[j].value.dbl = ys->values[i].value.dbl + (delta * (j - i));
+ }
+
+ k = (int)(((n - 1)/newnj) * newnj + 1);
+
+ if (k != n)
+ {
+ double nys;
+
+ if (SUCCEED == eval_loess_regression_curve(y, n, length, ideg, n, nleft, nright, res,
+ userw, rw, &nys))
+ {
+ ys->values[n - 1].value.dbl = nys;
+ }
+ else
+ {
+ ys->values[n - 1].value.dbl = y->values[n - 1].value.dbl;
+ }
+
+ if (k != (n - 1))
+ {
+ delta = (ys->values[n - 1].value.dbl - ys->values[k - 1].value.dbl) / (n - k);
+
+ for (i = k; i < n - 1; i++)
+ ys->values[k].value.dbl = ys->values[k - 1].value.dbl + (delta * (i - k + 1));
+ }
+
+ }
+ }
+}
+
+static void combine_smooth(const zbx_vector_history_record_t *y, int n, int np, int ns, int isdeg, int nsjump,
+ int userw, const zbx_vector_history_record_t *rw, zbx_vector_history_record_t *season,
+ zbx_vector_history_record_t *work1, zbx_vector_history_record_t *work2,
+ zbx_vector_history_record_t *work3, zbx_vector_history_record_t *work4)
+{
+ int i;
+
+ for (i = 0; i < np; i++)
+ {
+ int k, m, j, nleft, nright;
+ double nval;
+ zbx_vector_history_record_t work_2_copy;
+
+ k = ((n - i - 1) / np) + 1;
+
+ for (j = 0; j < k; j++)
+ work1->values[j].value.dbl = y->values[j * np + i].value.dbl;
+
+ if (1 == userw)
+ {
+ for (j = 0; j < k; j++)
+ work3->values[i].value.dbl = rw->values[i * np + i].value.dbl;
+ }
+
+ zbx_history_record_vector_create(&work_2_copy);
+
+ for (j = 1; j < work2->values_num; j++)
+ {
+ zbx_history_record_t cp;
+
+ cp.timestamp = work2->values[j].timestamp;
+ cp.value.dbl = work2->values[j].value.dbl;
+ zbx_vector_history_record_append_ptr(&work_2_copy, &cp);
+ }
+
+ apply_loess_smoothing(work1, k, ns, isdeg, nsjump, userw, work3, &work_2_copy, work4);
+
+ for (j = 1; j < work2->values_num; j++)
+ {
+ work2->values[j].timestamp = work_2_copy.values[j - 1].timestamp;
+ work2->values[j].value.dbl = work_2_copy.values[j - 1].value.dbl;
+ }
+
+ zbx_history_record_vector_destroy(&work_2_copy, ITEM_VALUE_TYPE_FLOAT);
+
+ nright = MIN(ns, k);
+
+ if (SUCCEED == eval_loess_regression_curve(work1, k, ns, isdeg, 0, 1, nright, work4, userw,
+ work3, &nval))
+ {
+ work2->values[0].value.dbl = nval;
+ }
+ else
+ {
+ work2->values[0].value.dbl = work2->values[1].value.dbl;
+ }
+
+ nleft = MAX(1, k - ns + 1);
+
+ if (SUCCEED == eval_loess_regression_curve(work1, k, ns, isdeg, k+1, nleft, k, work4, userw,
+ work3, &nval))
+ {
+ work2->values[k + 1].value.dbl = nval;
+ }
+ else
+ {
+ work2->values[k + 1].value.dbl = work2->values[k].value.dbl;
+ }
+
+ for (m = 0; m < k + 2; m++)
+ {
+ season->values[m * np + i].timestamp = work2->values[m].timestamp;
+ season->values[m * np + i].value.dbl = work2->values[m].value.dbl;
+ }
+ }
+}
+
+static void eval_moving_average(const zbx_vector_history_record_t *x, int n, int length,
+ zbx_vector_history_record_t *ave)
+{
+ int i, newn;
+ double v = 0;
+
+ for (i = 0; i < length; i++)
+ v += x->values[i].value.dbl;
+
+ ave->values[0].value.dbl = v / length;
+
+ newn = n - length + 1;
+
+ if (newn > 1)
+ {
+ int k, m, j;
+
+ k = length;
+ m = 0;
+
+ for (j = 1; j < newn; j++)
+ {
+ k += 1;
+ m += 1;
+
+ v = v - x->values[m - 1].value.dbl + x->values[k - 1].value.dbl;
+
+ ave->values[j].value.dbl = v / length;
+ }
+ }
+}
+
+static double find_stl_median(zbx_vector_history_record_t *v)
+{
+ zbx_vector_history_record_sort(v, (zbx_compare_func_t)history_record_float_compare);
+
+ if (0 == v->values_num % 2)
+ return (v->values[v->values_num / 2 - 1].value.dbl + v->values[v->values_num / 2].value.dbl) / 2.0;
+ else
+ return v->values[v->values_num / 2].value.dbl;
+}
+
+static void eval_robustness_weights(const zbx_vector_history_record_t *y, int n,
+ const zbx_vector_history_record_t *fit, zbx_vector_history_record_t *rw)
+{
+ int i;
+ double med;
+ zbx_vector_uint64_t low, high, mid;
+ zbx_vector_history_record_t r;
+
+ ZBX_UNUSED(n);
+
+ zbx_vector_uint64_create(&low);
+ zbx_vector_uint64_create(&high);
+ zbx_vector_uint64_create(&mid);
+ zbx_history_record_vector_create(&r);
+
+ for (i = 0; i < y->values_num; i++)
+ {
+ zbx_history_record_t cp;
+
+ cp.timestamp = y->values[i].timestamp;
+ cp.value.dbl = fabs(y->values[i].value.dbl - fit->values[i].value.dbl);
+ zbx_vector_history_record_append_ptr(&r, &cp);
+ }
+
+ med = 6 * find_stl_median(&r);
+
+ for (i = 0; i < r.values_num; i++)
+ {
+ zbx_vector_uint64_append(&low, (r.values[i].value.dbl <= 0.001 * med) ? 1 : 0);
+ zbx_vector_uint64_append(&high, (r.values[i].value.dbl > 0.999 * med) ? 1 : 0);
+ zbx_vector_uint64_append(&mid, !(low.values[i] | high.values[i]));
+ }
+
+ for (i = 0; i < low.values_num; i++)
+ {
+ if (1 == low.values[i])
+ rw->values[i].value.dbl = 1;
+ }
+
+ for (i = 0; i < mid.values_num; i++)
+ {
+ if (1 == mid.values[i])
+ {
+ rw->values[i].value.dbl = pow(1 - pow(r.values[i].value.dbl, 2), 2);
+ }
+ }
+
+ for(i = 0; i < high.values_num; i++)
+ {
+ if (1 == high.values[i])
+ rw->values[i].value.dbl = 0;
+ }
+
+ zbx_history_record_vector_destroy(&r, ITEM_VALUE_TYPE_FLOAT);
+
+ zbx_vector_uint64_destroy(&low);
+ zbx_vector_uint64_destroy(&high);
+ zbx_vector_uint64_destroy(&mid);
+}
+
+static void step(const zbx_vector_history_record_t *y, int n, int np, int ns, int nt, int nl, int isdeg, int itdeg,
+ int ildeg, int nsjump, int ntjump, int nljump, int ni, int userw, zbx_vector_history_record_t *rw,
+ zbx_vector_history_record_t *season, zbx_vector_history_record_t *trend, zbx_vector_VV_t *work)
+{
+ int i, j;
+
+ for (i = 0; i < ni; i++)
+ {
+ zbx_vector_history_record_t work_0_copy, work_1_copy, work_2_copy, work_3_copy, work_4_copy;
+
+ for (j = 0; j < n; j++)
+ work->values[j]->values[0].value.dbl = y->values[j].value.dbl - trend->values[j].value.dbl;
+
+ zbx_history_record_vector_create(&work_0_copy);
+ zbx_history_record_vector_create(&work_1_copy);
+ zbx_history_record_vector_create(&work_2_copy);
+ zbx_history_record_vector_create(&work_3_copy);
+ zbx_history_record_vector_create(&work_4_copy);
+
+ for (j = 0; j < work->values_num; j++)
+ {
+ zbx_history_record_t cp;
+
+ cp.timestamp = work->values[j]->values[0].timestamp;
+ cp.value.dbl = work->values[j]->values[0].value.dbl;
+ zbx_vector_history_record_append_ptr(&work_0_copy, &cp);
+
+ cp.timestamp = work->values[j]->values[1].timestamp;
+ cp.value.dbl = work->values[j]->values[1].value.dbl;
+ zbx_vector_history_record_append_ptr(&work_1_copy, &cp);
+
+ cp.timestamp = work->values[j]->values[2].timestamp;
+ cp.value.dbl = work->values[j]->values[2].value.dbl;
+ zbx_vector_history_record_append_ptr(&work_2_copy, &cp);
+
+ cp.timestamp = work->values[j]->values[3].timestamp;
+ cp.value.dbl = work->values[j]->values[3].value.dbl;
+ zbx_vector_history_record_append_ptr(&work_3_copy, &cp);
+
+ cp.timestamp = work->values[j]->values[4].timestamp;
+ cp.value.dbl = work->values[j]->values[4].value.dbl;
+ zbx_vector_history_record_append_ptr(&work_4_copy, &cp);
+ }
+
+ combine_smooth(&work_0_copy, n, np, ns, isdeg, nsjump, userw, rw, &work_1_copy, &work_2_copy,
+ &work_3_copy, &work_4_copy, season);
+
+ eval_moving_average(&work_1_copy, n + 2 * np, np, &work_2_copy);
+ eval_moving_average(&work_2_copy, n + np + 1, np, &work_0_copy);
+ eval_moving_average(&work_0_copy, n + 2, 3, &work_2_copy);
+
+ apply_loess_smoothing(&work_2_copy, n, nl, ildeg, nljump, 0, &work_3_copy, &work_0_copy, &work_4_copy);
+
+ for (j = np; j < np + n; j++)
+ {
+ season->values[j - np].value.dbl = work_1_copy.values[j].value.dbl -
+ work_0_copy.values[j - np].value.dbl;
+ }
+
+ for (j = 0; j < n; j++)
+ work_0_copy.values[j].value.dbl = y->values[j].value.dbl - season->values[j].value.dbl;
+
+ apply_loess_smoothing(&work_0_copy, n, nt, itdeg, ntjump, userw, rw, trend, &work_2_copy);
+
+ /* save changes from copies back into work */
+ for (j = 0; j < work->values_num; j++)
+ {
+ work->values[j]->values[0].value.dbl = work_0_copy.values[j].value.dbl;
+ work->values[j]->values[1].value.dbl = work_1_copy.values[j].value.dbl;
+ work->values[j]->values[2].value.dbl = work_2_copy.values[j].value.dbl;
+ work->values[j]->values[3].value.dbl = work_3_copy.values[j].value.dbl;
+ work->values[j]->values[4].value.dbl = work_4_copy.values[j].value.dbl;
+ }
+
+ zbx_history_record_vector_destroy(&work_0_copy, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&work_1_copy, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&work_2_copy, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&work_3_copy, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&work_4_copy, ITEM_VALUE_TYPE_FLOAT);
+ }
+}
+
+int zbx_STL(const zbx_vector_history_record_t *values_in, int freq, int is_robust, int s_window, int s_degree,
+ double t_window, int t_degree, int l_window, int l_degree, int nsjump, int ntjump, int nljump,
+ int inner, int outer, zbx_vector_history_record_t *trend, zbx_vector_history_record_t *seasonal,
+ zbx_vector_history_record_t *remainder, char **error)
+{
+ int values_in_len, userw, i, ret = FAIL;
+ zbx_vector_history_record_t weights;
+ zbx_vector_VV_t work;
+ double tmp;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+ values_in_len = values_in->values_num;
+
+ if (2 > freq)
+ {
+ *error = zbx_dsprintf(*error, "Frequency (season/h) must be greater than 1, it is: %d", freq);
+ goto out;
+ }
+
+ if (2 * freq >= values_in_len)
+ {
+ *error = zbx_dsprintf(*error, "STL requires number of data elements more than two times the frequency. "
+ "Frequency (season/h) is: %d, number of data entries is: %d", freq, values_in_len);
+ goto out;
+ }
+
+ if (S_WINDOW_DEF == s_window)
+ s_window = 10 * values_in_len + 1;
+
+ if (S_JUMP_DEF == nsjump)
+ nsjump = (int)(tmp = ceil((double)s_window / 10));
+
+ ZBX_UNUSED(tmp);
+
+ if (T_WINDOW_DEF == t_window)
+ t_window = nextodd(ceil(1.5 * (double)freq / (1 - (1.5 / s_window))));
+
+ if (T_JUMP_DEF == ntjump)
+ ntjump = (int)(tmp = ceil(t_window/10));
+
+ ZBX_UNUSED(tmp);
+
+ if (L_WINDOW_DEF == l_window)
+ l_window = nextodd(freq);
+
+ if (L_DEGREE_DEF == l_degree)
+ l_degree = t_degree;
+
+ if (L_JUMP_DEF == nljump)
+ nljump = (int)(tmp = ceil((double)l_window / 10));
+
+ ZBX_UNUSED(tmp);
+
+ if (INNER_DEF == inner)
+ inner = (1 == is_robust) ? 1 : 2;
+
+ if (OUTER_DEF == outer)
+ outer = (1 == is_robust) ? 15 : 0;
+
+ zbx_vector_history_record_reserve(seasonal, (size_t)values_in_len);
+ zbx_vector_history_record_reserve(trend, (size_t)values_in_len);
+ zbx_history_record_vector_create(&weights);
+ zbx_vector_history_record_reserve(&weights, (size_t)values_in_len);
+ zbx_vector_history_record_reserve(remainder, (size_t)values_in_len);
+
+ for (i = 0; i < values_in_len; i++)
+ {
+ zbx_history_record_t value1, value2, value3, value4;
+
+ value1.timestamp = values_in->values[i].timestamp;
+ value1.value.dbl = 0;
+ zbx_vector_history_record_append_ptr(&weights, &value1);
+
+ value2.timestamp = values_in->values[i].timestamp;
+ value2.value.dbl = 0;
+ zbx_vector_history_record_append_ptr(seasonal, &value2);
+
+ value3.timestamp = values_in->values[i].timestamp;
+ value3.value.dbl = 0;
+ zbx_vector_history_record_append_ptr(trend, &value3);
+
+ value4.timestamp = values_in->values[i].timestamp;
+ value4.value.dbl = 0;
+ zbx_vector_history_record_append_ptr(remainder, &value4);
+ }
+
+ zbx_vector_VV_create(&work);
+ zbx_vector_VV_reserve(&work, (size_t)(values_in_len + 2 * freq));
+
+ for (i = 0; i < work.values_alloc; i++)
+ {
+ int j;
+ zbx_vector_history_record_t *work_temp;
+
+ work_temp = (zbx_vector_history_record_t*)zbx_malloc(NULL, sizeof(zbx_vector_history_record_t));
+ zbx_history_record_vector_create(work_temp);
+
+ for (j = 0; j < 5; j++)
+ {
+ zbx_history_record_t x;
+
+ x.value.dbl = 0;
+ zbx_vector_history_record_append_ptr(work_temp, &x);
+ }
+
+ zbx_vector_VV_append(&work, work_temp);
+ }
+
+ s_window = MAX(3, s_window);
+ t_window = MAX(3, t_window);
+ l_window = MAX(3, l_window);
+
+ if (0 == (s_window % 2))
+ s_window += 1;
+
+ if (0 == ((int)t_window % 2))
+ t_window += 1;
+
+ if (0 == (l_window % 2))
+ l_window += 1;
+
+ userw = 0;
+
+ step(values_in, values_in_len, freq, s_window, (int)t_window, l_window, s_degree, t_degree, l_degree, nsjump,
+ ntjump, nljump, inner, userw, &weights, seasonal, trend, &work);
+
+ userw = 1;
+
+ for (i = 0; i < outer; i++)
+ {
+ int j;
+ zbx_vector_history_record_t work_0_copy;
+
+ zbx_history_record_vector_create(&work_0_copy);
+
+ for (j = 0; j < values_in_len; j++)
+ {
+ work.values[j]->values[0].value.dbl = trend->values[j].value.dbl +
+ seasonal->values[j].value.dbl;
+ }
+
+ for (j = 0; j < work.values_num; j++)
+ {
+ zbx_history_record_t cp;
+
+ cp.timestamp = work.values[j]->values[0].timestamp;
+ cp.value.dbl = work.values[j]->values[0].value.dbl;
+ zbx_vector_history_record_append_ptr(&work_0_copy, &cp);
+ }
+
+ eval_robustness_weights(values_in, values_in_len, &work_0_copy, &weights);
+ step(values_in, values_in_len, freq, s_window, t_window, l_window, s_degree, t_degree, l_degree, nsjump,
+ ntjump, nljump, inner, userw, &weights, seasonal, trend, &work);
+
+ zbx_history_record_vector_destroy(&work_0_copy, ITEM_VALUE_TYPE_FLOAT);
+ }
+
+ if (0 >= outer)
+ {
+ for (i = 0; i < weights.values_num; i++)
+ weights.values[i].value.dbl = 1;
+ }
+
+ for (i = 0; i < values_in->values_num; i++)
+ {
+ remainder->values[i].value.dbl = values_in->values[i].value.dbl - trend->values[i].value.dbl -
+ seasonal->values[i].value.dbl;
+ }
+
+ zbx_vector_VV_clear_ext(&work, VV_clear);
+ zbx_vector_VV_destroy(&work);
+ zbx_history_record_vector_destroy(&weights, ITEM_VALUE_TYPE_FLOAT);
+
+ ret = SUCCEED;
+out:
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+ return ret;
+}
diff --git a/src/libs/zbxserver/anomalystl.h b/src/libs/zbxserver/anomalystl.h
new file mode 100644
index 00000000000..527d6f8ef10
--- /dev/null
+++ b/src/libs/zbxserver/anomalystl.h
@@ -0,0 +1,50 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#ifndef ZABBIX_ANOMALYSTL_H
+#define ZABBIX_ANOMALYSTL_H
+
+#include "common.h"
+
+#include "evalfunc_common.h"
+
+/* default values which can be used in zbx_STL() arguments */
+#define STL_DEF_DEVIATIONS 3
+#define S_DEGREE_DEF 0
+#define S_WINDOW_DEF 0
+#define T_WINDOW_DEF ZBX_INFINITY
+#define T_DEGREE_DEF 1
+#define L_WINDOW_DEF -1
+#define L_DEGREE_DEF -1
+#define S_JUMP_DEF -1
+#define T_JUMP_DEF -1
+#define L_JUMP_DEF -1
+#define ROBUST_DEF 0
+#define INNER_DEF -1
+#define OUTER_DEF -1
+
+int zbx_STL(const zbx_vector_history_record_t *values_in, int freq, int is_robust, int s_window, int s_degree,
+ double t_window, int t_degree, int l_window, int l_degree, int nsjump, int ntjump, int nljump,
+ int inner, int outer, zbx_vector_history_record_t *trend, zbx_vector_history_record_t *seasonal,
+ zbx_vector_history_record_t *remainder, char **error);
+
+int zbx_get_percentage_of_deviations_in_stl_remainder(const zbx_vector_history_record_t *remainder,
+ double deviations_count, const char* devalg, int detect_period_start, int detect_period_end,
+ double *result, char **error);
+#endif
diff --git a/src/libs/zbxserver/evalfunc.c b/src/libs/zbxserver/evalfunc.c
index dd19ee2403d..5fb0c91d736 100644
--- a/src/libs/zbxserver/evalfunc.c
+++ b/src/libs/zbxserver/evalfunc.c
@@ -21,11 +21,14 @@
#include "db.h"
#include "log.h"
#include "zbxserver.h"
-#include "evalfunc.h"
#include "zbxregexp.h"
#include "valuecache.h"
#include "zbxtrends.h"
#include "../zbxalgo/vectorimpl.h"
+#include "anomalystl.h"
+
+#include "evalfunc_common.h"
+#include "evalfunc.h"
#define ZBX_VALUEMAP_STRING_LEN 64
@@ -47,21 +50,6 @@ zbx_valuemaps_t;
ZBX_PTR_VECTOR_DECL(valuemaps_ptr, zbx_valuemaps_t *)
ZBX_PTR_VECTOR_IMPL(valuemaps_ptr, zbx_valuemaps_t *)
-typedef enum
-{
- ZBX_PARAM_OPTIONAL,
- ZBX_PARAM_MANDATORY
-}
-zbx_param_type_t;
-
-typedef enum
-{
- ZBX_VALUE_NONE,
- ZBX_VALUE_SECONDS,
- ZBX_VALUE_NVALUES
-}
-zbx_value_type_t;
-
/******************************************************************************
* *
* Function: add_value_suffix_uptime *
@@ -653,43 +641,25 @@ int zbx_evaluatable_for_notsupported(const char *fn)
return FAIL;
}
-static const char *zbx_type_string(zbx_value_type_t type)
-{
- switch (type)
- {
- case ZBX_VALUE_NONE:
- return "none";
- case ZBX_VALUE_SECONDS:
- return "sec";
- case ZBX_VALUE_NVALUES:
- return "num";
- default:
- THIS_SHOULD_NEVER_HAPPEN;
- return "unknown";
- }
-}
-
/******************************************************************************
* *
- * Function: get_function_parameter_int *
+ * Function: get_function_parameter_period *
* *
* Purpose: get the value of sec|#num trigger function parameter *
* *
* Parameters: parameters - [IN] trigger function parameters *
* Nparam - [IN] specifies which parameter to extract *
- * parameter_type - [IN] specifies whether parameter is mandatory *
- * or optional *
* value - [OUT] parameter value (preserved as is if the *
* parameter is optional and empty) *
* type - [OUT] parameter value type (number of seconds *
- * or number of values) *
+ * or number of values, preserved as is if the *
+ * parameter is optional and empty) *
* *
* Return value: SUCCEED - parameter is valid *
* FAIL - otherwise *
* *
******************************************************************************/
-static int get_function_parameter_int(const char *parameters, int Nparam, zbx_param_type_t parameter_type,
- int *value, zbx_value_type_t *type)
+static int get_function_parameter_period(const char *parameters, int Nparam, int *value, zbx_value_type_t *type)
{
char *parameter;
int ret = FAIL;
@@ -699,39 +669,29 @@ static int get_function_parameter_int(const char *parameters, int Nparam, zbx_pa
if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
goto out;
- if ('\0' == *parameter)
+ if ('\0' != *parameter)
{
- switch (parameter_type)
+ if ('#' == *parameter)
{
- case ZBX_PARAM_OPTIONAL:
+ *type = ZBX_VALUE_NVALUES;
+ if (SUCCEED == is_uint31(parameter + 1, value) && 0 < *value)
ret = SUCCEED;
- break;
- case ZBX_PARAM_MANDATORY:
- break;
- default:
- THIS_SHOULD_NEVER_HAPPEN;
}
- }
- else if ('#' == *parameter)
- {
- *type = ZBX_VALUE_NVALUES;
- if (SUCCEED == is_uint31(parameter + 1, value) && 0 < *value)
- ret = SUCCEED;
- }
- else if ('-' == *parameter)
- {
- if (SUCCEED == is_time_suffix(parameter + 1, value, ZBX_LENGTH_UNLIMITED))
+ else if ('-' == *parameter)
+ {
+ if (SUCCEED == is_time_suffix(parameter + 1, value, ZBX_LENGTH_UNLIMITED))
+ {
+ *value = -(*value);
+ *type = ZBX_VALUE_SECONDS;
+ ret = SUCCEED;
+ }
+ }
+ else if (SUCCEED == is_time_suffix(parameter, value, ZBX_LENGTH_UNLIMITED))
{
- *value = -(*value);
*type = ZBX_VALUE_SECONDS;
ret = SUCCEED;
}
}
- else if (SUCCEED == is_time_suffix(parameter, value, ZBX_LENGTH_UNLIMITED))
- {
- *type = ZBX_VALUE_SECONDS;
- ret = SUCCEED;
- }
if (SUCCEED == ret)
zabbix_log(LOG_LEVEL_DEBUG, "%s() type:%s value:%d", __func__, zbx_type_string(*type), *value);
@@ -743,159 +703,6 @@ out:
return ret;
}
-static int get_function_parameter_uint64(const char *parameters, int Nparam, zbx_uint64_t *value)
-{
- char *parameter;
- int ret = FAIL;
-
- zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
- if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
- goto out;
-
- if (SUCCEED == (ret = is_uint64(parameter, value)))
- zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_UI64, __func__, *value);
-
- zbx_free(parameter);
-out:
- zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
- return ret;
-}
-
-static int get_function_parameter_float(const char *parameters, int Nparam, unsigned char flags, double *value)
-{
- char *parameter;
- int ret = FAIL;
-
- zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
- if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
- goto out;
-
- if (SUCCEED == (ret = is_double_suffix(parameter, flags)))
- {
- *value = str2double(parameter);
- zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_DBL, __func__, *value);
- }
-
- zbx_free(parameter);
-out:
- zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
- return ret;
-}
-
-static int get_function_parameter_str(const char *parameters, int Nparam, char **value)
-{
- int ret = FAIL;
-
- zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
- if (NULL == (*value = zbx_function_get_param_dyn(parameters, Nparam)))
- goto out;
-
- zabbix_log(LOG_LEVEL_DEBUG, "%s() value:'%s'", __func__, *value);
- ret = SUCCEED;
-out:
- zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
- return ret;
-}
-
-/******************************************************************************
- * *
- * Function: get_function_parameter_hist_range *
- * *
- * Purpose: get the value of sec|num + timeshift trigger function parameter *
- * *
- * Parameters: from - [IN] the function calculation time *
- * parameters - [IN] trigger function parameters *
- * Nparam - [IN] specifies which parameter to extract *
- * value - [OUT] parameter value (preserved as is if the *
- * parameter is optional and empty) *
- * type - [OUT] parameter value type (number of seconds *
- * or number of values) *
- * timeshift - [OUT] the timeshift value (0 if absent) *
- * *
- * Return value: SUCCEED - parameter is valid *
- * FAIL - otherwise *
- * *
- ******************************************************************************/
-static int get_function_parameter_hist_range(int from, const char *parameters, int Nparam, int *value,
- zbx_value_type_t *type, int *timeshift)
-{
- char *parameter = NULL, *shift;
- int ret = FAIL;
-
- zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
-
- if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
- goto out;
-
- if (NULL != (shift = strchr(parameter, ':')))
- *shift++ = '\0';
-
- if ('\0' == *parameter)
- {
- *value = 0;
- *type = ZBX_VALUE_NONE;
- }
- else if ('#' != *parameter)
- {
- if (SUCCEED != is_time_suffix(parameter, value, ZBX_LENGTH_UNLIMITED) || 0 > *value)
- goto out;
-
- *type = ZBX_VALUE_SECONDS;
- }
- else
- {
- if (SUCCEED != is_uint31(parameter + 1, value) || 0 >= *value)
- goto out;
- *type = ZBX_VALUE_NVALUES;
- }
-
- if (NULL != shift)
- {
- struct tm tm;
- char *error = NULL;
- int end;
-
- if (SUCCEED != zbx_parse_timeshift(from, shift, &tm, &error))
- {
- zabbix_log(LOG_LEVEL_DEBUG, "%s() timeshift error:%s", __func__, error);
- zbx_free(error);
- goto out;
- }
-
- if (-1 == (end = mktime(&tm)))
- {
- zabbix_log(LOG_LEVEL_DEBUG, "%s() invalid timeshift value:%s", __func__, zbx_strerror(errno));
- goto out;
- }
-
- if (end >= from)
- {
- zabbix_log(LOG_LEVEL_DEBUG, "%s() timeshift produced time in future", __func__);
- goto out;
- }
-
- *timeshift = from - end;
- }
- else
- *timeshift = 0;
-
- ret = SUCCEED;
- zabbix_log(LOG_LEVEL_DEBUG, "%s() type:%s value:%d timeshift:%d", __func__, zbx_type_string(*type), *value,
- *timeshift);
-out:
- zbx_free(parameter);
-
- zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
-
- return ret;
-}
-
/******************************************************************************
* *
* Function: get_last_n_value *
@@ -960,8 +767,11 @@ out:
* *
* Purpose: evaluate function 'logeventid' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameter - regex string for event id matching *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] regex string for event id matching *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -1056,8 +866,11 @@ out:
* *
* Purpose: evaluate function 'logsource' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameter - ignored *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] ignored *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -1147,7 +960,11 @@ out:
* *
* Purpose: evaluate function 'logseverity' for the item *
* *
- * Parameters: item - item (performance metric) *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] Nth last value and time shift (optional) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -1188,7 +1005,7 @@ out:
return ret;
}
-static int history_record_float_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
+int history_record_float_compare(const zbx_history_record_t *d1, const zbx_history_record_t *d2)
{
ZBX_RETURN_IF_NOT_EQUAL(d1->value.dbl, d2->value.dbl);
@@ -1393,7 +1210,8 @@ static void count_one_str(int *count, int op, const char *value, const char *pat
* *
* Purpose: evaluate functions 'count' and 'find' for the item *
* *
- * Parameters: item - [IN] item (performance metric) *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
* parameters - [IN] up to three comma-separated fields: *
* (1) number of seconds/values + timeshift *
* (2) comparison operator (optional) *
@@ -1739,14 +1557,19 @@ out:
* *
* Purpose: evaluate function 'sum' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameters - number of seconds/values and time shift (optional)*
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] number of seconds/values and time shift *
+ * (optional) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
* *
******************************************************************************/
-static int evaluate_SUM(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
+static int evaluate_SUM(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+ char **error)
{
int arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
zbx_value_type_t arg1_type;
@@ -1828,14 +1651,19 @@ out:
* *
* Purpose: evaluate function 'avg' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameters - number of seconds/values and time shift (optional)*
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] number of seconds/values and time shift *
+ * (optional) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
* *
******************************************************************************/
-static int evaluate_AVG(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
+static int evaluate_AVG(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+ char **error)
{
int arg1, ret = FAIL, i, seconds = 0, nvalues = 0, time_shift;
zbx_value_type_t arg1_type;
@@ -1924,9 +1752,11 @@ out:
* *
* Purpose: evaluate function 'last' for the item *
* *
- * Parameters: value - dynamic buffer *
- * item - item (performance metric) *
- * parameters - Nth last value and time shift (optional) *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] Nth last value and time shift (optional) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -1957,14 +1787,19 @@ static int evaluate_LAST(zbx_variant_t *value, DC_ITEM *item, const char *parame
* *
* Purpose: evaluate function 'min' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameters - number of seconds/values and time shift (optional)*
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] number of seconds/values and time shift *
+ * (optional) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
* *
******************************************************************************/
-static int evaluate_MIN(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
+static int evaluate_MIN(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+ char **error)
{
int arg1, i, ret = FAIL, seconds = 0, nvalues = 0, time_shift;
zbx_value_type_t arg1_type;
@@ -2057,14 +1892,19 @@ out:
* *
* Purpose: evaluate function 'max' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameters - number of seconds/values and time shift (optional)*
+ * Parameters: value - [OUT] *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] number of seconds/values and time shift *
+ * (optional) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
* *
******************************************************************************/
-static int evaluate_MAX(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts, char **error)
+static int evaluate_MAX(zbx_variant_t *value, DC_ITEM *item, const char *parameters, const zbx_timespec_t *ts,
+ char **error)
{
int arg1, ret = FAIL, i, seconds = 0, nvalues = 0, time_shift;
zbx_value_type_t arg1_type;
@@ -2158,9 +1998,12 @@ out:
* *
* Purpose: evaluate function 'percentile' for the item *
* *
- * Parameters: item - [IN] item (performance metric) *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
* parameters - [IN] seconds/values, time shift (optional), *
* percentage *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in *
* 'value' *
@@ -2264,8 +2107,10 @@ out:
* *
* Purpose: evaluate function 'nodata' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameter - number of seconds *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] number of seconds *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -2290,7 +2135,7 @@ static int evaluate_NODATA(zbx_variant_t *value, DC_ITEM *item, const char *para
goto out;
}
- if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) ||
+ if (SUCCEED != get_function_parameter_period(parameters, 1, &arg1, &arg1_type) ||
ZBX_VALUE_SECONDS != arg1_type || 0 >= arg1)
{
*error = zbx_strdup(*error, "invalid second parameter");
@@ -2375,8 +2220,10 @@ out:
* *
* Purpose: evaluate function 'change' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameter - number of seconds *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -2446,8 +2293,11 @@ out:
* *
* Purpose: evaluate function 'fuzzytime' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameter - number of seconds *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] number of seconds *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -2475,7 +2325,8 @@ static int evaluate_FUZZYTIME(zbx_variant_t *value, DC_ITEM *item, const char *p
goto out;
}
- if (SUCCEED != get_function_parameter_int(parameters, 1, ZBX_PARAM_MANDATORY, &arg1, &arg1_type) || 0 >= arg1)
+ if (SUCCEED != get_function_parameter_period(parameters, 1, &arg1, &arg1_type) ||
+ 0 >= arg1)
{
*error = zbx_strdup(*error, "invalid second parameter");
goto out;
@@ -2493,8 +2344,8 @@ static int evaluate_FUZZYTIME(zbx_variant_t *value, DC_ITEM *item, const char *p
goto out;
}
- fuzlow = (int)(ts->sec - arg1);
- fuzhig = (int)(ts->sec + arg1);
+ fuzlow = (zbx_uint64_t)(ts->sec - arg1);
+ fuzhig = (zbx_uint64_t)(ts->sec + arg1);
if (ITEM_VALUE_TYPE_UINT64 == item->value_type)
{
@@ -2526,13 +2377,15 @@ out:
* *
* Purpose: evaluate logical bitwise function 'and' for the item *
* *
- * Parameters: value - dynamic buffer *
- * item - item (performance metric) *
- * parameters - to 2 comma-separated fields: *
+ * Parameters: value - [OUT] dynamic buffer,result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] to 2 comma-separated fields: *
* (1) same as the 1st parameter for function *
* evaluate_LAST() (see documentation of *
* trigger function last()), *
* (2) mask to bitwise AND with (mandatory), *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -2593,8 +2446,12 @@ clean:
* *
* Purpose: evaluate function 'forecast' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameters - number of seconds/values and time shift (optional)*
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] number of seconds/values and time shift *
+ * (optional) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -2637,7 +2494,7 @@ static int evaluate_FORECAST(zbx_variant_t *value, DC_ITEM *item, const char *pa
goto out;
}
- if (SUCCEED != get_function_parameter_int(parameters, 2, ZBX_PARAM_MANDATORY, &time, &time_type) ||
+ if (SUCCEED != get_function_parameter_period(parameters, 2, &time, &time_type) ||
ZBX_VALUE_SECONDS != time_type)
{
*error = zbx_strdup(*error, "invalid third parameter");
@@ -2694,8 +2551,8 @@ static int evaluate_FORECAST(zbx_variant_t *value, DC_ITEM *item, const char *pa
if (0 < values.values_num)
{
- t = (double *)zbx_malloc(t, values.values_num * sizeof(double));
- x = (double *)zbx_malloc(x, values.values_num * sizeof(double));
+ t = (double *)zbx_malloc(t, (size_t)values.values_num * sizeof(double));
+ x = (double *)zbx_malloc(x, (size_t)values.values_num * sizeof(double));
zero_time.sec = values.values[values.values_num - 1].timestamp.sec;
zero_time.ns = values.values[values.values_num - 1].timestamp.ns;
@@ -2748,8 +2605,12 @@ out:
* *
* Purpose: evaluate function 'timeleft' for the item *
* *
- * Parameters: item - item (performance metric) *
- * parameters - number of seconds/values and time shift (optional)*
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] number of seconds/values and time shift *
+ * (optional) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -2839,8 +2700,8 @@ static int evaluate_TIMELEFT(zbx_variant_t *value, DC_ITEM *item, const char *pa
if (0 < values.values_num)
{
- t = (double *)zbx_malloc(t, values.values_num * sizeof(double));
- x = (double *)zbx_malloc(x, values.values_num * sizeof(double));
+ t = (double *)zbx_malloc(t, (size_t)values.values_num * sizeof(double));
+ x = (double *)zbx_malloc(x, (size_t)values.values_num * sizeof(double));
zero_time.sec = values.values[values.values_num - 1].timestamp.sec;
zero_time.ns = values.values[values.values_num - 1].timestamp.ns;
@@ -2886,19 +2747,91 @@ out:
return ret;
}
+static int trends_eval_stl(const char *table, zbx_uint64_t itemid, int start, int end, int start_detect_period,
+ int end_detect_period, int season, double deviations, const char *dev_alg, int s_window,
+ double *value, char **error)
+{
+ int i, period_counter, ret = FAIL;
+ double tmp_res, neighboring_right_value, neighboring_left_value = ZBX_INFINITY;
+ zbx_vector_history_record_t values, trend, seasonal, remainder;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+ zbx_history_record_vector_create(&values);
+ zbx_history_record_vector_create(&trend);
+ zbx_history_record_vector_create(&seasonal);
+ zbx_history_record_vector_create(&remainder);
+
+ for (period_counter = start; period_counter <= end; period_counter += 3600)
+ {
+ zbx_history_record_t val;
+
+ val.timestamp.sec = period_counter;
+
+ if (FAIL == zbx_trends_eval_avg(table, itemid, period_counter, period_counter, &tmp_res, NULL))
+ {
+ val.value.dbl = neighboring_left_value;
+ }
+ else
+ {
+ val.value.dbl = tmp_res;
+ neighboring_left_value = tmp_res;
+ }
+
+ zbx_vector_history_record_append_ptr(&values, &val);
+ }
+
+ if (ZBX_INFINITY == neighboring_left_value)
+ {
+ *error = zbx_strdup(*error, "all data is empty");
+ goto out;
+ }
+
+ neighboring_right_value = values.values[values.values_num - 1].value.dbl;
+
+ for (i = values.values_num - 2; i >= 0; i--)
+ {
+ if (ZBX_INFINITY == values.values[i].value.dbl)
+ values.values[i].value.dbl = neighboring_right_value;
+ else
+ neighboring_right_value = values.values[i].value.dbl;
+ }
+
+ ret = zbx_STL(&values, season, ROBUST_DEF, s_window, S_DEGREE_DEF, T_WINDOW_DEF, T_DEGREE_DEF, L_WINDOW_DEF,
+ L_DEGREE_DEF, S_JUMP_DEF, T_JUMP_DEF, L_JUMP_DEF, INNER_DEF, OUTER_DEF,
+ &trend, &seasonal, &remainder, error);
+
+ if (SUCCEED == ret)
+ {
+ ret = zbx_get_percentage_of_deviations_in_stl_remainder(&remainder, deviations, dev_alg,
+ start_detect_period, end_detect_period, value, error);
+ }
+out:
+ zbx_history_record_vector_destroy(&trend, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&seasonal, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&remainder, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&values, ITEM_VALUE_TYPE_FLOAT);
+
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+ return ret;
+
+}
+
/******************************************************************************
* *
* Function: evaluate_TREND *
* *
* Purpose: evaluate trend* functions for the item *
* *
- * Parameters: value - [OUT] the function result *
+ * Parameters: value - [OUT] result *
* item - [IN] item (performance metric) *
* func - [IN] the trend function to evaluate *
* (avg, sum, count, delta, max, min) *
* parameters - [IN] function parameters *
* ts - [IN] the historical time when function must be *
* evaluated *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -2907,14 +2840,20 @@ out:
static int evaluate_TREND(zbx_variant_t *value, DC_ITEM *item, const char *func, const char *parameters,
const zbx_timespec_t *ts, char **error)
{
- int ret = FAIL, start, end;
+ int start, end, ret = FAIL;
char *period = NULL;
const char *table;
double value_dbl;
zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
- if (1 != num_param(parameters))
+ if (0 != strcmp(func, "stl") && 1 != num_param(parameters))
+ {
+ *error = zbx_strdup(*error, "invalid number of parameters");
+ goto out;
+ }
+
+ if (0 == strcmp(func, "stl") && (3 > num_param(parameters) || 6 < num_param(parameters)))
{
*error = zbx_strdup(*error, "invalid number of parameters");
goto out;
@@ -2962,6 +2901,79 @@ static int evaluate_TREND(zbx_variant_t *value, DC_ITEM *item, const char *func,
{
ret = zbx_trends_eval_sum(table, item->itemid, start, end, &value_dbl, error);
}
+ else if (0 == strcmp(func, "stl"))
+ {
+ char *dev_alg = NULL;
+ int start_detect_period, end_detect_period, season_shift, season, season_processed,
+ detect_period, detect_period_shift;
+ double deviations;
+ zbx_uint64_t s_window;
+ zbx_value_type_t detect_period_type, season_type;
+
+ if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 2, &detect_period,
+ &detect_period_type, &detect_period_shift))
+ {
+ *error = zbx_strdup(*error, "invalid third parameter");
+ goto out;
+ }
+
+ if (ZBX_VALUE_SECONDS != detect_period_type)
+ {
+ THIS_SHOULD_NEVER_HAPPEN;
+ goto out;
+ }
+
+ ZBX_UNUSED(detect_period_shift);
+
+ end_detect_period = end + SEC_PER_HOUR - 1;
+ start_detect_period = end_detect_period - detect_period + 1;
+
+ if (start_detect_period < start)
+ {
+ *error = zbx_strdup(*error, "detection period must not exceed evaluation period");
+ goto out;
+ }
+
+ if (SUCCEED != get_function_parameter_hist_range(ts->sec, parameters, 3, &season, &season_type,
+ &season_shift))
+ {
+ *error = zbx_strdup(*error, "invalid fourth parameter");
+ goto out;
+ }
+
+ ZBX_UNUSED(season_shift);
+
+ if (ZBX_VALUE_SECONDS != season_type)
+ {
+ THIS_SHOULD_NEVER_HAPPEN;
+ goto out;
+ }
+
+ if (SUCCEED != get_function_parameter_float(parameters, 4, ZBX_FLAG_DOUBLE_PLAIN, &deviations))
+ deviations = STL_DEF_DEVIATIONS;
+
+ if (SUCCEED != get_function_parameter_str(parameters, 5, &dev_alg) || '\0' == *dev_alg)
+ {
+ dev_alg = zbx_strdup(NULL, "mad");
+ }
+ else if ((0 != strcmp("mad", dev_alg) && (0 != strcmp("stddevpop", dev_alg)) &&
+ (0 != strcmp("stddevsamp", dev_alg))))
+ {
+ *error = zbx_strdup(*error, "invalid sixth parameter");
+ zbx_free(dev_alg);
+ goto out;
+ }
+
+ if (SUCCEED != get_function_parameter_uint64(parameters, 6, &s_window))
+ s_window = S_WINDOW_DEF;
+
+ season_processed = (int)((double)season / 3600);
+
+ ret = trends_eval_stl(table, item->itemid, start, end, start_detect_period, end_detect_period,
+ (int)season_processed, deviations, dev_alg, (int)s_window, &value_dbl, error);
+
+ zbx_free(dev_alg);
+ }
else
{
*error = zbx_strdup(*error, "unknown trend function");
@@ -2972,7 +2984,6 @@ static int evaluate_TREND(zbx_variant_t *value, DC_ITEM *item, const char *func,
zbx_variant_set_dbl(value, value_dbl);
out:
zbx_free(period);
-
zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
return ret;
@@ -3035,9 +3046,11 @@ static int validate_params_and_get_data(DC_ITEM *item, const char *parameters, c
* *
* Purpose: evaluate function 'first' for the item *
* *
- * Parameters: value - dynamic buffer *
- * item - item (performance metric) *
- * parameters - Nth first value and time shift (optional) *
+ * Parameters: value - [OUT] result *
+ * item - [IN] item (performance metric) *
+ * parameters - [IN] Nth first value and time shift (optional) *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
* FAIL - failed to evaluate function *
@@ -3142,7 +3155,7 @@ out:
* *
* Purpose: evaluate functions 'monoinc' and 'monodec' for the item *
* *
- * Parameters: value - [OUT] the function return value *
+ * Parameters: value - [OUT] result *
* item - [IN] item (performance metric) *
* parameters - [IN] mode, strict or weak monotonicity *
* ts - [IN] the function execution time *
@@ -3283,7 +3296,7 @@ out:
* *
* Purpose: evaluate functions 'rate' for the item *
* *
- * Parameters: value - [OUT] the function return value *
+ * Parameters: value - [OUT] result *
* item - [IN] item (performance metric) *
* parameters - [IN] seconds, time shift (optional) *
* ts - [IN] the function execution time *
@@ -3474,7 +3487,7 @@ int zbx_evaluate_RATE(zbx_variant_t *value, DC_ITEM *item, const char *parameter
* *
* Purpose: evaluate function 'changecount' for the item *
* *
- * Parameters: value - [OUT] the function return value *
+ * Parameters: value - [OUT] result *
* item - [IN] item (performance metric) *
* parameters - [IN] mode, increases, decreases or all changes *
* ts - [IN] the function execution time *
@@ -3629,6 +3642,148 @@ out:
#undef PREV
#undef LAST
+/******************************************************************************
+ * *
+ * Function: evaluate_BASELINE *
+ * *
+ * Purpose: evaluate baseline* functions for the item *
+ * *
+ * Parameters: value - [OUT] the function result *
+ * item - [IN] item (performance metric) *
+ * func - [IN] the baseline function to evaluate *
+ * (wma, dev) *
+ * parameters - [IN] function parameters *
+ * ts - [IN] the historical time when function must be *
+ * evaluated *
+ * *
+ * Return value: SUCCEED - evaluated successfully, result is stored in 'value'*
+ * FAIL - failed to evaluate function *
+ * *
+ ******************************************************************************/
+static int evaluate_BASELINE(zbx_variant_t *value, DC_ITEM *item, const char *func, const char *parameters,
+ const zbx_timespec_t *ts, char **error)
+{
+ int ret = FAIL, season_num;
+ char *period = NULL, *tmp = NULL;
+ zbx_vector_dbl_t values;
+ zbx_vector_uint64_t index;
+ double value_dbl;
+ zbx_time_unit_t season_unit;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+ zbx_vector_dbl_create(&values);
+ zbx_vector_uint64_create(&index);
+
+ if (3 != num_param(parameters))
+ {
+ *error = zbx_strdup(*error, "invalid number of parameters");
+ goto out;
+ }
+
+ if (SUCCEED != get_function_parameter_str(parameters, 1, &period))
+ {
+ *error = zbx_strdup(*error, "invalid second parameter");
+ goto out;
+ }
+
+ if (SUCCEED != get_function_parameter_str(parameters, 2, &tmp) ||
+ ZBX_TIME_UNIT_HOUR > (season_unit = zbx_tm_str_to_unit(tmp)))
+ {
+ *error = zbx_strdup(*error, "invalid third parameter");
+ goto out;
+ }
+ zbx_free(tmp);
+
+ if (SUCCEED != get_function_parameter_str(parameters, 3, &tmp) || 0 >= (season_num = atoi(tmp)))
+ {
+ *error = zbx_strdup(*error, "invalid fourth parameter");
+ goto out;
+ }
+
+ if (0 == strcmp(func, "wma"))
+ {
+ int i, weights = 0;
+
+ if (SUCCEED != zbx_baseline_get_data(item->itemid, item->value_type, ts->sec, period, season_num,
+ season_unit, 1, &values, &index, error))
+ {
+ goto out;
+ }
+
+ if (0 == values.values_num)
+ {
+ *error = zbx_strdup(NULL, "not enough data");
+ goto out;
+ }
+
+ value_dbl = 0;
+
+ for (i = 0; i < values.values_num; i++)
+ {
+ int weight = season_num - (int)index.values[i];
+
+ value_dbl += values.values[i] * weight;
+ weights += weight;
+ }
+
+ value_dbl /= weights;
+ }
+ else if (0 == strcmp(func, "dev"))
+ {
+ double value_dev, value_avg = 0;
+ int i;
+
+ if (SUCCEED != zbx_baseline_get_data(item->itemid, item->value_type, ts->sec, period, season_num,
+ season_unit, 0, &values, &index, error))
+ {
+ goto out;
+ }
+
+ if (1 >= values.values_num)
+ {
+ *error = zbx_strdup(NULL, "not enough data");
+ goto out;
+ }
+
+ if (SUCCEED != zbx_eval_calc_stddevpop(&values, &value_dev, error))
+ goto out;
+
+ if (ZBX_DOUBLE_EPSILON <= value_dev)
+ {
+ for (i = 0; i < values.values_num; i++)
+ value_avg += values.values[i];
+ value_avg /= values.values_num;
+
+ value_dbl = fabs(values.values[0] - value_avg) / value_dev;
+ }
+ else
+ value_dbl = 0;
+
+ zabbix_log(LOG_LEVEL_TRACE, "fabs(" ZBX_FS_DBL " - " ZBX_FS_DBL ") / " ZBX_FS_DBL " = " ZBX_FS_DBL,
+ values.values[0], value_avg, value_dev, value_dbl);
+ }
+ else
+ {
+ *error = zbx_strdup(*error, "unknown baseline function");
+ goto out;
+ }
+
+ zbx_variant_set_dbl(value, value_dbl);
+
+ ret = SUCCEED;
+out:
+ zbx_free(tmp);
+ zbx_free(period);
+
+ zbx_vector_uint64_destroy(&index);
+ zbx_vector_dbl_destroy(&values);
+
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+ return ret;
+}
+
static void history_to_dbl_vector(const zbx_history_record_t *v, int n, unsigned char value_type,
zbx_vector_dbl_t *values)
{
@@ -3710,9 +3865,12 @@ out:
* *
* Purpose: evaluate function *
* *
- * Parameters: item - item to calculate function for *
- * function - function (for example, 'max') *
- * parameter - parameter of the function *
+ * Parameters: value - [OUT] dynamic buffer, result *
+ * item - [IN] item to calculate function for *
+ * function - [IN] function (for example, 'max') *
+ * parameter - [IN] parameter of the function *
+ * ts - [IN] the starting timestamp *
+ * error - [OUT] the error message *
* *
* Return value: SUCCEED - evaluated successfully, value contains its value *
* FAIL - evaluation failed *
@@ -3854,6 +4012,10 @@ int evaluate_function2(zbx_variant_t *value, DC_ITEM *item, const char *function
{
ret = evaluate_CHANGECOUNT(value, item, parameter, ts, error);
}
+ else if (0 == strncmp(function, "baseline", 8))
+ {
+ ret = evaluate_BASELINE(value, item, function + 8, parameter, ts, error);
+ }
else
{
*error = zbx_strdup(*error, "function is not supported");
@@ -3889,7 +4051,8 @@ int zbx_is_trigger_function(const char *name, size_t len)
"pi", "e", "expm1", "atan2", "first", "kurtosis", "mad", "skewness", "stddevpop", "stddevsamp",
"sumofsquares", "varpop", "varsamp", "ascii", "bitlength", "char", "concat", "insert", "lcase",
"left", "ltrim", "bytelength", "repeat", "replace", "right", "rtrim", "mid", "trim", "between",
- "in", "bitor", "bitxor", "bitnot", "bitlshift", "bitrshift", NULL};
+ "in", "bitor", "bitxor", "bitnot", "bitlshift", "bitrshift", "baselinewma", "baselinedev",
+ NULL};
char **ptr;
for (ptr = functions; NULL != *ptr; ptr++)
diff --git a/src/libs/zbxserver/evalfunc_common.c b/src/libs/zbxserver/evalfunc_common.c
new file mode 100644
index 00000000000..2293d94e5b0
--- /dev/null
+++ b/src/libs/zbxserver/evalfunc_common.c
@@ -0,0 +1,188 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#include "common.h"
+#include "log.h"
+#include "zbxtrends.h"
+
+#include "evalfunc_common.h"
+
+const char *zbx_type_string(zbx_value_type_t type)
+{
+ switch (type)
+ {
+ case ZBX_VALUE_NONE:
+ return "none";
+ case ZBX_VALUE_SECONDS:
+ return "sec";
+ case ZBX_VALUE_NVALUES:
+ return "num";
+ default:
+ THIS_SHOULD_NEVER_HAPPEN;
+ return "unknown";
+ }
+}
+
+int get_function_parameter_uint64(const char *parameters, int Nparam, zbx_uint64_t *value)
+{
+ char *parameter;
+ int ret = FAIL;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
+
+ if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
+ goto out;
+
+ if (SUCCEED == (ret = is_uint64(parameter, value)))
+ zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_UI64, __func__, *value);
+
+ zbx_free(parameter);
+out:
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+ return ret;
+}
+
+int get_function_parameter_float(const char *parameters, int Nparam, unsigned char flags, double *value)
+{
+ char *parameter;
+ int ret = FAIL;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
+
+ if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
+ goto out;
+
+ if (SUCCEED == (ret = is_double_suffix(parameter, flags)))
+ {
+ *value = str2double(parameter);
+ zabbix_log(LOG_LEVEL_DEBUG, "%s() value:" ZBX_FS_DBL, __func__, *value);
+ }
+
+ zbx_free(parameter);
+out:
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+ return ret;
+}
+
+int get_function_parameter_str(const char *parameters, int Nparam, char **value)
+{
+ int ret = FAIL;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
+
+ if (NULL == (*value = zbx_function_get_param_dyn(parameters, Nparam)))
+ goto out;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s() value:'%s'", __func__, *value);
+ ret = SUCCEED;
+out:
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+ return ret;
+}
+
+/******************************************************************************
+ * *
+ * Function: get_function_parameter_hist_range *
+ * *
+ * Purpose: get the value of sec|num + timeshift trigger function parameter *
+ * *
+ * Parameters: from - [IN] the function calculation time *
+ * parameters - [IN] trigger function parameters *
+ * Nparam - [IN] specifies which parameter to extract *
+ * value - [OUT] parameter value (preserved as is if the *
+ * parameter is optional and empty) *
+ * type - [OUT] parameter value type (number of seconds *
+ * or number of values) *
+ * timeshift - [OUT] the timeshift value (0 if absent) *
+ * *
+ * Return value: SUCCEED - parameter is valid *
+ * FAIL - otherwise *
+ * *
+ ******************************************************************************/
+int get_function_parameter_hist_range(int from, const char *parameters, int Nparam, int *value,
+ zbx_value_type_t *type, int *timeshift)
+{
+ char *parameter = NULL, *shift;
+ int ret = FAIL;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s() parameters:'%s' Nparam:%d", __func__, parameters, Nparam);
+
+ if (NULL == (parameter = zbx_function_get_param_dyn(parameters, Nparam)))
+ goto out;
+
+ if (NULL != (shift = strchr(parameter, ':')))
+ *shift++ = '\0';
+
+ if ('\0' == *parameter)
+ {
+ *value = 0;
+ *type = ZBX_VALUE_NONE;
+ }
+ else if ('#' != *parameter)
+ {
+ if (SUCCEED != is_time_suffix(parameter, value, ZBX_LENGTH_UNLIMITED) || 0 > *value)
+ goto out;
+
+ *type = ZBX_VALUE_SECONDS;
+ }
+ else
+ {
+ if (SUCCEED != is_uint31(parameter + 1, value) || 0 >= *value)
+ goto out;
+ *type = ZBX_VALUE_NVALUES;
+ }
+
+ if (NULL != shift)
+ {
+ struct tm tm;
+ char *error = NULL;
+ int end;
+
+ if (SUCCEED != zbx_parse_timeshift(from, shift, &tm, &error))
+ {
+ zabbix_log(LOG_LEVEL_DEBUG, "%s() timeshift error:%s", __func__, error);
+ zbx_free(error);
+ goto out;
+ }
+
+ if (-1 == (end = (int)mktime(&tm)))
+ {
+ zabbix_log(LOG_LEVEL_DEBUG, "%s() invalid timeshift value:%s", __func__,
+ zbx_strerror(errno));
+ goto out;
+ }
+
+ *timeshift = from - end;
+ }
+ else
+ *timeshift = 0;
+
+ ret = SUCCEED;
+ zabbix_log(LOG_LEVEL_DEBUG, "%s() type:%s value:%d timeshift:%d", __func__, zbx_type_string(*type),
+ *value, *timeshift);
+out:
+ zbx_free(parameter);
+
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
+
+ return ret;
+}
diff --git a/src/libs/zbxserver/evalfunc_common.h b/src/libs/zbxserver/evalfunc_common.h
new file mode 100644
index 00000000000..bec0de4b7af
--- /dev/null
+++ b/src/libs/zbxserver/evalfunc_common.h
@@ -0,0 +1,39 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#ifndef ZABBIX_EVALFUNC_COMMON_H
+#define ZABBIX_EVALFUNC_COMMON_H
+
+#include "common.h"
+
+typedef enum
+{
+ ZBX_VALUE_NONE,
+ ZBX_VALUE_SECONDS,
+ ZBX_VALUE_NVALUES
+}
+zbx_value_type_t;
+
+const char *zbx_type_string(zbx_value_type_t type);
+int get_function_parameter_uint64(const char *parameters, int Nparam, zbx_uint64_t *value);
+int get_function_parameter_float(const char *parameters, int Nparam, unsigned char flags, double *value);
+int get_function_parameter_str(const char *parameters, int Nparam, char **value);
+int get_function_parameter_hist_range(int from, const char *parameters, int Nparam, int *value,
+ zbx_value_type_t *type, int *timeshift);
+#endif
diff --git a/src/libs/zbxsysinfo/sysinfo.c b/src/libs/zbxsysinfo/sysinfo.c
index a8adb5949b6..32d9c9ad4f0 100644
--- a/src/libs/zbxsysinfo/sysinfo.c
+++ b/src/libs/zbxsysinfo/sysinfo.c
@@ -200,6 +200,36 @@ int add_user_parameter(const char *itemkey, char *command, char *error, size_t m
return ret;
}
+
+void remove_user_parameters(void)
+{
+ int i, usr = -1;
+
+ if (NULL == commands)
+ return;
+
+ for (i = 0; NULL != commands[i].key; i++)
+ {
+ if (0 != (CF_USERPARAMETER & commands[i].flags))
+ {
+ zbx_free(commands[i].key);
+ zbx_free(commands[i].test_param);
+
+ if (0 > usr)
+ usr = i;
+ }
+ }
+
+ if (0 < usr)
+ {
+ commands = (ZBX_METRIC *)zbx_realloc(commands, ((unsigned int)usr + 1) * sizeof(ZBX_METRIC));
+ memset(&commands[usr], 0, sizeof(ZBX_METRIC));
+ }
+ else if (0 == usr)
+ {
+ zbx_free(commands);
+ }
+}
#endif
void init_metrics(void)
diff --git a/src/libs/zbxtrends/Makefile.am b/src/libs/zbxtrends/Makefile.am
index 9949df07882..66f75786f65 100644
--- a/src/libs/zbxtrends/Makefile.am
+++ b/src/libs/zbxtrends/Makefile.am
@@ -1,8 +1,14 @@
## Process this file with automake to produce Makefile.in
-noinst_LIBRARIES = libzbxtrends.a
+noinst_LIBRARIES = \
+ libzbxtrends.a \
+ libzbxtrends_baseline.a
+
libzbxtrends_a_SOURCES = \
trends.c \
trends.h \
cache.c
+
+libzbxtrends_baseline_a_SOURCES = \
+ baseline.c
diff --git a/src/libs/zbxtrends/baseline.c b/src/libs/zbxtrends/baseline.c
new file mode 100644
index 00000000000..351a6351a49
--- /dev/null
+++ b/src/libs/zbxtrends/baseline.c
@@ -0,0 +1,270 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#include "common.h"
+#include "zbxtrends.h"
+#include "log.h"
+
+/******************************************************************************
+ * *
+ * Function: baseline_get_common_data *
+ * *
+ * Purpose: get baseline data for common period/season combinations *
+ * *
+ * Parameters: itemid - [IN] the item identifier *
+ * table - [IN] the trends table name *
+ * now - [IN] the current timestamp *
+ * period - [IN] the data period *
+ * season_num - [IN] the number of seasons *
+ * season_unit - [IN] the season time unit *
+ * skip - [IN] how many data periods to skip *
+ * values - [OUT] the average data period value in each *
+ * season *
+ * index - [OUT] the index of returned values, starting *
+ * with 0. It will have values be from 0 to *
+ * <seasons num> + 1 - <skip> with holes for *
+ * periods without data. *
+ * error - [OUT] the error message if parsing failed *
+ * *
+ * Return value: SUCCEED - data were retrieved successfully *
+ * FAIL - otherwise *
+ * *
+ ******************************************************************************/
+static int baseline_get_common_data(zbx_uint64_t itemid, const char *table, time_t now, const char *period,
+ int season_num, zbx_time_unit_t season_unit, int skip, zbx_vector_dbl_t *values,
+ zbx_vector_uint64_t *index, char **error)
+{
+ int i, start, end;
+ double value_dbl;
+ struct tm tm, tm_now;
+
+ tm_now = *localtime(&now);
+
+ for (i = 0; i < season_num; i++)
+ {
+ if (FAIL == zbx_trends_parse_range(now, period, &start, &end, error))
+ return FAIL;
+
+ if (skip <= i)
+ {
+ zbx_trend_state_t state;
+
+ state = zbx_trends_get_avg(table, itemid, start, end, &value_dbl);
+
+ if (ZBX_TREND_STATE_NORMAL != state)
+ {
+ if (0 == i || ZBX_TREND_STATE_NODATA != state)
+ {
+ *error = zbx_strdup(NULL, zbx_trends_error(state));
+ return FAIL;
+ }
+ }
+ else
+ {
+ zbx_vector_dbl_append(values, value_dbl);
+ zbx_vector_uint64_append(index, (zbx_uint64_t)(i - skip));
+ }
+ }
+
+ tm = tm_now;
+ zbx_tm_sub(&tm, i + 1, season_unit);
+
+ if (-1 == (now = mktime(&tm)))
+ {
+ *error = zbx_dsprintf(*error, "cannot convert season start time: %s", zbx_strerror(errno));
+ return FAIL;
+ }
+ }
+
+ return SUCCEED;
+}
+
+/******************************************************************************
+ * *
+ * Function: baseline_get_isoyear_data *
+ * *
+ * Purpose: get baseline data for week based periods in a year *
+ * *
+ * Parameters: itemid - [IN] the item identifier *
+ * table - [IN] the trends table name *
+ * now - [IN] the current timestamp *
+ * period - [IN] the data period *
+ * season_num - [IN] the number of seasons *
+ * skip - [IN] how many data periods to skip *
+ * values - [OUT] the average data period value in each *
+ * season *
+ * index - [OUT] the index of returned values, starting *
+ * with 0. It will have values be from 0 to *
+ * <seasons num> + 1 - <skip> with holes for *
+ * periods without data. *
+ * error - [OUT] the error message if parsing failed *
+ * *
+ * Return value: SUCCEED - data were retrieved successfully *
+ * FAIL - otherwise *
+ * *
+ ******************************************************************************/
+static int baseline_get_isoyear_data(zbx_uint64_t itemid, const char *table, time_t now, const char *period,
+ int season_num, int skip, zbx_vector_dbl_t *values, zbx_vector_uint64_t *index, char **error)
+{
+ int i, start, end, period_num;
+ time_t time_tmp;
+ double value_dbl;
+ struct tm tm_end, tm_start;
+ size_t len;
+ zbx_time_unit_t period_unit;
+
+ if (FAIL == zbx_tm_parse_period(period, &len, &period_num, &period_unit, error))
+ return FAIL;
+
+ if (FAIL == zbx_trends_parse_range(now, period, &start, &end, error))
+ return FAIL;
+
+ time_tmp = end;
+ tm_end = *localtime(&time_tmp);
+
+ for (i = 0; i < season_num; i++)
+ {
+ if (skip <= i)
+ {
+ zbx_trend_state_t state;
+
+ state = zbx_trends_get_avg(table, itemid, start, end, &value_dbl);
+
+ if (ZBX_TREND_STATE_NORMAL != state)
+ {
+ if (0 == i || ZBX_TREND_STATE_NODATA != state)
+ {
+ *error = zbx_strdup(NULL, zbx_trends_error(state));
+ return FAIL;
+ }
+ }
+ else
+ {
+ zbx_vector_dbl_append(values, value_dbl);
+ zbx_vector_uint64_append(index, (zbx_uint64_t)(i - skip));
+ }
+ }
+
+ zbx_tm_sub(&tm_end, 1, ZBX_TIME_UNIT_ISOYEAR);
+
+ if (-1 == (end = (int)mktime(&tm_end)))
+ {
+ *error = zbx_dsprintf(*error, "cannot convert data period end time: %s", zbx_strerror(errno));
+ return FAIL;
+ }
+
+ tm_start = tm_end;
+ /* add an hour to get real end timestamp rather than last trend hour */
+ zbx_tm_add(&tm_start, 1, ZBX_TIME_UNIT_HOUR);
+ zbx_tm_sub(&tm_start, period_num, period_unit);
+
+ if (-1 == (start = (int)mktime(&tm_start)))
+ {
+ *error = zbx_dsprintf(*error, "cannot convert data period start time: %s", zbx_strerror(errno));
+ return FAIL;
+ }
+ }
+
+ return SUCCEED;
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_baseline_get_data *
+ * *
+ * Purpose: get baseline data for the specified period *
+ * *
+ * Parameters: itemid - [IN] the item identifier *
+ * value_type - [IN] the item value type *
+ * now - [IN] the current timestamp *
+ * period - [IN] the data period *
+ * seasons - [IN] the seasons *
+ * skip - [IN] how many data periods to skip *
+ * values - [OUT] the average data period value in each *
+ * season *
+ * index - [OUT] the index of returned values, starting *
+ * with 0. It will have values be from 0 to *
+ * <seasons num> + 1 - <skip> with holes for *
+ * periods without data. *
+ * error - [OUT] the error message if parsing failed *
+ * *
+ * Return value: SUCCEED - data were retrieved successfully *
+ * FAIL - otherwise *
+ * *
+ * Comments: By default the first period is included in the data. So the *
+ * returned vector contains data for this period + data from *
+ * seasons. To retrieve only data from seasons use pass 1 to skip *
+ * parameter. *
+ * *
+ ******************************************************************************/
+int zbx_baseline_get_data(zbx_uint64_t itemid, unsigned char value_type, time_t now, const char *period,
+ int season_num, zbx_time_unit_t season_unit, int skip, zbx_vector_dbl_t *values,
+ zbx_vector_uint64_t *index, char **error)
+{
+ zbx_time_unit_t period_unit;
+ int ret = FAIL;
+ const char *table;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s()", __func__);
+
+ switch (value_type)
+ {
+ case ITEM_VALUE_TYPE_FLOAT:
+ table = "trends";
+ break;
+ case ITEM_VALUE_TYPE_UINT64:
+ table = "trends_uint";
+ break;
+ default:
+ *error = zbx_strdup(*error, "unsupported value type");
+ goto out;
+ }
+
+ if (FAIL == zbx_trends_parse_base(period, &period_unit, error))
+ goto out;
+
+ if (ZBX_TIME_UNIT_MONTH == season_unit && ZBX_TIME_UNIT_WEEK == period_unit)
+ {
+ *error = zbx_strdup(*error, "weekly data periods cannot be used with month seasons");
+ goto out;
+ }
+
+ if (season_unit < period_unit)
+ {
+ *error = zbx_strdup(*error, "season cannot be less than data period base");
+ goto out;
+ }
+
+ /* include the data period which might be skipped because of 'skip' parameter */
+ season_num++;
+
+ if (ZBX_TIME_UNIT_WEEK == period_unit && ZBX_TIME_UNIT_YEAR == season_unit)
+ {
+ ret = baseline_get_isoyear_data(itemid, table, now, period, season_num, skip, values, index, error);
+ }
+ else
+ {
+ ret = baseline_get_common_data(itemid, table, now, period, season_num, season_unit, skip, values,
+ index, error);
+ }
+out:
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s %s", __func__, zbx_result_string(ret), ZBX_NULL2EMPTY_STR(*error));
+
+ return ret;
+}
diff --git a/src/libs/zbxtrends/cache.c b/src/libs/zbxtrends/cache.c
index 56cd0d5cd1b..c86040fc6c5 100644
--- a/src/libs/zbxtrends/cache.c
+++ b/src/libs/zbxtrends/cache.c
@@ -331,6 +331,56 @@ static zbx_tfc_data_t *tfc_index_add(zbx_tfc_data_t *data_local)
/******************************************************************************
* *
+ * Function: tfc_function_str *
+ * *
+ * Purpose: return trend function name in readable format *
+ * *
+ ******************************************************************************/
+static const char *tfc_function_str(zbx_trend_function_t function)
+{
+ switch (function)
+ {
+ case ZBX_TREND_FUNCTION_AVG:
+ return "avg";
+ case ZBX_TREND_FUNCTION_COUNT:
+ return "count";
+ case ZBX_TREND_FUNCTION_DELTA:
+ return "delta";
+ case ZBX_TREND_FUNCTION_MAX:
+ return "max";
+ case ZBX_TREND_FUNCTION_MIN:
+ return "min";
+ case ZBX_TREND_FUNCTION_SUM:
+ return "sum";
+ default:
+ return "unknown";
+ }
+}
+
+/******************************************************************************
+ * *
+ * Function: tfc_state_str *
+ * *
+ * Purpose: return trend cache state in readable format *
+ * *
+ ******************************************************************************/
+static const char *tfc_state_str(zbx_trend_state_t state)
+{
+ switch (state)
+ {
+ case ZBX_TREND_STATE_NORMAL:
+ return "cached";
+ case ZBX_TREND_STATE_NODATA:
+ return "nodata";
+ case ZBX_TREND_STATE_OVERFLOW:
+ return "overflow";
+ default:
+ return "unknown";
+ }
+}
+
+/******************************************************************************
+ * *
* Function: zbx_tfc_init *
* *
* Purpose: initialize trend function cache *
@@ -442,7 +492,21 @@ int zbx_tfc_get_value(zbx_uint64_t itemid, int start, int end, zbx_trend_functio
if (NULL == cache)
return FAIL;
- zabbix_log(LOG_LEVEL_DEBUG, "In %s() itemid:" ZBX_FS_UI64 " period:%d-%d", __func__, itemid, start, end);
+ if (SUCCEED == ZBX_CHECK_LOG_LEVEL(LOG_LEVEL_DEBUG))
+ {
+ time_t ts_time;
+ struct tm tm_start, tm_end;
+
+ ts_time = start;
+ localtime_r(&ts_time, &tm_start);
+ ts_time = end;
+ localtime_r(&ts_time, &tm_end);
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s() itemid:" ZBX_FS_UI64 " %s(%04d.%02d.%02d/%02d, %04d.%02d.%02d/%02d)",
+ __func__, itemid, tfc_function_str(function), tm_start.tm_year + 1900,
+ tm_start.tm_mon + 1, tm_start.tm_mday, tm_start.tm_hour, tm_end.tm_year + 1900,
+ tm_end.tm_mon + 1, tm_end.tm_mday, tm_end.tm_hour);
+ }
data_local.itemid = itemid;
data_local.start = start;
@@ -466,7 +530,18 @@ int zbx_tfc_get_value(zbx_uint64_t itemid, int start, int end, zbx_trend_functio
UNLOCK_CACHE;
- zabbix_log(LOG_LEVEL_DEBUG, "End of %s() data:%p", __func__, data);
+ if (SUCCEED == ZBX_CHECK_LOG_LEVEL(LOG_LEVEL_DEBUG))
+ {
+ if (NULL != data)
+ {
+ char buf[ZBX_MAX_DOUBLE_LEN + 1];
+
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s() state:%s value:%s", __func__,
+ tfc_state_str(data->state), zbx_print_double(buf, sizeof(buf), data->value));
+ }
+ else
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s():not cached", __func__);
+ }
return NULL != data ? SUCCEED : FAIL;
}
@@ -493,6 +568,28 @@ void zbx_tfc_put_value(zbx_uint64_t itemid, int start, int end, zbx_trend_functi
if (NULL == cache)
return;
+ if (SUCCEED == ZBX_CHECK_LOG_LEVEL(LOG_LEVEL_DEBUG))
+ {
+ time_t ts_time;
+ struct tm tm_start, tm_end;
+ char buf[ZBX_MAX_DOUBLE_LEN + 1];
+
+ ts_time = start;
+ localtime_r(&ts_time, &tm_start);
+ ts_time = end;
+ localtime_r(&ts_time, &tm_end);
+
+ if (state == ZBX_TREND_STATE_NODATA)
+ zbx_strlcpy(buf, "none", sizeof(buf));
+ else
+ zbx_print_double(buf, sizeof(buf), value);
+
+ zabbix_log(LOG_LEVEL_DEBUG, "In %s() itemid:" ZBX_FS_UI64 " %s(%04d.%02d.%02d/%02d, %04d.%02d.%02d/%02d)"
+ "=%s state:%s", __func__, itemid, tfc_function_str(function), tm_start.tm_year + 1900,
+ tm_start.tm_mon + 1, tm_start.tm_mday, tm_start.tm_hour, tm_end.tm_year + 1900,
+ tm_end.tm_mon + 1, tm_end.tm_mday, tm_end.tm_hour, buf, tfc_state_str(state));
+ }
+
data_local.itemid = itemid;
data_local.start = 0;
data_local.end = 0;
@@ -528,6 +625,8 @@ void zbx_tfc_put_value(zbx_uint64_t itemid, int start, int end, zbx_trend_functi
data->state = state;
UNLOCK_CACHE;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
}
void zbx_tfc_invalidate_trends(ZBX_DC_TREND *trends, int trends_num)
diff --git a/src/libs/zbxtrends/trends.c b/src/libs/zbxtrends/trends.c
index 56962f5b8c1..cb93a54d9c9 100644
--- a/src/libs/zbxtrends/trends.c
+++ b/src/libs/zbxtrends/trends.c
@@ -91,7 +91,6 @@ static int trends_parse_base(const char *period_shift, zbx_time_unit_t *base, ch
int zbx_trends_parse_base(const char *params, zbx_time_unit_t *base, char **error)
{
const char *period_shift;
- int ret;
if (NULL == (period_shift = strchr(params, ':')))
{
@@ -99,9 +98,7 @@ int zbx_trends_parse_base(const char *params, zbx_time_unit_t *base, char **erro
return FAIL;
}
- ret = trends_parse_base(period_shift + 1, base, error);
-
- return ret;
+ return trends_parse_base(period_shift + 1, base, error);
}
/******************************************************************************
@@ -252,7 +249,8 @@ int zbx_parse_timeshift(time_t from, const char *timeshift, struct tm *tm, char
******************************************************************************/
int zbx_trends_parse_range(time_t from, const char *param, int *start, int *end, char **error)
{
- int period_num, period_hours[ZBX_TIME_UNIT_COUNT] = {0, 0, 0, 1, 24, 24 * 7, 24 * 30, 24 * 365};
+ int period_num;
+ int period_hours[ZBX_TIME_UNIT_COUNT] = {0, 0, 0, 1, 24, 24 * 7, 24 * 30, 24 * 365, 24 * 7 * 53};
zbx_time_unit_t period_unit;
size_t len;
struct tm tm_end, tm_start;
@@ -359,7 +357,8 @@ int zbx_trends_parse_nextcheck(time_t from, const char *period_shift, time_t *ne
{
if (ZBX_TIME_UNIT_UNKNOWN == (unit = zbx_tm_str_to_unit(++period_shift)))
{
- *error = zbx_dsprintf(*error, "unexpected character starting with \"%s\"", period_shift);
+ *error = zbx_dsprintf(*error, "unexpected character starting with \"%s\"",
+ period_shift);
return FAIL;
}
@@ -389,6 +388,10 @@ int zbx_trends_parse_nextcheck(time_t from, const char *period_shift, time_t *ne
period_shift += len;
}
+ else if (',' == *period_shift)
+ {
+ break;
+ }
else
{
*error = zbx_dsprintf(*error, "unexpected character starting with \"%s\"", period_shift);
@@ -678,3 +681,28 @@ int zbx_trends_eval_sum(const char *table, zbx_uint64_t itemid, int start, int e
return FAIL;
}
+
+zbx_trend_state_t zbx_trends_get_avg(const char *table, zbx_uint64_t itemid, int start, int end, double *value)
+{
+ zbx_trend_state_t state;
+
+ if (FAIL == zbx_tfc_get_value(itemid, start, end, ZBX_TREND_FUNCTION_AVG, value, &state))
+ {
+ state = trends_eval_avg(table, itemid, start, end, value);
+ zbx_tfc_put_value(itemid, start, end, ZBX_TREND_FUNCTION_AVG, *value, state);
+ }
+
+ return state;
+}
+
+const char *zbx_trends_error(zbx_trend_state_t state)
+{
+ if (0 > state || state >= ZBX_TREND_STATE_COUNT)
+ {
+ THIS_SHOULD_NEVER_HAPPEN;
+ return "unknown trend cache state";
+ }
+
+ return trends_errors[state];
+}
+
diff --git a/src/libs/zbxtrends/trends.h b/src/libs/zbxtrends/trends.h
index 6f3d4b48198..e4f18abbca2 100644
--- a/src/libs/zbxtrends/trends.h
+++ b/src/libs/zbxtrends/trends.h
@@ -34,16 +34,6 @@ typedef enum
}
zbx_trend_function_t;
-typedef enum
-{
- ZBX_TREND_STATE_UNKNOWN,
- ZBX_TREND_STATE_NORMAL,
- ZBX_TREND_STATE_NODATA,
- ZBX_TREND_STATE_OVERFLOW,
- ZBX_TREND_STATE_COUNT
-}
-zbx_trend_state_t;
-
int zbx_tfc_get_value(zbx_uint64_t itemid, int start, int end, zbx_trend_function_t function, double *value,
zbx_trend_state_t *state);
void zbx_tfc_put_value(zbx_uint64_t itemid, int start, int end, zbx_trend_function_t function, double value,
diff --git a/src/zabbix_agent/active.c b/src/zabbix_agent/active.c
index b588d5d9da2..3899d4d8169 100644
--- a/src/zabbix_agent/active.c
+++ b/src/zabbix_agent/active.c
@@ -49,6 +49,14 @@ static ZBX_THREAD_LOCAL zbx_vector_ptr_t active_metrics;
static ZBX_THREAD_LOCAL zbx_vector_ptr_t regexps;
static ZBX_THREAD_LOCAL char *session_token;
static ZBX_THREAD_LOCAL zbx_uint64_t last_valueid = 0;
+static ZBX_THREAD_LOCAL zbx_vector_pre_persistent_t pre_persistent_vec; /* used for staging of data going */
+ /* into persistent files */
+/* used for deleting inactive persistent files */
+static ZBX_THREAD_LOCAL zbx_vector_persistent_inactive_t persistent_inactive_vec;
+
+#ifndef _WINDOWS
+static volatile sig_atomic_t need_update_userparam;
+#endif
static void init_active_metrics(void)
{
@@ -59,7 +67,7 @@ static void init_active_metrics(void)
if (NULL == buffer.data)
{
zabbix_log(LOG_LEVEL_DEBUG, "buffer: first allocation for %d elements", CONFIG_BUFFER_SIZE);
- sz = CONFIG_BUFFER_SIZE * sizeof(ZBX_ACTIVE_BUFFER_ELEMENT);
+ sz = (size_t)CONFIG_BUFFER_SIZE * sizeof(ZBX_ACTIVE_BUFFER_ELEMENT);
buffer.data = (ZBX_ACTIVE_BUFFER_ELEMENT *)zbx_malloc(buffer.data, sz);
memset(buffer.data, 0, sz);
buffer.count = 0;
@@ -70,6 +78,8 @@ static void init_active_metrics(void)
zbx_vector_ptr_create(&active_metrics);
zbx_vector_ptr_create(&regexps);
+ zbx_vector_pre_persistent_create(&pre_persistent_vec);
+ zbx_vector_persistent_inactive_create(&persistent_inactive_vec);
zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
}
@@ -85,6 +95,9 @@ static void free_active_metric(ZBX_ACTIVE_METRIC *metric)
zbx_free(metric->logfiles[i].filename);
zbx_free(metric->logfiles);
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ zbx_free(metric->persistent_file_name);
+#endif
zbx_free(metric);
}
@@ -159,8 +172,35 @@ static void add_check(const char *key, const char *key_orig, int refresh, zbx_ui
metric->logfiles_num = 0;
metric->start_time = 0.0;
metric->processed_bytes = 0;
- }
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ if (NULL != metric->persistent_file_name)
+ {
+ char *error = NULL;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s() removing persistent file '%s'",
+ __func__, metric->persistent_file_name);
+
+ zbx_remove_from_persistent_inactive_list(&persistent_inactive_vec, metric->key_orig);
+
+ if (SUCCEED != zbx_remove_persistent_file(metric->persistent_file_name, &error))
+ {
+ /* log error and continue operation */
+ zabbix_log(LOG_LEVEL_WARNING, "cannot remove persistent file \"%s\": %s",
+ metric->persistent_file_name, error);
+ zbx_free(error);
+ }
+ zbx_free(metric->persistent_file_name);
+ }
+#endif
+ }
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ else if (NULL != metric->persistent_file_name)
+ {
+ /* the metric is active, but it could have been placed on inactive list earlier */
+ zbx_remove_from_persistent_inactive_list(&persistent_inactive_vec, metric->key_orig);
+ }
+#endif
/* replace metric */
if (metric->refresh != refresh)
{
@@ -206,6 +246,7 @@ static void add_check(const char *key, const char *key_orig, int refresh, zbx_ui
metric->start_time = 0.0;
metric->processed_bytes = 0;
+ metric->persistent_file_name = NULL; /* initialized but not used on Microsoft Windows */
zbx_vector_ptr_append(&active_metrics, metric);
out:
@@ -400,6 +441,13 @@ static int parse_list_of_checks(char *str, const char *host, unsigned short port
if (0 == found)
{
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ if (NULL != metric->persistent_file_name)
+ {
+ zbx_add_to_persistent_inactive_list(&persistent_inactive_vec, metric->key_orig,
+ metric->persistent_file_name);
+ }
+#endif
zbx_vector_ptr_remove_noorder(&active_metrics, i);
free_active_metric(metric);
i--; /* consider the same index on the next run */
@@ -604,7 +652,7 @@ static int refresh_active_checks(zbx_vector_ptr_t *addrs)
}
if (ZBX_DEFAULT_AGENT_PORT != CONFIG_LISTEN_PORT)
- zbx_json_adduint64(&json, ZBX_PROTO_TAG_PORT, CONFIG_LISTEN_PORT);
+ zbx_json_adduint64(&json, ZBX_PROTO_TAG_PORT, (zbx_uint64_t)CONFIG_LISTEN_PORT);
level = SUCCEED != last_ret ? LOG_LEVEL_DEBUG : LOG_LEVEL_WARNING;
@@ -706,16 +754,21 @@ static int check_response(char *response)
* *
* Purpose: Send value stored in the buffer to Zabbix server *
* *
- * Parameters: host - IP or Hostname of Zabbix server *
- * port - port number *
+ * Parameters: addrs - [IN] vector with a pair of Zabbix server IP or *
+ * Hostname and port number *
+ * prep_vec - [IN/OUT] vector with data for writing into *
+ * persistent files *
* *
- * Return value: returns SUCCEED on successful sending, *
- * FAIL on other cases *
+ * Return value: SUCCEED if: *
+ * - no need to send data now (buffer empty or has enough *
+ * free elements, or recently sent) *
+ * - data successfully sent to server (proxy) *
+ * FAIL - error when sending data *
* *
* Author: Alexei Vladishev *
* *
******************************************************************************/
-static int send_buffer(zbx_vector_ptr_t *addrs)
+static int send_buffer(zbx_vector_ptr_t *addrs, zbx_vector_pre_persistent_t *prep_vec)
{
ZBX_ACTIVE_BUFFER_ELEMENT *el;
int ret = SUCCEED, i, now, level;
@@ -837,6 +890,12 @@ static int send_buffer(zbx_vector_ptr_t *addrs)
if (SUCCEED == ret)
{
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ zbx_write_persistent_files(prep_vec);
+ zbx_clean_pre_persistent_elements(prep_vec);
+#else
+ ZBX_UNUSED(prep_vec);
+#endif
/* free buffer */
for (i = 0; i < buffer.count; i++)
{
@@ -877,8 +936,8 @@ ret:
* *
* Purpose: Buffer new value or send the whole buffer to the server *
* *
- * Parameters: server - IP or Hostname of Zabbix server *
- * port - port of Zabbix server *
+ * Parameters: addrs - vector with a pair of Zabbix server IP or *
+ * Hostname and port number *
* host - name of host in Zabbix database *
* key - name of metric *
* value - key value or error message why an item became *
@@ -909,9 +968,9 @@ ret:
* *
******************************************************************************/
static int process_value(zbx_vector_ptr_t *addrs, const char *host, const char *key,
- const char *value, unsigned char state, zbx_uint64_t *lastlogsize, int *mtime,
- unsigned long *timestamp, const char *source, unsigned short *severity, unsigned long *logeventid,
- unsigned char flags)
+ const char *value, unsigned char state, zbx_uint64_t *lastlogsize, const int *mtime,
+ const unsigned long *timestamp, const char *source, const unsigned short *severity,
+ const unsigned long *logeventid, unsigned char flags)
{
ZBX_ACTIVE_BUFFER_ELEMENT *el = NULL;
int i, ret = FAIL;
@@ -932,7 +991,7 @@ static int process_value(zbx_vector_ptr_t *addrs, const char *host, const char *
}
}
- /* do not sent data from buffer if host/key are the same as previous unless buffer is full already */
+ /* do not send data from buffer if host/key are the same as previous unless buffer is full already */
if (0 < buffer.count)
{
el = &buffer.data[buffer.count - 1];
@@ -941,7 +1000,7 @@ static int process_value(zbx_vector_ptr_t *addrs, const char *host, const char *
CONFIG_BUFFER_SIZE <= buffer.count ||
0 != strcmp(el->key, key) || 0 != strcmp(el->host, host))
{
- send_buffer(addrs);
+ send_buffer(addrs, &pre_persistent_vec);
}
}
@@ -989,7 +1048,7 @@ static int process_value(zbx_vector_ptr_t *addrs, const char *host, const char *
zbx_free(el->source);
}
- sz = (CONFIG_BUFFER_SIZE - i - 1) * sizeof(ZBX_ACTIVE_BUFFER_ELEMENT);
+ sz = (size_t)(CONFIG_BUFFER_SIZE - i - 1) * sizeof(ZBX_ACTIVE_BUFFER_ELEMENT);
memmove(&buffer.data[i], &buffer.data[i + 1], sz);
zabbix_log(LOG_LEVEL_DEBUG, "buffer full: new element %d", buffer.count - 1);
@@ -1024,6 +1083,14 @@ static int process_value(zbx_vector_ptr_t *addrs, const char *host, const char *
if (0 != (ZBX_METRIC_FLAG_PERSISTENT & flags))
buffer.pcount++;
+ /* If conditions are met then send buffer now. It is necessary for synchronization */
+ /* between sending data to server and writing of persistent files. */
+ if ((0 != (flags & ZBX_METRIC_FLAG_PERSISTENT) && CONFIG_BUFFER_SIZE / 2 <= buffer.pcount) ||
+ CONFIG_BUFFER_SIZE <= buffer.count)
+ {
+ send_buffer(addrs, &pre_persistent_vec);
+ }
+
ret = SUCCEED;
out:
zabbix_log(LOG_LEVEL_DEBUG, "End of %s():%s", __func__, zbx_result_string(ret));
@@ -1106,10 +1173,54 @@ out:
return ret;
}
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+/******************************************************************************
+ * *
+ * Function: zbx_minimal_init_prep_vec_data *
+ * *
+ * Purpose: initialize an element of preparation vector with available data *
+ * *
+ * Parameters: lastlogsize - [IN] lastlogize value to write into persistent *
+ * data file *
+ * mtime - [IN] mtime value to write into persistent data *
+ * file *
+ * prep_vec_elem - [IN/OUT] element of vector to initialize *
+ * *
+ * Comments: this is a minimal initialization for using before sending status *
+ * updates or meta-data. It initializes only 2 attributes to be *
+ * usable without any data about log files. *
+ * *
+ ******************************************************************************/
+static void zbx_minimal_init_prep_vec_data(zbx_uint64_t lastlogsize, int mtime, zbx_pre_persistent_t *prep_vec_elem)
+{
+ if (NULL != prep_vec_elem->filename)
+ zbx_free(prep_vec_elem->filename); /* filename == NULL should be checked when preparing JSON */
+ /* for writing as most attributes are not initialized */
+ prep_vec_elem->processed_size = lastlogsize;
+ prep_vec_elem->mtime = mtime;
+}
+
+static void zbx_fill_prep_vec_element(zbx_vector_pre_persistent_t *prep_vec, const char *key,
+ const char *persistent_file_name, const struct st_logfile *logfile, const zbx_uint64_t lastlogsize,
+ const int mtime)
+{
+ /* index in preparation vector */
+ int idx = zbx_find_or_create_prep_vec_element(prep_vec, key, persistent_file_name);
+
+ if (NULL != logfile)
+ {
+ zbx_init_prep_vec_data(logfile, prep_vec->values + idx);
+ zbx_update_prep_vec_data(logfile, logfile->processed_size, prep_vec->values + idx);
+ }
+ else
+ zbx_minimal_init_prep_vec_data(lastlogsize, mtime, prep_vec->values + idx);
+}
+#endif /* not WINDOWS, not __MINGW32__ */
+
static void process_active_checks(zbx_vector_ptr_t *addrs)
{
char *error = NULL;
- int i, now, ret;
+ int i, now;
zabbix_log(LOG_LEVEL_DEBUG, "In %s() server:'%s' port:%hu", __func__, ((zbx_addr_t *)addrs->values[0])->ip,
((zbx_addr_t *)addrs->values[0])->port);
@@ -1119,10 +1230,8 @@ static void process_active_checks(zbx_vector_ptr_t *addrs)
for (i = 0; i < active_metrics.values_num; i++)
{
zbx_uint64_t lastlogsize_last, lastlogsize_sent;
- int mtime_last, mtime_sent;
- ZBX_ACTIVE_METRIC *metric;
-
- metric = (ZBX_ACTIVE_METRIC *)active_metrics.values[i];
+ int mtime_last, mtime_sent, ret;
+ ZBX_ACTIVE_METRIC *metric = (ZBX_ACTIVE_METRIC *)active_metrics.values[i];
if (metric->nextcheck > now)
continue;
@@ -1143,25 +1252,42 @@ static void process_active_checks(zbx_vector_ptr_t *addrs)
else if (0 != ((ZBX_METRIC_FLAG_LOG_LOG | ZBX_METRIC_FLAG_LOG_LOGRT) & metric->flags))
{
ret = process_log_check(addrs, &regexps, metric, process_value, &lastlogsize_sent,
- &mtime_sent, &error);
+ &mtime_sent, &error, &pre_persistent_vec);
}
else if (0 != (ZBX_METRIC_FLAG_LOG_EVENTLOG & metric->flags))
+ {
ret = process_eventlog_check(addrs, &regexps, metric, process_value, &lastlogsize_sent, &error);
+ }
else
ret = process_common_check(addrs, metric, &error);
if (SUCCEED != ret)
{
- const char *perror;
-
- perror = (NULL != error ? error : ZBX_NOTSUPPORTED_MSG);
+ const char *perror = (NULL != error ? error : ZBX_NOTSUPPORTED_MSG);
metric->state = ITEM_STATE_NOTSUPPORTED;
metric->error_count = 0;
metric->processed_bytes = 0;
zabbix_log(LOG_LEVEL_WARNING, "active check \"%s\" is not supported: %s", metric->key, perror);
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ /* only for log*[] items */
+ if (0 != ((ZBX_METRIC_FLAG_LOG_LOG | ZBX_METRIC_FLAG_LOG_LOGRT) & metric->flags) &&
+ NULL != metric->persistent_file_name)
+ {
+ const struct st_logfile *logfile = NULL;
+
+ if (0 < metric->logfiles_num)
+ {
+ logfile = find_last_processed_file_in_logfiles_list(metric->logfiles,
+ metric->logfiles_num);
+ }
+ zbx_fill_prep_vec_element(&pre_persistent_vec, metric->key_orig,
+ metric->persistent_file_name, logfile, metric->lastlogsize,
+ metric->mtime);
+ }
+#endif
process_value(addrs, CONFIG_HOSTNAME, metric->key_orig, perror, ITEM_STATE_NOTSUPPORTED,
&metric->lastlogsize, &metric->mtime, NULL, NULL, NULL, NULL, metric->flags);
@@ -1171,9 +1297,7 @@ static void process_active_checks(zbx_vector_ptr_t *addrs)
{
if (0 == metric->error_count)
{
- unsigned char old_state;
-
- old_state = metric->state;
+ unsigned char old_state = metric->state;
if (ITEM_STATE_NOTSUPPORTED == metric->state)
{
@@ -1184,6 +1308,22 @@ static void process_active_checks(zbx_vector_ptr_t *addrs)
if (SUCCEED == need_meta_update(metric, lastlogsize_sent, mtime_sent, old_state,
lastlogsize_last, mtime_last))
{
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ if (NULL != metric->persistent_file_name)
+ {
+ const struct st_logfile *logfile = NULL;
+
+ if (0 < metric->logfiles_num)
+ {
+ logfile = find_last_processed_file_in_logfiles_list(
+ metric->logfiles, metric->logfiles_num);
+ }
+
+ zbx_fill_prep_vec_element(&pre_persistent_vec, metric->key_orig,
+ metric->persistent_file_name, logfile,
+ metric->lastlogsize, metric->mtime);
+ }
+#endif
/* meta information update */
process_value(addrs, CONFIG_HOSTNAME, metric->key_orig, NULL,
metric->state, &metric->lastlogsize, &metric->mtime, NULL, NULL,
@@ -1195,7 +1335,7 @@ static void process_active_checks(zbx_vector_ptr_t *addrs)
}
}
- send_buffer(addrs);
+ send_buffer(addrs, &pre_persistent_vec);
metric->nextcheck = (int)time(NULL) + metric->refresh;
}
@@ -1228,6 +1368,14 @@ static void update_schedule(int delta)
buffer.lastsent += delta;
}
+#ifndef _WINDOWS
+static void zbx_active_checks_sigusr_handler(int flags)
+{
+ if (ZBX_RTC_USER_PARAMETERS_RELOAD == ZBX_RTC_GET_MSG(flags))
+ need_update_userparam = 1;
+}
+#endif
+
ZBX_THREAD_ENTRY(active_checks_thread, args)
{
ZBX_THREAD_ACTIVECHK_ARGS activechk_args;
@@ -1258,13 +1406,26 @@ ZBX_THREAD_ENTRY(active_checks_thread, args)
#endif
init_active_metrics();
+#ifndef _WINDOWS
+ zbx_set_sigusr_handler(zbx_active_checks_sigusr_handler);
+#endif
+
while (ZBX_IS_RUNNING())
{
+#ifndef _WINDOWS
+ if (1 == need_update_userparam)
+ {
+ zbx_setproctitle("active checks #%d [reloading user parameters]", process_num);
+ reload_user_parameters(process_type, process_num);
+ need_update_userparam = 0;
+ }
+#endif
+
zbx_update_env(zbx_time());
if ((now = time(NULL)) >= nextsend)
{
- send_buffer(&activechk_args.addrs);
+ send_buffer(&activechk_args.addrs, &pre_persistent_vec);
nextsend = time(NULL) + 1;
}
@@ -1280,6 +1441,9 @@ ZBX_THREAD_ENTRY(active_checks_thread, args)
{
nextrefresh = time(NULL) + CONFIG_REFRESH_ACTIVE_CHECKS;
}
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ zbx_remove_inactive_persistent_files(&persistent_inactive_vec);
+#endif
}
if (now >= nextcheck && CONFIG_BUFFER_SIZE / 2 > buffer.pcount)
diff --git a/src/zabbix_agent/listener.c b/src/zabbix_agent/listener.c
index 243836bb568..b91b1bcb5b2 100644
--- a/src/zabbix_agent/listener.c
+++ b/src/zabbix_agent/listener.c
@@ -40,6 +40,10 @@ extern ZBX_THREAD_LOCAL int server_num, process_num;
#include "zbxcrypto.h"
#include "../libs/zbxcrypto/tls_tcp_active.h"
+#ifndef _WINDOWS
+static volatile sig_atomic_t need_update_userparam;
+#endif
+
static void process_listener(zbx_socket_t *s)
{
AGENT_RESULT result;
@@ -99,6 +103,14 @@ static void process_listener(zbx_socket_t *s)
zabbix_log(LOG_LEVEL_DEBUG, "Process listener error: %s", zbx_socket_strerror());
}
+#ifndef _WINDOWS
+static void zbx_listener_sigusr_handler(int flags)
+{
+ if (ZBX_RTC_USER_PARAMETERS_RELOAD == ZBX_RTC_GET_MSG(flags))
+ need_update_userparam = 1;
+}
+#endif
+
ZBX_THREAD_ENTRY(listener_thread, args)
{
#if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
@@ -124,8 +136,22 @@ ZBX_THREAD_ENTRY(listener_thread, args)
#if defined(HAVE_GNUTLS) || defined(HAVE_OPENSSL)
zbx_tls_init_child();
#endif
+
+#ifndef _WINDOWS
+ zbx_set_sigusr_handler(zbx_listener_sigusr_handler);
+#endif
+
while (ZBX_IS_RUNNING())
{
+#ifndef _WINDOWS
+ if (1 == need_update_userparam)
+ {
+ zbx_setproctitle("listener #%d [reloading user parameters]", process_num);
+ reload_user_parameters(process_type, process_num);
+ need_update_userparam = 0;
+ }
+#endif
+
zbx_setproctitle("listener #%d [waiting for connection]", process_num);
ret = zbx_tcp_accept(&s, configured_tls_accept_modes);
zbx_update_env(zbx_time());
diff --git a/src/zabbix_agent/logfiles/Makefile.am b/src/zabbix_agent/logfiles/Makefile.am
index 795bee6ae86..a85fef6aba7 100644
--- a/src/zabbix_agent/logfiles/Makefile.am
+++ b/src/zabbix_agent/logfiles/Makefile.am
@@ -4,6 +4,6 @@ noinst_LIBRARIES = libzbxlogfiles.a
libzbxlogfiles_a_SOURCES = \
logfiles.c logfiles.h \
+ persistent_state.c persistent_state.h \
../metrics.h
-
-
+
diff --git a/src/zabbix_agent/logfiles/logfiles.c b/src/zabbix_agent/logfiles/logfiles.c
index 77397a9ce61..87d5b2e99a2 100644
--- a/src/zabbix_agent/logfiles/logfiles.c
+++ b/src/zabbix_agent/logfiles/logfiles.c
@@ -21,13 +21,15 @@
#include "logfiles.h"
#include "log.h"
#include "sysinfo.h"
+#include "persistent_state.h"
+#include "cfg.h"
#if defined(_WINDOWS) || defined(__MINGW32__)
# include "symbols.h"
# include "zbxtypes.h" /* ssize_t */
#endif /* _WINDOWS */
-#define MAX_LEN_MD5 512 /* maximum size of the initial part of the file to calculate MD5 sum for */
+#define MAX_LEN_MD5 512 /* maximum size of the first and the last blocks of the file to calculate MD5 sum for */
#define ZBX_SAME_FILE_ERROR -1
#define ZBX_SAME_FILE_NO 0
@@ -235,13 +237,14 @@ out:
/******************************************************************************
* *
- * Function: file_start_md5 *
+ * Function: file_part_md5 *
* *
- * Purpose: calculate the MD5 sum of the first block of the file *
+ * Purpose: calculate the MD5 sum of the specified part of the file *
* *
* Parameters: *
* f - [IN] file descriptor *
- * length - [IN] length of the block in bytes. Maximum is 512 bytes. *
+ * offset - [IN] start position of the part *
+ * length - [IN] length of the part in bytes. Maximum is 512 bytes. *
* md5buf - [OUT] output buffer, MD5_DIGEST_SIZE-bytes long, where the *
* calculated MD5 sum is placed *
* filename - [IN] file name, used in error logging *
@@ -250,7 +253,8 @@ out:
* Return value: SUCCEED or FAIL *
* *
******************************************************************************/
-static int file_start_md5(int f, int length, md5_byte_t *md5buf, const char *filename, char **err_msg)
+static int file_part_md5(int f, size_t offset, int length, md5_byte_t *md5buf, const char *filename,
+ char **err_msg)
{
md5_state_t state;
char buf[MAX_LEN_MD5];
@@ -258,15 +262,15 @@ static int file_start_md5(int f, int length, md5_byte_t *md5buf, const char *fil
if (MAX_LEN_MD5 < length)
{
- *err_msg = zbx_dsprintf(*err_msg, "Length %d exceeds maximum MD5 fragment length of %d.", length,
+ *err_msg = zbx_dsprintf(*err_msg, "Length %d exceeds maximum MD5 fragment length %d.", length,
MAX_LEN_MD5);
return FAIL;
}
- if ((zbx_offset_t)-1 == zbx_lseek(f, 0, SEEK_SET))
+ if ((zbx_offset_t)-1 == zbx_lseek(f, offset, SEEK_SET))
{
- *err_msg = zbx_dsprintf(*err_msg, "Cannot set position to 0 for file \"%s\": %s", filename,
- zbx_strerror(errno));
+ *err_msg = zbx_dsprintf(*err_msg, "Cannot set position to " ZBX_FS_SIZE_T " for file \"%s\": %s",
+ (zbx_fs_size_t)offset, filename, zbx_strerror(errno));
return FAIL;
}
@@ -447,23 +451,26 @@ static int set_use_ino_by_fs_type(const char *path, int *use_ino, char **err_msg
******************************************************************************/
static void print_logfile_list(const struct st_logfile *logfiles, int logfiles_num)
{
- int i;
-
- for (i = 0; i < logfiles_num; i++)
+ if (SUCCEED == ZBX_CHECK_LOG_LEVEL(LOG_LEVEL_DEBUG))
{
- zabbix_log(LOG_LEVEL_DEBUG, " nr:%d filename:'%s' mtime:%d size:" ZBX_FS_UI64 " processed_size:"
- ZBX_FS_UI64 " seq:%d copy_of:%d incomplete:%d dev:" ZBX_FS_UI64 " ino_hi:" ZBX_FS_UI64
- " ino_lo:" ZBX_FS_UI64
- " md5size:%d md5buf:%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
- i, logfiles[i].filename, logfiles[i].mtime, logfiles[i].size,
- logfiles[i].processed_size, logfiles[i].seq, logfiles[i].copy_of,
- logfiles[i].incomplete, logfiles[i].dev, logfiles[i].ino_hi, logfiles[i].ino_lo,
- logfiles[i].md5size, logfiles[i].md5buf[0], logfiles[i].md5buf[1],
- logfiles[i].md5buf[2], logfiles[i].md5buf[3], logfiles[i].md5buf[4],
- logfiles[i].md5buf[5], logfiles[i].md5buf[6], logfiles[i].md5buf[7],
- logfiles[i].md5buf[8], logfiles[i].md5buf[9], logfiles[i].md5buf[10],
- logfiles[i].md5buf[11], logfiles[i].md5buf[12], logfiles[i].md5buf[13],
- logfiles[i].md5buf[14], logfiles[i].md5buf[15]);
+ int i;
+
+ for (i = 0; i < logfiles_num; i++)
+ {
+ char first_buf[ZBX_MD5_PRINT_BUF_LEN], last_buf[ZBX_MD5_PRINT_BUF_LEN];
+
+ zbx_md5buf2str(logfiles[i].first_block_md5, first_buf);
+ zbx_md5buf2str(logfiles[i].last_block_md5, last_buf);
+
+ zabbix_log(LOG_LEVEL_DEBUG, " nr:%d filename:'%s' mtime:%d size:" ZBX_FS_UI64
+ " processed_size:" ZBX_FS_UI64 " seq:%d copy_of:%d incomplete:%d dev:"
+ ZBX_FS_UI64 " ino_hi:" ZBX_FS_UI64 " ino_lo:" ZBX_FS_UI64 " md5_block_size:%d"
+ " first_block_md5:%s last_block_offset:" ZBX_FS_UI64 " last_block_md5:%s", i,
+ logfiles[i].filename, logfiles[i].mtime, logfiles[i].size,
+ logfiles[i].processed_size, logfiles[i].seq, logfiles[i].copy_of,
+ logfiles[i].incomplete, logfiles[i].dev, logfiles[i].ino_hi, logfiles[i].ino_lo,
+ logfiles[i].md5_block_size, first_buf, logfiles[i].last_block_offset, last_buf);
+ }
}
}
@@ -531,6 +538,8 @@ static int open_file_helper(const char *pathname, char **err_msg)
* Parameters: fd - [IN] file descriptor to close *
* pathname - [IN] pathname of file, used for error reporting *
* err_msg - [IN/OUT] error message why file could not be closed *
+ * unless an earlier error has been already *
+ * reported *
* *
* Return value: SUCCEED or FAIL *
* *
@@ -540,7 +549,8 @@ static int close_file_helper(int fd, const char *pathname, char **err_msg)
if (0 == close(fd))
return SUCCEED;
- *err_msg = zbx_dsprintf(*err_msg, "Cannot close file \"%s\": %s", pathname, zbx_strerror(errno));
+ if (NULL == *err_msg)
+ *err_msg = zbx_dsprintf(NULL, "Cannot close file \"%s\": %s", pathname, zbx_strerror(errno));
return FAIL;
}
@@ -549,19 +559,19 @@ static int close_file_helper(int fd, const char *pathname, char **err_msg)
* *
* Function: examine_md5_and_place *
* *
- * Purpose: from MD5 sums of initial blocks and places of 2 files make *
- * a conclusion is it the same file, a pair 'original/copy' or *
- * 2 different files *
+ * Purpose: from MD5 sums of blocks and places of 2 files make a conclusion *
+ * is it the same file, a pair 'original/copy' or 2 different files *
* *
- * Parameters: buf1 - [IN] MD5 sum of initial block of he 1st file *
- * buf2 - [IN] MD5 sum of initial block of he 2nd file *
+ * Parameters: buf1 - [IN] MD5 sum of block in the 1st file *
+ * buf2 - [IN] MD5 sum of block in the 2nd file *
+ * size - [IN] size of MD5 sum *
* is_same_place - [IN] equality of file places *
* *
* Return value: ZBX_SAME_FILE_NO - they are 2 different files *
* ZBX_SAME_FILE_YES - 2 files are (assumed) to be the same *
* ZBX_SAME_FILE_COPY - one file is copy of the other *
* *
- * Comments: in case files places are unknown but MD5 sums of initial blocks *
+ * Comments: in case files places are unknown but MD5 sums of block pairs *
* match it is assumed to be the same file *
* *
******************************************************************************/
@@ -614,13 +624,12 @@ static int examine_md5_and_place(const md5_byte_t *buf1, const md5_byte_t *buf2,
static int is_same_file_logcpt(const struct st_logfile *old_file, const struct st_logfile *new_file, int use_ino,
const struct st_logfile *new_files, int num_new, char **err_msg)
{
- int is_same_place, ret = ZBX_SAME_FILE_NO, found_matching_md5 = 0, same_name_in_new_list = 0, i, f;
- md5_byte_t md5tmp[MD5_DIGEST_SIZE];
+ int is_same_place, ret = ZBX_SAME_FILE_NO, found_matching_md5 = 0, same_name_in_new_list = 0, i, f;
if (old_file->mtime > new_file->mtime)
return ZBX_SAME_FILE_NO;
- if (-1 == old_file->md5size || -1 == new_file->md5size)
+ if (-1 == old_file->md5_block_size || -1 == new_file->md5_block_size)
{
/* Cannot compare MD5 sums. Assume two different files - reporting twice is better than skipping. */
return ZBX_SAME_FILE_NO;
@@ -628,27 +637,57 @@ static int is_same_file_logcpt(const struct st_logfile *old_file, const struct s
is_same_place = compare_file_places(old_file, new_file, use_ino);
- if (old_file->md5size == new_file->md5size)
+ if (old_file->md5_block_size == new_file->md5_block_size &&
+ old_file->last_block_offset == new_file->last_block_offset)
{
- return examine_md5_and_place(old_file->md5buf, new_file->md5buf, sizeof(new_file->md5buf),
- is_same_place);
+ if (ZBX_SAME_FILE_NO == (ret = examine_md5_and_place(old_file->first_block_md5,
+ new_file->first_block_md5, sizeof(new_file->first_block_md5), is_same_place)))
+ {
+ return ret;
+ }
+
+ return examine_md5_and_place(old_file->last_block_md5, new_file->last_block_md5,
+ sizeof(new_file->last_block_md5), is_same_place);
}
- if (0 == old_file->md5size || 0 == new_file->md5size)
+ if (0 == old_file->md5_block_size || 0 == new_file->md5_block_size)
return ZBX_SAME_FILE_NO;
- /* MD5 sums have been calculated from initial blocks of different sizes */
+ /* MD5 sums have been calculated from blocks of different sizes or last blocks offsets differ */
- if (old_file->md5size < new_file->md5size)
+ if (old_file->md5_block_size < new_file->md5_block_size ||
+ (old_file->md5_block_size == new_file->md5_block_size &&
+ old_file->last_block_offset != new_file->last_block_offset))
{
+ md5_byte_t md5tmp[MD5_DIGEST_SIZE];
+
if (-1 == (f = open_file_helper(new_file->filename, err_msg)))
return ZBX_SAME_FILE_ERROR;
- if (SUCCEED == file_start_md5(f, old_file->md5size, md5tmp, new_file->filename, err_msg))
- ret = examine_md5_and_place(old_file->md5buf, md5tmp, sizeof(md5tmp), is_same_place);
- else
+ if (SUCCEED != file_part_md5(f, 0, old_file->md5_block_size, md5tmp, new_file->filename, err_msg))
+ {
ret = ZBX_SAME_FILE_ERROR;
+ goto clean1;
+ }
+ if (ZBX_SAME_FILE_NO == (ret = examine_md5_and_place(old_file->first_block_md5, md5tmp, sizeof(md5tmp),
+ is_same_place)))
+ {
+ goto clean1;
+ }
+
+ if (0 < old_file->last_block_offset)
+ {
+ if (SUCCEED != file_part_md5(f, old_file->last_block_offset, old_file->md5_block_size, md5tmp,
+ new_file->filename, err_msg))
+ {
+ ret = ZBX_SAME_FILE_ERROR;
+ goto clean1;
+ }
+
+ ret = examine_md5_and_place(old_file->last_block_md5, md5tmp, sizeof(md5tmp), is_same_place);
+ }
+clean1:
if (0 != close(f) && ZBX_SAME_FILE_ERROR != ret)
{
*err_msg = zbx_dsprintf(*err_msg, "Cannot close file \"%s\": %s",
@@ -659,10 +698,10 @@ static int is_same_file_logcpt(const struct st_logfile *old_file, const struct s
return ret;
}
- /* old_file->md5size > new_file->md5size. */
+ /* Remaining case: old_file->md5_block_size > new_file->md5_block_size */
- /* Now it is necessary to read the first 'new_file->md5size' bytes of */
- /* the old file to calculate MD5 sum to compare. Unfortunately we */
+ /* Now it is necessary to read the first 'new_file->md5_block_size' bytes */
+ /* of the old file to calculate MD5 sum to compare. Unfortunately we */
/* cannot reliably use 'old_file->filename' to open the file because: */
/* - being from the old list it might be no longer available, */
/* - it can have a different name in the new file list; */
@@ -671,7 +710,9 @@ static int is_same_file_logcpt(const struct st_logfile *old_file, const struct s
for (i = 0; i < num_new; i++)
{
- if ((zbx_uint64_t)new_file->md5size > new_files[i].size)
+ md5_byte_t md5tmp[MD5_DIGEST_SIZE];
+
+ if ((zbx_uint64_t)new_file->md5_block_size > new_files[i].size)
continue;
if (0 == strcmp(old_file->filename, new_file->filename) ||
@@ -684,17 +725,34 @@ static int is_same_file_logcpt(const struct st_logfile *old_file, const struct s
if (-1 == (f = open_file_helper(new_files[i].filename, err_msg)))
return ZBX_SAME_FILE_ERROR;
- if (SUCCEED == file_start_md5(f, new_file->md5size, md5tmp, new_files[i].filename, err_msg))
+ if (SUCCEED != file_part_md5(f, 0, new_file->md5_block_size, md5tmp, new_files[i].filename, err_msg))
{
- ret = examine_md5_and_place(new_file->md5buf, md5tmp, sizeof(md5tmp),
- compare_file_places(old_file, new_files + i, use_ino));
+ ret = ZBX_SAME_FILE_ERROR;
+ goto clean2;
+ }
+
+ if (ZBX_SAME_FILE_NO == (ret = examine_md5_and_place(new_file->first_block_md5, md5tmp, sizeof(md5tmp),
+ compare_file_places(old_file, new_files + i, use_ino))))
+ {
+ goto clean2;
+ }
+
+ if (0 < new_file->last_block_offset)
+ {
+ if (SUCCEED != file_part_md5(f, new_file->last_block_offset, new_file->md5_block_size, md5tmp,
+ new_files[i].filename, err_msg))
+ {
+ ret = ZBX_SAME_FILE_ERROR;
+ goto clean2;
+ }
- if (ZBX_SAME_FILE_YES == ret || ZBX_SAME_FILE_COPY == ret)
- found_matching_md5 = 1;
+ ret = examine_md5_and_place(new_file->last_block_md5, md5tmp, sizeof(md5tmp),
+ compare_file_places(old_file, new_files + i, use_ino));
}
- else
- ret = ZBX_SAME_FILE_ERROR;
+ if (ZBX_SAME_FILE_YES == ret || ZBX_SAME_FILE_COPY == ret)
+ found_matching_md5 = 1;
+clean2:
if (0 != close(f) && ZBX_SAME_FILE_ERROR != ret)
{
*err_msg = zbx_dsprintf(*err_msg, "Cannot close file \"%s\": %s", new_files[i].filename,
@@ -708,19 +766,38 @@ static int is_same_file_logcpt(const struct st_logfile *old_file, const struct s
if (0 == found_matching_md5 && 0 == same_name_in_new_list)
{
+ md5_byte_t md5tmp[MD5_DIGEST_SIZE];
+
/* last try - opening file with the name from the old list */
if (-1 == (f = open_file_helper(old_file->filename, err_msg)))
return ZBX_SAME_FILE_NO; /* not an error if it is no longer available */
- if (SUCCEED == file_start_md5(f, new_file->md5size, md5tmp, old_file->filename, err_msg))
+ if (SUCCEED != file_part_md5(f, 0, new_file->md5_block_size, md5tmp, old_file->filename, err_msg))
{
- ret = examine_md5_and_place(new_file->md5buf, md5tmp, sizeof(md5tmp),
- compare_file_places(old_file, new_file, use_ino));
- }
- else
ret = ZBX_SAME_FILE_NO;
+ goto clean3;
+ }
+ if (ZBX_SAME_FILE_NO == (ret = examine_md5_and_place(new_file->first_block_md5, md5tmp, sizeof(md5tmp),
+ compare_file_places(old_file, new_file, use_ino))))
+ {
+ goto clean3;
+ }
+
+ if (0 < new_file->last_block_offset)
+ {
+ if (SUCCEED != file_part_md5(f, new_file->last_block_offset, new_file->md5_block_size, md5tmp,
+ old_file->filename, err_msg))
+ {
+ ret = ZBX_SAME_FILE_NO;
+ goto clean3;
+ }
+
+ ret = examine_md5_and_place(new_file->last_block_md5, md5tmp, sizeof(md5tmp),
+ compare_file_places(old_file, new_file, use_ino));
+ }
+clean3:
if (0 != close(f))
{
*err_msg = zbx_dsprintf(*err_msg, "Cannot close file \"%s\": %s", old_file->filename,
@@ -753,8 +830,8 @@ static int is_same_file_logcpt(const struct st_logfile *old_file, const struct s
* *
* Return value: ZBX_SAME_FILE_NO - it is not the same file, *
* ZBX_SAME_FILE_YES - it could be the same file, *
- * ZBX_SAME_FILE_ERROR - error. *
- * ZBX_SAME_FILE_RETRY - retry on the next check *
+ * ZBX_SAME_FILE_ERROR - error, *
+ * ZBX_SAME_FILE_RETRY - retry on the next check. *
* *
* Comments: In some cases we can say that it IS NOT the same file. *
* We can never say that it IS the same file and it has not been *
@@ -771,27 +848,75 @@ static int is_same_file_logrt(const struct st_logfile *old_file, const struct st
if (ZBX_FILE_PLACE_OTHER == compare_file_places(old_file, new_file, use_ino))
{
- /* files cannot reside on different devices or occupy different inodes */
+ /* files cannot reside on different devices or occupy different inodes and be the same */
return ZBX_SAME_FILE_NO;
}
- if (old_file->size > new_file->size)
+ if (old_file->size > new_file->size || old_file->processed_size > new_file->size)
{
/* File size cannot decrease. Truncating or replacing a file with a smaller one */
/* counts as 2 different files. */
return ZBX_SAME_FILE_NO;
}
+ /* the old file and the new file occupy the same device and inode (index), */
+ /* the new file is not smaller than the old one */
+
if (old_file->size == new_file->size && old_file->mtime < new_file->mtime)
{
- /* Depending on file system it's possible that stat() was called */
- /* between mtime and file size update. In this situation we will */
- /* get a file with the old size and a new mtime. */
+ int same_first_block = 0, same_last_block = 0;
+
+ if (0 < old_file->md5_block_size && old_file->md5_block_size == new_file->md5_block_size)
+ {
+ if (0 != memcmp(old_file->first_block_md5, new_file->first_block_md5,
+ sizeof(new_file->first_block_md5)))
+ {
+ return ZBX_SAME_FILE_NO;
+ }
+
+ same_first_block = 1;
+
+ if (old_file->last_block_offset == new_file->last_block_offset)
+ {
+ if (0 != memcmp(old_file->last_block_md5, new_file->last_block_md5,
+ sizeof(new_file->last_block_md5)))
+ {
+ return ZBX_SAME_FILE_NO;
+ }
+
+ same_last_block = 1;
+ }
+ }
+
+ /* There is one problematic case: log file size stays the same */
+ /* but its modification time (mtime) changes. This can be caused */
+ /* by 3 scenarios: */
+ /* 1) the log file is rewritten with the same content at the */
+ /* same location on disk. Very rare but possible. */
+ /* 2) depending on file system it's possible that stat() was */
+ /* called between mtime and file size update. In this */
+ /* situation the agent registers a file with the old size */
+ /* and a new mtime. */
+ /* 3) application somehow "touch"-es the log file: mtime */
+ /* increases, size does not. */
+ /* */
+ /* Agent cannot distinguish between these cases. Only users */
+ /* familiar with their applications and log file rotation can */
+ /* know which scenario takes place with which log file. */
+ /* Most users would choose "noreread" option (it is not enabled */
+ /* by default!) to handle it as the same log file without no */
+ /* new records to report. */
+ /* Some users might want to handle it as a new log file (it is */
+ /* the default setting) (e.g. for log*.count[] purpose). */
+
+ if (0 != same_first_block && 0 != same_last_block && ZBX_LOG_ROTATION_NO_REREAD == options)
+ return ZBX_SAME_FILE_YES;
+
/* On the first try we assume it's the same file, just its size */
/* has not been changed yet. */
/* If the size has not changed on the next check, then we assume */
/* that some tampering was done and to be safe we will treat it */
- /* as a different file. */
+ /* as a different file unless "noreread" option is specified. */
if (0 == old_file->retry)
{
if (ZBX_LOG_ROTATION_NO_REREAD != options)
@@ -817,29 +942,38 @@ static int is_same_file_logrt(const struct st_logfile *old_file, const struct st
return ZBX_SAME_FILE_NO;
}
- if (-1 == old_file->md5size || -1 == new_file->md5size)
+ if (-1 == old_file->md5_block_size || -1 == new_file->md5_block_size)
{
/* Cannot compare MD5 sums. Assume two different files - reporting twice is better than skipping. */
return ZBX_SAME_FILE_NO;
}
- if (old_file->md5size > new_file->md5size)
+ if (old_file->md5_block_size > new_file->md5_block_size)
{
/* file initial block size from which MD5 sum is calculated cannot decrease */
return ZBX_SAME_FILE_NO;
}
- if (old_file->md5size == new_file->md5size)
+ if (old_file->md5_block_size == new_file->md5_block_size)
{
- if (0 != memcmp(old_file->md5buf, new_file->md5buf, sizeof(new_file->md5buf))) /* MD5 sums differ */
+ if (0 != memcmp(old_file->first_block_md5, new_file->first_block_md5,
+ sizeof(new_file->first_block_md5)))
+ {
return ZBX_SAME_FILE_NO;
+ }
- return ZBX_SAME_FILE_YES;
+ if (old_file->last_block_offset == new_file->last_block_offset &&
+ 0 == memcmp(old_file->last_block_md5, new_file->last_block_md5,
+ sizeof(new_file->last_block_md5)))
+ {
+ return ZBX_SAME_FILE_YES;
+ }
}
- if (0 < old_file->md5size)
+ if (0 < old_file->md5_block_size)
{
- /* MD5 for the old file has been calculated from a smaller block than for the new file */
+ /* MD5 for the old file has been calculated from a smaller block or */
+ /* with a different offset than for the new file */
int f, ret;
md5_byte_t md5tmp[MD5_DIGEST_SIZE];
@@ -847,22 +981,41 @@ static int is_same_file_logrt(const struct st_logfile *old_file, const struct st
if (-1 == (f = open_file_helper(new_file->filename, err_msg)))
return ZBX_SAME_FILE_ERROR;
- if (SUCCEED == file_start_md5(f, old_file->md5size, md5tmp, new_file->filename, err_msg))
+ if (SUCCEED != file_part_md5(f, 0, old_file->md5_block_size, md5tmp, new_file->filename, err_msg))
{
- ret = (0 == memcmp(old_file->md5buf, &md5tmp, sizeof(md5tmp))) ? ZBX_SAME_FILE_YES :
- ZBX_SAME_FILE_NO;
+ ret = ZBX_SAME_FILE_ERROR;
+ goto clean;
}
- else
+
+ if (0 != memcmp(old_file->first_block_md5, md5tmp, sizeof(md5tmp)))
+ {
+ ret = ZBX_SAME_FILE_NO;
+ goto clean;
+ }
+
+ if (0 == old_file->last_block_offset)
+ {
+ ret = ZBX_SAME_FILE_YES;
+ goto clean;
+ }
+
+ if (SUCCEED != file_part_md5(f, old_file->last_block_offset, old_file->md5_block_size, md5tmp,
+ new_file->filename, err_msg))
+ {
ret = ZBX_SAME_FILE_ERROR;
+ goto clean;
+ }
- if (0 != close(f))
+ if (0 == memcmp(old_file->last_block_md5, md5tmp, sizeof(md5tmp)))
+ ret = ZBX_SAME_FILE_YES;
+ else
+ ret = ZBX_SAME_FILE_NO;
+clean:
+ if (0 != close(f) && ZBX_SAME_FILE_ERROR != ret)
{
- if (ZBX_SAME_FILE_ERROR != ret)
- {
- *err_msg = zbx_dsprintf(*err_msg, "Cannot close file \"%s\": %s", new_file->filename,
- zbx_strerror(errno));
- ret = ZBX_SAME_FILE_ERROR;
- }
+ *err_msg = zbx_dsprintf(*err_msg, "Cannot close file \"%s\": %s", new_file->filename,
+ zbx_strerror(errno));
+ ret = ZBX_SAME_FILE_ERROR;
}
return ret;
@@ -1339,7 +1492,7 @@ static int find_old2new(const char * const old2new, int num_new, int i_old)
static void add_logfile(struct st_logfile **logfiles, int *logfiles_alloc, int *logfiles_num, const char *filename,
zbx_stat_t *st)
{
- int i = 0, cmp = 0;
+ int i = 0;
zabbix_log(LOG_LEVEL_DEBUG, "In %s() filename:'%s' mtime:%d size:" ZBX_FS_UI64, __func__, filename,
(int)st->st_mtime, (zbx_uint64_t)st->st_size);
@@ -1377,7 +1530,9 @@ static void add_logfile(struct st_logfile **logfiles, int *logfiles_alloc, int *
if (st->st_mtime == (*logfiles)[i].mtime)
{
- if (0 > (cmp = strcmp(filename, (*logfiles)[i].filename)))
+ int cmp = strcmp(filename, (*logfiles)[i].filename);
+
+ if (0 > cmp)
continue; /* (2) sort by descending name */
if (0 == cmp)
@@ -1403,18 +1558,20 @@ static void add_logfile(struct st_logfile **logfiles, int *logfiles_alloc, int *
(*logfiles)[i].filename = zbx_strdup(NULL, filename);
(*logfiles)[i].mtime = (int)st->st_mtime;
- (*logfiles)[i].md5size = -1;
(*logfiles)[i].seq = 0;
+ (*logfiles)[i].retry = 0;
(*logfiles)[i].incomplete = 0;
(*logfiles)[i].copy_of = -1;
-#if !defined(_WINDOWS) && !defined(__MINGW32__)
+#if !defined(_WINDOWS) && !defined(__MINGW32__) /* on MS Windows these attributes are not initialized here */
(*logfiles)[i].dev = (zbx_uint64_t)st->st_dev;
(*logfiles)[i].ino_lo = (zbx_uint64_t)st->st_ino;
(*logfiles)[i].ino_hi = 0;
#endif
(*logfiles)[i].size = (zbx_uint64_t)st->st_size;
(*logfiles)[i].processed_size = 0;
- (*logfiles)[i].retry = 0;
+ (*logfiles)[i].md5_block_size = -1;
+ (*logfiles)[i].last_block_offset = 0;
+ /* 'first_block_md5' and 'last_block_md5' are not initialized here */
++(*logfiles_num);
out:
@@ -1528,14 +1685,12 @@ static int pick_logfiles(const char *directory, int mtime, const zbx_regexp_t *r
{
#if defined(_WINDOWS) || defined(__MINGW32__)
int ret = FAIL;
- char *find_path = NULL, *file_name_utf8;
- wchar_t *find_wpath = NULL;
intptr_t find_handle;
struct _wfinddata_t find_data;
/* "open" Windows directory */
- find_path = zbx_dsprintf(find_path, "%s*", directory);
- find_wpath = zbx_utf8_to_unicode(find_path);
+ char *find_path = zbx_dsprintf(NULL, "%s*", directory);
+ wchar_t *find_wpath = zbx_utf8_to_unicode(find_path);
if (-1 == (find_handle = _wfindfirst(find_wpath, &find_data)))
{
@@ -1551,7 +1706,8 @@ static int pick_logfiles(const char *directory, int mtime, const zbx_regexp_t *r
do
{
- file_name_utf8 = zbx_unicode_to_utf8(find_data.name);
+ char *file_name_utf8 = zbx_unicode_to_utf8(find_data.name);
+
pick_logfile(directory, file_name_utf8, mtime, re, logfiles, logfiles_alloc, logfiles_num);
zbx_free(file_name_utf8);
}
@@ -1584,9 +1740,7 @@ clean:
*use_ino = 1;
while (NULL != (d_ent = readdir(dir)))
- {
pick_logfile(directory, d_ent->d_name, mtime, re, logfiles, logfiles_alloc, logfiles_num);
- }
if (-1 == closedir(dir))
{
@@ -1645,9 +1799,9 @@ static int compile_filename_regexp(const char *filename_regexp, zbx_regexp_t **r
* *
******************************************************************************/
#if defined(_WINDOWS) || defined(__MINGW32__)
-static int fill_file_details(struct st_logfile **logfiles, int logfiles_num, int use_ino, char **err_msg)
+static int fill_file_details(struct st_logfile *logfiles, int logfiles_num, int use_ino, char **err_msg)
#else
-static int fill_file_details(struct st_logfile **logfiles, int logfiles_num, char **err_msg)
+static int fill_file_details(struct st_logfile *logfiles, int logfiles_num, char **err_msg)
#endif
{
int i, ret = SUCCEED;
@@ -1658,15 +1812,32 @@ static int fill_file_details(struct st_logfile **logfiles, int logfiles_num, cha
for (i = 0; i < logfiles_num; i++)
{
int f;
- struct st_logfile *p = *logfiles + i;
+ struct st_logfile *p = logfiles + i;
if (-1 == (f = open_file_helper(p->filename, err_msg)))
return FAIL;
- p->md5size = (zbx_uint64_t)MAX_LEN_MD5 > p->size ? (int)p->size : MAX_LEN_MD5;
+ /* get MD5 sums of the first and the last blocks */
+
+ p->md5_block_size = (int)MIN(MAX_LEN_MD5, p->size);
- if (SUCCEED != (ret = file_start_md5(f, p->md5size, p->md5buf, p->filename, err_msg)))
+ if (SUCCEED != (ret = file_part_md5(f, 0, p->md5_block_size, p->first_block_md5, p->filename,
+ err_msg)))
+ {
goto clean;
+ }
+
+ if (0 < (p->last_block_offset = p->size - (size_t)p->md5_block_size))
+ {
+ if (SUCCEED != (ret = file_part_md5(f, p->last_block_offset, p->md5_block_size,
+ p->last_block_md5, p->filename, err_msg)))
+ {
+ goto clean;
+ }
+ }
+ else /* file is small, set the last block MD5 equal to the first block's one */
+ memcpy(p->last_block_md5, p->first_block_md5, sizeof(p->last_block_md5));
+
#if defined(_WINDOWS) || defined(__MINGW32__)
ret = file_id(f, use_ino, &p->dev, &p->ino_lo, &p->ino_hi, p->filename, err_msg);
#endif /*_WINDOWS*/
@@ -1772,6 +1943,8 @@ static int make_logfile_list(unsigned char flags, const char *filename, int mtim
{
zabbix_log(LOG_LEVEL_WARNING, "insufficient access rights (no \"execute\" permission) "
"to directory \"%s\": %s", directory, zbx_strerror(errno));
+ /* No access could be a transient condition if file rotation is manipulating */
+ /* directories. Therefore 'ret' is not set to FAIL or ZBX_NO_FILE_ERROR here. */
}
else
{
@@ -1791,12 +1964,17 @@ clean1:
goto clean;
}
else
+ {
THIS_SHOULD_NEVER_HAPPEN;
+ *err_msg = zbx_dsprintf(*err_msg, "%s(): internal error: invalid flags:%hhu", __func__, flags);
+ ret = FAIL;
+ goto clean;
+ }
#if defined(_WINDOWS) || defined(__MINGW32__)
- ret = fill_file_details(logfiles, *logfiles_num, *use_ino, err_msg);
+ ret = fill_file_details(*logfiles, *logfiles_num, *use_ino, err_msg);
#else
- ret = fill_file_details(logfiles, *logfiles_num, err_msg);
+ ret = fill_file_details(*logfiles, *logfiles_num, err_msg);
#endif
clean:
if ((FAIL == ret || ZBX_NO_FILE_ERROR == ret) && NULL != *logfiles)
@@ -1880,6 +2058,17 @@ static char *buf_find_newline(char *p, char **p_next, const char *p_end, const c
}
}
+static int zbx_match_log_rec(const zbx_vector_ptr_t *regexps, const char *value, const char *pattern,
+ const char *output_template, char **output, char **err_msg)
+{
+ int ret;
+
+ if (FAIL == (ret = regexp_sub_ex(regexps, value, pattern, ZBX_CASE_SENSITIVE, output_template, output)))
+ *err_msg = zbx_dsprintf(*err_msg, "cannot compile regular expression");
+
+ return ret; /* ZBX_REGEXP_MATCH, ZBX_REGEXP_NO_MATCH or FAIL */
+}
+
/******************************************************************************
* *
* Function: zbx_read2 *
@@ -1887,11 +2076,12 @@ static char *buf_find_newline(char *p, char **p_next, const char *p_end, const c
* Comments: Thread-safe *
* *
******************************************************************************/
-static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int *mtime, int *big_rec,
- int *incomplete, char **err_msg, const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern,
+static int zbx_read2(int fd, unsigned char flags, struct st_logfile *logfile, zbx_uint64_t *lastlogsize,
+ const int *mtime, int *big_rec, const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern,
const char *output_template, int *p_count, int *s_count, zbx_process_value_func_t process_value,
zbx_vector_ptr_t *addrs, const char *hostname, const char *key,
- zbx_uint64_t *lastlogsize_sent, int *mtime_sent)
+ zbx_uint64_t *lastlogsize_sent, int *mtime_sent, const char *persistent_file_name,
+ zbx_vector_pre_persistent_t *prep_vec, char **err_msg)
{
static ZBX_THREAD_LOCAL char *buf = NULL;
@@ -1900,13 +2090,15 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
char *p_start, *p, *p_nl, *p_next, *item_value = NULL;
size_t szbyte;
zbx_offset_t offset;
- int send_err;
- zbx_uint64_t lastlogsize1;
+ const int is_count_item = (0 != (ZBX_METRIC_FLAG_LOG_COUNT & flags)) ? 1 : 0;
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ int prep_vec_idx = -1; /* index in 'prep_vec' vector */
+#endif
+ zbx_uint64_t processed_size;
#define BUF_SIZE (256 * ZBX_KIBIBYTE) /* The longest encodings use 4 bytes for every character. To send */
/* up to 64 k characters to Zabbix server a 256 kB buffer might be */
/* required. */
-
if (NULL == buf)
buf = (char *)zbx_malloc(buf, (size_t)(BUF_SIZE + 1));
@@ -1929,9 +2121,7 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
goto out;
}
- nbytes = (int)read(fd, buf, (size_t)BUF_SIZE);
-
- if (-1 == nbytes)
+ if (-1 == (nbytes = (int)read(fd, buf, (size_t)BUF_SIZE)))
{
/* error on read */
*big_rec = 0;
@@ -1954,7 +2144,7 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
if (NULL == (p_nl = buf_find_newline(p, &p_next, p_end, cr, lf, szbyte)))
{
if (p_end > p)
- *incomplete = 1;
+ logfile->incomplete = 1;
if (BUF_SIZE > nbytes)
{
@@ -1977,6 +2167,7 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
/* database). */
char *value;
+ int send_err;
buf[BUF_SIZE] = '\0';
@@ -1990,21 +2181,47 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
" will be analyzed, the rest will be ignored while Zabbix agent"
" is running.", value);
- lastlogsize1 = (size_t)offset + (size_t)nbytes;
+ processed_size = (size_t)offset + (size_t)nbytes;
send_err = FAIL;
- if (0 == (ZBX_METRIC_FLAG_LOG_COUNT & flags)) /* log[] or logrt[] */
+ regexp_ret = zbx_match_log_rec(regexps, value, pattern,
+ (0 == is_count_item) ? output_template : NULL,
+ (0 == is_count_item) ? &item_value : NULL, err_msg);
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ if (NULL != persistent_file_name && (ZBX_REGEXP_MATCH == regexp_ret ||
+ ZBX_REGEXP_NO_MATCH == regexp_ret))
{
- if (ZBX_REGEXP_MATCH == (regexp_ret = regexp_sub_ex(regexps, value,
- pattern, ZBX_CASE_SENSITIVE, output_template,
- &item_value)))
+ /* Prepare 'prep_vec' element even if the current record won't match. */
+ /* Its mtime and lastlogsize could be sent to server later as */
+ /* metadata update, then a persistent file should be written. */
+ /* 'prep_vec' can be emptied at any call to process_value() which */
+ /* calls send_buffer(), so be ready to reinitialize. */
+ if (-1 == prep_vec_idx || 0 == prep_vec->values_num)
+ {
+ prep_vec_idx = zbx_find_or_create_prep_vec_element(prep_vec,
+ key, persistent_file_name);
+ zbx_init_prep_vec_data(logfile,
+ prep_vec->values + prep_vec_idx);
+ }
+
+ zbx_update_prep_vec_data(logfile, processed_size,
+ prep_vec->values + prep_vec_idx);
+ }
+#else
+ ZBX_UNUSED(persistent_file_name);
+ ZBX_UNUSED(prep_vec);
+#endif
+ if (ZBX_REGEXP_MATCH == regexp_ret)
+ {
+ if (0 == is_count_item) /* log[] or logrt[] */
{
if (SUCCEED == (send_err = process_value(addrs, hostname, key,
item_value, ITEM_STATE_NORMAL,
- &lastlogsize1, mtime, NULL, NULL, NULL, NULL,
+ &processed_size, mtime, NULL, NULL, NULL, NULL,
flags | ZBX_METRIC_FLAG_PERSISTENT)))
{
- *lastlogsize_sent = lastlogsize1;
+ *lastlogsize_sent = processed_size;
+
if (NULL != mtime_sent)
*mtime_sent = *mtime;
@@ -2015,20 +2232,17 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
{
zbx_free(item_value);
+ if ('\0' != *encoding)
+ zbx_free(value);
+
/* Sending of buffer failed. */
/* Try to resend it in the next check. */
ret = SUCCEED;
goto out;
}
}
- }
- else /* log.count[] or logrt.count[] */
- {
- if (ZBX_REGEXP_MATCH == (regexp_ret = regexp_sub_ex(regexps, value,
- pattern, ZBX_CASE_SENSITIVE, NULL, NULL)))
- {
+ else /* log.count[] or logrt.count[] */
(*s_count)--;
- }
}
if ('\0' != *encoding)
@@ -2036,17 +2250,16 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
if (FAIL == regexp_ret)
{
- *err_msg = zbx_dsprintf(*err_msg, "cannot compile regular expression");
ret = FAIL;
goto out;
}
(*p_count)--;
- if (0 != (ZBX_METRIC_FLAG_LOG_COUNT & flags) ||
+ if (0 != is_count_item ||
ZBX_REGEXP_NO_MATCH == regexp_ret || SUCCEED == send_err)
{
- *lastlogsize = lastlogsize1;
+ *lastlogsize = processed_size;
*big_rec = 1; /* ignore the rest of this record */
}
}
@@ -2062,7 +2275,7 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
{
/* the "newline" was found, so there is at least one complete record */
/* (or trailing part of a large record) in the buffer */
- *incomplete = 0;
+ logfile->incomplete = 0;
for (;;)
{
@@ -2076,6 +2289,7 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
if (0 == *big_rec)
{
char *value;
+ int send_err;
*p_nl = '\0';
@@ -2084,21 +2298,44 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
else
value = p_start;
- lastlogsize1 = (size_t)offset + (size_t)(p_next - buf);
+ processed_size = (size_t)offset + (size_t)(p_next - buf);
send_err = FAIL;
- if (0 == (ZBX_METRIC_FLAG_LOG_COUNT & flags)) /* log[] or logrt[] */
+ regexp_ret = zbx_match_log_rec(regexps, value, pattern,
+ (0 == is_count_item) ? output_template : NULL,
+ (0 == is_count_item) ? &item_value : NULL, err_msg);
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ if (NULL != persistent_file_name && (ZBX_REGEXP_MATCH == regexp_ret ||
+ ZBX_REGEXP_NO_MATCH == regexp_ret))
{
- if (ZBX_REGEXP_MATCH == (regexp_ret = regexp_sub_ex(regexps, value,
- pattern, ZBX_CASE_SENSITIVE, output_template,
- &item_value)))
+ /* Prepare 'prep_vec' element even if the current record won't match. */
+ /* Its mtime and lastlogsize could be sent to server later as */
+ /* metadata update, then a persistent file should be written. */
+ /* 'prep_vec' can be emptied at any call to process_value() which */
+ /* calls send_buffer(), so be ready to reinitialize. */
+ if (-1 == prep_vec_idx || 0 == prep_vec->values_num)
+ {
+ prep_vec_idx = zbx_find_or_create_prep_vec_element(prep_vec,
+ key, persistent_file_name);
+ zbx_init_prep_vec_data(logfile,
+ prep_vec->values + prep_vec_idx);
+ }
+
+ zbx_update_prep_vec_data(logfile, processed_size,
+ prep_vec->values + prep_vec_idx);
+ }
+#endif
+ if (ZBX_REGEXP_MATCH == regexp_ret)
+ {
+ if (0 == is_count_item) /* log[] or logrt[] */
{
if (SUCCEED == (send_err = process_value(addrs, hostname, key,
item_value, ITEM_STATE_NORMAL,
- &lastlogsize1, mtime, NULL, NULL, NULL, NULL,
+ &processed_size, mtime, NULL, NULL, NULL, NULL,
flags | ZBX_METRIC_FLAG_PERSISTENT)))
{
- *lastlogsize_sent = lastlogsize1;
+ *lastlogsize_sent = processed_size;
+
if (NULL != mtime_sent)
*mtime_sent = *mtime;
@@ -2109,20 +2346,17 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
{
zbx_free(item_value);
+ if ('\0' != *encoding)
+ zbx_free(value);
+
/* Sending of buffer failed. */
/* Try to resend it in the next check. */
ret = SUCCEED;
goto out;
}
}
- }
- else /* log.count[] or logrt.count[] */
- {
- if (ZBX_REGEXP_MATCH == (regexp_ret = regexp_sub_ex(regexps, value,
- pattern, ZBX_CASE_SENSITIVE, NULL, NULL)))
- {
+ else /* log.count[] or logrt.count[] */
(*s_count)--;
- }
}
if ('\0' != *encoding)
@@ -2130,17 +2364,16 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
if (FAIL == regexp_ret)
{
- *err_msg = zbx_dsprintf(*err_msg, "cannot compile regular expression");
ret = FAIL;
goto out;
}
(*p_count)--;
- if (0 != (ZBX_METRIC_FLAG_LOG_COUNT & flags) ||
+ if (0 != is_count_item ||
ZBX_REGEXP_NO_MATCH == regexp_ret || SUCCEED == send_err)
{
- *lastlogsize = lastlogsize1;
+ *lastlogsize = processed_size;
}
}
else
@@ -2159,7 +2392,7 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
/* There are no complete records in the buffer. */
/* Try to read more data from this position if available. */
if (p_end > p)
- *incomplete = 1;
+ logfile->incomplete = 1;
if ((zbx_offset_t)-1 == zbx_lseek(fd, *lastlogsize, SEEK_SET))
{
@@ -2172,7 +2405,7 @@ static int zbx_read2(int fd, unsigned char flags, zbx_uint64_t *lastlogsize, int
break;
}
else
- *incomplete = 0;
+ logfile->incomplete = 0;
}
}
}
@@ -2192,7 +2425,7 @@ out:
* Parameters: *
* flags - [IN] bit flags with item type: log, logrt, log.count *
* or logrt.count *
- * filename - [IN] logfile name *
+ * logfile - [IN/OUT] logfile attributes *
* lastlogsize - [IN/OUT] offset from the beginning of the file *
* mtime - [IN/OUT] file modification time for reporting to *
* server *
@@ -2202,11 +2435,6 @@ out:
* jump to the end *
* big_rec - [IN/OUT] state variable to remember whether a long *
* record is being processed *
- * incomplete - [OUT] 0 - the last record ended with a newline, *
- * 1 - there was no newline at the end of the last *
- * record. *
- * err_msg - [IN/OUT] error message why an item became *
- * NOTSUPPORTED *
* encoding - [IN] text string describing encoding. *
* See function find_cr_lf_szbyte() for supported *
* encodings. *
@@ -2224,6 +2452,11 @@ out:
* key - [IN] item key the data belongs to *
* processed_bytes - [OUT] number of processed bytes in logfile *
* seek_offset - [IN] position to seek in file *
+ * persistent_file_name - [IN] name of file for saving persistent data *
+ * prep_vec - [IN/OUT] vector with data for writing into *
+ * persistent files *
+ * err_msg - [IN/OUT] error message why an item became *
+ * NOTSUPPORTED *
* *
* Return value: returns SUCCEED on successful reading, *
* FAIL on other cases *
@@ -2236,19 +2469,20 @@ out:
* Thread-safe *
* *
******************************************************************************/
-static int process_log(unsigned char flags, const char *filename, zbx_uint64_t *lastlogsize, int *mtime,
+static int process_log(unsigned char flags, struct st_logfile *logfile, zbx_uint64_t *lastlogsize, int *mtime,
zbx_uint64_t *lastlogsize_sent, int *mtime_sent, unsigned char *skip_old_data, int *big_rec,
- int *incomplete, char **err_msg, const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern,
- const char *output_template, int *p_count, int *s_count, zbx_process_value_func_t process_value,
- zbx_vector_ptr_t *addrs, const char *hostname, const char *key,
- zbx_uint64_t *processed_bytes, zbx_uint64_t seek_offset)
+ const char *encoding, zbx_vector_ptr_t *regexps, const char *pattern, const char *output_template,
+ int *p_count, int *s_count, zbx_process_value_func_t process_value, zbx_vector_ptr_t *addrs,
+ const char *hostname, const char *key, zbx_uint64_t *processed_bytes, zbx_uint64_t seek_offset,
+ const char *persistent_file_name, zbx_vector_pre_persistent_t *prep_vec, char **err_msg)
{
int f, ret = FAIL;
zabbix_log(LOG_LEVEL_DEBUG, "In %s() filename:'%s' lastlogsize:" ZBX_FS_UI64 " mtime:%d seek_offset:"
- ZBX_FS_UI64, __func__, filename, *lastlogsize, NULL != mtime ? *mtime : 0, seek_offset);
+ ZBX_FS_UI64, __func__, logfile->filename, *lastlogsize, NULL != mtime ? *mtime : 0,
+ seek_offset);
- if (-1 == (f = open_file_helper(filename, err_msg)))
+ if (-1 == (f = open_file_helper(logfile->filename, err_msg)))
goto out;
if ((zbx_offset_t)-1 != zbx_lseek(f, seek_offset, SEEK_SET))
@@ -2256,9 +2490,9 @@ static int process_log(unsigned char flags, const char *filename, zbx_uint64_t *
*lastlogsize = seek_offset;
*skip_old_data = 0;
- if (SUCCEED == (ret = zbx_read2(f, flags, lastlogsize, mtime, big_rec, incomplete, err_msg, encoding,
- regexps, pattern, output_template, p_count, s_count, process_value, addrs,
- hostname, key, lastlogsize_sent, mtime_sent)))
+ if (SUCCEED == (ret = zbx_read2(f, flags, logfile, lastlogsize, mtime, big_rec, encoding, regexps,
+ pattern, output_template, p_count, s_count, process_value, addrs, hostname, key,
+ lastlogsize_sent, mtime_sent, persistent_file_name, prep_vec, err_msg)))
{
*processed_bytes = *lastlogsize - seek_offset;
}
@@ -2266,14 +2500,14 @@ static int process_log(unsigned char flags, const char *filename, zbx_uint64_t *
else
{
*err_msg = zbx_dsprintf(*err_msg, "Cannot set position to " ZBX_FS_UI64 " in file \"%s\": %s",
- seek_offset, filename, zbx_strerror(errno));
+ seek_offset, logfile->filename, zbx_strerror(errno));
}
- if (SUCCEED != close_file_helper(f, filename, err_msg))
+ if (SUCCEED != close_file_helper(f, logfile->filename, err_msg))
ret = FAIL;
out:
zabbix_log(LOG_LEVEL_DEBUG, "End of %s() filename:'%s' lastlogsize:" ZBX_FS_UI64 " mtime:%d ret:%s"
- " processed_bytes:" ZBX_FS_UI64, __func__, filename, *lastlogsize,
+ " processed_bytes:" ZBX_FS_UI64, __func__, logfile->filename, *lastlogsize,
NULL != mtime ? *mtime : 0, zbx_result_string(ret),
SUCCEED == ret ? *processed_bytes : (zbx_uint64_t)0);
@@ -2377,29 +2611,55 @@ static void ensure_order_if_mtimes_equal(const struct st_logfile *logfiles_old,
}
}
-static int files_start_with_same_md5(const struct st_logfile *log1, const struct st_logfile *log2)
+/******************************************************************************
+ * *
+ * Function: files_have_same_blocks_md5 *
+ * *
+ * Purpose: compare MD5 sums of first and last blocks between 2 files. If MD5 *
+ * sums have been calculated for blocks of different sizes or *
+ * offsets then open the log file with larger size of blocks and get *
+ * MD5 for the smaller size *
+ * *
+ * Parameters: *
+ * log1 - [IN] log file 1 attributes *
+ * log2 - [IN] log file 2 attributes *
+ * *
+ * Return value: SUCCEED or FAIL *
+ * *
+ * Comments: Use this function to compare log files from the 'new' file list. *
+ * DO NOT use it with a file which belongs to the 'old' list (the *
+ * old file name now could point to different file) *
+ * *
+ ******************************************************************************/
+static int files_have_same_blocks_md5(const struct st_logfile *log1, const struct st_logfile *log2)
{
- if (-1 == log1->md5size || -1 == log2->md5size)
+ if (-1 == log1->md5_block_size || -1 == log2->md5_block_size)
return FAIL;
- if (log1->md5size == log2->md5size) /* this works for empty files, too */
+ if (log1->md5_block_size == log2->md5_block_size) /* this works for empty files, too */
{
- if (0 == memcmp(log1->md5buf, log2->md5buf, sizeof(log1->md5buf)))
- return SUCCEED;
- else
+ if (0 != memcmp(log1->first_block_md5, log2->first_block_md5, sizeof(log1->first_block_md5)))
return FAIL;
+
+ if (log1->last_block_offset == log2->last_block_offset)
+ {
+ if (0 != memcmp(log1->last_block_md5, log2->last_block_md5, sizeof(log1->last_block_md5)))
+ return FAIL;
+
+ return SUCCEED;
+ }
}
- /* we have MD5 sums, but they are calculated from blocks of different sizes */
+ /* we have MD5 sums but they were calculated from blocks of different sizes or offsets */
- if (0 < log1->md5size && 0 < log2->md5size)
+ if (0 < log1->md5_block_size && 0 < log2->md5_block_size)
{
const struct st_logfile *file_smaller, *file_larger;
int fd, ret = FAIL;
char *err_msg = NULL; /* required, but not used */
md5_byte_t md5tmp[MD5_DIGEST_SIZE];
- if (log1->md5size < log2->md5size)
+ if (log1->md5_block_size < log2->md5_block_size)
{
file_smaller = log1;
file_larger = log2;
@@ -2413,12 +2673,27 @@ static int files_start_with_same_md5(const struct st_logfile *log1, const struct
if (-1 == (fd = zbx_open(file_larger->filename, O_RDONLY)))
return FAIL;
- if (SUCCEED == file_start_md5(fd, file_smaller->md5size, md5tmp, "", &err_msg))
+ if (SUCCEED != file_part_md5(fd, 0, file_smaller->md5_block_size, md5tmp, "", &err_msg))
+ goto clean;
+
+ if (0 != memcmp(file_smaller->first_block_md5, md5tmp, sizeof(md5tmp)))
+ goto clean;
+
+ if (0 == file_smaller->last_block_offset)
{
- if (0 == memcmp(file_smaller->md5buf, md5tmp, sizeof(md5tmp)))
- ret = SUCCEED;
+ ret = SUCCEED;
+ goto clean;
+ }
+
+ if (SUCCEED != file_part_md5(fd, file_smaller->last_block_offset, file_smaller->md5_block_size, md5tmp,
+ "", &err_msg))
+ {
+ goto clean;
}
+ if (0 == memcmp(file_smaller->last_block_md5, md5tmp, sizeof(md5tmp)))
+ ret = SUCCEED;
+clean:
zbx_free(err_msg);
close(fd);
@@ -2439,7 +2714,7 @@ static void handle_multiple_copies(struct st_logfile *logfiles, int logfiles_num
for (j = i + 1; j < logfiles_num; j++)
{
- if (SUCCEED == files_start_with_same_md5(logfiles + i, logfiles + j))
+ if (SUCCEED == files_have_same_blocks_md5(logfiles + i, logfiles + j))
{
/* logfiles[i] and logfiles[j] are original and copy (or vice versa). */
/* If logfiles[i] has been at least partially processed then transfer its */
@@ -2487,7 +2762,7 @@ static void delay_update_if_copies(struct st_logfile *logfiles, int logfiles_num
if (0 == logfiles[j].size)
continue;
- if (SUCCEED == files_start_with_same_md5(logfiles + i, logfiles + j))
+ if (SUCCEED == files_have_same_blocks_md5(logfiles + i, logfiles + j))
{
int more_processed;
@@ -2530,7 +2805,7 @@ static zbx_uint64_t max_processed_size_in_copies(const struct st_logfile *logfil
for (j = 0; j < logfiles_num; j++)
{
- if (i != j && SUCCEED == files_start_with_same_md5(logfiles + i, logfiles + j))
+ if (i != j && SUCCEED == files_have_same_blocks_md5(logfiles + i, logfiles + j))
{
/* logfiles[i] and logfiles[j] are original and copy (or vice versa). */
if (max_processed < logfiles[j].processed_size)
@@ -3056,6 +3331,9 @@ static int update_new_list_from_old(zbx_log_rotation_options_t rotation_type, st
* start_time - [IN/OUT] start time of check *
* processed_bytes - [IN/OUT] number of bytes processed *
* rotation_type - [IN] simple rotation or copy/truncate rotation *
+ * persistent_file_name - [IN] name of file for saving persistent data *
+ * prep_vec - [IN/OUT] vector with data for writing into *
+ * persistent files *
* *
* Return value: returns SUCCEED on successful reading, *
* FAIL on other cases *
@@ -3063,14 +3341,15 @@ static int update_new_list_from_old(zbx_log_rotation_options_t rotation_type, st
* Comments: Supposed to be thread-safe, see pick_logfiles() comments. *
* *
******************************************************************************/
-int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastlogsize, int *mtime,
+static int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastlogsize, int *mtime,
zbx_uint64_t *lastlogsize_sent, int *mtime_sent, unsigned char *skip_old_data, int *big_rec,
- int *use_ino, char **err_msg, struct st_logfile **logfiles_old, const int *logfiles_num_old,
+ int *use_ino, char **err_msg, struct st_logfile **logfiles_old, int logfiles_num_old,
struct st_logfile **logfiles_new, int *logfiles_num_new, const char *encoding,
zbx_vector_ptr_t *regexps, const char *pattern, const char *output_template, int *p_count, int *s_count,
zbx_process_value_func_t process_value, zbx_vector_ptr_t *addrs, const char *hostname,
const char *key, int *jumped, float max_delay, double *start_time, zbx_uint64_t *processed_bytes,
- zbx_log_rotation_options_t rotation_type)
+ zbx_log_rotation_options_t rotation_type, const char *persistent_file_name,
+ zbx_vector_pre_persistent_t *prep_vec)
{
int i, start_idx, ret = FAIL, logfiles_num = 0, logfiles_alloc = 0, seq = 1,
from_first_file = 1, last_processed, limit_reached = 0, res;
@@ -3094,7 +3373,7 @@ int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastl
zabbix_log(LOG_LEVEL_DEBUG, "%s(): no files, setting skip_old_data to 0", __func__);
}
- if (0 != (ZBX_METRIC_FLAG_LOG_LOGRT & flags) && 0 == *logfiles_num_old)
+ if (0 != (ZBX_METRIC_FLAG_LOG_LOGRT & flags) && 0 == logfiles_num_old)
{
/* Both the old and the new log file lists are empty. That means the agent has not */
/* seen any log files for this logrt[] item since started. If log files appear later */
@@ -3131,8 +3410,8 @@ int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastl
else
start_idx = 0;
- if (0 < *logfiles_num_old && 0 < logfiles_num && SUCCEED != update_new_list_from_old(rotation_type,
- *logfiles_old, *logfiles_num_old, logfiles, logfiles_num, *use_ino, &seq, &start_idx,
+ if (0 < logfiles_num_old && 0 < logfiles_num && SUCCEED != update_new_list_from_old(rotation_type,
+ *logfiles_old, logfiles_num_old, logfiles, logfiles_num, *use_ino, &seq, &start_idx,
lastlogsize, err_msg))
{
destroy_logfile_list(&logfiles, &logfiles_alloc, &logfiles_num);
@@ -3146,7 +3425,7 @@ int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastl
{
zabbix_log(LOG_LEVEL_DEBUG, "%s() old file list:", __func__);
if (NULL != *logfiles_old)
- print_logfile_list(*logfiles_old, *logfiles_num_old);
+ print_logfile_list(*logfiles_old, logfiles_num_old);
else
zabbix_log(LOG_LEVEL_DEBUG, " file list empty");
@@ -3272,11 +3551,11 @@ int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastl
if (0 != process_this_file)
{
- ret = process_log(flags, logfiles[i].filename, lastlogsize, mtime, lastlogsize_sent,
- mtime_sent, skip_old_data, big_rec, &logfiles[i].incomplete, err_msg,
- encoding, regexps, pattern, output_template, p_count, s_count,
- process_value, addrs, hostname, key, &processed_bytes_tmp,
- seek_offset);
+ ret = process_log(flags, logfiles + i, lastlogsize, mtime, lastlogsize_sent,
+ mtime_sent, skip_old_data, big_rec, encoding, regexps, pattern,
+ output_template, p_count, s_count, process_value, addrs, hostname, key,
+ &processed_bytes_tmp, seek_offset, persistent_file_name, prep_vec,
+ err_msg);
/* process_log() advances 'lastlogsize' only on success therefore */
/* we do not check for errors here */
@@ -3342,7 +3621,61 @@ int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastl
*logfiles_num_new = logfiles_num;
if (0 < logfiles_num)
+ {
+ /* Try to update MD5 sums of initial blocks if they were calculated for small blocks. */
+ /* Log file processing has been done. Errors here only prevent updating MD5 sums for */
+ /* a single file but do not affect function return value. */
+ char *err_tmp = NULL;
+ int k;
+
+ for (k = 0; k < logfiles_num; k++)
+ {
+ if (MAX_LEN_MD5 > logfiles[k].md5_block_size &&
+ logfiles[k].size > (zbx_uint64_t)logfiles[k].md5_block_size)
+ {
+ int f, new_md5_block_size = (int)MIN(MAX_LEN_MD5, logfiles[k].size);
+ size_t new_last_block_offset;
+ md5_byte_t new_first_block_md5[MD5_DIGEST_SIZE],
+ new_last_block_md5[MD5_DIGEST_SIZE];
+
+ if (-1 == (f = zbx_open(logfiles[k].filename, O_RDONLY)))
+ continue;
+
+ if (SUCCEED != file_part_md5(f, 0, new_md5_block_size, new_first_block_md5,
+ logfiles[k].filename, &err_tmp))
+ {
+ zbx_free(err_tmp);
+ goto clean;
+ }
+
+ if (0 < (new_last_block_offset = logfiles[k].size - (size_t)new_md5_block_size))
+ {
+ if (SUCCEED != file_part_md5(f, new_last_block_offset,
+ new_md5_block_size, new_last_block_md5, logfiles[k].filename,
+ &err_tmp))
+ {
+ zbx_free(err_tmp);
+ goto clean;
+ }
+ }
+ else /* file is small, set the last block MD5 equal to the first block's one */
+ memcpy(new_last_block_md5, new_first_block_md5, sizeof(new_last_block_md5));
+
+ logfiles[k].md5_block_size = new_md5_block_size;
+ logfiles[k].last_block_offset = new_last_block_offset;
+
+ memcpy(logfiles[k].first_block_md5, new_first_block_md5,
+ sizeof(logfiles[k].first_block_md5));
+ memcpy(logfiles[k].last_block_md5, new_last_block_md5,
+ sizeof(logfiles[k].last_block_md5));
+clean:
+ if (0 != close(f))
+ continue;
+ }
+ }
+
*logfiles_new = logfiles;
+ }
out:
if (0.0f != max_delay)
{
@@ -3373,9 +3706,9 @@ static int check_number_of_parameters(unsigned char flags, const AGENT_REQUEST *
}
if (0 != (ZBX_METRIC_FLAG_LOG_COUNT & flags))
- max_parameter_num = 7; /* log.count or logrt.count */
+ max_parameter_num = 8; /* log.count or logrt.count */
else
- max_parameter_num = 8; /* log or logrt */
+ max_parameter_num = 9; /* log or logrt */
if (max_parameter_num < parameter_num)
{
@@ -3502,6 +3835,56 @@ err:
return FAIL;
}
+static int init_persistent_dir_parameter(const char *server, unsigned short port, const char *item_key,
+ int is_count_item, const AGENT_REQUEST *request, char **persistent_file_name, char **error)
+{
+ /* <persistent_dir> is parameter 8 for log[], logrt[], but parameter 7 for log.count[], logrt.count[] */
+ /* (here counting starts from 0) */
+
+ const int persistent_dir_param_nr = (0 == is_count_item) ? 8 : 7;
+ char *persistent_dir;
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ char *persistent_serv_dir;
+#endif
+
+ if (NULL == (persistent_dir = get_rparam(request, persistent_dir_param_nr)) || '\0' == *persistent_dir)
+ return SUCCEED;
+
+#if defined(_WINDOWS) || defined(__MINGW32__)
+ ZBX_UNUSED(server);
+ ZBX_UNUSED(port);
+ ZBX_UNUSED(item_key);
+ ZBX_UNUSED(persistent_file_name);
+
+ *error = zbx_dsprintf(*error, "The %s parameter (persistent directory) is not supported on Microsoft Windows.",
+ (8 == persistent_dir_param_nr) ? "ninth" : "eighth");
+ return FAIL;
+#else
+ if (NULL != *persistent_file_name) /* name is set, so all preparation has been done earlier */
+ return SUCCEED;
+
+ /* set up directory for persistent file */
+
+ if (SUCCEED != is_ascii_string(persistent_dir)) /* reject non-ASCII directory name */
+ {
+ *error = zbx_dsprintf(*error, "Invalid %s parameter. It contains non-ASCII characters.",
+ (8 == persistent_dir_param_nr) ? "ninth" : "eighth");
+ return FAIL;
+ }
+
+ if (NULL == (persistent_serv_dir = zbx_create_persistent_server_directory(persistent_dir, server, port, error)))
+ return FAIL;
+
+ *persistent_file_name = zbx_make_persistent_file_name(persistent_serv_dir, item_key);
+
+ zbx_free(persistent_serv_dir);
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): set persistent_file_name:[%s]", __func__, *persistent_file_name);
+
+ return SUCCEED;
+#endif
+}
+
/******************************************************************************
* *
* Function: process_log_check *
@@ -3515,7 +3898,7 @@ err:
******************************************************************************/
int process_log_check(zbx_vector_ptr_t *addrs, zbx_vector_ptr_t *regexps, ZBX_ACTIVE_METRIC *metric,
zbx_process_value_func_t process_value_cb, zbx_uint64_t *lastlogsize_sent, int *mtime_sent,
- char **error)
+ char **error, zbx_vector_pre_persistent_t *prep_vec)
{
AGENT_REQUEST request;
const char *filename, *regexp, *encoding, *skip, *output_template;
@@ -3535,10 +3918,10 @@ int process_log_check(zbx_vector_ptr_t *addrs, zbx_vector_ptr_t *regexps, ZBX_AC
init_request(&request);
/* Expected parameters by item: */
- /* log [file, <regexp>,<encoding>,<maxlines>, <mode>,<output>,<maxdelay>, <options>] 8 params */
- /* log.count [file, <regexp>,<encoding>,<maxproclines>,<mode>, <maxdelay>, <options>] 7 params */
- /* logrt [file_regexp,<regexp>,<encoding>,<maxlines>, <mode>,<output>,<maxdelay>, <options>] 8 params */
- /* logrt.count[file_regexp,<regexp>,<encoding>,<maxproclines>,<mode>, <maxdelay>, <options>] 7 params */
+ /* log [file, <regexp>,<encoding>,<maxlines>, <mode>,<output>,<maxdelay>, <options>,<persistent_dir>] 9 params */
+ /* log.count [file, <regexp>,<encoding>,<maxproclines>,<mode>, <maxdelay>, <options>,<persistent_dir>] 8 params */
+ /* logrt [file_regexp,<regexp>,<encoding>,<maxlines>, <mode>,<output>,<maxdelay>, <options>,<persistent_dir>] 9 params */
+ /* logrt.count[file_regexp,<regexp>,<encoding>,<maxproclines>,<mode>, <maxdelay>, <options>,<persistent_dir>] 8 params */
if (SUCCEED != parse_item_key(metric->key, &request))
{
@@ -3610,6 +3993,14 @@ int process_log_check(zbx_vector_ptr_t *addrs, zbx_vector_ptr_t *regexps, ZBX_AC
if (SUCCEED != init_rotation_type(metric->flags, &request, &rotation_type, error))
goto out;
+ /* parameter 'persistent_dir' */
+ if (SUCCEED != init_persistent_dir_parameter(((zbx_addr_t *)addrs->values[0])->ip,
+ ((zbx_addr_t *)addrs->values[0])->port, metric->key, is_count_item, &request,
+ &metric->persistent_file_name, error))
+ {
+ goto out;
+ }
+
/* jumping over fast growing log files is not supported with 'copytruncate' */
if (ZBX_LOG_ROTATION_LOGCPT == rotation_type && 0.0f != max_delay)
{
@@ -3646,12 +4037,89 @@ int process_log_check(zbx_vector_ptr_t *addrs, zbx_vector_ptr_t *regexps, ZBX_AC
/* not be sent to server. */
}
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+ /* recover state from persistent file only if agent has no already established state */
+ if (0 != (ZBX_METRIC_FLAG_NEW & metric->flags) && NULL != metric->persistent_file_name &&
+ 0 == metric->logfiles_num)
+ {
+ /* try to restore state from persistent file */
+ char *err_msg = NULL;
+ char buf[MAX_STRING_LEN];
+
+ if (SUCCEED == zbx_read_persistent_file(metric->persistent_file_name, buf, sizeof(buf), &err_msg))
+ {
+ zbx_uint64_t processed_size_tmp = 0;
+ int mtime_tmp = 0;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): item \"%s\": persistent file \"%s\" found, data:[%s]",
+ __func__, metric->key, metric->persistent_file_name, buf);
+
+ if (SUCCEED == zbx_restore_file_details(buf, &metric->logfiles, &metric->logfiles_num,
+ &processed_size_tmp, &mtime_tmp, &err_msg))
+ {
+ /* If 'lastlogsize' value from server is not equal to 'processed_size' from */
+ /* persistent file then give priority to persistent file to prevent unwanted */
+ /* re-reading of log file records. */
+ /* For 'mtime' give priority to persistent file only if server sent a smaller */
+ /* 'mtime' value' (unusual case, it should not happen). The value of 'mtime' */
+ /* from server larger than 'mtime' from persistent file most likely means */
+ /* that some other agent instance has analyzed log files up to server-supplied */
+ /* 'mtime' and the current instance needs not to start analysis from 'mtime' */
+ /* restored from persistent file. */
+
+ if (metric->lastlogsize != processed_size_tmp || metric->mtime < mtime_tmp)
+ {
+ char *msg = NULL;
+ size_t msg_alloc = 0, msg_offset = 0;
+
+ zbx_snprintf_alloc(&msg, &msg_alloc, &msg_offset, "%s(): item \"%s\":"
+ " overriding", __func__, metric->key);
+
+ if (metric->lastlogsize != processed_size_tmp)
+ {
+ zbx_snprintf_alloc(&msg, &msg_alloc, &msg_offset,
+ " lastlogsize: " ZBX_FS_UI64 " -> " ZBX_FS_UI64,
+ metric->lastlogsize, processed_size_tmp);
+
+ metric->lastlogsize = processed_size_tmp;
+ }
+
+ if (metric->mtime < mtime_tmp)
+ {
+ zbx_snprintf_alloc(&msg, &msg_alloc, &msg_offset,
+ " mtime: %d -> %d",
+ metric->mtime, mtime_tmp);
+
+ metric->mtime = mtime_tmp;
+ }
+
+ zabbix_log(LOG_LEVEL_WARNING, "%s from persistent file", msg);
+
+ zbx_free(msg);
+ }
+ }
+ else
+ {
+ zabbix_log(LOG_LEVEL_WARNING, "%s(): item \"%s\": persistent file \"%s\" restore error:"
+ " %s", __func__, metric->key, metric->persistent_file_name, err_msg);
+ zbx_free(err_msg);
+ }
+ }
+ else
+ {
+ /* persistent file errors are not fatal */
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): item \"%s\": persistent file [%s] does not exist or error:"
+ " %s", __func__, metric->key, metric->persistent_file_name, err_msg);
+ zbx_free(err_msg);
+ }
+ }
+#endif
ret = process_logrt(metric->flags, filename, &metric->lastlogsize, &metric->mtime, lastlogsize_sent, mtime_sent,
&metric->skip_old_data, &metric->big_rec, &metric->use_ino, error, &metric->logfiles,
- &metric->logfiles_num, &logfiles_new, &logfiles_num_new, encoding, regexps, regexp,
+ metric->logfiles_num, &logfiles_new, &logfiles_num_new, encoding, regexps, regexp,
output_template, &p_count, &s_count, process_value_cb, addrs, CONFIG_HOSTNAME,
metric->key_orig, &jumped, max_delay, &metric->start_time, &metric->processed_bytes,
- rotation_type);
+ rotation_type, metric->persistent_file_name, prep_vec);
if (0 == is_count_item && NULL != logfiles_new)
{
@@ -3739,3 +4207,25 @@ out:
return ret;
}
+
+struct st_logfile *find_last_processed_file_in_logfiles_list(struct st_logfile *logfiles, int logfiles_num)
+{
+ int i, max_seq = -1, last_file_idx = 0;
+
+ if (1 == logfiles_num)
+ return logfiles;
+
+ /* The last (at least partially) processed file is the one with the maximum 'seq' value. */
+ /* If no one file is processed then return pointer to the list first element. */
+
+ for (i = 0; i < logfiles_num; i++)
+ {
+ if (max_seq < logfiles[i].seq)
+ {
+ max_seq = logfiles[i].seq;
+ last_file_idx = i;
+ }
+ }
+
+ return logfiles + last_file_idx;
+}
diff --git a/src/zabbix_agent/logfiles/logfiles.h b/src/zabbix_agent/logfiles/logfiles.h
index 5a739e93d08..52e56ff10f9 100644
--- a/src/zabbix_agent/logfiles/logfiles.h
+++ b/src/zabbix_agent/logfiles/logfiles.h
@@ -23,6 +23,9 @@
#include "zbxregexp.h"
#include "md5.h"
#include "../metrics.h"
+#include "persistent_state.h"
+
+#define ZBX_MD5_PRINT_BUF_LEN ((MD5_DIGEST_SIZE) * 2 + 1) /* for MD5 sum representation with hex-digits */
typedef enum
{
@@ -37,7 +40,6 @@ struct st_logfile
{
char *filename;
int mtime; /* st_mtime from stat() */
- int md5size; /* size of the initial part for which the md5 sum is calculated */
int seq; /* number in processing order */
int retry;
int incomplete; /* 0 - the last record ends with a newline, 1 - the last record contains */
@@ -49,27 +51,23 @@ struct st_logfile
zbx_uint64_t ino_hi; /* Microsoft Windows: nFileIndexHigh or FileId.HighPart */
zbx_uint64_t size; /* st_size from stat() */
zbx_uint64_t processed_size; /* how far the Zabbix agent has analyzed the file */
- md5_byte_t md5buf[MD5_DIGEST_SIZE]; /* md5 sum of the initial part of the file */
+ int md5_block_size; /* size of the first and last blocks of file for which the md5 sum is */
+ /* calculated (in 'first_block_md5') */
+ md5_byte_t first_block_md5[MD5_DIGEST_SIZE]; /* md5 sum of the initial part of the file */
+ zbx_uint64_t last_block_offset; /* position of the last block from the beginning of file */
+ md5_byte_t last_block_md5[MD5_DIGEST_SIZE]; /* md5 sum of the last block */
};
typedef int (*zbx_process_value_func_t)(zbx_vector_ptr_t *addrs, const char *host,
- const char *key, const char *value, unsigned char state, zbx_uint64_t *lastlogsize, int *mtime,
- unsigned long *timestamp, const char *source, unsigned short *severity,
- unsigned long *logeventid, unsigned char flags);
+ const char *key, const char *value, unsigned char state, zbx_uint64_t *lastlogsize, const int *mtime,
+ const unsigned long *timestamp, const char *source, const unsigned short *severity,
+ const unsigned long *logeventid, unsigned char flags);
void destroy_logfile_list(struct st_logfile **logfiles, int *logfiles_alloc, int *logfiles_num);
-int process_logrt(unsigned char flags, const char *filename, zbx_uint64_t *lastlogsize, int *mtime,
- zbx_uint64_t *lastlogsize_sent, int *mtime_sent, unsigned char *skip_old_data, int *big_rec,
- int *use_ino, char **err_msg, struct st_logfile **logfiles_old, const int *logfiles_num_old,
- struct st_logfile **logfiles_new, int *logfiles_num_new, const char *encoding,
- zbx_vector_ptr_t *regexps, const char *pattern, const char *output_template, int *p_count, int *s_count,
- zbx_process_value_func_t process_value, zbx_vector_ptr_t *addrs, const char *hostname,
- const char *key, int *jumped, float max_delay, double *start_time, zbx_uint64_t *processed_bytes,
- zbx_log_rotation_options_t rotation_type);
-
int process_log_check(zbx_vector_ptr_t *addrs, zbx_vector_ptr_t *regexps, ZBX_ACTIVE_METRIC *metric,
zbx_process_value_func_t process_value_cb, zbx_uint64_t *lastlogsize_sent, int *mtime_sent,
- char **error);
+ char **error, zbx_vector_pre_persistent_t *prep_vec);
+struct st_logfile *find_last_processed_file_in_logfiles_list(struct st_logfile *logfiles, int logfiles_num);
#endif
diff --git a/src/zabbix_agent/logfiles/persistent_state.c b/src/zabbix_agent/logfiles/persistent_state.c
new file mode 100644
index 00000000000..7a715029029
--- /dev/null
+++ b/src/zabbix_agent/logfiles/persistent_state.c
@@ -0,0 +1,950 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#include "common.h"
+#include "md5.h"
+#include "log.h"
+#include "logfiles.h"
+#include "persistent_state.h"
+#include "zbxjson.h"
+#include "../../libs/zbxalgo/vectorimpl.h"
+
+/* tags for agent persistent storage files */
+#define ZBX_PERSIST_TAG_FILENAME "filename"
+#define ZBX_PERSIST_TAG_MTIME "mtime"
+#define ZBX_PERSIST_TAG_SEQ "seq"
+#define ZBX_PERSIST_TAG_INCOMPLETE "incomplete"
+#define ZBX_PERSIST_TAG_COPY_OF "copy_of"
+#define ZBX_PERSIST_TAG_DEVICE "dev"
+#define ZBX_PERSIST_TAG_INODE_LO "ino_lo"
+#define ZBX_PERSIST_TAG_INODE_HI "ino_hi"
+#define ZBX_PERSIST_TAG_SIZE "size"
+#define ZBX_PERSIST_TAG_PROCESSED_SIZE "processed_size"
+#define ZBX_PERSIST_TAG_MD5_BLOCK_SIZE "md5_block_size"
+#define ZBX_PERSIST_TAG_FIRST_BLOCK_MD5 "first_block_md5"
+#define ZBX_PERSIST_TAG_LAST_BLOCK_OFFSET "last_block_offset"
+#define ZBX_PERSIST_TAG_LAST_BLOCK_MD5 "last_block_md5"
+
+ZBX_VECTOR_IMPL(pre_persistent, zbx_pre_persistent_t)
+ZBX_VECTOR_IMPL(persistent_inactive, zbx_persistent_inactive_t)
+
+#if !defined(_WINDOWS) && !defined(__MINGW32__)
+static int zbx_persistent_inactive_compare_func(const void *d1, const void *d2)
+{
+ return strcmp(((const zbx_persistent_inactive_t *)d1)->key_orig,
+ ((const zbx_persistent_inactive_t *)d2)->key_orig);
+}
+
+/******************************************************************************
+ * *
+ * Function: str2file_name_part *
+ * *
+ * Purpose: for the specified string get the part of persistent storage path *
+ * *
+ * Parameters: *
+ * str - [IN] string (e.g. host, item key) *
+ * *
+ * Return value: dynamically allocated string with the part of path *
+ * corresponding to the input string *
+ * *
+ * Comments: the part of persistent storage path is built of md5 sum of the *
+ * input string with the length of input string appended *
+ * *
+ * Example: for input string *
+ * "logrt[/home/zabbix/test.log,,,,,,,,/home/zabbix/agent_private]" *
+ * the function returns *
+ * "147bd30c08995022fbe78de3c26c082962" *
+ * \/ - length of input string *
+ * \------------------------------/ - md5 sum of input string *
+ * *
+ ******************************************************************************/
+static char *str2file_name_part(const char *str)
+{
+ md5_state_t state;
+ md5_byte_t md5[MD5_DIGEST_SIZE];
+ char size_buf[21]; /* 20 - max size of printed 'size_t' value, 1 - '\0' */
+ char *md5_text = NULL;
+ size_t str_sz, md5_text_sz, size_buf_len;
+
+ str_sz = strlen(str);
+
+ zbx_md5_init(&state);
+ zbx_md5_append(&state, (const md5_byte_t *)str, (int)str_sz);
+ zbx_md5_finish(&state, md5);
+
+ size_buf_len = zbx_snprintf(size_buf, sizeof(size_buf), ZBX_FS_SIZE_T, (zbx_fs_size_t)str_sz);
+
+ md5_text_sz = MD5_DIGEST_SIZE * 2 + size_buf_len + 1;
+ md5_text = (char *)zbx_malloc(NULL, md5_text_sz);
+
+ zbx_md5buf2str(md5, md5_text);
+ memcpy(md5_text + MD5_DIGEST_SIZE * 2, size_buf, size_buf_len + 1);
+
+ return md5_text;
+}
+
+/******************************************************************************
+ * *
+ * Function: active_server2dir_name_part *
+ * *
+ * Purpose: calculate the part of persistent storage path for the specified *
+ * server/port pair where the agent is sending active check data *
+ * *
+ * Parameters: *
+ * server - [IN] server string *
+ * port - [IN] port number *
+ * *
+ * Return value: dynamically allocated string with the part of path *
+ * *
+ * Comments: the part of persistent storage path is built of md5 sum of the *
+ * input string with the length of input string appended *
+ * *
+ * Example: for server "127.0.0.1" and port 10091 the function returns *
+ * "8392b6ea687188e70feac24517d2f9d715" *
+ * \/ - length of "127.0.0.1:10091" *
+ * \------------------------------/ - md5 sum of "127.0.0.1:10091" *
+ * *
+ ******************************************************************************/
+static char *active_server2dir_name_part(const char *server, unsigned short port)
+{
+ char *endpoint, *dir_name;
+
+ endpoint = zbx_dsprintf(NULL, "%s:%hu", server, port);
+ dir_name = str2file_name_part(endpoint);
+ zbx_free(endpoint);
+
+ return dir_name;
+}
+
+/******************************************************************************
+ * *
+ * Function: make_persistent_server_directory_name *
+ * *
+ * Purpose: make the name of persistent storage directory for the specified *
+ * server/proxy and port *
+ * *
+ * Parameters: *
+ * base_path - [IN] initial part of pathname *
+ * server - [IN] server string *
+ * port - [IN] port number *
+ * *
+ * Return value: dynamically allocated string with the name of directory *
+ * *
+ * Example: for base_path "/var/tmp/", server "127.0.0.1", port 10091 the *
+ * function returns "/var/tmp/8392b6ea687188e70feac24517d2f9d715" *
+ * *
+ ******************************************************************************/
+static char *make_persistent_server_directory_name(const char *base_path, const char *server, unsigned short port)
+{
+ char *server_part, *file_name;
+
+ server_part = active_server2dir_name_part(server, port);
+ file_name = zbx_dsprintf(NULL, "%s/%s", base_path, server_part);
+ zbx_free(server_part);
+
+ return file_name;
+}
+
+/******************************************************************************
+ * *
+ * Function: check_persistent_directory_exists *
+ * *
+ * Purpose: check if the directory exists *
+ * *
+ * Parameters: *
+ * pathname - [IN] full pathname of directory *
+ * error - [OUT] error message *
+ * *
+ * Return value: SUCCEED or FAIL (with dynamically allocated 'error') *
+ * *
+ ******************************************************************************/
+static int check_persistent_directory_exists(const char *pathname, char **error)
+{
+ zbx_stat_t status;
+
+ if (0 != lstat(pathname, &status))
+ {
+ *error = zbx_dsprintf(*error, "cannot obtain directory information: %s", zbx_strerror(errno));
+ return FAIL;
+ }
+
+ if (0 == S_ISDIR(status.st_mode))
+ {
+ *error = zbx_dsprintf(*error, "file exists but is not a directory");
+ return FAIL;
+ }
+
+ return SUCCEED;
+}
+
+/******************************************************************************
+ * *
+ * Function: create_persistent_directory *
+ * *
+ * Purpose: create directory if it does not exist or check access if it *
+ * exists *
+ * *
+ * Parameters: *
+ * pathname - [IN] full pathname of directory *
+ * error - [OUT] error message *
+ * *
+ * Return value: SUCCEED - directory created or already exists *
+ * FAIL - cannot create directory or it has insufficient *
+ * access rights (see dynamically allocated 'error') *
+ * *
+ ******************************************************************************/
+static int create_persistent_directory(const char *pathname, char **error)
+{
+ if (0 != mkdir(pathname, S_IRWXU))
+ {
+ if (EEXIST == errno)
+ return check_persistent_directory_exists(pathname, error);
+
+ *error = zbx_dsprintf(*error, "%s(): cannot create directory \"%s\": %s", __func__, pathname,
+ zbx_strerror(errno));
+ return FAIL;
+ }
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): created directory:[%s]", __func__, pathname);
+
+ return SUCCEED;
+}
+
+/******************************************************************************
+ * *
+ * Function: create_base_path_directories *
+ * *
+ * Purpose: create all subdirectories in the pathname if they do not exist *
+ * *
+ * Parameters: *
+ * pathname - [IN] full pathname of directory, must consist of only *
+ * ASCII characters *
+ * error - [OUT] error message *
+ * *
+ * Return value: SUCCEED - directories created or already exist *
+ * FAIL - cannot create directory or it has insufficient *
+ * access rights (see dynamically allocated 'error') *
+ * *
+ ******************************************************************************/
+static int create_base_path_directories(const char *pathname, char **error)
+{
+ char *path, *p;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): pathname:[%s]", __func__, pathname);
+
+ if ('/' != pathname[0])
+ {
+ *error = zbx_dsprintf(*error, "persistent directory name is not an absolute path,"
+ " it does not start with '/'");
+ return FAIL;
+ }
+
+ path = zbx_strdup(NULL, pathname); /* mutable copy */
+
+ for (p = path + 1; ; ++p)
+ {
+ if ('/' == *p)
+ {
+ *p = '\0';
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): checking directory:[%s]", __func__, path);
+
+ if (SUCCEED != create_persistent_directory(path, error))
+ {
+ zbx_free(path);
+ return FAIL;
+ }
+
+ *p = '/';
+ }
+ else if ('\0' == *p)
+ {
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): checking directory:[%s]", __func__, path);
+
+ if (SUCCEED != create_persistent_directory(path, error))
+ {
+ zbx_free(path);
+ return FAIL;
+ }
+
+ break;
+ }
+ }
+
+ zbx_free(path);
+
+ return SUCCEED;
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_create_persistent_server_directory *
+ * *
+ * Purpose: create directory if it does not exist or check access if it *
+ * exists. Directory name is derived from host and port. *
+ * *
+ * Parameters: *
+ * base_path - [IN] initial part of pathname, must consist of only *
+ * ASCII characters *
+ * host - [IN] host string *
+ * port - [IN] port number *
+ * error - [OUT] error message *
+ * *
+ * Return value: on success - dynamically allocated string with the name of *
+ * directory, *
+ * on error - NULL (with dynamically allocated 'error') *
+ * *
+ ******************************************************************************/
+char *zbx_create_persistent_server_directory(const char *base_path, const char *host, unsigned short port,
+ char **error)
+{
+ char *server_dir_name, *err_msg = NULL;
+
+ /* persistent storage top-level directory */
+ if (SUCCEED != create_base_path_directories(base_path, error))
+ return NULL;
+
+ /* directory for server/proxy where the current active check process will be sending data */
+ server_dir_name = make_persistent_server_directory_name(base_path, host, port);
+
+ if (SUCCEED != create_persistent_directory(server_dir_name, &err_msg))
+ {
+ *error = zbx_dsprintf(*error, "cannot create directory \"%s\": %s", server_dir_name, err_msg);
+ zbx_free(server_dir_name);
+ zbx_free(err_msg);
+ return NULL;
+ }
+
+ if (0 != access(server_dir_name, R_OK | W_OK | X_OK))
+ {
+ if (NULL != server_dir_name) /* only to silence GCC warning "directive argument is null" */
+ {
+ *error = zbx_dsprintf(*error, "insufficient access rights to directory \"%s\"",
+ server_dir_name);
+ }
+ else
+ THIS_SHOULD_NEVER_HAPPEN;
+
+ zbx_free(server_dir_name);
+ return NULL;
+ }
+
+ return server_dir_name;
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_make_persistent_file_name *
+ * *
+ * Purpose: make the name of persistent storage directory or file *
+ * *
+ * Parameters: *
+ * persistent_server_dir - [IN] initial part of pathname *
+ * item_key - [IN] item key (not NULL) *
+ * *
+ * Return value: dynamically allocated string with the name of file *
+ * *
+ ******************************************************************************/
+char *zbx_make_persistent_file_name(const char *persistent_server_dir, const char *item_key)
+{
+ char *file_name, *item_part;
+
+ item_part = str2file_name_part(item_key);
+ file_name = zbx_dsprintf(NULL, "%s/%s", persistent_server_dir, item_part);
+ zbx_free(item_part);
+
+ return file_name;
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_write_persistent_file *
+ * *
+ * Purpose: write metric info into persistent file *
+ * *
+ * Parameters: *
+ * filename - [IN] file name *
+ * data - [IN] file content *
+ * error - [OUT] error message *
+ * *
+ * Return value: SUCCEED - file was successfully written *
+ * FAIL - cannot write the file (see dynamically allocated *
+ * 'error' message) *
+ * *
+ ******************************************************************************/
+static int zbx_write_persistent_file(const char *filename, const char *data, char **error)
+{
+ FILE *fp;
+ size_t sz, alloc_bytes = 0, offset = 0;
+ int ret = SUCCEED;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): filename:[%s] data:[%s]", __func__, filename, data);
+
+ if (NULL == (fp = fopen(filename, "w")))
+ {
+ zbx_snprintf_alloc(error, &alloc_bytes, &offset, "cannot open file: %s", zbx_strerror(errno));
+ return FAIL;
+ }
+
+ sz = strlen(data);
+
+ if (sz != fwrite(data, 1, sz, fp))
+ {
+ zbx_snprintf_alloc(error, &alloc_bytes, &offset, "cannot write to file: %s", zbx_strerror(errno));
+ ret = FAIL;
+ }
+
+ if (0 != fclose(fp))
+ {
+ zbx_snprintf_alloc(error, &alloc_bytes, &offset, "%scannot close file: %s",
+ (FAIL == ret) ? "; ": "" , zbx_strerror(errno));
+ ret = FAIL;
+ }
+
+ return ret;
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_read_persistent_file *
+ * *
+ * Purpose: read metric info from persistent file. One line is read. *
+ * *
+ * Parameters: *
+ * filename - [IN] file name *
+ * buf - [OUT] buffer to read file into *
+ * buf_size - [IN] buffer size *
+ * err_msg - [OUT] error message *
+ * *
+ * Return value: SUCCEED - file was successfully read *
+ * FAIL - cannot read the file (see dynamically allocated *
+ * 'err_msg' message) *
+ * *
+ ******************************************************************************/
+int zbx_read_persistent_file(const char *filename, char *buf, size_t buf_size, char **err_msg)
+{
+ int ret = FAIL;
+ FILE *f;
+
+ if (NULL == (f = fopen(filename, "r")))
+ {
+ *err_msg = zbx_dsprintf(*err_msg, "cannot open file \"%s\": %s", filename, zbx_strerror(errno));
+ return FAIL;
+ }
+
+ if (NULL == fgets(buf, (int)buf_size, f))
+ {
+ *err_msg = zbx_dsprintf(*err_msg, "cannot read from file \"%s\" or file empty", filename);
+ goto out;
+ }
+
+ buf[strcspn(buf, "\r\n")] = '\0'; /* discard newline at the end of string */
+
+ ret = SUCCEED;
+out:
+ if (0 != fclose(f))
+ { /* only log, cannot do anything in case of error */
+ zabbix_log(LOG_LEVEL_CRIT, "cannot close file \"%s\": %s", filename, zbx_strerror(errno));
+ }
+
+ return ret;
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_remove_persistent_file *
+ * *
+ * Purpose: remove the specified file *
+ * *
+ * Parameters: *
+ * pathname - [IN] file name *
+ * error - [OUT] error message *
+ * *
+ * Return value: SUCCEED - file was removed or does not exist *
+ * FAIL - cannot remove the specified file (see dynamically *
+ * allocated 'error' message) *
+ * *
+ ******************************************************************************/
+int zbx_remove_persistent_file(const char *pathname, char **error)
+{
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): removing persistent file '%s'", __func__, pathname);
+
+ if (0 == unlink(pathname) || ENOENT == errno)
+ return SUCCEED;
+
+ *error = zbx_strdup(*error, zbx_strerror(errno));
+
+ return FAIL;
+}
+
+void zbx_write_persistent_files(zbx_vector_pre_persistent_t *prep_vec)
+{
+ int i;
+
+ for (i = 0; i < prep_vec->values_num; i++)
+ {
+ char *error = NULL;
+ struct zbx_json json;
+
+ /* prepare JSON */
+ zbx_json_init(&json, ZBX_JSON_STAT_BUF_LEN);
+
+ if (NULL != prep_vec->values[i].filename)
+ {
+ zbx_json_addstring(&json, ZBX_PERSIST_TAG_FILENAME, prep_vec->values[i].filename,
+ ZBX_JSON_TYPE_STRING);
+ }
+
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_MTIME, (zbx_uint64_t)prep_vec->values[i].mtime);
+
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_PROCESSED_SIZE, prep_vec->values[i].processed_size);
+
+ if (NULL != prep_vec->values[i].filename)
+ {
+ char buf[ZBX_MD5_PRINT_BUF_LEN];
+
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_SEQ, (zbx_uint64_t)prep_vec->values[i].seq);
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_INCOMPLETE,
+ (zbx_uint64_t)prep_vec->values[i].incomplete);
+
+ zbx_json_addint64(&json, ZBX_PERSIST_TAG_COPY_OF, prep_vec->values[i].copy_of);
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_DEVICE, prep_vec->values[i].dev);
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_INODE_LO, prep_vec->values[i].ino_lo);
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_INODE_HI, prep_vec->values[i].ino_hi);
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_SIZE, prep_vec->values[i].size);
+
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_MD5_BLOCK_SIZE,
+ (zbx_uint64_t)prep_vec->values[i].md5_block_size);
+
+ zbx_md5buf2str(prep_vec->values[i].first_block_md5, buf);
+ zbx_json_addstring(&json, ZBX_PERSIST_TAG_FIRST_BLOCK_MD5, buf, ZBX_JSON_TYPE_STRING);
+
+ zbx_json_adduint64(&json, ZBX_PERSIST_TAG_LAST_BLOCK_OFFSET,
+ prep_vec->values[i].last_block_offset);
+
+ zbx_md5buf2str(prep_vec->values[i].last_block_md5, buf);
+ zbx_json_addstring(&json, ZBX_PERSIST_TAG_LAST_BLOCK_MD5, buf, ZBX_JSON_TYPE_STRING);
+ }
+
+ zbx_json_close(&json);
+
+ if (SUCCEED != zbx_write_persistent_file(prep_vec->values[i].persistent_file_name, json.buffer, &error))
+ {
+ zabbix_log(LOG_LEVEL_WARNING, "cannot write persistent file \"%s\": %s",
+ prep_vec->values[i].persistent_file_name, error);
+ zbx_free(error);
+ }
+
+ zbx_json_free(&json);
+ }
+}
+
+void zbx_clean_pre_persistent_elements(zbx_vector_pre_persistent_t *prep_vec)
+{
+ int i;
+
+ /* clean only element data and number of elements, do not reduce vector size */
+
+ for (i = 0; i < prep_vec->values_num; i++)
+ {
+ zbx_free(prep_vec->values[i].key_orig);
+ zbx_free(prep_vec->values[i].persistent_file_name);
+ zbx_free(prep_vec->values[i].filename);
+ }
+
+ zbx_vector_pre_persistent_clear(prep_vec);
+}
+
+void zbx_add_to_persistent_inactive_list(zbx_vector_persistent_inactive_t *inactive_vec, char *key,
+ const char *filename)
+{
+ zbx_persistent_inactive_t el;
+
+ el.key_orig = key;
+
+ if (FAIL == zbx_vector_persistent_inactive_search(inactive_vec, el,
+ zbx_persistent_inactive_compare_func))
+ {
+ /* create and initialize a new vector element */
+
+ el.key_orig = zbx_strdup(NULL, key);
+ el.not_received_time = time(NULL);
+ el.persistent_file_name = zbx_strdup(NULL, filename);
+
+ zbx_vector_persistent_inactive_append(inactive_vec, el);
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): added element %d with key '%s' for file '%s'", __func__,
+ inactive_vec->values_num - 1, key, filename);
+ }
+}
+
+void zbx_remove_from_persistent_inactive_list(zbx_vector_persistent_inactive_t *inactive_vec, char *key)
+{
+ zbx_persistent_inactive_t el;
+ int idx;
+
+ el.key_orig = key;
+
+ if (FAIL == (idx = zbx_vector_persistent_inactive_search(inactive_vec, el,
+ zbx_persistent_inactive_compare_func)))
+ {
+ return;
+ }
+
+ zbx_free(inactive_vec->values[idx].key_orig);
+ zbx_free(inactive_vec->values[idx].persistent_file_name);
+ zbx_vector_persistent_inactive_remove(inactive_vec, idx);
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): removed element %d with key '%s'", __func__, idx, key);
+}
+
+void zbx_remove_inactive_persistent_files(zbx_vector_persistent_inactive_t *inactive_vec)
+{
+ int i;
+ time_t now;
+
+ now = time(NULL);
+
+ for (i = 0; i < inactive_vec->values_num; i++)
+ {
+ zbx_persistent_inactive_t *el = inactive_vec->values + i;
+
+ if (ZBX_PERSIST_INACTIVITY_PERIOD <= now - el->not_received_time)
+ {
+ char *err_msg = NULL;
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): removing element %d with key '%s'", __func__, i,
+ el->key_orig);
+
+ if (SUCCEED != zbx_remove_persistent_file(el->persistent_file_name, &err_msg))
+ {
+ zabbix_log(LOG_LEVEL_WARNING, "cannot remove persistent file \"%s\": %s",
+ el->persistent_file_name, err_msg);
+ zbx_free(err_msg);
+ }
+
+ zbx_free(el->key_orig);
+ zbx_free(el->persistent_file_name);
+ zbx_vector_persistent_inactive_remove(inactive_vec, i);
+ }
+ }
+}
+
+static int zbx_pre_persistent_compare_func(const void *d1, const void *d2)
+{
+ return strcmp(((const zbx_pre_persistent_t *)d1)->key_orig, ((const zbx_pre_persistent_t *)d2)->key_orig);
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_find_or_create_prep_vec_element *
+ * *
+ * Purpose: search preparation vector to find element with the specified key. *
+ * If not found then create the element. *
+ * *
+ * Parameters: *
+ * prep_vec - [IN/OUT] preparation vector for persistent data *
+ * files *
+ * key - [IN] log*[] item key *
+ * persistent_file_name - [IN] file name for copying into new element *
+ * *
+ ******************************************************************************/
+int zbx_find_or_create_prep_vec_element(zbx_vector_pre_persistent_t *prep_vec, const char *key,
+ const char *persistent_file_name)
+{
+ zbx_pre_persistent_t prep_element;
+ int prep_vec_idx;
+
+ prep_element.key_orig = (char *)key;
+
+ if (FAIL == (prep_vec_idx = zbx_vector_pre_persistent_search(prep_vec, prep_element,
+ zbx_pre_persistent_compare_func)))
+ {
+ /* create and initialize a new vector element */
+ memset(&prep_element, 0, sizeof(prep_element));
+
+ zbx_vector_pre_persistent_append(prep_vec, prep_element);
+ prep_vec_idx = prep_vec->values_num - 1;
+
+ /* fill in 'key_orig' and 'persistent_file_name' values - they never change for the specified */
+ /* log*[] item (otherwise it is not the same item anymore) */
+ prep_vec->values[prep_vec_idx].key_orig = zbx_strdup(NULL, key);
+ prep_vec->values[prep_vec_idx].persistent_file_name = zbx_strdup(NULL, persistent_file_name);
+
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): key:[%s] created element %d", __func__, key, prep_vec_idx);
+ }
+ else
+ zabbix_log(LOG_LEVEL_DEBUG, "%s(): key:[%s] found element %d", __func__, key, prep_vec_idx);
+
+ return prep_vec_idx;
+}
+
+void zbx_init_prep_vec_data(const struct st_logfile *logfile, zbx_pre_persistent_t *prep_vec_elem)
+{
+ /* copy attributes which are stable within one check of the specified log file but */
+ /* may change in the next check */
+
+ if (NULL == prep_vec_elem->filename || 0 != strcmp(prep_vec_elem->filename, logfile->filename))
+ prep_vec_elem->filename = zbx_strdup(prep_vec_elem->filename, logfile->filename);
+
+ prep_vec_elem->mtime = logfile->mtime;
+ prep_vec_elem->seq = logfile->seq;
+ prep_vec_elem->copy_of = logfile->copy_of;
+ prep_vec_elem->dev = logfile->dev;
+ prep_vec_elem->ino_lo = logfile->ino_lo;
+ prep_vec_elem->ino_hi = logfile->ino_hi;
+ prep_vec_elem->size = logfile->size;
+
+ prep_vec_elem->md5_block_size = logfile->md5_block_size;
+ memcpy(prep_vec_elem->first_block_md5, logfile->first_block_md5, sizeof(logfile->first_block_md5));
+
+ prep_vec_elem->last_block_offset = logfile->last_block_offset;
+ memcpy(prep_vec_elem->last_block_md5, logfile->last_block_md5, sizeof(logfile->last_block_md5));
+}
+
+void zbx_update_prep_vec_data(const struct st_logfile *logfile, zbx_uint64_t processed_size,
+ zbx_pre_persistent_t *prep_vec_elem)
+{
+ /* copy attributes which (may) change with every log file record */
+ prep_vec_elem->processed_size = processed_size;
+ prep_vec_elem->incomplete = logfile->incomplete;
+}
+
+/******************************************************************************
+ * *
+ * Function: zbx_restore_file_details *
+ * *
+ * Purpose: create the 'old log file list' and restore log file attributes *
+ * from JSON string which was read from persistent file *
+ * *
+ * Parameters: *
+ * str - [IN] JSON string *
+ * logfiles - [OUT] log file list (vector) *
+ * logfiles_num - [OUT] number of elements in the log file list *
+ * processed_size - [OUT] processed size attribute *
+ * mtime - [OUT] mtime *
+ * err_msg - [OUT] dynamically allocated error message *
+ * *
+ * Return value: SUCCEED or FAIL *
+ * *
+ * Examples of valid JSON 'str' (one text line but here it is split for *
+ * readability): *
+ * {"mtime":1623174047, *
+ * "processed_size":0} *
+ * or *
+ * {"filename":"/home/zabbix/test.log", *
+ * "mtime":0, *
+ * "processed_size":324, *
+ * "seq":0, *
+ * "incomplete":0, *
+ * "copy_of":-1, *
+ * "dev":65027, *
+ * "ino_lo":17043636, *
+ * "ino_hi":0, *
+ * "size":635, *
+ * "md5_block_size":512, *
+ * "first_block_md5":"7f2d0cf871384671c51359ce8c90e475", *
+ * "last_block_offset":123, *
+ * "last_block_md5":"86985e105f79b95d6bc918fb45ec7727"} *
+ ******************************************************************************/
+int zbx_restore_file_details(const char *str, struct st_logfile **logfiles, int *logfiles_num,
+ zbx_uint64_t *processed_size, int *mtime, char **err_msg)
+{
+ struct zbx_json_parse jp;
+ /* temporary variables before filling in 'st_logfile' elements */
+ char filename[MAX_STRING_LEN];
+ int mtime_tmp = 0;
+ int seq = 0;
+ int incomplete = 0;
+ int copy_of = 0;
+ zbx_uint64_t dev;
+ zbx_uint64_t ino_lo;
+ zbx_uint64_t ino_hi;
+ zbx_uint64_t size;
+ zbx_uint64_t processed_size_tmp = 0;
+ int md5_block_size = 0;
+ md5_byte_t first_block_md5[MD5_DIGEST_SIZE];
+ zbx_uint64_t last_block_offset = 0;
+ md5_byte_t last_block_md5[MD5_DIGEST_SIZE];
+ /* flags to check missing attributes */
+ int got_filename = 0, got_mtime = 0, got_seq = 0, got_incomplete = 0, got_copy_of = 0, got_dev = 0,
+ got_ino_lo = 0, got_ino_hi = 0, got_size = 0, got_processed_size = 0, got_md5_block_size = 0,
+ got_first_block_md5 = 0, got_last_block_offset = 0, got_last_block_md5 = 0, sum;
+ char tmp[MAX_STRING_LEN];
+
+ if (0 != *logfiles_num || NULL != *logfiles)
+ {
+ THIS_SHOULD_NEVER_HAPPEN;
+ *err_msg = zbx_dsprintf(*err_msg, "%s(): non-empty log file list, logfiles_num:%d",
+ __func__, *logfiles_num);
+ zabbix_log(LOG_LEVEL_WARNING, "%s(): non-empty log file list, logfiles_num:%d",
+ __func__, *logfiles_num);
+ return FAIL;
+ }
+
+ if (SUCCEED != zbx_json_open(str, &jp))
+ {
+ *err_msg = zbx_dsprintf(*err_msg, "cannot parse persistent data: %s", zbx_json_strerror());
+ return FAIL;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_FILENAME, filename, sizeof(filename), NULL))
+ got_filename = 1;
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_MTIME, tmp, sizeof(tmp), NULL))
+ {
+ mtime_tmp = atoi(tmp);
+ got_mtime = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_SEQ, tmp, sizeof(tmp), NULL))
+ {
+ seq = atoi(tmp);
+ got_seq = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_INCOMPLETE, tmp, sizeof(tmp), NULL))
+ {
+ incomplete = atoi(tmp);
+ got_incomplete = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_COPY_OF, tmp, sizeof(tmp), NULL))
+ {
+ copy_of = atoi(tmp);
+ got_copy_of = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_DEVICE, tmp, sizeof(tmp), NULL))
+ {
+ if (SUCCEED == is_uint64(tmp, &dev))
+ got_dev = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_INODE_LO, tmp, sizeof(tmp), NULL))
+ {
+ if (SUCCEED == is_uint64(tmp, &ino_lo))
+ got_ino_lo = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_INODE_HI, tmp, sizeof(tmp), NULL))
+ {
+ if (SUCCEED == is_uint64(tmp, &ino_hi))
+ got_ino_hi = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_SIZE, tmp, sizeof(tmp), NULL))
+ {
+ if (SUCCEED == is_uint64(tmp, &size))
+ got_size = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_PROCESSED_SIZE, tmp, sizeof(tmp), NULL))
+ {
+ if (SUCCEED == is_uint64(tmp, &processed_size_tmp))
+ got_processed_size = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_MD5_BLOCK_SIZE, tmp, sizeof(tmp), NULL))
+ {
+ md5_block_size = atoi(tmp);
+ got_md5_block_size = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_FIRST_BLOCK_MD5, tmp, sizeof(tmp), NULL))
+ {
+ if (sizeof(first_block_md5) == zbx_hex2bin((const unsigned char *)tmp, first_block_md5,
+ sizeof(first_block_md5)))
+ {
+ got_first_block_md5 = 1;
+ }
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_LAST_BLOCK_OFFSET, tmp, sizeof(tmp), NULL))
+ {
+ if (SUCCEED == is_uint64(tmp, &last_block_offset))
+ got_last_block_offset = 1;
+ }
+
+ if (SUCCEED == zbx_json_value_by_name(&jp, ZBX_PERSIST_TAG_LAST_BLOCK_MD5, tmp, sizeof(tmp), NULL))
+ {
+ if (sizeof(last_block_md5) == zbx_hex2bin((const unsigned char *)tmp, last_block_md5,
+ sizeof(last_block_md5)))
+ {
+ got_last_block_md5 = 1;
+ }
+ }
+
+ /* 'mtime' and 'processed_size' should always be present */
+ if (0 == got_mtime || 0 == got_processed_size)
+ {
+ *err_msg = zbx_dsprintf(*err_msg, "corrupted data: 'mtime' or 'processed_size' attribute missing");
+ return FAIL;
+ }
+
+ /* all other 12 variables should be present or none of them */
+ sum = got_filename + got_seq + got_incomplete + got_copy_of + got_dev + got_ino_lo + got_ino_hi + got_size +
+ got_md5_block_size + got_first_block_md5 + got_last_block_offset + got_last_block_md5;
+
+ if (0 == sum) /* got only metadata 'mtime' and 'processed_size' */
+ {
+ *mtime = mtime_tmp;
+ *processed_size = processed_size_tmp;
+ return SUCCEED;
+ }
+
+ if (12 != sum)
+ {
+ *err_msg = zbx_dsprintf(*err_msg, "present/missing attributes: filename:%d seq:%d incomplete:%d"
+ " copy_of:%d dev:%d ino_lo:%d ino_hi:%d size:%d md5_block_size:%d first_block_md5:%d"
+ " last_block_offset:%d last_block_md5:%d", got_filename, got_seq,
+ got_incomplete, got_copy_of, got_dev, got_ino_lo, got_ino_hi, got_size,
+ got_md5_block_size, got_first_block_md5, got_last_block_offset, got_last_block_md5);
+ return FAIL;
+ }
+
+ /* All attributes present. Create log file list with one element. It will be used as the 'old log file list', */
+ /* it does not need to be resizable. */
+ *logfiles = (struct st_logfile *)zbx_malloc(NULL, sizeof(struct st_logfile));
+ *logfiles_num = 1;
+
+ (*logfiles)[0].filename = zbx_strdup(NULL, filename);
+ (*logfiles)[0].mtime = mtime_tmp;
+ (*logfiles)[0].seq = seq;
+ (*logfiles)[0].retry = 0;
+ (*logfiles)[0].incomplete = incomplete;
+ (*logfiles)[0].copy_of = copy_of;
+ (*logfiles)[0].dev = dev;
+ (*logfiles)[0].ino_lo = ino_lo;
+ (*logfiles)[0].ino_hi = ino_hi;
+ (*logfiles)[0].size = size;
+ (*logfiles)[0].processed_size = processed_size_tmp;
+
+ (*logfiles)[0].md5_block_size = md5_block_size;
+ memcpy((*logfiles)[0].first_block_md5, first_block_md5, sizeof(first_block_md5));
+
+ (*logfiles)[0].last_block_offset = last_block_offset;
+ memcpy((*logfiles)[0].last_block_md5, last_block_md5, sizeof(last_block_md5));
+
+ *mtime = mtime_tmp;
+ *processed_size = processed_size_tmp;
+
+ return SUCCEED;
+}
+#endif /* not WINDOWS */
diff --git a/src/zabbix_agent/logfiles/persistent_state.h b/src/zabbix_agent/logfiles/persistent_state.h
new file mode 100644
index 00000000000..f9292c9da5b
--- /dev/null
+++ b/src/zabbix_agent/logfiles/persistent_state.h
@@ -0,0 +1,85 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#ifndef ZABBIX_PERSISTENT_STATE_H
+#define ZABBIX_PERSISTENT_STATE_H
+
+#include "common.h" /* for SEC_PER_DAY */
+#include "md5.h" /* for MD5_DIGEST_SIZE, md5_byte_t */
+#include "zbxtypes.h" /* for zbx_uint64_t struct st_logfile; */
+#include "zbxalgo.h"
+
+#define ZBX_PERSIST_INACTIVITY_PERIOD SEC_PER_DAY /* the time period after which persistent files used by log */
+ /* items which are not received in active check list can be */
+ /* removed */
+typedef struct
+{
+ char *key_orig;
+ char *persistent_file_name;
+ /* data for writing into persistent file */
+ char *filename;
+ int mtime;
+ int seq;
+ int incomplete;
+ int copy_of;
+ zbx_uint64_t dev;
+ zbx_uint64_t ino_lo;
+ zbx_uint64_t ino_hi;
+ zbx_uint64_t size;
+ zbx_uint64_t processed_size;
+ int md5_block_size;
+ md5_byte_t first_block_md5[MD5_DIGEST_SIZE];
+ zbx_uint64_t last_block_offset;
+ md5_byte_t last_block_md5[MD5_DIGEST_SIZE];
+}
+zbx_pre_persistent_t;
+
+ZBX_VECTOR_DECL(pre_persistent, zbx_pre_persistent_t)
+
+typedef struct
+{
+ char *key_orig;
+ time_t not_received_time; /* time the item was not received anymore in the list of active checks */
+ char *persistent_file_name;
+}
+zbx_persistent_inactive_t;
+
+ZBX_VECTOR_DECL(persistent_inactive, zbx_persistent_inactive_t)
+
+char *zbx_create_persistent_server_directory(const char *base_path, const char *host, unsigned short port,
+ char **error);
+char *zbx_make_persistent_file_name(const char *persistent_server_dir, const char *item_key);
+int zbx_read_persistent_file(const char *filename, char *buf, size_t buf_size, char **err_msg);
+int zbx_remove_persistent_file(const char *pathname, char **error);
+void zbx_write_persistent_files(zbx_vector_pre_persistent_t *prep_vec);
+void zbx_clean_pre_persistent_elements(zbx_vector_pre_persistent_t *prep_vec);
+
+void zbx_add_to_persistent_inactive_list(zbx_vector_persistent_inactive_t *inactive_vec, char *key,
+ const char *filename);
+void zbx_remove_from_persistent_inactive_list(zbx_vector_persistent_inactive_t *inactive_vec, char *key);
+void zbx_remove_inactive_persistent_files(zbx_vector_persistent_inactive_t *inactive_vec);
+
+int zbx_find_or_create_prep_vec_element(zbx_vector_pre_persistent_t *prep_vec, const char *key,
+ const char *persistent_file_name);
+void zbx_init_prep_vec_data(const struct st_logfile *logfile, zbx_pre_persistent_t *prep_vec_elem);
+void zbx_update_prep_vec_data(const struct st_logfile *logfile, zbx_uint64_t processed_size,
+ zbx_pre_persistent_t *prep_vec_elem);
+int zbx_restore_file_details(const char *str, struct st_logfile **logfiles, int *logfiles_num,
+ zbx_uint64_t *processed_size, int *mtime, char **err_msg);
+#endif
diff --git a/src/zabbix_agent/metrics.h b/src/zabbix_agent/metrics.h
index df1d6c98936..b936c67cf61 100644
--- a/src/zabbix_agent/metrics.h
+++ b/src/zabbix_agent/metrics.h
@@ -61,6 +61,7 @@ typedef struct
/* items. Used for measuring duration of checks. */
zbx_uint64_t processed_bytes; /* number of processed bytes for log[], log.count[], logrt[], */
/* logrt.count[] items */
+ char *persistent_file_name; /* not used on Microsoft Windows */
}
ZBX_ACTIVE_METRIC;
diff --git a/src/zabbix_agent/zabbix_agentd.c b/src/zabbix_agent/zabbix_agentd.c
index 42600c59208..e477c1e1700 100644
--- a/src/zabbix_agent/zabbix_agentd.c
+++ b/src/zabbix_agent/zabbix_agentd.c
@@ -189,6 +189,7 @@ const char *help_message[] = {
" -R --runtime-control runtime-option Perform administrative functions",
"",
" Runtime control options:",
+ " " ZBX_USER_PARAMETERS_RELOAD " Reload user parameters from the configuration file",
" " ZBX_LOG_LEVEL_INCREASE "=target Increase log level, affects all processes if",
" target is not specified",
" " ZBX_LOG_LEVEL_DECREASE "=target Decrease log level, affects all processes if",
@@ -966,7 +967,7 @@ static void zbx_load_config(int requirement, ZBX_TASK_EX *task)
zbx_strarr_init(&CONFIG_PERF_COUNTERS);
zbx_strarr_init(&CONFIG_PERF_COUNTERS_EN);
#endif
- parse_cfg_file(CONFIG_FILE, cfg, requirement, ZBX_CFG_STRICT);
+ parse_cfg_file(CONFIG_FILE, cfg, requirement, ZBX_CFG_STRICT, ZBX_CFG_EXIT_FAILURE);
finalize_key_access_rules_configuration();
@@ -1015,14 +1016,14 @@ static void zbx_load_config(int requirement, ZBX_TASK_EX *task)
******************************************************************************/
static void zbx_free_config(void)
{
- zbx_strarr_free(CONFIG_ALIASES);
- zbx_strarr_free(CONFIG_USER_PARAMETERS);
+ zbx_strarr_free(&CONFIG_ALIASES);
+ zbx_strarr_free(&CONFIG_USER_PARAMETERS);
#ifndef _WINDOWS
- zbx_strarr_free(CONFIG_LOAD_MODULE);
+ zbx_strarr_free(&CONFIG_LOAD_MODULE);
#endif
#ifdef _WINDOWS
- zbx_strarr_free(CONFIG_PERF_COUNTERS);
- zbx_strarr_free(CONFIG_PERF_COUNTERS_EN);
+ zbx_strarr_free(&CONFIG_PERF_COUNTERS);
+ zbx_strarr_free(&CONFIG_PERF_COUNTERS_EN);
#endif
}
@@ -1120,6 +1121,15 @@ int MAIN_ZABBIX_ENTRY(int flags)
exit(EXIT_FAILURE);
}
#endif
+
+ if (FAIL == load_user_parameters(CONFIG_USER_PARAMETERS, &error))
+ {
+ zabbix_log(LOG_LEVEL_CRIT, "cannot load user parameters: %s", error);
+ zbx_free(error);
+ zbx_free_service_resources(FAIL);
+ exit(EXIT_FAILURE);
+ }
+
if (0 != CONFIG_PASSIVE_FORKS)
{
if (FAIL == zbx_tcp_listen(&listen_sock, CONFIG_LISTEN_IP, (unsigned short)CONFIG_LISTEN_PORT))
@@ -1327,9 +1337,9 @@ void zbx_on_exit(int ret)
int main(int argc, char **argv)
{
ZBX_TASK_EX t = {ZBX_TASK_START};
+ char *error = NULL;
#ifdef _WINDOWS
int ret;
- char *error;
/* Provide, so our process handles errors instead of the system itself. */
/* Attention!!! */
@@ -1428,7 +1438,14 @@ int main(int argc, char **argv)
}
#endif
set_user_parameter_dir(CONFIG_USER_PARAMETER_DIR);
- load_user_parameters(CONFIG_USER_PARAMETERS);
+
+ if (FAIL == load_user_parameters(CONFIG_USER_PARAMETERS, &error))
+ {
+ zabbix_log(LOG_LEVEL_CRIT, "cannot load user parameters: %s", error);
+ zbx_free(error);
+ exit(EXIT_FAILURE);
+ }
+
load_aliases(CONFIG_ALIASES);
zbx_free_config();
if (ZBX_TASK_TEST_METRIC == t.task)
@@ -1465,7 +1482,6 @@ int main(int argc, char **argv)
default:
zbx_load_config(ZBX_CFG_FILE_REQUIRED, &t);
set_user_parameter_dir(CONFIG_USER_PARAMETER_DIR);
- load_user_parameters(CONFIG_USER_PARAMETERS);
load_aliases(CONFIG_ALIASES);
break;
}
diff --git a/src/zabbix_agent/zbxconf.c b/src/zabbix_agent/zbxconf.c
index 6bf3c7ff1fd..8173b606f80 100644
--- a/src/zabbix_agent/zbxconf.c
+++ b/src/zabbix_agent/zbxconf.c
@@ -80,13 +80,17 @@ void load_aliases(char **lines)
* Purpose: load user parameters from configuration *
* *
* Parameters: lines - user parameter entries from configuration file *
+ * error - error message *
+ * *
+ * Return value: SUCCEED - successfully loaded user parameters *
+ * FAIL - failed to load user parameters *
* *
* Author: Vladimir Levijev *
* *
* Comments: calls add_user_parameter() for each entry *
* *
******************************************************************************/
-void load_user_parameters(char **lines)
+int load_user_parameters(char **lines, char **err)
{
char *p, **pline, error[MAX_STRING_LEN];
@@ -94,19 +98,21 @@ void load_user_parameters(char **lines)
{
if (NULL == (p = strchr(*pline, ',')))
{
- zabbix_log(LOG_LEVEL_CRIT, "cannot add user parameter \"%s\": not comma-separated", *pline);
- exit(EXIT_FAILURE);
+ *err = zbx_dsprintf(*err, "user parameter \"%s\": not comma-separated", *pline);
+ return FAIL;
}
*p = '\0';
if (FAIL == add_user_parameter(*pline, p + 1, error, sizeof(error)))
{
*p = ',';
- zabbix_log(LOG_LEVEL_CRIT, "cannot add user parameter \"%s\": %s", *pline, error);
- exit(EXIT_FAILURE);
+ *err = zbx_dsprintf(*err, "user parameter \"%s\": %s", *pline, error);
+ return FAIL;
}
*p = ',';
}
+
+ return SUCCEED;
}
/******************************************************************************
@@ -230,6 +236,65 @@ void load_perf_counters(const char **def_lines, const char **eng_lines)
break;
}
}
+#else
+/******************************************************************************
+ * *
+ * Function: load_config_user_params *
+ * *
+ * Purpose: load user parameters from configuration file *
+ * *
+ ******************************************************************************/
+static int load_config_user_params(void)
+{
+ struct cfg_line cfg[] =
+ {
+ /* PARAMETER, VAR, TYPE,
+ MANDATORY, MIN, MAX */
+ {"UserParameter", &CONFIG_USER_PARAMETERS, TYPE_MULTISTRING,
+ PARM_OPT, 0, 0},
+ {NULL}
+ };
+
+ return parse_cfg_file(CONFIG_FILE, cfg, ZBX_CFG_FILE_REQUIRED, ZBX_CFG_NOT_STRICT, ZBX_CFG_NO_EXIT_FAILURE);
+}
+
+/******************************************************************************
+ * *
+ * Function: reload_user_parameters *
+ * *
+ * Purpose: reload user parameters *
+ * *
+ * Parameters: process_type - process type *
+ * process_num - process number *
+ * *
+ ******************************************************************************/
+void reload_user_parameters(unsigned char process_type, int process_num)
+{
+ char *error = NULL;
+
+ remove_user_parameters();
+ zbx_strarr_init(&CONFIG_USER_PARAMETERS);
+
+ if (FAIL == load_config_user_params())
+ {
+ zabbix_log(LOG_LEVEL_ERR, "cannot reload user parameters [%s #%d]: error processing configuration file",
+ get_process_type_string(process_type), process_num);
+ goto out;
+ }
+
+ if (FAIL == load_user_parameters(CONFIG_USER_PARAMETERS, &error))
+ {
+ zabbix_log(LOG_LEVEL_ERR, "cannot reload user parameters [%s #%d], stopped at: %s",
+ get_process_type_string(process_type), process_num, error);
+ zbx_free(error);
+ goto out;
+ }
+
+ zabbix_log(LOG_LEVEL_INFORMATION, "user parameters reloaded [%s #%d]", get_process_type_string(process_type),
+ process_num);
+out:
+ zbx_strarr_free(&CONFIG_USER_PARAMETERS);
+}
#endif /* _WINDOWS */
#ifdef _AIX
diff --git a/src/zabbix_agent/zbxconf.h b/src/zabbix_agent/zbxconf.h
index a09e41209c0..582f47d5903 100644
--- a/src/zabbix_agent/zbxconf.h
+++ b/src/zabbix_agent/zbxconf.h
@@ -59,8 +59,9 @@ extern char *CONFIG_TLS_PSK_IDENTITY;
extern char *CONFIG_TLS_PSK_FILE;
void load_aliases(char **lines);
-void load_user_parameters(char **lines);
+int load_user_parameters(char **lines, char **err);
int load_key_access_rule(const char *value, const struct cfg_line *cfg);
+void reload_user_parameters(unsigned char process_type, int process_num);
#ifdef _WINDOWS
void load_perf_counters(const char **def_lines, const char **eng_lines);
#endif
diff --git a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
index 9e471422408..0e31813f64f 100644
--- a/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
+++ b/src/zabbix_java/src/com/zabbix/gateway/GeneralInformation.java
@@ -22,9 +22,9 @@ package com.zabbix.gateway;
class GeneralInformation
{
static final String APPLICATION_NAME = "Zabbix Java Gateway";
- static final String REVISION_DATE = "9 November 2021";
+ static final String REVISION_DATE = "22 November 2021";
static final String REVISION = "{ZABBIX_REVISION}";
- static final String VERSION = "6.0.0alpha7";
+ static final String VERSION = "6.0.0alpha8";
static void printVersion()
{
diff --git a/src/zabbix_proxy/Makefile.am b/src/zabbix_proxy/Makefile.am
index ca6f0cb7502..e4320f7c2d4 100644
--- a/src/zabbix_proxy/Makefile.am
+++ b/src/zabbix_proxy/Makefile.am
@@ -79,6 +79,7 @@ zabbix_proxy_LDADD = \
$(top_builddir)/src/libs/zbxtasks/libzbxtasks.a \
$(top_builddir)/src/libs/zbxdiag/libzbxdiag_proxy.a \
$(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \
+ $(top_builddir)/src/libs/zbxtrends/libzbxtrends_baseline.a \
$(top_builddir)/src/libs/zbxtrends/libzbxtrends.a \
$(top_builddir)/src/libs/zbxprometheus/libzbxprometheus.a \
$(top_builddir)/src/libs/zbxvault/libzbxvault.a \
diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c
index 69b8ee71a5c..e42ecfb8494 100644
--- a/src/zabbix_proxy/proxy.c
+++ b/src/zabbix_proxy/proxy.c
@@ -905,7 +905,7 @@ static void zbx_load_config(ZBX_TASK_EX *task)
/* initialize multistrings */
zbx_strarr_init(&CONFIG_LOAD_MODULE);
- parse_cfg_file(CONFIG_FILE, cfg, ZBX_CFG_FILE_REQUIRED, ZBX_CFG_STRICT);
+ parse_cfg_file(CONFIG_FILE, cfg, ZBX_CFG_FILE_REQUIRED, ZBX_CFG_STRICT, ZBX_CFG_EXIT_FAILURE);
zbx_set_defaults();
@@ -945,7 +945,7 @@ static void zbx_load_config(ZBX_TASK_EX *task)
******************************************************************************/
static void zbx_free_config(void)
{
- zbx_strarr_free(CONFIG_LOAD_MODULE);
+ zbx_strarr_free(&CONFIG_LOAD_MODULE);
}
/******************************************************************************
diff --git a/src/zabbix_sender/zabbix_sender.c b/src/zabbix_sender/zabbix_sender.c
index ed60d697c08..83b6d11e2af 100644
--- a/src/zabbix_sender/zabbix_sender.c
+++ b/src/zabbix_sender/zabbix_sender.c
@@ -961,7 +961,7 @@ static void zbx_load_config(const char *config_file)
};
/* do not complain about unknown parameters in agent configuration file */
- parse_cfg_file(config_file, cfg, ZBX_CFG_FILE_REQUIRED, ZBX_CFG_NOT_STRICT);
+ parse_cfg_file(config_file, cfg, ZBX_CFG_FILE_REQUIRED, ZBX_CFG_NOT_STRICT, ZBX_CFG_EXIT_FAILURE);
/* get first hostname only */
if (NULL != cfg_hostname)
diff --git a/src/zabbix_server/Makefile.am b/src/zabbix_server/Makefile.am
index 7046b1ac119..f44884903d0 100644
--- a/src/zabbix_server/Makefile.am
+++ b/src/zabbix_server/Makefile.am
@@ -116,6 +116,7 @@ zabbix_server_LDADD = \
$(top_builddir)/src/libs/zbxtasks/libzbxtasks.a \
$(top_builddir)/src/libs/zbxdiag/libzbxdiag_server.a \
$(top_builddir)/src/libs/zbxcompress/libzbxcompress.a \
+ $(top_builddir)/src/libs/zbxtrends/libzbxtrends_baseline.a \
$(top_builddir)/src/libs/zbxtrends/libzbxtrends.a \
$(top_builddir)/src/libs/zbxserver/libzbxserver_server.a \
$(top_builddir)/src/libs/zbxha/libzbxha.a \
diff --git a/src/zabbix_server/actions.c b/src/zabbix_server/actions.c
index 3962e4409a7..87c3748fb64 100644
--- a/src/zabbix_server/actions.c
+++ b/src/zabbix_server/actions.c
@@ -3602,7 +3602,7 @@ void get_db_actions_info(zbx_vector_uint64_t *actionids, zbx_vector_ptr_t *actio
DBadd_condition_alloc(&filter, &filter_alloc, &filter_offset, "actionid", actionids->values,
actionids->values_num);
- result = DBselect("select actionid,name,status,eventsource,esc_period,pause_suppressed"
+ result = DBselect("select actionid,name,status,eventsource,esc_period,pause_suppressed,notify_if_canceled"
" from actions"
" where%s order by actionid", filter);
@@ -3627,6 +3627,7 @@ void get_db_actions_info(zbx_vector_uint64_t *actionids, zbx_vector_ptr_t *actio
zbx_free(tmp);
ZBX_STR2UCHAR(action->pause_suppressed, row[5]);
+ ZBX_STR2UCHAR(action->notify_if_canceled, row[6]);
action->name = zbx_strdup(NULL, row[1]);
action->recovery = ZBX_ACTION_RECOVERY_NONE;
diff --git a/src/zabbix_server/escalator/escalator.c b/src/zabbix_server/escalator/escalator.c
index 6cc06a72c87..3fea49b299f 100644
--- a/src/zabbix_server/escalator/escalator.c
+++ b/src/zabbix_server/escalator/escalator.c
@@ -1070,7 +1070,7 @@ static void add_sentusers_msg_esc_cancel(ZBX_USER_MSG **user_msg, zbx_uint64_t a
user_timezone = get_user_timezone(userid);
}
- message_dyn = zbx_dsprintf(NULL, "NOTE: Escalation cancelled: %s\nLast message sent:\n%s", error,
+ message_dyn = zbx_dsprintf(NULL, "NOTE: Escalation canceled: %s\nLast message sent:\n%s", error,
row[3]);
tz = NULL == user_timezone || 0 == strcmp(user_timezone, "default") ? default_timezone : user_timezone;
@@ -2420,7 +2420,7 @@ out:
static void escalation_log_cancel_warning(const DB_ESCALATION *escalation, const char *error)
{
if (0 != escalation->esc_step)
- zabbix_log(LOG_LEVEL_WARNING, "escalation cancelled: %s", error);
+ zabbix_log(LOG_LEVEL_WARNING, "escalation canceled: %s", error);
}
/******************************************************************************
@@ -2443,8 +2443,9 @@ static void escalation_cancel(DB_ESCALATION *escalation, const DB_ACTION *action
zabbix_log(LOG_LEVEL_DEBUG, "In %s() escalationid:" ZBX_FS_UI64 " status:%s",
__func__, escalation->escalationid, zbx_escalation_status_string(escalation->status));
- /* the cancellation notification can be sent if no objects are deleted */
- if (NULL != action && NULL != event && 0 != event->trigger.triggerid && 0 != escalation->esc_step)
+ /* the cancellation notification can be sent if no objects are deleted and notification is not disabled */
+ if (NULL != action && NULL != event && 0 != event->trigger.triggerid && 0 != escalation->esc_step &&
+ ACTION_NOTIFY_IF_CANCELED_FALSE != action->notify_if_canceled)
{
add_sentusers_msg_esc_cancel(&user_msg, action->actionid, event, ZBX_NULL2EMPTY_STR(error),
default_timezone, service, roles);
diff --git a/src/zabbix_server/server.c b/src/zabbix_server/server.c
index 4ba24d928ba..212a61cef96 100644
--- a/src/zabbix_server/server.c
+++ b/src/zabbix_server/server.c
@@ -976,7 +976,7 @@ static void zbx_load_config(ZBX_TASK_EX *task)
/* initialize multistrings */
zbx_strarr_init(&CONFIG_LOAD_MODULE);
- parse_cfg_file(CONFIG_FILE, cfg, ZBX_CFG_FILE_REQUIRED, ZBX_CFG_STRICT);
+ parse_cfg_file(CONFIG_FILE, cfg, ZBX_CFG_FILE_REQUIRED, ZBX_CFG_STRICT, ZBX_CFG_EXIT_FAILURE);
zbx_set_defaults();
@@ -1000,7 +1000,7 @@ static void zbx_load_config(ZBX_TASK_EX *task)
******************************************************************************/
static void zbx_free_config(void)
{
- zbx_strarr_free(CONFIG_LOAD_MODULE);
+ zbx_strarr_free(&CONFIG_LOAD_MODULE);
}
/******************************************************************************
diff --git a/templates/db/oracle_odbc/README.md b/templates/db/oracle_odbc/README.md
index eb2daee113f..4a95b8bc474 100644
--- a/templates/db/oracle_odbc/README.md
+++ b/templates/db/oracle_odbc/README.md
@@ -46,21 +46,7 @@ This template was tested on:
2. Install the ODBC driver on the Zabbix server or the Zabbix proxy.
See Oracle documentation for instructions: https://www.oracle.com/database/technologies/releasenote-odbc-ic.html.
-3. Add a new record to odbc.ini:
-```
-[$ORACLE.DSN]
-Driver = Oracle 19 ODBC driver
-Servername = $ORACLE.DSN
-DSN = $ORACLE.DSN
-```
-**Note! Credentials in the odbc.ini do not work for Oracle.**
-
-4. Check the connection via isql:
-```
-isql $TNS_NAME $DB_USER $DB_PASSWORD
-```
-
-5. Configure Zabbix server or Zabbix proxy for Oracle ENV Usage. Edit or add a new file:
+3. Configure Zabbix server or Zabbix proxy for Oracle ENV Usage. Edit or add a new file:
Edit or add new file
@@ -76,12 +62,12 @@ isql $TNS_NAME $DB_USER $DB_PASSWORD
export TNS_ADMIN=$ORACLE_HOME/network/admin
```
-6. Restart Zabbix server or Zabbix proxy.
+4. Restart Zabbix server or Zabbix proxy.
-7. Set the username and password in host macros ({$ORACLE.USER} and {$ORACLE.PASSWORD}).
-
-8. Set the {$ORACLE.DSN} in host macros.
+5. Set the username and password in host macros ({$ORACLE.USER} and {$ORACLE.PASSWORD}).
+6. Set the {$ORACLE.DRIVER} and {$ORACLE.SERVICE} in host macros.
+ {$ORACLE.DRIVER} is a path to driver location in OS.
The "Service's TCP port state" item uses {HOST.CONN} and {$ORACLE.PORT} macros to check the availability of the listener.
@@ -99,13 +85,14 @@ No specific Zabbix configuration is required.
|{$ORACLE.DB.FILE.MAX.WARN} |<p>Maximum percentage of database files for trigger expression.</p> |`80` |
|{$ORACLE.DBNAME.MATCHES} |<p>This macro is used in database discovery. It can be overridden on a host or linked template level.</p> |`.*` |
|{$ORACLE.DBNAME.NOT_MATCHES} |<p>This macro is used in database discovery. It can be overridden on a host or linked template level.</p> |`PDB\$SEED` |
-|{$ORACLE.DSN} |<p>System data source name</p> |`<Put your DSN here>` |
+|{$ORACLE.DRIVER} |<p>Oracle driver path. e.g /usr/lib/oracle/21/client64/lib/libsqora.so.21.1</p> |`<Put path to oracle driver here>` |
|{$ORACLE.EXPIRE.PASSWORD.MIN.WARN} |<p>Number of days of warning before password expires (for trigger expression).</p> |`7` |
|{$ORACLE.PASSWORD} |<p>Oracle user password.</p> |`<Put your password here>` |
|{$ORACLE.PGA.USE.MAX.WARN} |<p>Maximum percentage of PGA usage alert threshold (for trigger expression).</p> |`90` |
|{$ORACLE.PORT} |<p>Oracle DB TCP port.</p> |`1521` |
|{$ORACLE.PROCESSES.MAX.WARN} |<p>Maximum percentage of active processes alert threshold (for trigger expression).</p> |`80` |
|{$ORACLE.REDO.MIN.WARN} |<p>Minimum number of REDO logs alert threshold (for trigger expression).</p> |`3` |
+|{$ORACLE.SERVICE} |<p>Oracle service name</p> |`<Put oracle service name here>` |
|{$ORACLE.SESSION.LOCK.MAX.TIME} |<p>Maximum session lock duration in seconds for count the session as a prolongely locked query.</p> |`600` |
|{$ORACLE.SESSION.LONG.LOCK.MAX.WARN} |<p>Maximum number of the prolongely locked sessions alert threshold (for trigger expression).</p> |`3` |
|{$ORACLE.SESSIONS.LOCK.MAX.WARN} |<p>Maximum percentage of locked sessions alert threshold (for trigger expression).</p> |`20` |
@@ -127,11 +114,11 @@ There are no template links in this template.
|Name|Description|Type|Key and additional info|
|----|-----------|----|----|
-|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[db_list,"{$ORACLE.DSN}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
-|PDB discovery |<p>Scanning PDB in DBMS.</p> |ODBC |db.odbc.discovery[pdb_list,"{$ORACLE.DSN}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
-|Tablespace discovery |<p>Scanning tablespaces in DBMS.</p> |ODBC |db.odbc.discovery[tbsname,"{$ORACLE.DSN}"]<p>**Filter**:</p>AND <p>- A: {#TABLESPACE} MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.MATCHES}`</p><p>- B: {#TABLESPACE} NOT_MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.NOT_MATCHES}`</p> |
-|Archive log discovery |<p>Log archive destinations.</p> |ODBC |db.odbc.discovery[archivelog,"{$ORACLE.DSN}"] |
-|ASM disk groups discovery |<p>ASM disk groups</p> |ODBC |db.odbc.discovery[asm,"{$ORACLE.DSN}"] |
+|Database discovery |<p>Scanning databases in DBMS.</p> |ODBC |db.odbc.discovery[db_list,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
+|PDB discovery |<p>Scanning PDB in DBMS.</p> |ODBC |db.odbc.discovery[pdb_list,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$ORACLE.DBNAME.MATCHES}`</p><p>- B: {#DBNAME} NOT_MATCHES_REGEX `{$ORACLE.DBNAME.NOT_MATCHES}`</p> |
+|Tablespace discovery |<p>Scanning tablespaces in DBMS.</p> |ODBC |db.odbc.discovery[tbsname,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Filter**:</p>AND <p>- A: {#TABLESPACE} MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.MATCHES}`</p><p>- B: {#TABLESPACE} NOT_MATCHES_REGEX `{$ORACLE.TABLESPACE.NAME.NOT_MATCHES}`</p> |
+|Archive log discovery |<p>Log archive destinations.</p> |ODBC |db.odbc.discovery[archivelog,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"] |
+|ASM disk groups discovery |<p>ASM disk groups</p> |ODBC |db.odbc.discovery[asm,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"] |
## Items collected
@@ -221,50 +208,50 @@ There are no template links in this template.
|Oracle |ASM '{#DG_NAME}': Total size |<p>Total size of ASM disk group.</p> |DEPENDENT |oracle.asm_total_size["{#DG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DG_NAME=='{#DG_NAME}')].SIZE_BYTE.first()`</p> |
|Oracle |ASM '{#DG_NAME}': Free size |<p>Free size of ASM disk group.</p> |DEPENDENT |oracle.asm_free_size["{#DG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DG_NAME=='{#DG_NAME}')].FREE_SIZE_BYTE.first()`</p> |
|Oracle |ASM '{#DG_NAME}': Free size |<p>Usage percent of ASM disk group.</p> |DEPENDENT |oracle.asm_used_pct["{#DG_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$[?(@.DG_NAME=='{#DG_NAME}')].USED_PERCENT.first()`</p> |
-|Zabbix_raw_items |Oracle: Get instance state |<p>The item gets state of the current instance.</p> |ODBC |db.odbc.get[get_instance_state,"{$ORACLE.DSN}"]<p>**Expression**:</p>`Text is too long. Please see the template.` |
-|Zabbix_raw_items |Oracle: Get system metrics |<p>The item gets system metric values.</p> |ODBC |db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]<p>**Expression**:</p>`Text is too long. Please see the template.` |
-|Zabbix_raw_items |Oracle: Get tablespaces stats |<p>Get tablespaces stats.</p> |ODBC |db.odbc.get[tablespace_stats,"{$ORACLE.DSN}"]<p>**Expression**:</p>`Text is too long. Please see the template.` |
-|Zabbix_raw_items |Oracle: Get CDB and No-CDB info |<p>Get info about CDB and No-CDB databases on instansce.</p> |ODBC |db.odbc.get[get_cdb_info,"{$ORACLE.DSN}"]<p>**Expression**:</p>`Text is too long. Please see the template.` |
-|Zabbix_raw_items |Oracle: Get PDB info |<p>Get info about PDB databases on instansce.</p> |ODBC |db.odbc.get[get_pdb_info,"{$ORACLE.DSN}"]<p>**Expression**:</p>`Text is too long. Please see the template.` |
-|Zabbix_raw_items |Oracle: Get archive log info | |ODBC |db.odbc.get[get_archivelog_stat,"{$ORACLE.DSN}"]<p>**Expression**:</p>`Text is too long. Please see the template.` |
-|Zabbix_raw_items |Oracle: Get ASM stats |<p>Get ASM disk groups stats.</p> |ODBC |db.odbc.get[get_asm_stat,"{$ORACLE.DSN}"]<p>**Expression**:</p>`Text is too long. Please see the template.` |
+|Zabbix_raw_items |Oracle: Get instance state |<p>The item gets state of the current instance.</p> |ODBC |db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix_raw_items |Oracle: Get system metrics |<p>The item gets system metric values.</p> |ODBC |db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix_raw_items |Oracle: Get tablespaces stats |<p>Get tablespaces stats.</p> |ODBC |db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix_raw_items |Oracle: Get CDB and No-CDB info |<p>Get info about CDB and No-CDB databases on instansce.</p> |ODBC |db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix_raw_items |Oracle: Get PDB info |<p>Get info about PDB databases on instansce.</p> |ODBC |db.odbc.get[get_pdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix_raw_items |Oracle: Get archive log info | |ODBC |db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
+|Zabbix_raw_items |Oracle: Get ASM stats |<p>Get ASM disk groups stats.</p> |ODBC |db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]<p>**Expression**:</p>`The text is too long. Please see the template.` |
## Triggers
|Name|Description|Expression|Severity|Dependencies and additional info|
|----|-----------|----|----|----|
-|Oracle: Port {$ORACLE.PORT} is unavailable |<p>The TCP port of the Oracle Server service is currently unavailable.</p> |`{TEMPLATE_NAME:net.tcp.service[tcp,{HOST.CONN},{$ORACLE.PORT}].max(#3)}=0 and {Oracle by ODBC:proc.num[,,,"tnslsnr LISTENER"].max(#3)}>0` |DISASTER | |
-|Oracle: LISTENER process is not running | |`{TEMPLATE_NAME:proc.num[,,,"tnslsnr LISTENER"].max(#3)}=0` |DISASTER | |
-|Oracle: Version has changed (new version value received: {ITEM.VALUE}) |<p>Oracle DB version has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.version.diff()}=1 and {TEMPLATE_NAME:oracle.version.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Oracle: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:oracle.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
-|Oracle: Failed to fetch info data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes. The database might be unavailable for connecting.</p> |`{TEMPLATE_NAME:oracle.uptime.nodata(5m)}=1` |WARNING |<p>**Depends on**:</p><p>- Oracle: Port {$ORACLE.PORT} is unavailable</p> |
-|Oracle: Instance name has changed (new name received: {ITEM.VALUE}) |<p>Oracle DB Instance name has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.instance_name.diff()}=1 and {TEMPLATE_NAME:oracle.instance_name.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Oracle: Instance hostname has changed (new hostname received: {ITEM.VALUE}) |<p>Oracle DB Instance hostname has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.instance_hostname.diff()}=1 and {TEMPLATE_NAME:oracle.instance_hostname.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|Oracle: Too many active processes (over {$ORACLE.PROCESSES.MAX.WARN}% for 5 min) |<p>Active processes are using more than {$ORACLE.PROCESSES.MAX.WARN}% of the available number of processes.</p> |`{TEMPLATE_NAME:oracle.processes_count.min(5m)} * 100 / {Oracle by ODBC:oracle.processes_limit.last()} > {$ORACLE.PROCESSES.MAX.WARN}` |WARNING | |
-|Oracle: Too many database files (over {$ORACLE.DB.FILE.MAX.WARN}% for 5 min) |<p>Number of datafiles is higher than {$ORACLE.DB.FILE.MAX.WARN}% of the available datafile files limit.</p> |`{TEMPLATE_NAME:oracle.db_files_count.min(5m)} * 100 / {Oracle by ODBC:oracle.db_files_limit.last()} > {$ORACLE.DB.FILE.MAX.WARN}` |WARNING | |
-|Oracle: Shared pool free is too low (less {$ORACLE.SHARED.FREE.MIN.WARN}% for 5m) |<p>The shared pool free memory percent has been less than {$ORACLE.SHARED.FREE.MIN.WARN}% in the last 5 minutes.</p> |`{TEMPLATE_NAME:oracle.shared_pool_free.max(5m)}<{$ORACLE.SHARED.FREE.MIN.WARN}` |WARNING | |
-|Oracle: Too many active sessions (over {$ORACLE.SESSIONS.MAX.WARN}% for 5 min) |<p>Active sessions are using more than {$ORACLE.SESSIONS.MAX.WARN}% of the available sessions.</p> |`{TEMPLATE_NAME:oracle.session_count.min(5m)} * 100 / {Oracle by ODBC:oracle.session_limit.last()} > {$ORACLE.SESSIONS.MAX.WARN}` |WARNING | |
-|Oracle: Too many locked sessions (over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% for 5 min) |<p>Number of locked sessions is over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% of the running sessions.</p> |`{TEMPLATE_NAME:oracle.session_lock_rate.min(5m)} > {$ORACLE.SESSIONS.LOCK.MAX.WARN}` |WARNING | |
-|Oracle: Too many sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s (over {$ORACLE.SESSION.LONG.LOCK.MAX.WARN} for 5 min) |<p>Number of sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME} seconds is too high. Long-term locks can negatively affect database performance, therefore, if they are detected, you should first find the most difficult queries from the database point of view and analyze possible resource leaks.</p> |`{TEMPLATE_NAME:oracle.session_long_time_locked.min(5m)} > {$ORACLE.SESSION.LONG.LOCK.MAX.WARN}` |WARNING | |
-|Oracle: Too high database concurrency (over {$ORACLE.CONCURRENCY.MAX.WARN}% for 5 min) |<p>Concurrency rate is over {$ORACLE.CONCURRENCY.MAX.WARN}%. A high contention value does not indicate the root cause of the problem, but is a signal to search for it. In the case of high competition, an analysis of resource consumption should be carried out, the most "heavy" queries made in the database, possibly - session tracing. All this will help determine the root cause and possible optimization points both in the database configuration and in the logic of building queries of the application itself.</p> |`{TEMPLATE_NAME:oracle.session_concurrency_rate.min(5m)} > {$ORACLE.CONCURRENCY.MAX.WARN}` |WARNING | |
-|Oracle: Zabbix account will expire soon (under {$ORACLE.EXPIRE.PASSWORD.MIN.WARN} days) |<p>Password for zabbix user in the database will expire soon.</p> |`{TEMPLATE_NAME:oracle.user_expire_password.last()} < {$ORACLE.EXPIRE.PASSWORD.MIN.WARN}` |WARNING | |
-|Oracle: Total PGA inuse is too high (over {$ORACLE.PGA.USE.MAX.WARN}% for 5 min) |<p>Total PGA in use is more than {$ORACLE.PGA.USE.MAX.WARN}% of PGA_AGGREGATE_TARGET.</p> |`{TEMPLATE_NAME:oracle.total_pga_used.min(5m)} * 100 / {Oracle by ODBC:oracle.pga_target.last()} > {$ORACLE.PGA.USE.MAX.WARN}` |WARNING | |
-|Oracle: Number of REDO logs available for switching is too low (less {$ORACLE.REDO.MIN.WARN} for 5 min) |<p>Number of available for log switching inactive/unused REDOs is low (Database down risk)</p> |`{TEMPLATE_NAME:oracle.redo_logs_available.max(5m)} < {$ORACLE.REDO.MIN.WARN}` |WARNING | |
-|Oracle Database '{#DBNAME}': Open status in mount mode |<p>The Oracle DB has a MOUNTED state.</p> |`{TEMPLATE_NAME:oracle.db_open_mode["{#DBNAME}"].last()}=1` |WARNING | |
-|Oracle Database '{#DBNAME}': Open status has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB open status has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.db_open_mode["{#DBNAME}"].diff()}=1` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle Database '{#DBNAME}': Open status in mount mode</p> |
-|Oracle Database '{#DBNAME}': Role has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB role has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.db_role["{#DBNAME}"].diff()}=1` |INFO |<p>Manual close: YES</p> |
-|Oracle Database '{#DBNAME}': Force logging is deactivated for DB with active Archivelog |<p>Force Logging mode - it is very important metric for Databases in 'ARCHIVELOG'. This feature allows to forcibly write all transactions to the REDO.</p> |`{TEMPLATE_NAME:oracle.db_force_logging["{#DBNAME}"].last()} = 0 and {Oracle by ODBC:oracle.db_log_mode["{#DBNAME}"].last()} = 1` |WARNING | |
-|Oracle Database '{#DBNAME}': Open status in mount mode |<p>The Oracle DB has a MOUNTED state.</p> |`{TEMPLATE_NAME:oracle.pdb_open_mode["{#DBNAME}"].last()}=1` |WARNING | |
-|Oracle Database '{#DBNAME}': Open status has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB open status has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.pdb_open_mode["{#DBNAME}"].diff()}=1` |INFO |<p>Manual close: YES</p> |
-|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). | |`{TEMPLATE_NAME:oracle.tbs_used_pct["{#TABLESPACE}"].min(5m)}>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).</p> |
-|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m). | |`{TEMPLATE_NAME:oracle.tbs_used_pct["{#TABLESPACE}"].min(5m)}>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}` |HIGH | |
-|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). | |`{TEMPLATE_NAME:oracle.tbs_used_file_pct["{#TABLESPACE}"].min(5m)}>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).</p> |
-|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m). | |`{TEMPLATE_NAME:oracle.tbs_used_file_pct["{#TABLESPACE}"].min(5m)}>{$ORACLE.TBS.USED.PCT.MAX.HIGH}` |HIGH | |
-|Oracle TBS '{#TABLESPACE}': Tablespase is OFFLINE |<p>The tablespase is in the offline state.</p> |`{TEMPLATE_NAME:oracle.tbs_status["{#TABLESPACE}"].last()}=2` |WARNING | |
-|Oracle TBS '{#TABLESPACE}': Tablespace status has changed (new value received: {ITEM.VALUE}) |<p>Oracle tablespace status has changed. Ack to close.</p> |`{TEMPLATE_NAME:oracle.tbs_status["{#TABLESPACE}"].diff()}=1` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespase is OFFLINE</p> |
-|Archivelog '{#DEST_NAME}': Log Archive is not valid |<p>ARL destination not in 3 - Valid or 2 - Deferred.</p> |`{TEMPLATE_NAME:oracle.archivelog_log_status["{#DEST_NAME}"].last()}<2` |HIGH | |
-|ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.WARN}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`{TEMPLATE_NAME:oracle.asm_used_pct["{#DG_NAME}"].min(5m)}>{$ORACLE.ASM.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m)</p> |
-|ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`{TEMPLATE_NAME:oracle.asm_used_pct["{#DG_NAME}"].min(5m)}>{$ORACLE.ASM.USED.PCT.MAX.HIGH}` |HIGH | |
+|Oracle: Port {$ORACLE.PORT} is unavailable |<p>The TCP port of the Oracle Server service is currently unavailable.</p> |`max(/Oracle by ODBC/net.tcp.service[tcp,{HOST.CONN},{$ORACLE.PORT}],#3)=0 and max(/Oracle by ODBC/proc.num[,,,"tnslsnr LISTENER"],#3)>0` |DISASTER | |
+|Oracle: LISTENER process is not running | |`max(/Oracle by ODBC/proc.num[,,,"tnslsnr LISTENER"],#3)=0` |DISASTER | |
+|Oracle: Version has changed (new version value received: {ITEM.VALUE}) |<p>Oracle DB version has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.version,#1)<>last(/Oracle by ODBC/oracle.version,#2) and length(last(/Oracle by ODBC/oracle.version))>0` |INFO |<p>Manual close: YES</p> |
+|Oracle: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`last(/Oracle by ODBC/oracle.uptime)<10m` |INFO |<p>Manual close: YES</p> |
+|Oracle: Failed to fetch info data (or no data for 5m) |<p>Zabbix has not received data for items for the last 5 minutes. The database might be unavailable for connecting.</p> |`nodata(/Oracle by ODBC/oracle.uptime,5m)=1` |WARNING |<p>**Depends on**:</p><p>- Oracle: Port {$ORACLE.PORT} is unavailable</p> |
+|Oracle: Instance name has changed (new name received: {ITEM.VALUE}) |<p>Oracle DB Instance name has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.instance_name,#1)<>last(/Oracle by ODBC/oracle.instance_name,#2) and length(last(/Oracle by ODBC/oracle.instance_name))>0` |INFO |<p>Manual close: YES</p> |
+|Oracle: Instance hostname has changed (new hostname received: {ITEM.VALUE}) |<p>Oracle DB Instance hostname has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.instance_hostname,#1)<>last(/Oracle by ODBC/oracle.instance_hostname,#2) and length(last(/Oracle by ODBC/oracle.instance_hostname))>0` |INFO |<p>Manual close: YES</p> |
+|Oracle: Too many active processes (over {$ORACLE.PROCESSES.MAX.WARN}% for 5 min) |<p>Active processes are using more than {$ORACLE.PROCESSES.MAX.WARN}% of the available number of processes.</p> |`min(/Oracle by ODBC/oracle.processes_count,5m) * 100 / last(/Oracle by ODBC/oracle.processes_limit) > {$ORACLE.PROCESSES.MAX.WARN}` |WARNING | |
+|Oracle: Too many database files (over {$ORACLE.DB.FILE.MAX.WARN}% for 5 min) |<p>Number of datafiles is higher than {$ORACLE.DB.FILE.MAX.WARN}% of the available datafile files limit.</p> |`min(/Oracle by ODBC/oracle.db_files_count,5m) * 100 / last(/Oracle by ODBC/oracle.db_files_limit) > {$ORACLE.DB.FILE.MAX.WARN}` |WARNING | |
+|Oracle: Shared pool free is too low (less {$ORACLE.SHARED.FREE.MIN.WARN}% for 5m) |<p>The shared pool free memory percent has been less than {$ORACLE.SHARED.FREE.MIN.WARN}% in the last 5 minutes.</p> |`max(/Oracle by ODBC/oracle.shared_pool_free,5m)<{$ORACLE.SHARED.FREE.MIN.WARN}` |WARNING | |
+|Oracle: Too many active sessions (over {$ORACLE.SESSIONS.MAX.WARN}% for 5 min) |<p>Active sessions are using more than {$ORACLE.SESSIONS.MAX.WARN}% of the available sessions.</p> |`min(/Oracle by ODBC/oracle.session_count,5m) * 100 / last(/Oracle by ODBC/oracle.session_limit) > {$ORACLE.SESSIONS.MAX.WARN}` |WARNING | |
+|Oracle: Too many locked sessions (over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% for 5 min) |<p>Number of locked sessions is over {$ORACLE.SESSIONS.LOCK.MAX.WARN}% of the running sessions.</p> |`min(/Oracle by ODBC/oracle.session_lock_rate,5m) > {$ORACLE.SESSIONS.LOCK.MAX.WARN}` |WARNING | |
+|Oracle: Too many sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME}s (over {$ORACLE.SESSION.LONG.LOCK.MAX.WARN} for 5 min) |<p>Number of sessions locked over {$ORACLE.SESSION.LOCK.MAX.TIME} seconds is too high. Long-term locks can negatively affect database performance, therefore, if they are detected, you should first find the most difficult queries from the database point of view and analyze possible resource leaks.</p> |`min(/Oracle by ODBC/oracle.session_long_time_locked,5m) > {$ORACLE.SESSION.LONG.LOCK.MAX.WARN}` |WARNING | |
+|Oracle: Too high database concurrency (over {$ORACLE.CONCURRENCY.MAX.WARN}% for 5 min) |<p>Concurrency rate is over {$ORACLE.CONCURRENCY.MAX.WARN}%. A high contention value does not indicate the root cause of the problem, but is a signal to search for it. In the case of high competition, an analysis of resource consumption should be carried out, the most "heavy" queries made in the database, possibly - session tracing. All this will help determine the root cause and possible optimization points both in the database configuration and in the logic of building queries of the application itself.</p> |`min(/Oracle by ODBC/oracle.session_concurrency_rate,5m) > {$ORACLE.CONCURRENCY.MAX.WARN}` |WARNING | |
+|Oracle: Zabbix account will expire soon (under {$ORACLE.EXPIRE.PASSWORD.MIN.WARN} days) |<p>Password for zabbix user in the database will expire soon.</p> |`last(/Oracle by ODBC/oracle.user_expire_password) < {$ORACLE.EXPIRE.PASSWORD.MIN.WARN}` |WARNING | |
+|Oracle: Total PGA inuse is too high (over {$ORACLE.PGA.USE.MAX.WARN}% for 5 min) |<p>Total PGA in use is more than {$ORACLE.PGA.USE.MAX.WARN}% of PGA_AGGREGATE_TARGET.</p> |`min(/Oracle by ODBC/oracle.total_pga_used,5m) * 100 / last(/Oracle by ODBC/oracle.pga_target) > {$ORACLE.PGA.USE.MAX.WARN}` |WARNING | |
+|Oracle: Number of REDO logs available for switching is too low (less {$ORACLE.REDO.MIN.WARN} for 5 min) |<p>Number of available for log switching inactive/unused REDOs is low (Database down risk)</p> |`max(/Oracle by ODBC/oracle.redo_logs_available,5m) < {$ORACLE.REDO.MIN.WARN}` |WARNING | |
+|Oracle Database '{#DBNAME}': Open status in mount mode |<p>The Oracle DB has a MOUNTED state.</p> |`last(/Oracle by ODBC/oracle.db_open_mode["{#DBNAME}"])=1` |WARNING | |
+|Oracle Database '{#DBNAME}': Open status has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB open status has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.db_open_mode["{#DBNAME}"],#1)<>last(/Oracle by ODBC/oracle.db_open_mode["{#DBNAME}"],#2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle Database '{#DBNAME}': Open status in mount mode</p> |
+|Oracle Database '{#DBNAME}': Role has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB role has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.db_role["{#DBNAME}"],#1)<>last(/Oracle by ODBC/oracle.db_role["{#DBNAME}"],#2)` |INFO |<p>Manual close: YES</p> |
+|Oracle Database '{#DBNAME}': Force logging is deactivated for DB with active Archivelog |<p>Force Logging mode - it is very important metric for Databases in 'ARCHIVELOG'. This feature allows to forcibly write all transactions to the REDO.</p> |`last(/Oracle by ODBC/oracle.db_force_logging["{#DBNAME}"]) = 0 and last(/Oracle by ODBC/oracle.db_log_mode["{#DBNAME}"]) = 1` |WARNING | |
+|Oracle Database '{#DBNAME}': Open status in mount mode |<p>The Oracle DB has a MOUNTED state.</p> |`last(/Oracle by ODBC/oracle.pdb_open_mode["{#DBNAME}"])=1` |WARNING | |
+|Oracle Database '{#DBNAME}': Open status has changed (new value received: {ITEM.VALUE}) |<p>Oracle DB open status has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.pdb_open_mode["{#DBNAME}"],#1)<>last(/Oracle by ODBC/oracle.pdb_open_mode["{#DBNAME}"],#2)` |INFO |<p>Manual close: YES</p> |
+|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). | |`min(/Oracle by ODBC/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m).</p> |
+|Oracle TBS '{#TABLESPACE}': Tablespace utilization is too high (over {$ORACLE.TBS.UTIL.PCT.MAX.HIGH}% for 5m). | |`min(/Oracle by ODBC/oracle.tbs_used_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.UTIL.PCT.MAX.HIGH}` |HIGH | |
+|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.WARN}% for 5m). | |`min(/Oracle by ODBC/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m).</p> |
+|Oracle TBS '{#TABLESPACE}': Tablespace usage is too high (over {$ORACLE.TBS.USED.PCT.MAX.HIGH}% for 5m). | |`min(/Oracle by ODBC/oracle.tbs_used_file_pct["{#TABLESPACE}"],5m)>{$ORACLE.TBS.USED.PCT.MAX.HIGH}` |HIGH | |
+|Oracle TBS '{#TABLESPACE}': Tablespase is OFFLINE |<p>The tablespase is in the offline state.</p> |`last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"])=2` |WARNING | |
+|Oracle TBS '{#TABLESPACE}': Tablespace status has changed (new value received: {ITEM.VALUE}) |<p>Oracle tablespace status has changed. Ack to close.</p> |`last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#1)<>last(/Oracle by ODBC/oracle.tbs_status["{#TABLESPACE}"],#2)` |INFO |<p>Manual close: YES</p><p>**Depends on**:</p><p>- Oracle TBS '{#TABLESPACE}': Tablespase is OFFLINE</p> |
+|Archivelog '{#DEST_NAME}': Log Archive is not valid |<p>ARL destination not in 3 - Valid or 2 - Deferred.</p> |`last(/Oracle by ODBC/oracle.archivelog_log_status["{#DEST_NAME}"])<2` |HIGH | |
+|ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.WARN}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`min(/Oracle by ODBC/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.WARN}` |WARNING |<p>**Depends on**:</p><p>- ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m)</p> |
+|ASM '{#DG_NAME}': Disk group usage is too high (over {$ORACLE.ASM.USED.PCT.MAX.HIGH}% for 5m) |<p>Usage percent of ASM disk group is over {$ORACLE.ASM.USED.PCT.MAX.WARN}</p> |`min(/Oracle by ODBC/oracle.asm_used_pct["{#DG_NAME}"],5m)>{$ORACLE.ASM.USED.PCT.MAX.HIGH}` |HIGH | |
## Feedback
diff --git a/templates/db/oracle_odbc/template_db_oracle_odbc.yaml b/templates/db/oracle_odbc/template_db_oracle_odbc.yaml
index dc059f208a5..e36ec3428c0 100644
--- a/templates/db/oracle_odbc/template_db_oracle_odbc.yaml
+++ b/templates/db/oracle_odbc/template_db_oracle_odbc.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '5.4'
- date: '2021-05-11T08:05:41Z'
+ date: '2021-12-01T16:34:59Z'
groups:
-
uuid: 748ad4d098d447d492bb935c907f652f
@@ -22,7 +22,7 @@ zabbix_export:
The "Service's TCP port state" item uses {HOST.CONN} and {$ORACLE.PORT} macros to check the availability of the listener.
- Template tooling version used: 0.38
+ Template tooling version used: 0.39
groups:
-
name: Templates/Databases
@@ -31,7 +31,7 @@ zabbix_export:
uuid: 1a6e01f90dca47459975632c14ce5a39
name: 'Oracle: Get archive log info'
type: ODBC
- key: 'db.odbc.get[get_archivelog_stat,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
delay: 5m
history: '0'
trends: '0'
@@ -53,7 +53,7 @@ zabbix_export:
uuid: 63fad55a2ced487aa30017b33bf1692e
name: 'Oracle: Get ASM stats'
type: ODBC
- key: 'db.odbc.get[get_asm_stat,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
history: '0'
trends: '0'
value_type: TEXT
@@ -75,7 +75,7 @@ zabbix_export:
uuid: 5de7c786988d49d0b50f28d2d622db62
name: 'Oracle: Get CDB and No-CDB info'
type: ODBC
- key: 'db.odbc.get[get_cdb_info,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
history: '0'
trends: '0'
value_type: TEXT
@@ -97,7 +97,7 @@ zabbix_export:
uuid: dde19b79507648bd80a82a0575bf8671
name: 'Oracle: Get instance state'
type: ODBC
- key: 'db.odbc.get[get_instance_state,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
history: '0'
trends: '0'
value_type: TEXT
@@ -122,7 +122,7 @@ zabbix_export:
uuid: cedcebd0b7ce474c9681022fcc75df1c
name: 'Oracle: Get PDB info'
type: ODBC
- key: 'db.odbc.get[get_pdb_info,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_pdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
history: '0'
trends: '0'
value_type: TEXT
@@ -142,7 +142,7 @@ zabbix_export:
uuid: 3839683749974cdeafd9178bdccb38d6
name: 'Oracle: Get system metrics'
type: ODBC
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
delay: 0;m0-59
history: '0'
trends: '0'
@@ -216,7 +216,7 @@ zabbix_export:
uuid: 972be2e777e44c539d0ddd7918b79e88
name: 'Oracle: Get tablespaces stats'
type: ODBC
- key: 'db.odbc.get[tablespace_stats,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
history: '0'
trends: '0'
value_type: TEXT
@@ -324,7 +324,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Active Parallel Sessions'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -344,7 +344,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Active Serial Sessions'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -364,7 +364,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Average Active Sessions'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -385,7 +385,7 @@ zabbix_export:
parameters:
- $..ARCHIVER.first()
master_item:
- key: 'db.odbc.get[get_instance_state,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -406,7 +406,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Buffer Cache Hit Ratio'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -425,7 +425,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Global Cache Blocks Corrupted'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -444,7 +444,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Global Cache Blocks Lost'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -465,7 +465,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Cursor Cache Hit Ratio'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -486,7 +486,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Database CPU Time Ratio'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -507,7 +507,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Database Wait Time Ratio'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -526,7 +526,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''DATAFILE::Count'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -545,7 +545,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYSPARAM::Db_Files'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -566,7 +566,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Disk Sort Per Sec'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -587,7 +587,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Enqueue Timeouts Per Sec'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -608,7 +608,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -627,7 +627,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''FRA::Restore Point'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -649,7 +649,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -671,7 +671,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -693,7 +693,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -715,7 +715,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -736,7 +736,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::GC CR Block Received Per Second'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -757,7 +757,7 @@ zabbix_export:
parameters:
- $..INSTANCE_ROLE.first()
master_item:
- key: 'db.odbc.get[get_instance_state,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -778,7 +778,7 @@ zabbix_export:
parameters:
- $..HOST_NAME.first()
master_item:
- key: 'db.odbc.get[get_instance_state,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -807,7 +807,7 @@ zabbix_export:
parameters:
- $..INSTANCE_NAME.first()
master_item:
- key: 'db.odbc.get[get_instance_state,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -836,7 +836,7 @@ zabbix_export:
parameters:
- $..STATUS.first()
master_item:
- key: 'db.odbc.get[get_instance_state,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -857,7 +857,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Library Cache Hit Ratio'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -878,7 +878,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Logons Per Sec'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -899,7 +899,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Long Table Scans Per Sec'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -920,7 +920,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Memory Sorts Ratio'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -940,7 +940,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''PGA::Global Memory Bound'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -960,7 +960,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''PGA::Aggregate Pga Target Parameter'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -981,7 +981,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Physical Reads Per Sec'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1002,7 +1002,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Physical Read Bytes Per Sec'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1023,7 +1023,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Physical Writes Per Sec'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1044,7 +1044,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Physical Write Bytes Per Sec'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1062,7 +1062,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''PROC::Procnum'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1081,7 +1081,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYSPARAM::Processes'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1100,7 +1100,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''REDO::Available'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1127,7 +1127,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Rows Per Sort'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1152,7 +1152,7 @@ zabbix_export:
parameters:
- '0.01'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1174,7 +1174,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1196,7 +1196,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1217,7 +1217,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SESSION::Concurrency rate'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1244,7 +1244,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SESSION::Total'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1266,7 +1266,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1285,7 +1285,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYSPARAM::Sessions'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1306,7 +1306,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SESSION::Lock rate'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1333,7 +1333,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SESSION::Long time locked'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1362,7 +1362,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1384,7 +1384,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1406,7 +1406,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1428,7 +1428,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1450,7 +1450,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1472,7 +1472,7 @@ zabbix_export:
error_handler: CUSTOM_VALUE
error_handler_params: '0'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1493,7 +1493,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Shared Pool Free %'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1520,7 +1520,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Total Sorts Per User Call'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1541,7 +1541,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::Temp Space Used'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1561,7 +1561,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''PGA::Total Pga Allocated'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1581,7 +1581,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''PGA::Total Freeable Pga Memory'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1601,7 +1601,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''PGA::Total Pga Inuse'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1622,7 +1622,7 @@ zabbix_export:
parameters:
- $..UPTIME.first()
master_item:
- key: 'db.odbc.get[get_instance_state,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1661,7 +1661,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''USER::Expire password'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1689,7 +1689,7 @@ zabbix_export:
parameters:
- '$[?(@.METRIC==''SYS::User Rollbacks Per Sec'')].VALUE.first()'
master_item:
- key: 'db.odbc.get[get_system_metrics,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_system_metrics,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1714,7 +1714,7 @@ zabbix_export:
parameters:
- 1d
master_item:
- key: 'db.odbc.get[get_instance_state,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_instance_state,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1754,7 +1754,7 @@ zabbix_export:
uuid: a527b14b1cee4115be5c5e9387af821b
name: 'Archive log discovery'
type: ODBC
- key: 'db.odbc.discovery[archivelog,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.discovery[archivelog,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
delay: 1h
params: |
SELECT d.dest_name
@@ -1783,7 +1783,7 @@ zabbix_export:
parameters:
- 1h
master_item:
- key: 'db.odbc.get[get_archivelog_stat,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1802,7 +1802,7 @@ zabbix_export:
parameters:
- '$[?(@.DEST_NAME==''{#DEST_NAME}'')].LOG_SEQUENCE.first()'
master_item:
- key: 'db.odbc.get[get_archivelog_stat,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1827,7 +1827,7 @@ zabbix_export:
parameters:
- 1h
master_item:
- key: 'db.odbc.get[get_archivelog_stat,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_archivelog_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1843,7 +1843,7 @@ zabbix_export:
uuid: c40708b755c7464bb064b7bffc584381
name: 'ASM disk groups discovery'
type: ODBC
- key: 'db.odbc.discovery[asm,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.discovery[asm,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
delay: 1h
params: 'SELECT name AS dg_name FROM v$asm_diskgroup;'
username: '{$ORACLE.USER}'
@@ -1865,7 +1865,7 @@ zabbix_export:
parameters:
- '$[?(@.DG_NAME==''{#DG_NAME}'')].FREE_SIZE_BYTE.first()'
master_item:
- key: 'db.odbc.get[get_asm_stat,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1885,7 +1885,7 @@ zabbix_export:
parameters:
- '$[?(@.DG_NAME==''{#DG_NAME}'')].SIZE_BYTE.first()'
master_item:
- key: 'db.odbc.get[get_asm_stat,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1906,7 +1906,7 @@ zabbix_export:
parameters:
- '$[?(@.DG_NAME==''{#DG_NAME}'')].USED_PERCENT.first()'
master_item:
- key: 'db.odbc.get[get_asm_stat,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_asm_stat,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -1948,7 +1948,7 @@ zabbix_export:
uuid: 0f65936b86314c269b7720a9ff3f1c14
name: 'Database discovery'
type: ODBC
- key: 'db.odbc.discovery[db_list,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.discovery[db_list,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
delay: 1h
params: 'SELECT name as DBNAME, DECODE(CDB, ''YES'', ''CDB'', ''No-CDB'') AS TYPE FROM V$DATABASE;'
username: '{$ORACLE.USER}'
@@ -1987,7 +1987,7 @@ zabbix_export:
parameters:
- 15m
master_item:
- key: 'db.odbc.get[get_cdb_info,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2012,7 +2012,7 @@ zabbix_export:
parameters:
- 15m
master_item:
- key: 'db.odbc.get[get_cdb_info,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2037,7 +2037,7 @@ zabbix_export:
parameters:
- 15m
master_item:
- key: 'db.odbc.get[get_cdb_info,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2080,7 +2080,7 @@ zabbix_export:
parameters:
- 15m
master_item:
- key: 'db.odbc.get[get_cdb_info,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_cdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2104,7 +2104,7 @@ zabbix_export:
uuid: 2611e69f735a42b190852589658dd591
name: 'PDB discovery'
type: ODBC
- key: 'db.odbc.discovery[pdb_list,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.discovery[pdb_list,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
delay: 1h
params: 'SELECT name as DBNAME FROM V$PDBS;'
username: '{$ORACLE.USER}'
@@ -2143,7 +2143,7 @@ zabbix_export:
parameters:
- 15m
master_item:
- key: 'db.odbc.get[get_pdb_info,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_pdb_info,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2166,7 +2166,7 @@ zabbix_export:
uuid: c8de553c98f64e59b40bf927f6447ad1
name: 'Tablespace discovery'
type: ODBC
- key: 'db.odbc.discovery[tbsname,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.discovery[tbsname,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
delay: 1h
params: |
SELECT
@@ -2203,7 +2203,7 @@ zabbix_export:
parameters:
- '$[?(@.TABLESPACE==''{#TABLESPACE}'')].FILE_BYTES.first()'
master_item:
- key: 'db.odbc.get[tablespace_stats,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2223,7 +2223,7 @@ zabbix_export:
parameters:
- '$[?(@.TABLESPACE==''{#TABLESPACE}'')].FREE_BYTES.first()'
master_item:
- key: 'db.odbc.get[tablespace_stats,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2243,7 +2243,7 @@ zabbix_export:
parameters:
- '$[?(@.TABLESPACE==''{#TABLESPACE}'')].MAX_BYTES.first()'
master_item:
- key: 'db.odbc.get[tablespace_stats,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2264,7 +2264,7 @@ zabbix_export:
parameters:
- '$[?(@.TABLESPACE==''{#TABLESPACE}'')].STATUS.first()'
master_item:
- key: 'db.odbc.get[tablespace_stats,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2302,7 +2302,7 @@ zabbix_export:
parameters:
- '$[?(@.TABLESPACE==''{#TABLESPACE}'')].USED_BYTES.first()'
master_item:
- key: 'db.odbc.get[tablespace_stats,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2323,7 +2323,7 @@ zabbix_export:
parameters:
- '$[?(@.TABLESPACE==''{#TABLESPACE}'')].USED_FILE_PCT.first()'
master_item:
- key: 'db.odbc.get[tablespace_stats,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2359,7 +2359,7 @@ zabbix_export:
parameters:
- '$[?(@.TABLESPACE==''{#TABLESPACE}'')].USED_PCT_MAX.first()'
master_item:
- key: 'db.odbc.get[tablespace_stats,"{$ORACLE.DSN}"]'
+ key: 'db.odbc.get[get_tablespaces_stats,,"Driver={$ORACLE.DRIVER};DBQ=//{HOST.CONN}:{$ORACLE.PORT}/{$ORACLE.SERVICE};"]'
tags:
-
tag: Application
@@ -2427,9 +2427,9 @@ zabbix_export:
value: PDB\$SEED
description: 'This macro is used in database discovery. It can be overridden on a host or linked template level.'
-
- macro: '{$ORACLE.DSN}'
- value: '<Put your DSN here>'
- description: 'System data source name'
+ macro: '{$ORACLE.DRIVER}'
+ value: '<Put path to oracle driver here>'
+ description: 'Oracle driver path. e.g /usr/lib/oracle/21/client64/lib/libsqora.so.21.1'
-
macro: '{$ORACLE.EXPIRE.PASSWORD.MIN.WARN}'
value: '7'
@@ -2455,6 +2455,10 @@ zabbix_export:
value: '3'
description: 'Minimum number of REDO logs alert threshold (for trigger expression).'
-
+ macro: '{$ORACLE.SERVICE}'
+ value: '<Put oracle service name here>'
+ description: 'Oracle service name'
+ -
macro: '{$ORACLE.SESSION.LOCK.MAX.TIME}'
value: '600'
description: 'Maximum session lock duration in seconds for count the session as a prolongely locked query.'
diff --git a/templates/db/postgresql/README.md b/templates/db/postgresql/README.md
index 94694216118..5288b76e54b 100644
--- a/templates/db/postgresql/README.md
+++ b/templates/db/postgresql/README.md
@@ -63,7 +63,7 @@ This template was tested on PostgreSQL versions 9.6, 10 and 11 on Linux and Wind
*:5432:postgres:zbx_monitor:<PASSWORD>
```
-6. Import `template_db_postgresql.yaml` to Zabbix and link it to the target host
+6. Import template file to Zabbix and link it to the target host
## Zabbix configuration
diff --git a/templates/db/postgresql/postgresql/pgsql.frozenxid.sql b/templates/db/postgresql/postgresql/pgsql.frozenxid.sql
index be9d548b146..80334d9b9ee 100644
--- a/templates/db/postgresql/postgresql/pgsql.frozenxid.sql
+++ b/templates/db/postgresql/postgresql/pgsql.frozenxid.sql
@@ -1,18 +1,13 @@
-WITH T AS (
- SELECT
- age(relfrozenxid),
- current_setting('autovacuum_freeze_max_age')::integer fma
- FROM pg_class
- WHERE relkind IN ('r', 't'))
-SELECT row_to_json(T2)
+SELECT row_to_json(T)
FROM (
- SELECT extract(epoch FROM now())::integer ts,
- (
- SELECT ((1 - max(age)::double precision / current_setting('autovacuum_freeze_max_age')::integer) * 100)::numeric(9,6)
- FROM T
- ) prc_before_av,
- (
- SELECT ((1 - max(age)::double precision / -((1 << 31) + 1)) * 100)::numeric(9,6)
- FROM T
- ) prc_before_stop
-) T2
+ SELECT
+ extract(epoch FROM now())::integer AS ts,
+ ((1 - max(age(d.datfrozenxid))::double precision /
+ current_setting('autovacuum_freeze_max_age')::bigint) * 100)::numeric(9,6)
+ AS prc_before_av,
+ ((1 - abs(max(age(d.datfrozenxid))::double precision /
+ (1::bigint << (min(t.typlen)*8)))) * 100)::numeric(9,6)
+ AS prc_before_stop
+ FROM pg_database d CROSS JOIN pg_type t
+ WHERE t.typname = 'xid'
+) T;
diff --git a/templates/db/postgresql/postgresql/pgsql.replication.lag.sql b/templates/db/postgresql/postgresql/pgsql.replication.lag.sql
index fa031ec612d..e6046c26c32 100644
--- a/templates/db/postgresql/postgresql/pgsql.replication.lag.sql
+++ b/templates/db/postgresql/postgresql/pgsql.replication.lag.sql
@@ -1,30 +1,18 @@
-DO LANGUAGE plpgsql $$
-DECLARE
- ver integer;
- res text;
-BEGIN
- SELECT current_setting('server_version_num') INTO ver;
-
- IF (ver >= 100000) THEN
- SELECT * INTO res from (
- SELECT
- CASE WHEN pg_last_wal_receive_lsn() = pg_last_wal_replay_lsn()
- THEN 0
- ELSE COALESCE(EXTRACT(EPOCH FROM now() - pg_last_xact_replay_timestamp())::integer, 0)
- END
- ) T;
-
- ELSE
- SELECT * INTO res from (
- SELECT
- CASE WHEN pg_last_xlog_receive_location() = pg_last_xlog_replay_location()
- THEN 0
- ELSE COALESCE(EXTRACT(EPOCH FROM now() - pg_last_xact_replay_timestamp())::integer, 0)
- END
- ) T;
- END IF;
-
- perform set_config('zbx_tmp.repl_lag_res', res, false);
-END $$;
-
-select current_setting('zbx_tmp.repl_lag_res');
+SELECT
+ CASE
+ WHEN NOT pg_is_in_recovery() THEN
+ 'SELECT 0 AS value'
+ WHEN current_setting('server_version_num')::integer < 100000 THEN
+ 'SELECT '
+ 'CASE WHEN pg_last_xlog_receive_location() = pg_last_xlog_replay_location() '
+ 'THEN 0 '
+ 'ELSE COALESCE(EXTRACT(EPOCH FROM now() - pg_last_xact_replay_timestamp())::integer, 0) '
+ 'END AS value'
+ WHEN current_setting('server_version_num')::integer >= 100000 THEN
+ 'SELECT '
+ 'CASE WHEN pg_last_wal_receive_lsn() = pg_last_wal_replay_lsn() '
+ 'THEN 0 '
+ 'ELSE COALESCE(EXTRACT(EPOCH FROM now() - pg_last_xact_replay_timestamp())::integer, 0) '
+ 'END AS value'
+ END
+\gexec
diff --git a/templates/db/postgresql/template_db_postgresql.yaml b/templates/db/postgresql/template_db_postgresql.yaml
index 3f4710a4c0b..00030236f6e 100644
--- a/templates/db/postgresql/template_db_postgresql.yaml
+++ b/templates/db/postgresql/template_db_postgresql.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-09-09T08:49:53Z'
+ date: '2021-11-15T17:54:17Z'
groups:
-
uuid: 748ad4d098d447d492bb935c907f652f
@@ -1794,7 +1794,7 @@ zabbix_export:
-
type: GRAPH_PROTOTYPE
width: '12'
- height: '12'
+ height: '5'
fields:
-
type: INTEGER
@@ -1807,7 +1807,7 @@ zabbix_export:
-
type: INTEGER
name: rows
- value: '3'
+ value: '1'
-
type: GRAPH_PROTOTYPE
name: graphid
@@ -1818,7 +1818,7 @@ zabbix_export:
type: GRAPH_PROTOTYPE
x: '12'
width: '12'
- height: '12'
+ height: '5'
fields:
-
type: INTEGER
@@ -1831,7 +1831,7 @@ zabbix_export:
-
type: INTEGER
name: rows
- value: '3'
+ value: '1'
-
type: GRAPH_PROTOTYPE
name: graphid
@@ -1840,9 +1840,9 @@ zabbix_export:
host: 'PostgreSQL by user parameters'
-
type: GRAPH_PROTOTYPE
- 'y': '12'
+ 'y': '5'
width: '12'
- height: '12'
+ height: '5'
fields:
-
type: INTEGER
@@ -1855,7 +1855,7 @@ zabbix_export:
-
type: INTEGER
name: rows
- value: '3'
+ value: '1'
-
type: GRAPH_PROTOTYPE
name: graphid
@@ -1865,9 +1865,9 @@ zabbix_export:
-
type: GRAPH_PROTOTYPE
x: '12'
- 'y': '12'
+ 'y': '5'
width: '12'
- height: '12'
+ height: '5'
fields:
-
type: INTEGER
@@ -1880,7 +1880,7 @@ zabbix_export:
-
type: INTEGER
name: rows
- value: '3'
+ value: '1'
-
type: GRAPH_PROTOTYPE
name: graphid
@@ -1889,9 +1889,9 @@ zabbix_export:
host: 'PostgreSQL by user parameters'
-
type: GRAPH_PROTOTYPE
- 'y': '24'
+ 'y': '10'
width: '12'
- height: '12'
+ height: '5'
fields:
-
type: INTEGER
@@ -1904,7 +1904,7 @@ zabbix_export:
-
type: INTEGER
name: rows
- value: '3'
+ value: '1'
-
type: GRAPH_PROTOTYPE
name: graphid
@@ -1914,9 +1914,9 @@ zabbix_export:
-
type: GRAPH_PROTOTYPE
x: '12'
- 'y': '24'
+ 'y': '10'
width: '12'
- height: '12'
+ height: '5'
fields:
-
type: INTEGER
@@ -1929,7 +1929,7 @@ zabbix_export:
-
type: INTEGER
name: rows
- value: '3'
+ value: '1'
-
type: GRAPH_PROTOTYPE
name: graphid
@@ -1938,9 +1938,9 @@ zabbix_export:
host: 'PostgreSQL by user parameters'
-
type: GRAPH_PROTOTYPE
- 'y': '36'
+ 'y': '15'
width: '12'
- height: '12'
+ height: '5'
fields:
-
type: INTEGER
@@ -1953,7 +1953,7 @@ zabbix_export:
-
type: INTEGER
name: rows
- value: '3'
+ value: '1'
-
type: GRAPH_PROTOTYPE
name: graphid
@@ -1963,9 +1963,9 @@ zabbix_export:
-
type: GRAPH_PROTOTYPE
x: '12'
- 'y': '36'
+ 'y': '15'
width: '12'
- height: '12'
+ height: '5'
fields:
-
type: INTEGER
@@ -1978,7 +1978,7 @@ zabbix_export:
-
type: INTEGER
name: rows
- value: '3'
+ value: '1'
-
type: GRAPH_PROTOTYPE
name: graphid
diff --git a/templates/db/postgresql_agent2/README.md b/templates/db/postgresql_agent2/README.md
index 50a06ac595f..69ba6c6263a 100644
--- a/templates/db/postgresql_agent2/README.md
+++ b/templates/db/postgresql_agent2/README.md
@@ -23,6 +23,7 @@ This template was tested on:
CREATE USER 'zbx_monitor' WITH PASSWORD '<PASSWORD>' INHERIT;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_ls_dir(text) TO zbx_monitor;
GRANT EXECUTE ON FUNCTION pg_catalog.pg_stat_file(text) TO zbx_monitor;
+GRANT EXECUTE ON FUNCTION pg_catalog.pg_ls_waldir() TO zbx_monitor;
```
2\. Edit pg_hba.conf to allow connections from Zabbix agent:
@@ -46,17 +47,17 @@ No specific Zabbix configuration is required.
### Macros used
-| Name | Description | Default |
-|-------------------------------|-------------|------------------------|
-| {$PG.CONFLICTS.MAX.WARN} | <p>-</p> | `0` |
-| {$PG.CONN_TOTAL_PCT.MAX.WARN} | <p>-</p> | `90` |
-| {$PG.DATABASE} | <p>-</p> | `postgres` |
-| {$PG.DEADLOCKS.MAX.WARN} | <p>-</p> | `0` |
-| {$PG.LLD.FILTER.APPLICATION} | <p>-</p> | `(.+)` |
-| {$PG.LLD.FILTER.DBNAME} | <p>-</p> | `(.+)` |
-| {$PG.PASSWORD} | <p>-</p> | `postgres` |
-| {$PG.URI} | <p>-</p> | `tcp://localhost:5432` |
-| {$PG.USER} | <p>-</p> | `postgres` |
+|Name|Description|Default|
+|----|-----------|-------|
+|{$PG.CONFLICTS.MAX.WARN} |<p>-</p> |`0` |
+|{$PG.CONN_TOTAL_PCT.MAX.WARN} |<p>-</p> |`90` |
+|{$PG.DATABASE} |<p>-</p> |`postgres` |
+|{$PG.DEADLOCKS.MAX.WARN} |<p>-</p> |`0` |
+|{$PG.LLD.FILTER.APPLICATION} |<p>-</p> |`(.+)` |
+|{$PG.LLD.FILTER.DBNAME} |<p>-</p> |`(.+)` |
+|{$PG.PASSWORD} |<p>-</p> |`postgres` |
+|{$PG.URI} |<p>-</p> |`tcp://localhost:5432` |
+|{$PG.USER} |<p>-</p> |`postgres` |
## Template links
@@ -64,121 +65,122 @@ There are no template links in this template.
## Discovery rules
-| Name | Description | Type | Key and additional info |
-|-----------------------|-------------|----------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Replication Discovery | <p>-</p> | ZABBIX_PASSIVE | pgsql.replication.process.discovery["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#APPLICATION} MATCHES_REGEX `{$PG.LLD.FILTER.APPLICATION}`</p> |
-| Database discovery | <p>-</p> | ZABBIX_PASSIVE | pgsql.db.discovery["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$PG.LLD.FILTER.DBNAME}`</p> |
+|Name|Description|Type|Key and additional info|
+|----|-----------|----|----|
+|Replication Discovery |<p>-</p> |ZABBIX_PASSIVE |pgsql.replication.process.discovery["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#APPLICATION_NAME} MATCHES_REGEX `{$PG.LLD.FILTER.APPLICATION}`</p> |
+|Database discovery |<p>-</p> |ZABBIX_PASSIVE |pgsql.db.discovery["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Filter**:</p>AND <p>- A: {#DBNAME} MATCHES_REGEX `{$PG.LLD.FILTER.DBNAME}`</p> |
## Items collected
-| Group | Name | Description | Type | Key and additional info |
-|------------------|-----------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| PostgreSQL | PostgreSQL: Custom queries | <p>Execute custom queries from file *.sql</p> | ZABBIX_PASSIVE | pgsql.custom.query["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DATABASE}",""] |
-| PostgreSQL | WAL: Bytes written | <p>WAL write in bytes</p> | DEPENDENT | pgsql.wal.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.write`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | WAL: Segments count | <p>Number of WAL segments</p> | DEPENDENT | pgsql.wal.count<p>**Preprocessing**:</p><p>- JSONPATH: `$.write`</p> |
-| PostgreSQL | Bgwriter: Buffers allocated | <p>Number of buffers allocated</p> | DEPENDENT | pgsql.bgwriter.buffers_alloc.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_alloc`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Bgwriter: Buffers written directly by a backend | <p>Number of buffers written directly by a backend</p> | DEPENDENT | pgsql.bgwriter.buffers_backend.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Bgwriter: Number of bgwriter stopped | <p>Number of times the background writer stopped a cleaning scan because it had written too many buffers</p> | DEPENDENT | pgsql.bgwriter.maxwritten_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxwritten_clean`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Bgwriter: Times a backend execute its own fsync | <p>Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)</p> | DEPENDENT | pgsql.bgwriter.buffers_backend_fsync.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend_fsync`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Checkpoint: Buffers background written | <p>Number of buffers written by the background writer</p> | DEPENDENT | pgsql.bgwriter.buffers_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_clean`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Checkpoint: Buffers checkpoints written | <p>Number of buffers written during checkpoints</p> | DEPENDENT | pgsql.bgwriter.buffers_checkpoint.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_checkpoint`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Checkpoint: By timeout | <p>Number of scheduled checkpoints that have been performed</p> | DEPENDENT | pgsql.bgwriter.checkpoints_timed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_timed`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Checkpoint: Requested | <p>Number of requested checkpoints that have been performed</p> | DEPENDENT | pgsql.bgwriter.checkpoints_req.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_req`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Checkpoint: Checkpoint write time | <p>Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds</p> | DEPENDENT | pgsql.bgwriter.checkpoint_write_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Checkpoint: Checkpoint write time | <p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk, in milliseconds</p> | DEPENDENT | pgsql.bgwriter.checkpoint_sync_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Checkpoint: Checkpoint sync time | <p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk</p> | DEPENDENT | pgsql.bgwriter.checkpoint_sync_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Archive: Count of archive files | <p>Collect all metrics from pg_stat_activity</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ARCHIVER-VIEW</p> | DEPENDENT | pgsql.archive.count_archived_files<p>**Preprocessing**:</p><p>- JSONPATH: `$.archived_count`</p> |
-| PostgreSQL | Archive: Count of attempts to archive files | <p>Collect all metrics from pg_stat_activity</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ARCHIVER-VIEW</p> | DEPENDENT | pgsql.archive.failed_trying_to_archive<p>**Preprocessing**:</p><p>- JSONPATH: `$.failed_count`</p> |
-| PostgreSQL | Archive: Count of files in archive_status need to archive | <p>-</p> | DEPENDENT | pgsql.archive.count_files_to_archive<p>**Preprocessing**:</p><p>- JSONPATH: `$.count_files`</p> |
-| PostgreSQL | Archive: Count of files need to archive | <p>Size of files to archive</p> | DEPENDENT | pgsql.archive.size_files_to_archive<p>**Preprocessing**:</p><p>- JSONPATH: `$.size_files`</p> |
-| PostgreSQL | Dbstat: Blocks read time | <p>Time spent reading data file blocks by backends, in milliseconds</p> | DEPENDENT | pgsql.dbstat.sum.blk_read_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.blk_read_time`</p><p>- MULTIPLIER: `0.001`</p> |
-| PostgreSQL | Dbstat: Blocks write time | <p>Time spent writing data file blocks by backends, in milliseconds</p> | DEPENDENT | pgsql.dbstat.sum.blk_write_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.blk_read_time`</p><p>- MULTIPLIER: `0.001`</p> |
-| PostgreSQL | Dbstat: Checksum failures | <p>Number of data page checksum failures detected (or on a shared object), or NULL if data checksums are not enabled. This metric included in PostgreSQL 12</p> | DEPENDENT | pgsql.dbstat.sum.checksum_failures.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checksum_failures`</p><p>- MATCHES_REGEX: `^\d*$`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Committed transactions | <p>Number of transactions that have been committed</p> | DEPENDENT | pgsql.dbstat.sum.xact_commit.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.xact_commit`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Conflicts | <p>Number of queries canceled due to conflicts with recovery. (Conflicts occur only on standby servers; see pg_stat_database_conflicts for details.)</p> | DEPENDENT | pgsql.dbstat.sum.conflicts.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.conflicts`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Deadlocks | <p>Number of deadlocks detected</p> | DEPENDENT | pgsql.dbstat.sum.deadlocks.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.deadlocks`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Disk blocks read | <p>Number of disk blocks read</p> | DEPENDENT | pgsql.dbstat.sum.blks_read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.blks_read`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Hit blocks read | <p>Number of times disk blocks were found already in the buffer cache</p> | DEPENDENT | pgsql.dbstat.sum.blks_hit.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.blks_hit`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Number temp bytes | <p>Total amount of data written to temporary files by queries</p> | DEPENDENT | pgsql.dbstat.sum.temp_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.temp_bytes`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Number temp bytes | <p>Number of temporary files created by queries</p> | DEPENDENT | pgsql.dbstat.sum.temp_files.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.temp_files`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Roll backed transactions | <p>Number of transactions that have been rolled back</p> | DEPENDENT | pgsql.dbstat.sum.xact_rollback.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.xact_rollback`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Rows deleted | <p>Number of rows deleted by queries</p> | DEPENDENT | pgsql.dbstat.sum.tup_deleted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_deleted`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Rows fetched | <p>Number of rows fetched by queries</p> | DEPENDENT | pgsql.dbstat.sum.tup_fetched.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_fetched`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Rows inserted | <p>Number of rows inserted by queries</p> | DEPENDENT | pgsql.dbstat.sum.tup_inserted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_inserted`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Rows returned | <p>Number of rows returned by queries</p> | DEPENDENT | pgsql.dbstat.sum.tup_returned.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_returned`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Rows updated | <p>Number of rows updated by queries</p> | DEPENDENT | pgsql.dbstat.sum.tup_updated.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_updated`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | Dbstat: Backends connected | <p>Number of connected backends</p> | DEPENDENT | pgsql.dbstat.sum.numbackends<p>**Preprocessing**:</p><p>- JSONPATH: `$.numbackends`</p> |
-| PostgreSQL | Connections sum: Active | <p>Total number of connections executing a query</p> | DEPENDENT | pgsql.connections.active<p>**Preprocessing**:</p><p>- JSONPATH: `$.active`</p> |
-| PostgreSQL | Connections sum: Fastpath function call | <p>Total number of connections executing a fast-path function</p> | DEPENDENT | pgsql.connections.fastpath_function_call<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle_in_transaction`</p> |
-| PostgreSQL | Connections sum: Idle | <p>Total number of connections waiting for a new client command</p> | DEPENDENT | pgsql.connections.idle<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle`</p> |
-| PostgreSQL | Connections sum: Idle in transaction | <p>Total number of connections in a transaction state, but not executing a query</p> | DEPENDENT | pgsql.connections.idle_in_transaction<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle_in_transaction`</p> |
-| PostgreSQL | Connections sum: Prepared | <p>Total number of prepared transactions</p><p>https://www.postgresql.org/docs/current/sql-prepare-transaction.html</p> | DEPENDENT | pgsql.connections.prepared<p>**Preprocessing**:</p><p>- JSONPATH: `$.prepared`</p> |
-| PostgreSQL | Connections sum: Total | <p>Total number of connections</p> | DEPENDENT | pgsql.connections.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.total`</p> |
-| PostgreSQL | Connections sum: Total % | <p>Total number of connections in percentage</p> | DEPENDENT | pgsql.connections.total_pct<p>**Preprocessing**:</p><p>- JSONPATH: `$.total_pct`</p> |
-| PostgreSQL | Connections sum: Waiting | <p>Total number of waiting connections</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#WAIT-EVENT-TABLE</p> | DEPENDENT | pgsql.connections.waiting<p>**Preprocessing**:</p><p>- JSONPATH: `$.waiting`</p> |
-| PostgreSQL | Connections sum: Idle in transaction (aborted) | <p>Total number of connections in a transaction state, but not executing a query and one of the statements in the transaction caused an error.</p> | DEPENDENT | pgsql.connections.idle_in_transaction_aborted<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle_in_transaction_aborted`</p> |
-| PostgreSQL | Connections sum: Disabled | <p>Total number of disabled connections</p> | DEPENDENT | pgsql.connections.disabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.disabled`</p> |
-| PostgreSQL | PostgreSQL: Age of oldest xid | <p>Age of oldest xid.</p> | ZABBIX_PASSIVE | pgsql.oldest.xid["{$PG.URI}","{$PG.USER}"] |
-| PostgreSQL | Autovacuum: Count of autovacuum workers | <p>Number of autovacuum workers.</p> | ZABBIX_PASSIVE | pgsql.autovacuum.count["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| PostgreSQL | PostgreSQL: Cache hit | <p>-</p> | ZABBIX_PASSIVE | pgsql.cache.hit["{$PG.URI}"] |
-| PostgreSQL | PostgreSQL: Uptime | <p>-</p> | ZABBIX_PASSIVE | pgsql.uptime["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| PostgreSQL | Replication: Lag in bytes | <p>Replication lag with Master in byte.</p> | ZABBIX_PASSIVE | pgsql.replication.lag.b["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| PostgreSQL | Replication: Lag in seconds | <p>Replication lag with Master in seconds.</p> | ZABBIX_PASSIVE | pgsql.replication.lag.sec["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| PostgreSQL | Replication: Recovery role | <p>Replication role: 1 — recovery is still in progress (standby mode), 0 — master mode.</p> | ZABBIX_PASSIVE | pgsql.replication.recovery_role["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| PostgreSQL | Replication: Standby count | <p>Number of standby servers</p> | ZABBIX_PASSIVE | pgsql.replication.count["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| PostgreSQL | Replication: Status | <p>Replication status: 0 — streaming is down, 1 — streaming is up, 2 — master mode</p> | ZABBIX_PASSIVE | pgsql.replication.status["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| PostgreSQL | PostgreSQL: Ping | <p>-</p> | ZABBIX_PASSIVE | pgsql.ping["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-| PostgreSQL | Application {#APPLICATION}: Replication flush lag | | DEPENDENT | pgsql.replication.process.flush_lag["{#APPLICATION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#APPLICATION}'].flush_lag`</p> |
-| PostgreSQL | Application {#APPLICATION}: Replication replay lag | | DEPENDENT | pgsql.replication.process.replay_lag["{#APPLICATION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#APPLICATION}'].replay_lag`</p> |
-| PostgreSQL | Application {#APPLICATION}: Replication write lag | | DEPENDENT | pgsql.replication.process.write_lag["{#APPLICATION}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#APPLICATION}'].write_lag`</p> |
-| PostgreSQL | DB {#DBNAME}: Database age | <p>Database age</p> | ZABBIX_PASSIVE | pgsql.db.age["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"] |
-| PostgreSQL | DB {#DBNAME}: Get bloating tables | <p>Number of bloating tables</p> | ZABBIX_PASSIVE | pgsql.db.bloating_tables["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"] |
-| PostgreSQL | DB {#DBNAME}: Database size | <p>Database size</p> | ZABBIX_PASSIVE | pgsql.db.size["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"] |
-| PostgreSQL | DB {#DBNAME}: Blocks hit per second | <p>Total number of times disk blocks were found already in the buffer cache, so that a read was not necessary</p> | DEPENDENT | pgsql.dbstat.blks_hit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_hit`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Disk blocks read per second | <p>Total number of disk blocks read in this database</p> | DEPENDENT | pgsql.dbstat.blks_read.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_read`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Detected conflicts per second | <p>Total number of queries canceled due to conflicts with recovery in this database</p> | DEPENDENT | pgsql.dbstat.conflicts.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].conflicts`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Detected deadlocks per second | <p>Total number of detected deadlocks in this database</p> | DEPENDENT | pgsql.dbstat.deadlocks.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].deadlocks`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Temp_bytes written per second | <p>Total amount of data written to temporary files by queries in this database</p> | DEPENDENT | pgsql.dbstat.temp_bytes.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_bytes`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Temp_files created per second | <p>Total number of temporary files created by queries in this database</p> | DEPENDENT | pgsql.dbstat.temp_files.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_files`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Tuples deleted per second | <p>Total number of rows deleted by queries in this database</p> | DEPENDENT | pgsql.dbstat.tup_deleted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_deleted`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Tuples fetched per second | <p>Total number of rows fetched by queries in this database</p> | DEPENDENT | pgsql.dbstat.tup_fetched.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_fetched`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Tuples inserted per second | <p>Total number of rows inserted by queries in this database</p> | DEPENDENT | pgsql.dbstat.tup_inserted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_inserted`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Tuples returned per second | <p>Number of rows returned by queries in this database</p> | DEPENDENT | pgsql.dbstat.tup_returned.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_returned`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Tuples updated per second | <p>Total number of rows updated by queries in this database</p> | DEPENDENT | pgsql.dbstat.tup_updated.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_updated`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Commits per second | <p>Number of transactions in this database that have been committed</p> | DEPENDENT | pgsql.dbstat.xact_commit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_commit`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Rollbacks per second | <p>Total number of transactions in this database that have been rolled back</p> | DEPENDENT | pgsql.dbstat.xact_rollback.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_rollback`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Backends connected | <p>Number of backends currently connected to this database</p> | DEPENDENT | pgsql.dbstat.numbackends["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].numbackends`</p> |
-| PostgreSQL | DB {#DBNAME}: Checksum failures | <p>Number of data page checksum failures detected in this database</p> | DEPENDENT | pgsql.dbstat.checksum_failures.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].checksum_failures`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Disk blocks read per second | <p>Time spent reading data file blocks by backends, in milliseconds</p> | DEPENDENT | pgsql.dbstat.blk_read_time.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blk_read_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Disk blocks read per second | <p>Time spent writing data file blocks by backends, in milliseconds</p> | DEPENDENT | pgsql.dbstat.blk_write_time.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blk_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
-| PostgreSQL | DB {#DBNAME}: Num of accessexclusive locks | <p>Number of accessexclusive locks for each database</p> | DEPENDENT | pgsql.locks.accessexclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].accessexclusive`</p> |
-| PostgreSQL | DB {#DBNAME}: Num of accessshare locks | <p>Number of accessshare locks for each database</p> | DEPENDENT | pgsql.locks.accessshare["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].accessshare`</p> |
-| PostgreSQL | DB {#DBNAME}: Num of exclusive locks | <p>Number of exclusive locks for each database</p> | DEPENDENT | pgsql.locks.exclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].exclusive`</p> |
-| PostgreSQL | DB {#DBNAME}: Num of rowexclusive locks | <p>Number of rowexclusive locks for each database</p> | DEPENDENT | pgsql.locks.rowexclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].rowexclusive`</p> |
-| PostgreSQL | DB {#DBNAME}: Num of rowshare locks | <p>Number of rowshare locks for each database</p> | DEPENDENT | pgsql.locks.rowshare["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].rowshare`</p> |
-| PostgreSQL | DB {#DBNAME}: Num of sharerowexclusive locks | <p>Number of total sharerowexclusive for each database</p> | DEPENDENT | pgsql.locks.sharerowexclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].sharerowexclusive`</p> |
-| PostgreSQL | DB {#DBNAME}: Num of shareupdateexclusive locks | <p>Number of shareupdateexclusive locks for each database</p> | DEPENDENT | pgsql.locks.shareupdateexclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].shareupdateexclusive`</p> |
-| PostgreSQL | DB {#DBNAME}: Num of share locks | <p>Number of share locks for each database</p> | DEPENDENT | pgsql.locks.share["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].share`</p> |
-| PostgreSQL | DB {#DBNAME}: Num of total locks | <p>Number of total locks for each database</p> | DEPENDENT | pgsql.locks.total["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].total`</p> |
-| Zabbix_raw_items | PostgreSQL: Get bgwriter | <p>https://www.postgresql.org/docs/12/monitoring-stats.html#PG-STAT-BGWRITER-VIEW</p> | ZABBIX_PASSIVE | pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| Zabbix_raw_items | PostgreSQL: Get archive | <p>Collect archive status metrics</p> | ZABBIX_PASSIVE | pgsql.archive["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| Zabbix_raw_items | PostgreSQL: Get dbstat | <p>Collect all metrics from pg_stat_database per database</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-DATABASE-VIEW</p> | ZABBIX_PASSIVE | pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| Zabbix_raw_items | PostgreSQL: Get dbstat sum | <p>Collect all metrics from pg_stat_database per database</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-DATABASE-VIEW</p> | ZABBIX_PASSIVE | pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| Zabbix_raw_items | PostgreSQL: Get connections | <p>Collect all metrics from pg_stat_activity</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ACTIVITY-VIEW</p> | ZABBIX_PASSIVE | pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| Zabbix_raw_items | PostgreSQL: Get WAL | <p>Collect WAL metrics</p> | ZABBIX_PASSIVE | pgsql.wal.stat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| Zabbix_raw_items | PostgreSQL: Get locks | <p>Collect all metrics from pg_locks per database</p><p>https://www.postgresql.org/docs/current/explicit-locking.html#LOCKING-TABLES</p> | ZABBIX_PASSIVE | pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
-| Zabbix_raw_items | PostgreSQL: Get replication | <p>Collect metrics from the pg_stat_replication, which contains information about the WAL sender process, showing statistics about replication to that sender's connected standby server.</p> | ZABBIX_PASSIVE | pgsql.replication.process["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|Group|Name|Description|Type|Key and additional info|
+|-----|----|-----------|----|---------------------|
+|PostgreSQL |PostgreSQL: Custom queries |<p>Execute custom queries from file *.sql</p> |ZABBIX_PASSIVE |pgsql.custom.query["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{$PG.DATABASE}",""] |
+|PostgreSQL |WAL: Bytes written |<p>WAL write in bytes</p> |DEPENDENT |pgsql.wal.write<p>**Preprocessing**:</p><p>- JSONPATH: `$.write`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |WAL: Bytes received |<p>WAL receive in bytes</p> |DEPENDENT |pgsql.wal.receive<p>**Preprocessing**:</p><p>- JSONPATH: `$.receive`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |WAL: Segments count |<p>Number of WAL segments</p> |DEPENDENT |pgsql.wal.count<p>**Preprocessing**:</p><p>- JSONPATH: `$.count`</p> |
+|PostgreSQL |Bgwriter: Buffers allocated |<p>Number of buffers allocated</p> |DEPENDENT |pgsql.bgwriter.buffers_alloc.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_alloc`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Bgwriter: Buffers written directly by a backend |<p>Number of buffers written directly by a backend</p> |DEPENDENT |pgsql.bgwriter.buffers_backend.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Bgwriter: Number of bgwriter stopped |<p>Number of times the background writer stopped a cleaning scan because it had written too many buffers</p> |DEPENDENT |pgsql.bgwriter.maxwritten_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.maxwritten_clean`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Bgwriter: Times a backend execute its own fsync |<p>Number of times a backend had to execute its own fsync call (normally the background writer handles those even when the backend does its own write)</p> |DEPENDENT |pgsql.bgwriter.buffers_backend_fsync.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_backend_fsync`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Checkpoint: Buffers background written |<p>Number of buffers written by the background writer</p> |DEPENDENT |pgsql.bgwriter.buffers_clean.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_clean`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Checkpoint: Buffers checkpoints written |<p>Number of buffers written during checkpoints</p> |DEPENDENT |pgsql.bgwriter.buffers_checkpoint.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.buffers_checkpoint`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Checkpoint: By timeout |<p>Number of scheduled checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_timed.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_timed`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Checkpoint: Requested |<p>Number of requested checkpoints that have been performed</p> |DEPENDENT |pgsql.bgwriter.checkpoints_req.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoints_req`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Checkpoint: Checkpoint write time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk, in milliseconds</p> |DEPENDENT |pgsql.bgwriter.checkpoint_write_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Checkpoint: Checkpoint write time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk, in milliseconds</p> |DEPENDENT |pgsql.bgwriter.checkpoint_sync_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Checkpoint: Checkpoint sync time |<p>Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk</p> |DEPENDENT |pgsql.bgwriter.checkpoint_sync_time.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checkpoint_sync_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Archive: Count of archive files |<p>Collect all metrics from pg_stat_activity</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ARCHIVER-VIEW</p> |DEPENDENT |pgsql.archive.count_archived_files<p>**Preprocessing**:</p><p>- JSONPATH: `$.archived_count`</p> |
+|PostgreSQL |Archive: Count of attempts to archive files |<p>Collect all metrics from pg_stat_activity</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ARCHIVER-VIEW</p> |DEPENDENT |pgsql.archive.failed_trying_to_archive<p>**Preprocessing**:</p><p>- JSONPATH: `$.failed_count`</p> |
+|PostgreSQL |Archive: Count of files in archive_status need to archive |<p>-</p> |DEPENDENT |pgsql.archive.count_files_to_archive<p>**Preprocessing**:</p><p>- JSONPATH: `$.count_files`</p> |
+|PostgreSQL |Archive: Count of files need to archive |<p>Size of files to archive</p> |DEPENDENT |pgsql.archive.size_files_to_archive<p>**Preprocessing**:</p><p>- JSONPATH: `$.size_files`</p> |
+|PostgreSQL |Dbstat: Blocks read time |<p>Time spent reading data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.sum.blk_read_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.blk_read_time`</p><p>- MULTIPLIER: `0.001`</p> |
+|PostgreSQL |Dbstat: Blocks write time |<p>Time spent writing data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.sum.blk_write_time<p>**Preprocessing**:</p><p>- JSONPATH: `$.blk_read_time`</p><p>- MULTIPLIER: `0.001`</p> |
+|PostgreSQL |Dbstat: Checksum failures |<p>Number of data page checksum failures detected (or on a shared object), or NULL if data checksums are not enabled. This metric included in PostgreSQL 12</p> |DEPENDENT |pgsql.dbstat.sum.checksum_failures.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.checksum_failures`</p><p>- MATCHES_REGEX: `^\d*$`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Committed transactions |<p>Number of transactions that have been committed</p> |DEPENDENT |pgsql.dbstat.sum.xact_commit.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.xact_commit`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Conflicts |<p>Number of queries canceled due to conflicts with recovery. (Conflicts occur only on standby servers; see pg_stat_database_conflicts for details.)</p> |DEPENDENT |pgsql.dbstat.sum.conflicts.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.conflicts`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Deadlocks |<p>Number of deadlocks detected</p> |DEPENDENT |pgsql.dbstat.sum.deadlocks.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.deadlocks`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Disk blocks read |<p>Number of disk blocks read</p> |DEPENDENT |pgsql.dbstat.sum.blks_read.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.blks_read`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Hit blocks read |<p>Number of times disk blocks were found already in the buffer cache</p> |DEPENDENT |pgsql.dbstat.sum.blks_hit.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.blks_hit`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Number temp bytes |<p>Total amount of data written to temporary files by queries</p> |DEPENDENT |pgsql.dbstat.sum.temp_bytes.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.temp_bytes`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Number temp bytes |<p>Number of temporary files created by queries</p> |DEPENDENT |pgsql.dbstat.sum.temp_files.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.temp_files`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Roll backed transactions |<p>Number of transactions that have been rolled back</p> |DEPENDENT |pgsql.dbstat.sum.xact_rollback.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.xact_rollback`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Rows deleted |<p>Number of rows deleted by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_deleted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_deleted`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Rows fetched |<p>Number of rows fetched by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_fetched.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_fetched`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Rows inserted |<p>Number of rows inserted by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_inserted.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_inserted`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Rows returned |<p>Number of rows returned by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_returned.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_returned`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Rows updated |<p>Number of rows updated by queries</p> |DEPENDENT |pgsql.dbstat.sum.tup_updated.rate<p>**Preprocessing**:</p><p>- JSONPATH: `$.tup_updated`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |Dbstat: Backends connected |<p>Number of connected backends</p> |DEPENDENT |pgsql.dbstat.sum.numbackends<p>**Preprocessing**:</p><p>- JSONPATH: `$.numbackends`</p> |
+|PostgreSQL |Connections sum: Active |<p>Total number of connections executing a query</p> |DEPENDENT |pgsql.connections.active<p>**Preprocessing**:</p><p>- JSONPATH: `$.active`</p> |
+|PostgreSQL |Connections sum: Fastpath function call |<p>Total number of connections executing a fast-path function</p> |DEPENDENT |pgsql.connections.fastpath_function_call<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle_in_transaction`</p> |
+|PostgreSQL |Connections sum: Idle |<p>Total number of connections waiting for a new client command</p> |DEPENDENT |pgsql.connections.idle<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle`</p> |
+|PostgreSQL |Connections sum: Idle in transaction |<p>Total number of connections in a transaction state, but not executing a query</p> |DEPENDENT |pgsql.connections.idle_in_transaction<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle_in_transaction`</p> |
+|PostgreSQL |Connections sum: Prepared |<p>Total number of prepared transactions</p><p>https://www.postgresql.org/docs/current/sql-prepare-transaction.html</p> |DEPENDENT |pgsql.connections.prepared<p>**Preprocessing**:</p><p>- JSONPATH: `$.prepared`</p> |
+|PostgreSQL |Connections sum: Total |<p>Total number of connections</p> |DEPENDENT |pgsql.connections.total<p>**Preprocessing**:</p><p>- JSONPATH: `$.total`</p> |
+|PostgreSQL |Connections sum: Total % |<p>Total number of connections in percentage</p> |DEPENDENT |pgsql.connections.total_pct<p>**Preprocessing**:</p><p>- JSONPATH: `$.total_pct`</p> |
+|PostgreSQL |Connections sum: Waiting |<p>Total number of waiting connections</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#WAIT-EVENT-TABLE</p> |DEPENDENT |pgsql.connections.waiting<p>**Preprocessing**:</p><p>- JSONPATH: `$.waiting`</p> |
+|PostgreSQL |Connections sum: Idle in transaction (aborted) |<p>Total number of connections in a transaction state, but not executing a query and one of the statements in the transaction caused an error.</p> |DEPENDENT |pgsql.connections.idle_in_transaction_aborted<p>**Preprocessing**:</p><p>- JSONPATH: `$.idle_in_transaction_aborted`</p> |
+|PostgreSQL |Connections sum: Disabled |<p>Total number of disabled connections</p> |DEPENDENT |pgsql.connections.disabled<p>**Preprocessing**:</p><p>- JSONPATH: `$.disabled`</p> |
+|PostgreSQL |PostgreSQL: Age of oldest xid |<p>Age of oldest xid.</p> |ZABBIX_PASSIVE |pgsql.oldest.xid["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|PostgreSQL |Autovacuum: Count of autovacuum workers |<p>Number of autovacuum workers.</p> |ZABBIX_PASSIVE |pgsql.autovacuum.count["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|PostgreSQL |PostgreSQL: Cache hit |<p>-</p> |CALCULATED |pgsql.cache.hit["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Expression**:</p>`last(//pgsql.dbstat.sum.blks_hit.rate) * 100 / (last(//pgsql.dbstat.sum.blks_hit.rate) + last(//pgsql.dbstat.sum.blks_read.rate))` |
+|PostgreSQL |PostgreSQL: Uptime |<p>-</p> |ZABBIX_PASSIVE |pgsql.uptime["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|PostgreSQL |Replication: Lag in bytes |<p>Replication lag with Master in byte.</p> |ZABBIX_PASSIVE |pgsql.replication.lag.b["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|PostgreSQL |Replication: Lag in seconds |<p>Replication lag with Master in seconds.</p> |ZABBIX_PASSIVE |pgsql.replication.lag.sec["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|PostgreSQL |Replication: Recovery role |<p>Replication role: 1 — recovery is still in progress (standby mode), 0 — master mode.</p> |ZABBIX_PASSIVE |pgsql.replication.recovery_role["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|PostgreSQL |Replication: Standby count |<p>Number of standby servers</p> |ZABBIX_PASSIVE |pgsql.replication.count["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|PostgreSQL |Replication: Status |<p>Replication status: 0 — streaming is down, 1 — streaming is up, 2 — master mode</p> |ZABBIX_PASSIVE |pgsql.replication.status["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|PostgreSQL |PostgreSQL: Ping |<p>-</p> |ZABBIX_PASSIVE |pgsql.ping["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
+|PostgreSQL |Application {#APPLICATION_NAME}: Replication flush lag | |DEPENDENT |pgsql.replication.process.flush_lag["{#APPLICATION_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#APPLICATION_NAME}'].flush_lag`</p> |
+|PostgreSQL |Application {#APPLICATION_NAME}: Replication replay lag | |DEPENDENT |pgsql.replication.process.replay_lag["{#APPLICATION_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#APPLICATION_NAME}'].replay_lag`</p> |
+|PostgreSQL |Application {#APPLICATION_NAME}: Replication write lag | |DEPENDENT |pgsql.replication.process.write_lag["{#APPLICATION_NAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#APPLICATION_NAME}'].write_lag`</p> |
+|PostgreSQL |DB {#DBNAME}: Database age |<p>Database age</p> |ZABBIX_PASSIVE |pgsql.db.age["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"] |
+|PostgreSQL |DB {#DBNAME}: Get bloating tables |<p>Number of bloating tables</p> |ZABBIX_PASSIVE |pgsql.db.bloating_tables["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"] |
+|PostgreSQL |DB {#DBNAME}: Database size |<p>Database size</p> |ZABBIX_PASSIVE |pgsql.db.size["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}","{#DBNAME}"] |
+|PostgreSQL |DB {#DBNAME}: Blocks hit per second |<p>Total number of times disk blocks were found already in the buffer cache, so that a read was not necessary</p> |DEPENDENT |pgsql.dbstat.blks_hit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_hit`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Total number of disk blocks read in this database</p> |DEPENDENT |pgsql.dbstat.blks_read.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blks_read`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Detected conflicts per second |<p>Total number of queries canceled due to conflicts with recovery in this database</p> |DEPENDENT |pgsql.dbstat.conflicts.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].conflicts`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Detected deadlocks per second |<p>Total number of detected deadlocks in this database</p> |DEPENDENT |pgsql.dbstat.deadlocks.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].deadlocks`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Temp_bytes written per second |<p>Total amount of data written to temporary files by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_bytes.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_bytes`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Temp_files created per second |<p>Total number of temporary files created by queries in this database</p> |DEPENDENT |pgsql.dbstat.temp_files.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].temp_files`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Tuples deleted per second |<p>Total number of rows deleted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_deleted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_deleted`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Tuples fetched per second |<p>Total number of rows fetched by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_fetched.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_fetched`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Tuples inserted per second |<p>Total number of rows inserted by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_inserted.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_inserted`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Tuples returned per second |<p>Number of rows returned by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_returned.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_returned`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Tuples updated per second |<p>Total number of rows updated by queries in this database</p> |DEPENDENT |pgsql.dbstat.tup_updated.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].tup_updated`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Commits per second |<p>Number of transactions in this database that have been committed</p> |DEPENDENT |pgsql.dbstat.xact_commit.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_commit`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Rollbacks per second |<p>Total number of transactions in this database that have been rolled back</p> |DEPENDENT |pgsql.dbstat.xact_rollback.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].xact_rollback`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Backends connected |<p>Number of backends currently connected to this database</p> |DEPENDENT |pgsql.dbstat.numbackends["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].numbackends`</p> |
+|PostgreSQL |DB {#DBNAME}: Checksum failures |<p>Number of data page checksum failures detected in this database</p> |DEPENDENT |pgsql.dbstat.checksum_failures.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].checksum_failures`</p><p>- MATCHES_REGEX: `^\d*$`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Time spent reading data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.blk_read_time.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blk_read_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Disk blocks read per second |<p>Time spent writing data file blocks by backends, in milliseconds</p> |DEPENDENT |pgsql.dbstat.blk_write_time.rate["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].blk_write_time`</p><p>- MULTIPLIER: `0.001`</p><p>- CHANGE_PER_SECOND |
+|PostgreSQL |DB {#DBNAME}: Num of accessexclusive locks |<p>Number of accessexclusive locks for each database</p> |DEPENDENT |pgsql.locks.accessexclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].accessexclusive`</p> |
+|PostgreSQL |DB {#DBNAME}: Num of accessshare locks |<p>Number of accessshare locks for each database</p> |DEPENDENT |pgsql.locks.accessshare["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].accessshare`</p> |
+|PostgreSQL |DB {#DBNAME}: Num of exclusive locks |<p>Number of exclusive locks for each database</p> |DEPENDENT |pgsql.locks.exclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].exclusive`</p> |
+|PostgreSQL |DB {#DBNAME}: Num of rowexclusive locks |<p>Number of rowexclusive locks for each database</p> |DEPENDENT |pgsql.locks.rowexclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].rowexclusive`</p> |
+|PostgreSQL |DB {#DBNAME}: Num of rowshare locks |<p>Number of rowshare locks for each database</p> |DEPENDENT |pgsql.locks.rowshare["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].rowshare`</p> |
+|PostgreSQL |DB {#DBNAME}: Num of sharerowexclusive locks |<p>Number of total sharerowexclusive for each database</p> |DEPENDENT |pgsql.locks.sharerowexclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].sharerowexclusive`</p> |
+|PostgreSQL |DB {#DBNAME}: Num of shareupdateexclusive locks |<p>Number of shareupdateexclusive locks for each database</p> |DEPENDENT |pgsql.locks.shareupdateexclusive["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].shareupdateexclusive`</p> |
+|PostgreSQL |DB {#DBNAME}: Num of share locks |<p>Number of share locks for each database</p> |DEPENDENT |pgsql.locks.share["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].share`</p> |
+|PostgreSQL |DB {#DBNAME}: Num of total locks |<p>Number of total locks for each database</p> |DEPENDENT |pgsql.locks.total["{#DBNAME}"]<p>**Preprocessing**:</p><p>- JSONPATH: `$['{#DBNAME}'].total`</p> |
+|Zabbix_raw_items |PostgreSQL: Get bgwriter |<p>https://www.postgresql.org/docs/12/monitoring-stats.html#PG-STAT-BGWRITER-VIEW</p> |ZABBIX_PASSIVE |pgsql.bgwriter["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|Zabbix_raw_items |PostgreSQL: Get archive |<p>Collect archive status metrics</p> |ZABBIX_PASSIVE |pgsql.archive["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|Zabbix_raw_items |PostgreSQL: Get dbstat |<p>Collect all metrics from pg_stat_database per database</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-DATABASE-VIEW</p> |ZABBIX_PASSIVE |pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|Zabbix_raw_items |PostgreSQL: Get dbstat sum |<p>Collect all metrics from pg_stat_database per database</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-DATABASE-VIEW</p> |ZABBIX_PASSIVE |pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|Zabbix_raw_items |PostgreSQL: Get connections |<p>Collect all metrics from pg_stat_activity</p><p>https://www.postgresql.org/docs/current/monitoring-stats.html#PG-STAT-ACTIVITY-VIEW</p> |ZABBIX_PASSIVE |pgsql.connections["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|Zabbix_raw_items |PostgreSQL: Get WAL |<p>Collect WAL metrics</p> |ZABBIX_PASSIVE |pgsql.wal.stat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|Zabbix_raw_items |PostgreSQL: Get locks |<p>Collect all metrics from pg_locks per database</p><p>https://www.postgresql.org/docs/current/explicit-locking.html#LOCKING-TABLES</p> |ZABBIX_PASSIVE |pgsql.locks["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
+|Zabbix_raw_items |PostgreSQL: Get replication |<p>Collect metrics from the pg_stat_replication, which contains information about the WAL sender process, showing statistics about replication to that sender's connected standby server.</p> |ZABBIX_PASSIVE |pgsql.replication.process["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"] |
## Triggers
-| Name | Description | Expression | Severity | Dependencies and additional info |
-|-----------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------|----------|----------------------------------|
-| Connections sum: Total number of connections is too high (over {$PG.CONN_TOTAL_PCT.MAX.WARN} in 5m) | <p>-</p> | `{TEMPLATE_NAME:pgsql.connections.total_pct.min(5m)} > {$PG.CONN_TOTAL_PCT.MAX.WARN}` | AVERAGE | |
-| PostgreSQL: Oldest xid is too big | <p>-</p> | `{TEMPLATE_NAME:pgsql.oldest.xid["{$PG.URI}","{$PG.USER}"].last()} > 18000000` | AVERAGE | |
-| PostgreSQL: Service has been restarted (uptime={ITEM.LASTVALUE}) | <p>-</p> | `{TEMPLATE_NAME:pgsql.uptime["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"].last()} < 600` | AVERAGE | |
-| PostgreSQL: Service is down | <p>-</p> | `{TEMPLATE_NAME:pgsql.ping["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"].last()}=0` | HIGH | |
-| DB {#DBNAME}: Too many recovery conflicts (over {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"} in 5m) | <p>The primary and standby servers are in many ways loosely connected. Actions on the primary will have an effect on the standby. As a result, there is potential for negative interactions or conflicts between them.</p><p>https://www.postgresql.org/docs/current/hot-standby.html#HOT-STANDBY-CONFLICT</p> | `{TEMPLATE_NAME:pgsql.dbstat.conflicts.rate["{#DBNAME}"].min(5m)} > {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"}` | AVERAGE | |
-| DB {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m) | <p>-</p> | `{TEMPLATE_NAME:pgsql.dbstat.deadlocks.rate["{#DBNAME}"].min(5m)} > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"}` | HIGH | |
+|Name|Description|Expression|Severity|Dependencies and additional info|
+|----|-----------|----|----|----|
+|Connections sum: Total number of connections is too high (over {$PG.CONN_TOTAL_PCT.MAX.WARN} in 5m) |<p>-</p> |`min(/PostgreSQL by Zabbix agent 2/pgsql.connections.total_pct,5m) > {$PG.CONN_TOTAL_PCT.MAX.WARN}` |AVERAGE | |
+|PostgreSQL: Oldest xid is too big |<p>-</p> |`last(/PostgreSQL by Zabbix agent 2/pgsql.oldest.xid["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]) > 18000000` |AVERAGE | |
+|PostgreSQL: Service has been restarted (uptime={ITEM.LASTVALUE}) |<p>-</p> |`last(/PostgreSQL by Zabbix agent 2/pgsql.uptime["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]) < 600` |AVERAGE | |
+|PostgreSQL: Service is down |<p>-</p> |`last(/PostgreSQL by Zabbix agent 2/pgsql.ping["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"])=0` |HIGH | |
+|DB {#DBNAME}: Too many recovery conflicts (over {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"} in 5m) |<p>The primary and standby servers are in many ways loosely connected. Actions on the primary will have an effect on the standby. As a result, there is potential for negative interactions or conflicts between them.</p><p>https://www.postgresql.org/docs/current/hot-standby.html#HOT-STANDBY-CONFLICT</p> |`min(/PostgreSQL by Zabbix agent 2/pgsql.dbstat.conflicts.rate["{#DBNAME}"],5m) > {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"}` |AVERAGE | |
+|DB {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m) |<p>-</p> |`min(/PostgreSQL by Zabbix agent 2/pgsql.dbstat.deadlocks.rate["{#DBNAME}"],5m) > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"}` |HIGH | |
## Feedback
diff --git a/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml b/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
index e0178268ad8..c622e66b1ec 100644
--- a/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
+++ b/templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
@@ -1,6 +1,6 @@
zabbix_export:
- version: '5.4'
- date: '2021-05-11T08:05:43Z'
+ version: '6.0'
+ date: '2021-11-26T09:48:24Z'
groups:
-
uuid: 748ad4d098d447d492bb935c907f652f
@@ -10,7 +10,7 @@ zabbix_export:
uuid: d0ef7d659a8f4beaaabfc4b6134e737a
template: 'PostgreSQL by Zabbix agent 2'
name: 'PostgreSQL by Zabbix agent 2'
- description: 'Template tooling version used: 0.38'
+ description: 'Template tooling version used: 0.39'
groups:
-
name: Templates/Databases
@@ -386,10 +386,12 @@ zabbix_export:
-
uuid: b98d2328694f44598f2177b3f93d4b90
name: 'PostgreSQL: Cache hit'
+ type: CALCULATED
key: 'pgsql.cache.hit["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
history: 7d
value_type: FLOAT
units: '%'
+ params: 'last(//pgsql.dbstat.sum.blks_hit.rate) * 100 / (last(//pgsql.dbstat.sum.blks_hit.rate) + last(//pgsql.dbstat.sum.blks_read.rate))'
tags:
-
tag: Application
@@ -617,7 +619,7 @@ zabbix_export:
trends: '0'
status: DISABLED
value_type: TEXT
- description: 'Execute custom queries from file *.sql'
+ description: 'Execute custom queries from file *.sql (check for option Plugins.Postgres.CustomQueriesPath at agent configuration)'
tags:
-
tag: Application
@@ -813,6 +815,10 @@ zabbix_export:
- $.numbackends
master_item:
key: 'pgsql.dbstat.sum["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
+ tags:
+ -
+ tag: Application
+ value: 'PostgreSQL: DB {#DBNAME}'
-
uuid: 96cb6b388b2c480ead1568293dd81e70
name: 'Dbstat: Number temp bytes'
@@ -1206,7 +1212,31 @@ zabbix_export:
-
type: JSONPATH
parameters:
- - $.write
+ - $.count
+ master_item:
+ key: 'pgsql.wal.stat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
+ tags:
+ -
+ tag: Application
+ value: PostgreSQL
+ -
+ uuid: 0e58a74b8a2d47d28f596196405b22b5
+ name: 'WAL: Bytes received'
+ type: DEPENDENT
+ key: pgsql.wal.receive
+ delay: '0'
+ history: 7d
+ units: B
+ description: 'WAL receive in bytes'
+ preprocessing:
+ -
+ type: JSONPATH
+ parameters:
+ - $.receive
+ -
+ type: CHANGE_PER_SECOND
+ parameters:
+ - ''
master_item:
key: 'pgsql.wal.stat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
tags:
@@ -1418,9 +1448,15 @@ zabbix_export:
parameters:
- '$[''{#DBNAME}''].checksum_failures'
-
+ type: MATCHES_REGEX
+ parameters:
+ - '^\d*$'
+ -
type: CHANGE_PER_SECOND
parameters:
- ''
+ error_handler: CUSTOM_VALUE
+ error_handler_params: '-1'
master_item:
key: 'pgsql.dbstat["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
tags:
@@ -2070,15 +2106,15 @@ zabbix_export:
evaltype: AND
conditions:
-
- macro: '{#APPLICATION}'
+ macro: '{#APPLICATION_NAME}'
value: '{$PG.LLD.FILTER.APPLICATION}'
formulaid: A
item_prototypes:
-
uuid: 15b83330044042668e618501160c37e4
- name: 'Application {#APPLICATION}: Replication flush lag'
+ name: 'Application {#APPLICATION_NAME}: Replication flush lag'
type: DEPENDENT
- key: 'pgsql.replication.process.flush_lag["{#APPLICATION}"]'
+ key: 'pgsql.replication.process.flush_lag["{#APPLICATION_NAME}"]'
delay: '0'
history: 7d
value_type: FLOAT
@@ -2087,18 +2123,18 @@ zabbix_export:
-
type: JSONPATH
parameters:
- - '$[''{#APPLICATION}''].flush_lag'
+ - '$[''{#APPLICATION_NAME}''].flush_lag'
master_item:
key: 'pgsql.replication.process["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
tags:
-
tag: Application
- value: 'PostgreSQL: Application {#APPLICATION}'
+ value: 'PostgreSQL: Application {#APPLICATION_NAME}'
-
uuid: 0daf6e3c7843488cb3160a2bd6b09fbf
- name: 'Application {#APPLICATION}: Replication replay lag'
+ name: 'Application {#APPLICATION_NAME}: Replication replay lag'
type: DEPENDENT
- key: 'pgsql.replication.process.replay_lag["{#APPLICATION}"]'
+ key: 'pgsql.replication.process.replay_lag["{#APPLICATION_NAME}"]'
delay: '0'
history: 7d
value_type: FLOAT
@@ -2107,18 +2143,18 @@ zabbix_export:
-
type: JSONPATH
parameters:
- - '$[''{#APPLICATION}''].replay_lag'
+ - '$[''{#APPLICATION_NAME}''].replay_lag'
master_item:
key: 'pgsql.replication.process["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
tags:
-
tag: Application
- value: 'PostgreSQL: Application {#APPLICATION}'
+ value: 'PostgreSQL: Application {#APPLICATION_NAME}'
-
uuid: 2d96bc517d3a4c3fbcae8a7f1436bf72
- name: 'Application {#APPLICATION}: Replication write lag'
+ name: 'Application {#APPLICATION_NAME}: Replication write lag'
type: DEPENDENT
- key: 'pgsql.replication.process.write_lag["{#APPLICATION}"]'
+ key: 'pgsql.replication.process.write_lag["{#APPLICATION_NAME}"]'
delay: '0'
history: 7d
value_type: FLOAT
@@ -2127,35 +2163,35 @@ zabbix_export:
-
type: JSONPATH
parameters:
- - '$[''{#APPLICATION}''].write_lag'
+ - '$[''{#APPLICATION_NAME}''].write_lag'
master_item:
key: 'pgsql.replication.process["{$PG.URI}","{$PG.USER}","{$PG.PASSWORD}"]'
tags:
-
tag: Application
- value: 'PostgreSQL: Application {#APPLICATION}'
+ value: 'PostgreSQL: Application {#APPLICATION_NAME}'
graph_prototypes:
-
uuid: e79dfe2d436d49da898772a9e7345825
- name: 'Application {#APPLICATION}: Replication lag'
+ name: 'Application {#APPLICATION_NAME}: Replication lag'
graph_items:
-
color: 1A7C11
item:
host: 'PostgreSQL by Zabbix agent 2'
- key: 'pgsql.replication.process.flush_lag["{#APPLICATION}"]'
+ key: 'pgsql.replication.process.flush_lag["{#APPLICATION_NAME}"]'
-
sortorder: '1'
color: 2774A4
item:
host: 'PostgreSQL by Zabbix agent 2'
- key: 'pgsql.replication.process.replay_lag["{#APPLICATION}"]'
+ key: 'pgsql.replication.process.replay_lag["{#APPLICATION_NAME}"]'
-
sortorder: '2'
color: F63100
item:
host: 'PostgreSQL by Zabbix agent 2'
- key: 'pgsql.replication.process.write_lag["{#APPLICATION}"]'
+ key: 'pgsql.replication.process.write_lag["{#APPLICATION_NAME}"]'
macros:
-
macro: '{$PG.CONFLICTS.MAX.WARN}'
@@ -2198,6 +2234,10 @@ zabbix_export:
fields:
-
type: INTEGER
+ name: source_type
+ value: '2'
+ -
+ type: INTEGER
name: columns
value: '1'
-
@@ -2205,10 +2245,6 @@ zabbix_export:
name: rows
value: '1'
-
- type: INTEGER
- name: source_type
- value: '2'
- -
type: GRAPH_PROTOTYPE
name: graphid
value:
@@ -2222,6 +2258,10 @@ zabbix_export:
fields:
-
type: INTEGER
+ name: source_type
+ value: '2'
+ -
+ type: INTEGER
name: columns
value: '1'
-
@@ -2229,10 +2269,6 @@ zabbix_export:
name: rows
value: '1'
-
- type: INTEGER
- name: source_type
- value: '2'
- -
type: GRAPH_PROTOTYPE
name: graphid
value:
@@ -2246,6 +2282,10 @@ zabbix_export:
fields:
-
type: INTEGER
+ name: source_type
+ value: '2'
+ -
+ type: INTEGER
name: columns
value: '1'
-
@@ -2253,10 +2293,6 @@ zabbix_export:
name: rows
value: '1'
-
- type: INTEGER
- name: source_type
- value: '2'
- -
type: GRAPH_PROTOTYPE
name: graphid
value:
@@ -2271,6 +2307,10 @@ zabbix_export:
fields:
-
type: INTEGER
+ name: source_type
+ value: '2'
+ -
+ type: INTEGER
name: columns
value: '1'
-
@@ -2278,10 +2318,6 @@ zabbix_export:
name: rows
value: '1'
-
- type: INTEGER
- name: source_type
- value: '2'
- -
type: GRAPH_PROTOTYPE
name: graphid
value:
diff --git a/templates/net/f5_bigip_snmp/README.md b/templates/net/f5_bigip_snmp/README.md
index 06412355f83..3ad51a4348a 100644
--- a/templates/net/f5_bigip_snmp/README.md
+++ b/templates/net/f5_bigip_snmp/README.md
@@ -54,7 +54,7 @@ There are no template links in this template.
|Blade voltage discovery |<p>A table containing information of blade voltage of the system.</p> |SNMP |bigip.blade.voltage.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
|CPU sensor discovery |<p>A table containing information of CPU sensor status on the system.</p> |SNMP |bigip.cpu.sensor.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
|Module discovery |<p>Resource allocation information about modules on the system</p> |SNMP |bigip.module.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
-|Certificate discovery |<p>A table containing certificate configuration.</p> |SNMP |bigip.cert.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
+|Certificate discovery |<p>A table containing certificate configuration.</p> |SNMP |bigip.cert.discovery |
|Virtual server discovery |<p>A table containing information of virtual servers.</p> |SNMP |bigip.virtual_server.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
|Node discovery |<p>A table containing statistic information of node addresses.</p> |SNMP |bigip.node.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
|Pool discovery |<p>A table containing statistic information of pools.</p> |SNMP |bigip.pool.discovery<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `6h`</p> |
@@ -165,7 +165,7 @@ There are no template links in this template.
|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Status available |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>none(0),</p><p>green(1),</p><p>tyellow(2),</p><p>tred(3),</p><p>tblue(4),</p><p>tgrey(5)</p> |SNMP |bigip.pool.available[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Network_interfaces |F5 BIG-IP: Pool [{#POOL.NAME}]: Status enabled |<p>MIB: F5-BIGIP-LOCAL-MIB</p><p>The activity status of the specified pool, as specified by the user.</p><p>none(0),</p><p>enabled(1),</p><p>disabled(2),</p><p>disabledbyparent(3)</p> |SNMP |bigip.pool.enabled[{#POOL.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Power_supply |F5 BIG-IP: Power supply [{#POWER.INDEX}]: Status |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The status of the indexed power supply on the system.,</p><p>This is only supported for the platform where</p><p>the sensor data is available.</p><p>Possible values: 0 - bad, 1 - good, 2 - notpresent.</p> |SNMP |bigip.chassis.power.status[{#POWER.INDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Security |F5 BIG-IP: Certificate [{#CERT.NAME}]: Expiration date |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The expiration date of the certificate in unix time.</p> |SNMP |bigip.cert.expiration.date[{#CERT.NAME}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `12h`</p> |
+|Security |F5 BIG-IP: Certificate [{#CERT.NAME}]: Expiration date |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The expiration date of the certificate in unix time.</p> |SNMP |bigip.cert.expiration.date[{#CERT.NAME}] |
|Status |F5 BIG-IP: SNMP agent availability |<p>-</p> |INTERNAL |zabbix[host,snmp,available]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Status |F5 BIG-IP: Uptime |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The system up time in 1/100 seconds since boot.</p> |SNMP |bigip.uptime<p>**Preprocessing**:</p><p>- MULTIPLIER: `0.01`</p> |
|TCP/UDP stat |F5 BIG-IP: Open TCP connections |<p>MIB: F5-BIGIP-SYSTEM-MIB</p><p>The number of current open TCP connections.</p> |SNMP |bigip.tcp.open |
@@ -191,14 +191,14 @@ There are no template links in this template.
|F5 BIG-IP: Fan[{#FAN.INDEX}] is not present |<p>Please check the fan unit</p> |`{TEMPLATE_NAME:bigip.chassis.fan.status[{#FAN.INDEX}].last()}=2` |INFO | |
|F5 BIG-IP: Low free space in file system [{#PART.NAME}] (less than {$BIGIP.FS.FREE.WARN.MIN}% for 5m) |<p>The system is running out of free space.</p> |`{TEMPLATE_NAME:bigip.disktable.freeblocks[{#PART.NAME}].last()}/{Big-IP SNMP:bigip.disktable.totalblocks[{#PART.NAME}].last()}*100<{$BIGIP.FS.FREE.WARN.MIN:"{#PART.NAME}"}`<p>Recovery expression:</p>`{TEMPLATE_NAME:bigip.disktable.freeblocks[{#PART.NAME}].last()}/{Big-IP SNMP:bigip.disktable.totalblocks[{#PART.NAME}].last()}*100>{$BIGIP.FS.FREE.WARN.MAX:"{#PART.NAME}"}` |WARNING |<p>Manual close: YES</p> |
|F5 BIG-IP: Chassis has been replaced (new serial number received) |<p>Chassis serial number has changed. Ack to close</p> |`{TEMPLATE_NAME:bigip.serialnumber.diff()}=1 and {TEMPLATE_NAME:bigip.serialnumber.strlen()}>0` |INFO |<p>Manual close: YES</p> |
-|F5 BIG-IP: High memory utilization in host [{#HOST.ID}] (over {$BIGIP.MEMORY.UTIL.WARN.MAX}% for 5m) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:bigip.memory.used[{#HOST.ID}].max(5m)}/{Big-IP SNMP:bigip.memory.total[{#HOST.ID}].min(5m)}*100>{$BIGIP.MEMORY.UTIL.WARN.MAX}`<p>Recovery expression:</p>`{TEMPLATE_NAME:bigip.memory.used[{#HOST.ID}].max(5m)}/{Big-IP SNMP:bigip.memory.total[{#HOST.ID}].min(5m)}*100<{$BIGIP.MEMORY.UTIL.WARN.MIN}` |WARNING | |
-|F5 BIG-IP: High swap utilization in host [{#HOST.ID}] (over {$BIGIP.SWAP.UTIL.WARN.MAX}% for 5m) |<p>The system is running out of free swap memory.</p> |`{TEMPLATE_NAME:bigip.memory.used.swap[{#HOST.ID}].max(5m)}/{Big-IP SNMP:bigip.memory.total.swap[{#HOST.ID}].min(5m)}*100>{$BIGIP.SWAP.UTIL.WARN.MAX}`<p>Recovery expression:</p>`{TEMPLATE_NAME:bigip.memory.used.swap[{#HOST.ID}].max(5m)}/{Big-IP SNMP:bigip.memory.total.swap[{#HOST.ID}].min(5m)}*100>{$BIGIP.SWAP.UTIL.WARN.MIN}` |WARNING | |
+|F5 BIG-IP: High memory utilization in host [{#HOST.ID}] (over {$BIGIP.MEMORY.UTIL.WARN.MAX}%) |<p>The system is running out of free memory.</p> |`{TEMPLATE_NAME:bigip.memory.used[{#HOST.ID}].last()}/{Big-IP SNMP:bigip.memory.total[{#HOST.ID}].last()}*100>{$BIGIP.MEMORY.UTIL.WARN.MAX}`<p>Recovery expression:</p>`{TEMPLATE_NAME:bigip.memory.used[{#HOST.ID}].last()}/{Big-IP SNMP:bigip.memory.total[{#HOST.ID}].last()}*100<{$BIGIP.MEMORY.UTIL.WARN.MIN}` |WARNING | |
+|F5 BIG-IP: High swap utilization in host [{#HOST.ID}] (over {$BIGIP.SWAP.UTIL.WARN.MAX}%) |<p>The system is running out of free swap memory.</p> |`{TEMPLATE_NAME:bigip.memory.used.swap[{#HOST.ID}].last()}/{Big-IP SNMP:bigip.memory.total.swap[{#HOST.ID}].last()}*100>{$BIGIP.SWAP.UTIL.WARN.MAX}`<p>Recovery expression:</p>`{TEMPLATE_NAME:bigip.memory.used.swap[{#HOST.ID}].last()}/{Big-IP SNMP:bigip.memory.total.swap[{#HOST.ID}].last()}*100>{$BIGIP.SWAP.UTIL.WARN.MIN}` |WARNING | |
|F5 BIG-IP: There are errors on the network interface ({#IF.NAME}) |<p>-</p> |`{TEMPLATE_NAME:bigip.net.in.error[{#IF.NAME}].last()}>{TEMPLATE_NAME:bigip.net.in.error[{#IF.NAME}].prev()} or {Big-IP SNMP:bigip.net.out.error[{#IF.NAME}].last()}>{Big-IP SNMP:bigip.net.out.error[{#IF.NAME}].prev()}` |AVERAGE | |
|F5 BIG-IP: Pool {#POOL.NAME} is not available in some capacity: {ITEM.VALUE1} |<p>-</p> |`{TEMPLATE_NAME:bigip.pool.available[{#POOL.NAME}].count(120m,1,ne)}>20` |AVERAGE |<p>**Depends on**:</p><p>- F5 BIG-IP: Pool {#POOL.NAME} is not enabled in some capacity: {ITEM.VALUE1}</p> |
|F5 BIG-IP: Pool {#POOL.NAME} is not enabled in some capacity: {ITEM.VALUE1} |<p>-</p> |`{TEMPLATE_NAME:bigip.pool.enabled[{#POOL.NAME}].count(120m,1,ne)}>4` |AVERAGE | |
|F5 BIG-IP: Power supply [{#POWER.INDEX}] is in critical state |<p>Please check the power supply unit</p> |`{TEMPLATE_NAME:bigip.chassis.power.status[{#POWER.INDEX}].last()}=0` |HIGH | |
|F5 BIG-IP: Power supply [{#POWER.INDEX}] is not present |<p>Please check the power supply unit</p> |`{TEMPLATE_NAME:bigip.chassis.power.status[{#POWER.INDEX}].last()}=2` |INFO | |
-|F5 BIG-IP: Less than {$BIGIP.CERT.MIN} days left until the certificate expires ({#CERT.NAME}) |<p>Please check certificate</p> |`{TEMPLATE_NAME:bigip.cert.expiration.date[{#CERT.NAME}].last()} + 86400 * {$BIGIP.CERT.MIN} < {TEMPLATE_NAME:bigip.cert.expiration.date[{#CERT.NAME}].now()}` |WARNING | |
+|F5 BIG-IP: Less than {$BIGIP.CERT.MIN} days left until the certificate expires ({#CERT.NAME}) |<p>Please check certificate</p> |`{TEMPLATE_NAME:bigip.cert.expiration.date[{#CERT.NAME}].last()} - 86400 * {$BIGIP.CERT.MIN} < {TEMPLATE_NAME:bigip.cert.expiration.date[{#CERT.NAME}].now()}` |WARNING | |
|F5 BIG-IP: No SNMP data collection |<p>SNMP is not available for polling. Please check device connectivity and SNMP settings.</p> |`{TEMPLATE_NAME:zabbix[host,snmp,available].max({$SNMP.TIMEOUT})}=0` |WARNING | |
|F5 BIG-IP: has been restarted (uptime < 10m) |<p>Uptime is less than 10 minutes</p> |`{TEMPLATE_NAME:bigip.uptime.last()}<10m` |INFO |<p>Manual close: YES</p> |
|F5 BIG-IP: Chassis temperature ({ITEM.LASTVALUE}) of sensor {#TEMP.INDEX} exceeds threshold of {$BIGIP.TEMP.HIGH} °C |<p>-</p> |`{TEMPLATE_NAME:bigip.chassis.temp.value[{#TEMP.INDEX}].last()}>{$BIGIP.TEMP.HIGH}` |HIGH | |
diff --git a/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml b/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml
index d47389df997..0f3579e82dc 100644
--- a/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml
+++ b/templates/net/f5_bigip_snmp/template_net_f5_bigip_virt_snmp.yaml
@@ -326,7 +326,7 @@ zabbix_export:
name: 'F5 BIG-IP: Changes have been made on the device not sync to the device group: {ITEM.VALUE}'
opdata: '{ITEM.LASTVALUE}'
priority: WARNING
- description: 'The device is inconsistent with the device group, requires user intervention'
+ description: 'Changes have been made on the device not sync to the device group, requires user intervention'
manual_close: 'YES'
-
uuid: eb3517626c6d425f9b88a2bc35641ab6
@@ -599,7 +599,7 @@ zabbix_export:
type: SNMP_AGENT
snmp_oid: 'discovery[{#CERT.NAME},.1.3.6.1.4.1.3375.2.1.15.1.2.1.1]'
key: bigip.cert.discovery
- delay: 1h
+ delay: 1d
description: 'A table containing certificate configuration.'
item_prototypes:
-
@@ -608,17 +608,13 @@ zabbix_export:
type: SNMP_AGENT
snmp_oid: '.1.3.6.1.4.1.3375.2.1.15.1.2.1.5.{#SNMPINDEX}'
key: 'bigip.cert.expiration.date[{#CERT.NAME}]'
- delay: 6h
+ delay: 12h
history: 7d
+ trends: '0'
units: unixtime
description: |
MIB: F5-BIGIP-SYSTEM-MIB
The expiration date of the certificate in unix time.
- preprocessing:
- -
- type: DISCARD_UNCHANGED_HEARTBEAT
- parameters:
- - 12h
tags:
-
tag: Application
@@ -626,16 +622,11 @@ zabbix_export:
trigger_prototypes:
-
uuid: 015ce3f5d10749aca1d871a1d26c51c5
- expression: 'last(/F5 Big-IP SNMP/bigip.cert.expiration.date[{#CERT.NAME}]) + 86400 * {$BIGIP.CERT.MIN} < now()'
+ expression: 'last(/F5 Big-IP SNMP/bigip.cert.expiration.date[{#CERT.NAME}]) - 86400 * {$BIGIP.CERT.MIN} < now()'
name: 'F5 BIG-IP: Less than {$BIGIP.CERT.MIN} days left until the certificate expires ({#CERT.NAME})'
opdata: 'Expires: {ITEM.VALUE}'
priority: WARNING
description: 'Please check certificate'
- preprocessing:
- -
- type: DISCARD_UNCHANGED_HEARTBEAT
- parameters:
- - 12h
-
uuid: 1bab90f9f015432c817cabebb98453af
name: 'Chassis fan discovery'
@@ -1816,18 +1807,18 @@ zabbix_export:
trigger_prototypes:
-
uuid: e72f446075214129ab1d6269fcd87051
- expression: 'max(/F5 Big-IP SNMP/bigip.memory.used[{#HOST.ID}],5m)/min(/F5 Big-IP SNMP/bigip.memory.total[{#HOST.ID}],5m)*100>{$BIGIP.MEMORY.UTIL.WARN.MAX}'
+ expression: 'last(/F5 Big-IP SNMP/bigip.memory.used[{#HOST.ID}])/last(/F5 Big-IP SNMP/bigip.memory.total[{#HOST.ID}])*100>{$BIGIP.MEMORY.UTIL.WARN.MAX}'
recovery_mode: RECOVERY_EXPRESSION
- recovery_expression: 'max(/F5 Big-IP SNMP/bigip.memory.used[{#HOST.ID}],5m)/min(/F5 Big-IP SNMP/bigip.memory.total[{#HOST.ID}],5m)*100<{$BIGIP.MEMORY.UTIL.WARN.MIN}'
- name: 'F5 BIG-IP: High memory utilization in host [{#HOST.ID}] (over {$BIGIP.MEMORY.UTIL.WARN.MAX}% for 5m)'
+ recovery_expression: 'last(/F5 Big-IP SNMP/bigip.memory.used[{#HOST.ID}])/last(/F5 Big-IP SNMP/bigip.memory.total[{#HOST.ID}])*100<{$BIGIP.MEMORY.UTIL.WARN.MIN}'
+ name: 'F5 BIG-IP: High memory utilization in host [{#HOST.ID}] (over {$BIGIP.MEMORY.UTIL.WARN.MAX}%)'
priority: WARNING
description: 'The system is running out of free memory.'
-
uuid: 5cf3e1f819ee46f49ba89156c53274ec
- expression: 'max(/F5 Big-IP SNMP/bigip.memory.used.swap[{#HOST.ID}],5m)/min(/F5 Big-IP SNMP/bigip.memory.total.swap[{#HOST.ID}],5m)*100>{$BIGIP.SWAP.UTIL.WARN.MAX}'
+ expression: 'last(/F5 Big-IP SNMP/bigip.memory.used.swap[{#HOST.ID}])/last(/F5 Big-IP SNMP/bigip.memory.total.swap[{#HOST.ID}])*100>{$BIGIP.SWAP.UTIL.WARN.MAX}'
recovery_mode: RECOVERY_EXPRESSION
- recovery_expression: 'max(/F5 Big-IP SNMP/bigip.memory.used.swap[{#HOST.ID}],5m)/min(/F5 Big-IP SNMP/bigip.memory.total.swap[{#HOST.ID}],5m)*100>{$BIGIP.SWAP.UTIL.WARN.MIN}'
- name: 'F5 BIG-IP: High swap utilization in host [{#HOST.ID}] (over {$BIGIP.SWAP.UTIL.WARN.MAX}% for 5m)'
+ recovery_expression: 'last(/F5 Big-IP SNMP/bigip.memory.used.swap[{#HOST.ID}])/last(/F5 Big-IP SNMP/bigip.memory.total.swap[{#HOST.ID}])*100>{$BIGIP.SWAP.UTIL.WARN.MIN}'
+ name: 'F5 BIG-IP: High swap utilization in host [{#HOST.ID}] (over {$BIGIP.SWAP.UTIL.WARN.MAX}%)'
priority: WARNING
description: 'The system is running out of free swap memory.'
graph_prototypes:
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md
index 4219b9c59b4..9635951b529 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml
index 9c790308b66..73cd51dcc50 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+PC_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+PC_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:44Z'
+ date: '2021-11-29T15:33:45Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
index 2948f7011de..3f129861a33 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml
index 6881948a9b3..6f364306c7d 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-1S+_snmp/template_net_mikrotik_CCR1009-7G-1C-1S+_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:45Z'
+ date: '2021-11-29T15:34:28Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
index f052d8b4a60..15ce4eed9a9 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml
index d8095c0c3d6..e4f2747a8a3 100644
--- a/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1009-7G-1C-PC_snmp/template_net_mikrotik_CCR1009-7G-1C-PC_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:47Z'
+ date: '2021-11-29T15:41:03Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
index d7e1ede116b..5d96cf774a2 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml
index 2058843241a..ccfc1615c7c 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12G_snmp/template_net_mikrotik_CCR1016-12G_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:49Z'
+ date: '2021-11-29T15:34:46Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
index d3926ec9a72..5ca87f980d5 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml
index e4f1851e198..5795f8b6d79 100644
--- a/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1016-12S-1S+_snmp/template_net_mikrotik_CCR1016-12S-1S+_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:50Z'
+ date: '2021-11-29T15:37:49Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
index 2f1479a187e..58d8fdb46dd 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml
index c60ec5395ea..d680631cf4f 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S-EM_snmp/template_net_mikrotik_CCR1036-12G-4S-EM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:52Z'
+ date: '2021-11-29T15:37:29Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
index 079e7ad1b05..dd86d052661 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml
index 5cf8c3e5e50..e57900e69d6 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1036-12G-4S_snmp/template_net_mikrotik_CCR1036-12G-4S_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:53Z'
+ date: '2021-11-29T15:38:51Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
index 2f55f313688..62218c93e3a 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml
index 066f5a92a49..6707a72e500 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+EM_snmp/template_net_mikrotik_CCR1036-8G-2S+EM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:55Z'
+ date: '2021-11-29T15:35:13Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
index ae7a1d56a24..d271b7ba261 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml
index af2a232a1b0..432b1131799 100644
--- a/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1036-8G-2S+_snmp/template_net_mikrotik_CCR1036-8G-2S+_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:57Z'
+ date: '2021-11-29T15:40:07Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
index 2aa99f301a6..11ac7103594 100644
--- a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml
index 36670ee11a1..d2260c6c841 100644
--- a/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR1072-1G-8S+_snmp/template_net_mikrotik_CCR1072-1G-8S+_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:06:59Z'
+ date: '2021-11-29T15:35:50Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
index 5a69c61cf63..833f7bce41f 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml
index 1b3a412018b..f4d1c89bcc5 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR2004-16G-2S+_snmp/template_net_mikrotik_CCR2004-16G-2S+_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:01Z'
+ date: '2021-11-29T15:34:02Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
index 6f415d226e7..6aa4920e362 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml
index 8d1e03e7a68..ef590590474 100644
--- a/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CCR2004-1G-12S+2XS_snmp/template_net_mikrotik_CCR2004-1G-12S+2XS_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:02Z'
+ date: '2021-11-29T15:33:37Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
index 44d983325dd..ee7a5ab19f4 100644
--- a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml
index 63a5f688835..0196d3bb728 100644
--- a/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS106-1C-5S_snmp/template_net_mikrotik_CRS106-1C-5S_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:06Z'
+ date: '2021-11-29T15:38:00Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md
index 1518d9b7817..de158b1cd68 100644
--- a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml
index 49283cc5980..040cc0923c2 100644
--- a/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS109-8G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS109-8G-1S-2HnD-IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:07Z'
+ date: '2021-11-29T15:32:56Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
index bc1c5137f69..18cb712a0fe 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml
index 8b0cd498877..22edab74042 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS112-8G-4S-IN_snmp/template_net_mikrotik_CRS112-8G-4S-IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:09Z'
+ date: '2021-11-29T15:34:37Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
index 1568d6e3347..5768e57bd79 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml
index cee8311b0f6..e8ff5ff13b2 100644
--- a/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS112-8P-4S-IN_snmp/template_net_mikrotik_CRS112-8P-4S-IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:11Z'
+ date: '2021-11-29T15:39:02Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md
index 674f5ec778a..9b91c284e75 100644
--- a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml
index 03fdab4b426..25d5d9d7447 100644
--- a/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS125-24G-1S-2HnD-IN_snmp/template_net_mikrotik_CRS125-24G-1S-2HnD-IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:13Z'
+ date: '2021-11-29T15:33:29Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md
index de105334356..5028ee6afdd 100644
--- a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml
index 92844448c5c..07b585a60d2 100644
--- a/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS212-1G-10S-1S+IN_snmp/template_net_mikrotik_CRS212-1G-10S-1S+IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:15Z'
+ date: '2021-11-29T15:37:19Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
index ab320ae4de8..d3605baf750 100644
--- a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml
index b176aff101c..9aa5d231078 100644
--- a/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS305-1G-4S+IN_snmp/template_net_mikrotik_CRS305-1G-4S+IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:17Z'
+ date: '2021-11-29T15:39:23Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
index 0263899bf71..341bdae16d2 100644
--- a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml
index dc0ba1e391a..f6e1ef29608 100644
--- a/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS309-1G-8S+IN_snmp/template_net_mikrotik_CRS309-1G-8S+IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:19Z'
+ date: '2021-11-29T15:35:32Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
index 9f8b8265978..e65b95eb32f 100644
--- a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml
index b664c79ed44..6d11e31a300 100644
--- a/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS312-4C+8XG-RM_snmp/template_net_mikrotik_CRS312-4C+8XG-RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:20Z'
+ date: '2021-11-29T15:40:52Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
index 9b51f163016..76dccb58fa0 100644
--- a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml
index 65c732b963a..7b994447ddc 100644
--- a/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS317-1G-16S+RM_snmp/template_net_mikrotik_CRS317-1G-16S+RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:22Z'
+ date: '2021-11-29T15:32:48Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
index 4d08812c4dc..074c2304426 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml
index 3cb431bee9b..2bb8834b1d2 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+IN_snmp/template_net_mikrotik_CRS326-24G-2S+IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:24Z'
+ date: '2021-11-29T15:36:39Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
index 097b1d4a6c3..40911d55564 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml
index 0cfa053fbf5..b69692e5489 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS326-24G-2S+RM_snmp/template_net_mikrotik_CRS326-24G-2S+RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:26Z'
+ date: '2021-11-29T15:37:08Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
index e83159c3403..e0d1d463384 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml
index c3556d4f0f9..fc380740dc4 100644
--- a/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS326-24S+2Q+RM_snmp/template_net_mikrotik_CRS326-24S+2Q+RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:28Z'
+ date: '2021-11-29T15:38:30Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
index 02936695d08..076225eb506 100644
--- a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml
index dfe8d0620de..52d0a93016b 100644
--- a/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS328-24P-4S+RM_snmp/template_net_mikrotik_CRS328-24P-4S+RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:30Z'
+ date: '2021-11-29T15:34:55Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md
index 21707f66b0c..dbc58768187 100644
--- a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml
index 9522aa01bc4..097863c9ae9 100644
--- a/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS328-4C-20S-4S+RM_snmp/template_net_mikrotik_CRS328-4C-20S-4S+RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:32Z'
+ date: '2021-11-29T15:36:19Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md
index 86ae10f176a..d3320f58e52 100644
--- a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml
index 844efe50556..e7d31c7fb0b 100644
--- a/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS354-48G-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48G-4S+2Q+RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:34Z'
+ date: '2021-11-29T15:36:48Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md
index 73b6aa02009..4f8f8e6273b 100644
--- a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml
index f69510f8d75..bf46b7416dc 100644
--- a/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CRS354-48P-4S+2Q+RM_snmp/template_net_mikrotik_CRS354-48P-4S+2Q+RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:36Z'
+ date: '2021-11-29T15:39:12Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
index 01a088d5e6d..2144e5e88c9 100644
--- a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml
index e839810d031..fdd65ea00ce 100644
--- a/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CSS326-24G-2S+RM_snmp/template_net_mikrotik_CSS326-24G-2S+RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:38Z'
+ date: '2021-11-29T15:35:41Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
index 90f34e62c6b..604220f8a79 100644
--- a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml
index c650cd7c018..74671c9252a 100644
--- a/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_CSS610-8G-2S+IN_snmp/template_net_mikrotik_CSS610-8G-2S+IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:40Z'
+ date: '2021-11-29T15:39:45Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md b/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
index eb99341d919..04a7e160b8e 100644
--- a/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_FiberBox_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml b/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml
index e95517c71ff..ccf59cfbb6b 100644
--- a/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_FiberBox_snmp/template_net_mikrotik_FiberBox_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:41Z'
+ date: '2021-11-29T15:35:04Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
index 653947ef31c..b6a41b7fa77 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml
index 7841b18fe94..39378cd7d96 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_PowerBox_Pro_snmp/template_net_mikrotik_PowerBox_Pro_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:59Z'
+ date: '2021-11-29T15:41:38Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md b/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
index 5885e9e6f4b..2e3386bf1d4 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_PowerBox_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml b/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml
index a70bbcb60c6..492a2c59c72 100644
--- a/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_PowerBox_snmp/template_net_mikrotik_PowerBox_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:01Z'
+ date: '2021-11-29T15:36:59Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
index 9e77804e0f8..9a9b6d6aa53 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml
index 0dee037a54d..0c3af2c7ae3 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_Dude_Edition_snmp/template_net_mikrotik_RB1100AHx4_Dude_Edition_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:04Z'
+ date: '2021-11-29T15:36:29Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
index ee6cfa561df..eb236252b70 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml
index 256029e98a3..7d0e904d6ce 100644
--- a/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB1100AHx4_snmp/template_net_mikrotik_RB1100AHx4_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:06Z'
+ date: '2021-11-29T15:37:39Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
index 537ea09144d..d05d26de61a 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml
index 0bfa5a7146c..a2f9491bfc7 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-IN_snmp/template_net_mikrotik_RB2011UiAS-IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:14Z'
+ date: '2021-11-29T15:34:20Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
index a3988b37a59..ca3632c4bd6 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml
index 3e4fa4e0686..58b39578134 100644
--- a/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011UiAS-RM_snmp/template_net_mikrotik_RB2011UiAS-RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:16Z'
+ date: '2021-11-29T15:40:18Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
index 09ca91966d5..fe85c15ad7d 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml
index b9d098fbf2a..e486c12fff4 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-IN_snmp/template_net_mikrotik_RB2011iL-IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:08Z'
+ date: '2021-11-29T15:40:29Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
index b28dfdb19ad..6f15d7073fa 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml
index 6ca9d0d69c0..44f34cb5929 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011iL-RM_snmp/template_net_mikrotik_RB2011iL-RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:10Z'
+ date: '2021-11-29T15:33:53Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
index ecc69f47c0f..28e93f4d348 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml
index 1f1fed3c9ca..2f1c56e8704 100644
--- a/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB2011iLS-IN_snmp/template_net_mikrotik_RB2011iLS-IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:12Z'
+ date: '2021-11-29T15:36:00Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
index 6668a4a7b45..b8f4e06a73e 100644
--- a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml
index 855ec54e024..4d8e8758b9d 100644
--- a/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB260GSP_snmp/template_net_mikrotik_RB260GSP_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:18Z'
+ date: '2021-11-29T15:41:26Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md b/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
index afed53e78a3..843a53767ba 100644
--- a/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB260GS_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml b/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml
index 6775f3596aa..b658ac4a86b 100644
--- a/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB260GS_snmp/template_net_mikrotik_RB260GS_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:21Z'
+ date: '2021-11-29T15:39:56Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
index 7f8942116a9..dd4798dfadb 100644
--- a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml
index 602e5f6a26a..3ae99a8eeff 100644
--- a/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB3011UiAS-RM_snmp/template_net_mikrotik_RB3011UiAS-RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:23Z'
+ date: '2021-11-29T15:40:40Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
index 0538d752c18..15b33fac4cf 100644
--- a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml
index 66e8a3f9baa..5911ea64de2 100644
--- a/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB4011iGS+RM_snmp/template_net_mikrotik_RB4011iGS+RM_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:25Z'
+ date: '2021-11-29T15:33:21Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
index b9b9ca87570..43e2acbc7f3 100644
--- a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml
index 0a2fdbc741b..62fecaca9b5 100644
--- a/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_RB5009UG+S+IN_snmp/template_net_mikrotik_RB5009UG+S+IN_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:08:27Z'
+ date: '2021-11-29T15:33:04Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
index ef3f63dfc2c..99eddb005e6 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml
index 9012c6b498c..dd3341c7163 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_lite_snmp/template_net_mikrotik_hEX_PoE_lite_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:45Z'
+ date: '2021-11-29T15:38:41Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
index c4bcfbda8cc..20e3159326b 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml
index 8fc7a5afcbb..d4c8c65b238 100644
--- a/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_PoE_snmp/template_net_mikrotik_hEX_PoE_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:47Z'
+ date: '2021-11-29T15:36:10Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
index 0a218d03903..635e4dcc84d 100644
--- a/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_S_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml
index 463204851d3..53d68f0f691 100644
--- a/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_S_snmp/template_net_mikrotik_hEX_S_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:52Z'
+ date: '2021-11-29T15:35:22Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
index 6fe228f7b15..88543e1d516 100644
--- a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml
index b5edb3f21bd..367ac477abc 100644
--- a/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_lite_snmp/template_net_mikrotik_hEX_lite_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:43Z'
+ date: '2021-11-29T15:34:11Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_hEX_snmp/README.md b/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
index 83d6313326f..4fe41721ab2 100644
--- a/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_hEX_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml b/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml
index b6c2d17fb54..5d0514a4ea6 100644
--- a/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_hEX_snmp/template_net_mikrotik_hEX_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:50Z'
+ date: '2021-11-29T15:41:15Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
index 2443fedb045..b713b68fa16 100644
--- a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml
index 47bbe27bb06..d7844ba87a5 100644
--- a/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_netPower_15FR_snmp/template_net_mikrotik_netPower_15FR_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:53Z'
+ date: '2021-11-29T15:33:12Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
index 7114fa5b76f..42127041327 100644
--- a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml
index 7449b840834..6838b553957 100644
--- a/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_netPower_16P_snmp/template_net_mikrotik_netPower_16P_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:55Z'
+ date: '2021-11-29T15:38:10Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
index e09aff9f760..67ede227c6b 100644
--- a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/README.md
@@ -81,11 +81,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml
index 1d2c44f6e42..032bd2eca84 100644
--- a/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_netPower_Lite_7R_snmp/template_net_mikrotik_netPower_Lite_7R_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-11T06:07:57Z'
+ date: '2021-11-29T15:39:34Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -631,7 +631,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -700,7 +700,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/net/mikrotik/mikrotik_snmp/README.md b/templates/net/mikrotik/mikrotik_snmp/README.md
index f358132d791..0c1ffec88b8 100644
--- a/templates/net/mikrotik/mikrotik_snmp/README.md
+++ b/templates/net/mikrotik/mikrotik_snmp/README.md
@@ -76,11 +76,11 @@ No specific Zabbix configuration is required.
|Wireless |Interface {#IFNAME}({#IFALIAS}): SSID |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApSsid Service Set Identifier.</p> |SNMP |ssid.name[mtxrWlApSsid.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP band |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApBand</p> |SNMP |ssid.band[mtxrWlApBand.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP noise floor |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApNoiseFloor</p> |SNMP |ssid.noise[mtxrWlApNoiseFloor.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `15m`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlApClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlApAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlApAuthClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP channel |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMChannel</p> |SNMP |ssid.channel[mtxrWlCMChannel.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP state |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMState Wireless interface state.</p> |SNMP |ssid.state[mtxrWlCMState.{#SNMPINDEX}]<p>**Preprocessing**:</p><p>- DISCARD_UNCHANGED_HEARTBEAT: `1h`</p> |
-|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
+|Wireless |Interface {#IFNAME}({#IFALIAS}): AP registered clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.</p> |SNMP |ssid.regclient[mtxrWlCMRegClientCount.{#SNMPINDEX}] |
|Wireless |Interface {#IFNAME}({#IFALIAS}): AP authenticated clients |<p>MIB: MIKROTIK-MIB</p><p>mtxrWlCMAuthClientCount Number of authentication clients.</p> |SNMP |ssid.authclient[mtxrWlCMAuthClientCount.{#SNMPINDEX}] |
## Triggers
diff --git a/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml b/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml
index 46f1ca9360a..7015aa36ae4 100644
--- a/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml
+++ b/templates/net/mikrotik/mikrotik_snmp/template_net_mikrotik_snmp.yaml
@@ -1,6 +1,6 @@
zabbix_export:
version: '6.0'
- date: '2021-10-08T17:48:38Z'
+ date: '2021-11-29T15:38:20Z'
groups:
-
uuid: 36bff6c29af64692839d077febfc7079
@@ -639,7 +639,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlApClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlApClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
@@ -708,7 +708,7 @@ zabbix_export:
history: 7d
description: |
MIB: MIKROTIK-MIB
- mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authetncation procedures for full connection.
+ mtxrWlCMRegClientCount Client established connection to AP, but didn't finish all authentication procedures for full connection.
tags:
-
tag: Application
diff --git a/templates/os/windows_agent/README.md b/templates/os/windows_agent/README.md
index 14c41326db6..e8232b92235 100644
--- a/templates/os/windows_agent/README.md
+++ b/templates/os/windows_agent/README.md
@@ -136,7 +136,7 @@ No specific Zabbix configuration is required.
|{$VFS.FS.FSDRIVETYPE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`fixed` |
|{$VFS.FS.FSDRIVETYPE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^\s$` |
|{$VFS.FS.FSNAME.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`.*` |
-|{$VFS.FS.FSNAME.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^(/dev|/sys|/run|/proc|.+/shm$)` |
+|{$VFS.FS.FSNAME.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^(?:/dev|/sys|/run|/proc|.+/shm$)` |
|{$VFS.FS.FSTYPE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`.*` |
|{$VFS.FS.FSTYPE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^\s$` |
|{$VFS.FS.PUSED.MAX.CRIT} |<p>The critical threshold of the filesystem utilization in percent.</p> |`90` |
@@ -367,9 +367,9 @@ No specific Zabbix configuration is required.
|Name|Description|Default|
|----|-----------|-------|
|{$SERVICE.NAME.MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^.*$` |
-|{$SERVICE.NAME.NOT_MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^RemoteRegistry|MMCSS|gupdate|SysmonLog|clr_optimization_v.+|clr_optimization_v.+|sppsvc|gpsvc|Pml Driver HPZ12|Net Driver HPZ12|MapsBroker|IntelAudioService|Intel\(R\) TPM Provisioning Service|dbupdate|DoSvc$` |
-|{$SERVICE.STARTUPNAME.MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^automatic|automatic delayed$` |
-|{$SERVICE.STARTUPNAME.NOT_MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^manual|disabled$` |
+|{$SERVICE.NAME.NOT_MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^(?:RemoteRegistry|MMCSS|gupdate|SysmonLog|clr_optimization_v.+|clr_optimization_v.+|sppsvc|gpsvc|Pml Driver HPZ12|Net Driver HPZ12|MapsBroker|IntelAudioService|Intel\(R\) TPM Provisioning Service|dbupdate|DoSvc)$` |
+|{$SERVICE.STARTUPNAME.MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^(?:automatic|automatic delayed)$` |
+|{$SERVICE.STARTUPNAME.NOT_MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^(?:manual|disabled)$` |
## Template links
diff --git a/templates/os/windows_agent/template_os_windows_agent.yaml b/templates/os/windows_agent/template_os_windows_agent.yaml
index cce3bc631f3..3d2efbe1256 100644
--- a/templates/os/windows_agent/template_os_windows_agent.yaml
+++ b/templates/os/windows_agent/template_os_windows_agent.yaml
@@ -539,7 +539,7 @@ zabbix_export:
description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
-
macro: '{$VFS.FS.FSNAME.NOT_MATCHES}'
- value: ^(/dev|/sys|/run|/proc|.+/shm$)
+ value: ^(?:/dev|/sys|/run|/proc|.+/shm$)
description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
-
macro: '{$VFS.FS.FSTYPE.MATCHES}'
@@ -1774,15 +1774,15 @@ zabbix_export:
description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
-
macro: '{$SERVICE.NAME.NOT_MATCHES}'
- value: '^RemoteRegistry|MMCSS|gupdate|SysmonLog|clr_optimization_v.+|clr_optimization_v.+|sppsvc|gpsvc|Pml Driver HPZ12|Net Driver HPZ12|MapsBroker|IntelAudioService|Intel\(R\) TPM Provisioning Service|dbupdate|DoSvc$'
+ value: '^(?:RemoteRegistry|MMCSS|gupdate|SysmonLog|clr_optimization_v.+|clr_optimization_v.+|sppsvc|gpsvc|Pml Driver HPZ12|Net Driver HPZ12|MapsBroker|IntelAudioService|Intel\(R\) TPM Provisioning Service|dbupdate|DoSvc)$'
description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
-
macro: '{$SERVICE.STARTUPNAME.MATCHES}'
- value: '^automatic|automatic delayed$'
+ value: '^(?:automatic|automatic delayed)$'
description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
-
macro: '{$SERVICE.STARTUPNAME.NOT_MATCHES}'
- value: ^manual|disabled$
+ value: ^(?:manual|disabled)$
description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
valuemaps:
-
diff --git a/templates/os/windows_agent_active/README.md b/templates/os/windows_agent_active/README.md
index dddc2e34f4c..d5e7e5349e8 100644
--- a/templates/os/windows_agent_active/README.md
+++ b/templates/os/windows_agent_active/README.md
@@ -136,7 +136,7 @@ No specific Zabbix configuration is required.
|{$VFS.FS.FSDRIVETYPE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`fixed` |
|{$VFS.FS.FSDRIVETYPE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^\s$` |
|{$VFS.FS.FSNAME.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`.*` |
-|{$VFS.FS.FSNAME.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^(/dev|/sys|/run|/proc|.+/shm$)` |
+|{$VFS.FS.FSNAME.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^(?:/dev|/sys|/run|/proc|.+/shm$)` |
|{$VFS.FS.FSTYPE.MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`.*` |
|{$VFS.FS.FSTYPE.NOT_MATCHES} |<p>This macro is used in filesystems discovery. Can be overridden on the host or linked template level.</p> |`^\s$` |
|{$VFS.FS.PUSED.MAX.CRIT} |<p>The critical threshold of the filesystem utilization in percent.</p> |`90` |
@@ -367,9 +367,9 @@ No specific Zabbix configuration is required.
|Name|Description|Default|
|----|-----------|-------|
|{$SERVICE.NAME.MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^.*$` |
-|{$SERVICE.NAME.NOT_MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^RemoteRegistry|MMCSS|gupdate|SysmonLog|clr_optimization_v.+|clr_optimization_v.+|sppsvc|gpsvc|Pml Driver HPZ12|Net Driver HPZ12|MapsBroker|IntelAudioService|Intel\(R\) TPM Provisioning Service|dbupdate|DoSvc$` |
-|{$SERVICE.STARTUPNAME.MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^automatic|automatic delayed$` |
-|{$SERVICE.STARTUPNAME.NOT_MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^manual|disabled$` |
+|{$SERVICE.NAME.NOT_MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^(?:RemoteRegistry|MMCSS|gupdate|SysmonLog|clr_optimization_v.+|clr_optimization_v.+|sppsvc|gpsvc|Pml Driver HPZ12|Net Driver HPZ12|MapsBroker|IntelAudioService|Intel\(R\) TPM Provisioning Service|dbupdate|DoSvc)$` |
+|{$SERVICE.STARTUPNAME.MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^(?:automatic|automatic delayed)$` |
+|{$SERVICE.STARTUPNAME.NOT_MATCHES} |<p>This macro is used in Service discovery. Can be overridden on the host or linked template level.</p> |`^(?:manual|disabled)$` |
## Template links
diff --git a/templates/os/windows_agent_active/template_os_windows_agent_active.yaml b/templates/os/windows_agent_active/template_os_windows_agent_active.yaml
index fc54feda811..d263e57b044 100644
--- a/templates/os/windows_agent_active/template_os_windows_agent_active.yaml
+++ b/templates/os/windows_agent_active/template_os_windows_agent_active.yaml
@@ -551,7 +551,7 @@ zabbix_export:
description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
-
macro: '{$VFS.FS.FSNAME.NOT_MATCHES}'
- value: ^(/dev|/sys|/run|/proc|.+/shm$)
+ value: ^(?:/dev|/sys|/run|/proc|.+/shm$)
description: 'This macro is used in filesystems discovery. Can be overridden on the host or linked template level.'
-
macro: '{$VFS.FS.FSTYPE.MATCHES}'
@@ -1820,15 +1820,15 @@ zabbix_export:
description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
-
macro: '{$SERVICE.NAME.NOT_MATCHES}'
- value: '^RemoteRegistry|MMCSS|gupdate|SysmonLog|clr_optimization_v.+|clr_optimization_v.+|sppsvc|gpsvc|Pml Driver HPZ12|Net Driver HPZ12|MapsBroker|IntelAudioService|Intel\(R\) TPM Provisioning Service|dbupdate|DoSvc$'
+ value: '^(?:RemoteRegistry|MMCSS|gupdate|SysmonLog|clr_optimization_v.+|clr_optimization_v.+|sppsvc|gpsvc|Pml Driver HPZ12|Net Driver HPZ12|MapsBroker|IntelAudioService|Intel\(R\) TPM Provisioning Service|dbupdate|DoSvc)$'
description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
-
macro: '{$SERVICE.STARTUPNAME.MATCHES}'
- value: '^automatic|automatic delayed$'
+ value: '^(?:automatic|automatic delayed)$'
description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
-
macro: '{$SERVICE.STARTUPNAME.NOT_MATCHES}'
- value: ^manual|disabled$
+ value: ^(?:manual|disabled)$
description: 'This macro is used in Service discovery. Can be overridden on the host or linked template level.'
valuemaps:
-
diff --git a/tests/libs/zbxcommon/Makefile.am b/tests/libs/zbxcommon/Makefile.am
index e2c3585d578..298c752307f 100644
--- a/tests/libs/zbxcommon/Makefile.am
+++ b/tests/libs/zbxcommon/Makefile.am
@@ -28,7 +28,8 @@ SERVER_tests = \
zbx_tm_round_down \
zbx_get_report_nextcheck \
zbx_ltrim_utf8 \
- zbx_rtrim_utf8
+ zbx_rtrim_utf8 \
+ zbx_get_week_number
endif
noinst_PROGRAMS = $(SERVER_tests)
@@ -517,4 +518,20 @@ zbx_rtrim_utf8_LDFLAGS = @SERVER_LDFLAGS@
zbx_rtrim_utf8_CFLAGS = $(COMMON_COMPILER_FLAGS)
+# zbx_get_week_number
+
+zbx_get_week_number_SOURCES = \
+ zbx_get_week_number.c \
+ $(COMMON_SRC_FILES)
+
+zbx_get_week_number_LDADD = \
+ $(COMMON_LIB_FILES)
+
+zbx_get_week_number_LDADD += @SERVER_LIBS@
+
+zbx_get_week_number_LDFLAGS = @SERVER_LDFLAGS@
+
+zbx_get_week_number_CFLAGS = $(COMMON_COMPILER_FLAGS)
+
+
endif
diff --git a/tests/libs/zbxcommon/zbx_get_week_number.c b/tests/libs/zbxcommon/zbx_get_week_number.c
new file mode 100644
index 00000000000..39c3b8b1074
--- /dev/null
+++ b/tests/libs/zbxcommon/zbx_get_week_number.c
@@ -0,0 +1,53 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#include "zbxmocktest.h"
+#include "zbxmockdata.h"
+#include "zbxmockassert.h"
+#include "zbxmockutil.h"
+
+#include "common.h"
+#include "zbxtrends.h"
+#include "log.h"
+
+void zbx_mock_test_entry(void **state)
+{
+ zbx_timespec_t ts;
+ struct tm tm;
+ time_t time_tmp;
+ int week_ret, week_exp;
+
+ ZBX_UNUSED(state);
+
+ if (0 != setenv("TZ", zbx_mock_get_parameter_string("in.timezone"), 1))
+ fail_msg("Cannot set 'TZ' environment variable: %s", zbx_strerror(errno));
+
+ tzset();
+
+ if (ZBX_MOCK_SUCCESS != zbx_strtime_to_timespec(zbx_mock_get_parameter_string("in.time"), &ts))
+ fail_msg("Invalid input time format");
+
+ time_tmp = (time_t)ts.sec;
+ tm = *localtime(&time_tmp);
+
+ week_ret = zbx_get_week_number(&tm);
+ week_exp = atoi(zbx_mock_get_parameter_string("out.week"));
+
+ zbx_mock_assert_int_eq("week number", week_exp, week_ret);
+}
diff --git a/tests/libs/zbxcommon/zbx_get_week_number.yaml b/tests/libs/zbxcommon/zbx_get_week_number.yaml
new file mode 100644
index 00000000000..e6842b32a62
--- /dev/null
+++ b/tests/libs/zbxcommon/zbx_get_week_number.yaml
@@ -0,0 +1,1695 @@
+---
+test case: 2010-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-01 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2010-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-02 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2010-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-03 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2010-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2010-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2010-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-06 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2010-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-07 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2010-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-08 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2010-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-09 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2010-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-10 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2010-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2010-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-21 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2010-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-22 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2010-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-23 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2010-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-24 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2010-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-25 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2010-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-26 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2010-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2010-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-28 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2010-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-29 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2010-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-30 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2010-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2010-12-31 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2011-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-01 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2011-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-02 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2011-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-03 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2011-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2011-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2011-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-06 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2011-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-07 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2011-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-08 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2011-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-09 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2011-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-10 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2011-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2011-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-21 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2011-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-22 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2011-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-23 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2011-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-24 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2011-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-25 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2011-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2011-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2011-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-28 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2011-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-29 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2011-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-30 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2011-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2011-12-31 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2012-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-01 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2012-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-02 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2012-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-03 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2012-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2012-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2012-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-06 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2012-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-07 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2012-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-08 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2012-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-09 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2012-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-10 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2012-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2012-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-21 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2012-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-22 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2012-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-23 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2012-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-24 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2012-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-25 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2012-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2012-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2012-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-28 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2012-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-29 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2012-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-30 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2012-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2012-12-31 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2013-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-01 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2013-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-02 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2013-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-03 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2013-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2013-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2013-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-06 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2013-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-07 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2013-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-08 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2013-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-09 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2013-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-10 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2013-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2013-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-21 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2013-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-22 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2013-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-23 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2013-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-24 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2013-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-25 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2013-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2013-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2013-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-28 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2013-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-29 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2013-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-30 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2013-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2013-12-31 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2014-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-01 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2014-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-02 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2014-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-03 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2014-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2014-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2014-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-06 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2014-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-07 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2014-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-08 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2014-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-09 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2014-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-10 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2014-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2014-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-21 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2014-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-22 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2014-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-23 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2014-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-24 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2014-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-25 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2014-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2014-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2014-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-28 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2014-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-29 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2014-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-30 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2014-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2014-12-31 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2015-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-01 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2015-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-02 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2015-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-03 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2015-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2015-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-05 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2015-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-06 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2015-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-07 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2015-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-08 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2015-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-09 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2015-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-10 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2015-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2015-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-21 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2015-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-22 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2015-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-23 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2015-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-24 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2015-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-25 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2015-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2015-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2015-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-28 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2015-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-29 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2015-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-30 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2015-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2015-12-31 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2016-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-01 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2016-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-02 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2016-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-03 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2016-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2016-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2016-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-06 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2016-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-07 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2016-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-08 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2016-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-09 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2016-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-10 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2016-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2016-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-21 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2016-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-22 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2016-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-23 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2016-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-24 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2016-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-25 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2016-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2016-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2016-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-28 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2016-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-29 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2016-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-30 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2016-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2016-12-31 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2017-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-01 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2017-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-02 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2017-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-03 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2017-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2017-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2017-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-06 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2017-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-07 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2017-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-08 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2017-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-09 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2017-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-10 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2017-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2017-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-21 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2017-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-22 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2017-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-23 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2017-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-24 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2017-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-25 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2017-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2017-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2017-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-28 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2017-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-29 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2017-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-30 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2017-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2017-12-31 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2018-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-01 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2018-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-02 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2018-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-03 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2018-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2018-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2018-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-06 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2018-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-07 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2018-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-08 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2018-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-09 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2018-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-10 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2018-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2018-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-21 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2018-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-22 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2018-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-23 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2018-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-24 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2018-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-25 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2018-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2018-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2018-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-28 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2018-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-29 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2018-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-30 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2018-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2018-12-31 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2019-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-01 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2019-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-02 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2019-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-03 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2019-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2019-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2019-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-06 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2019-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-07 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2019-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-08 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2019-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-09 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2019-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-10 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2019-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2019-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-21 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2019-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-22 12:00:00 +02:00
+out:
+ week: 51
+---
+test case: 2019-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-23 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2019-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-24 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2019-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-25 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2019-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2019-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2019-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-28 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2019-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-29 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2019-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-30 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2019-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2019-12-31 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2020-01-01 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-01 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2020-01-02 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-02 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2020-01-03 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-03 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2020-01-04 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-04 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2020-01-05 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-05 12:00:00 +02:00
+out:
+ week: 1
+---
+test case: 2020-01-06 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-06 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2020-01-07 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-07 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2020-01-08 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-08 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2020-01-09 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-09 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2020-01-10 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-10 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2020-01-11 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-01-11 12:00:00 +02:00
+out:
+ week: 2
+---
+test case: 2020-12-21 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-21 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2020-12-22 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-22 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2020-12-23 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-23 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2020-12-24 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-24 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2020-12-25 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-25 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2020-12-26 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-26 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2020-12-27 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-27 12:00:00 +02:00
+out:
+ week: 52
+---
+test case: 2020-12-28 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-28 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2020-12-29 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-29 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2020-12-30 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-30 12:00:00 +02:00
+out:
+ week: 53
+---
+test case: 2020-12-31 12:00:00 +02:00
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-31 12:00:00 +02:00
+out:
+ week: 53
+...
diff --git a/tests/libs/zbxcommon/zbx_tm_add.yaml b/tests/libs/zbxcommon/zbx_tm_add.yaml
index 5e04bbea7ec..cbd4e4bfd30 100644
--- a/tests/libs/zbxcommon/zbx_tm_add.yaml
+++ b/tests/libs/zbxcommon/zbx_tm_add.yaml
@@ -214,5 +214,29 @@ in:
param: 1s
out:
time: 2020-03-29 03:00:00 +03:00
+---
+test case: 2019-01-31 03:00:00 +02:00 + 1M
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-31 03:00:00 +02:00
+ param: 1M
+out:
+ time: 2019-02-28 03:00:00 +02:00
+---
+test case: 2019-01-31 03:00:00 +02:00 + 13M
+in:
+ timezone: :Europe/Riga
+ time: 2019-01-31 03:00:00 +02:00
+ param: 13M
+out:
+ time: 2020-02-29 03:00:00 +02:00
+---
+test case: 2020-02-29 03:00:00 +02:00 + 1y
+in:
+ timezone: :Europe/Riga
+ time: 2020-02-29 03:00:00 +02:00
+ param: 1y
+out:
+ time: 2021-02-28 03:00:00 +02:00
...
diff --git a/tests/libs/zbxcommon/zbx_tm_round_down.c b/tests/libs/zbxcommon/zbx_tm_round_down.c
index e36a8887c23..3c4135fb5c4 100644
--- a/tests/libs/zbxcommon/zbx_tm_round_down.c
+++ b/tests/libs/zbxcommon/zbx_tm_round_down.c
@@ -32,6 +32,7 @@ void zbx_mock_test_entry(void **state)
struct tm tm;
zbx_time_unit_t base;
time_t time_tmp;
+ const char *unit;
ZBX_UNUSED(state);
@@ -46,9 +47,15 @@ void zbx_mock_test_entry(void **state)
if (ZBX_MOCK_SUCCESS != zbx_strtime_to_timespec(zbx_mock_get_parameter_string("out.time"), &ts_out))
fail_msg("Invalid output time format");
- if (ZBX_TIME_UNIT_UNKNOWN == (base = zbx_tm_str_to_unit(zbx_mock_get_parameter_string("in.base"))))
- fail_msg("Invalid time unit");
-
+ if ('i' == *(unit = zbx_mock_get_parameter_string("in.base")))
+ {
+ base = ZBX_TIME_UNIT_ISOYEAR;
+ }
+ else
+ {
+ if (ZBX_TIME_UNIT_UNKNOWN == (base = zbx_tm_str_to_unit(unit)))
+ fail_msg("Invalid time unit");
+ }
time_tmp = ts_in.sec;
tm = *localtime(&time_tmp);
diff --git a/tests/libs/zbxcommon/zbx_tm_round_down.yaml b/tests/libs/zbxcommon/zbx_tm_round_down.yaml
index 0f4f3e9871f..9b551a40aff 100644
--- a/tests/libs/zbxcommon/zbx_tm_round_down.yaml
+++ b/tests/libs/zbxcommon/zbx_tm_round_down.yaml
@@ -110,5 +110,53 @@ in:
base: m
out:
time: 2020-09-01 00:01:00 +03:00
+---
+test case: 2021-01-01 12:00:00 +02:00 / i
+in:
+ timezone: :Europe/Riga
+ time: 2021-01-01 12:00:00 +02:00
+ base: i
+out:
+ time: 2019-12-30 00:00:00 +02:00
+---
+test case: 2021-01-10 12:00:00 +02:00 / i
+in:
+ timezone: :Europe/Riga
+ time: 2021-01-10 12:00:00 +02:00
+ base: i
+out:
+ time: 2021-01-04 00:00:00 +02:00
+---
+test case: 2021-07-01 12:00:00 +03:00 / i
+in:
+ timezone: :Europe/Riga
+ time: 2021-07-01 12:00:00 +03:00
+ base: i
+out:
+ time: 2021-01-04 00:00:00 +02:00
+---
+test case: 2021-12-31 12:00:00 +02:00 / i
+in:
+ timezone: :Europe/Riga
+ time: 2021-12-31 12:00:00 +03:00
+ base: i
+out:
+ time: 2021-01-04 00:00:00 +02:00
+---
+test case: 2022-01-02 12:00:00 +02:00 / i
+in:
+ timezone: :Europe/Riga
+ time: 2022-01-02 12:00:00 +03:00
+ base: i
+out:
+ time: 2021-01-04 00:00:00 +02:00
+---
+test case: 2022-01-03 12:00:00 +02:00 / i
+in:
+ timezone: :Europe/Riga
+ time: 2022-01-03 12:00:00 +03:00
+ base: i
+out:
+ time: 2022-01-03 00:00:00 +02:00
...
diff --git a/tests/libs/zbxcommon/zbx_tm_sub.c b/tests/libs/zbxcommon/zbx_tm_sub.c
index f2c67b86f74..9b2bf5aa2f6 100644
--- a/tests/libs/zbxcommon/zbx_tm_sub.c
+++ b/tests/libs/zbxcommon/zbx_tm_sub.c
@@ -26,13 +26,26 @@
#include "zbxtrends.h"
#include "log.h"
+static void parse_period(const char *period, int *multiplier, zbx_time_unit_t *base)
+{
+ const char *unit;
+
+ *multiplier = atoi(period);
+ unit = period + strlen(period) - 1;
+
+ if ('i' == *unit)
+ {
+ *base = ZBX_TIME_UNIT_ISOYEAR;
+ }
+ else if (ZBX_TIME_UNIT_UNKNOWN == (*base = zbx_tm_str_to_unit(unit)))
+ fail_msg("invalid time period '%s'", period);
+
+}
+
void zbx_mock_test_entry(void **state)
{
- const char *param;
- char *error = NULL;
zbx_timespec_t ts_in, ts_out, ts;
struct tm tm;
- size_t len;
int multiplier;
zbx_time_unit_t base;
time_t time_tmp;
@@ -50,12 +63,7 @@ void zbx_mock_test_entry(void **state)
if (ZBX_MOCK_SUCCESS != zbx_strtime_to_timespec(zbx_mock_get_parameter_string("out.time"), &ts_out))
fail_msg("Invalid output time format");
- param = zbx_mock_get_parameter_string("in.param");
- if (SUCCEED != zbx_tm_parse_period(param, &len, &multiplier, &base, &error))
- {
- fail_msg("Invalid time period: %s", error);
- zbx_free(error);
- }
+ parse_period(zbx_mock_get_parameter_string("in.param"), &multiplier, &base);
time_tmp = ts_in.sec;
tm = *localtime(&time_tmp);
diff --git a/tests/libs/zbxcommon/zbx_tm_sub.yaml b/tests/libs/zbxcommon/zbx_tm_sub.yaml
index d9bb0fbccfe..6f0d3288c9b 100644
--- a/tests/libs/zbxcommon/zbx_tm_sub.yaml
+++ b/tests/libs/zbxcommon/zbx_tm_sub.yaml
@@ -206,4 +206,52 @@ in:
param: 1s
out:
time: 2020-10-25 02:59:59 +03:00
+---
+test case: 2021-11-09 03:00:00 +02:00 - 1i
+in:
+ timezone: :Europe/Riga
+ time: 2021-11-09 03:00:00 +02:00
+ param: 1i
+out:
+ time: 2020-11-03 03:00:00 +02:00
+---
+test case: 2020-12-30 03:00:00 +02:00 - 1i
+in:
+ timezone: :Europe/Riga
+ time: 2020-12-30 03:00:00 +02:00
+ param: 1i
+out:
+ time: 2019-12-25 03:00:00 +02:00
+---
+test case: 2021-01-04 03:00:00 +02:00 - 1i
+in:
+ timezone: :Europe/Riga
+ time: 2021-01-04 03:00:00 +02:00
+ param: 1i
+out:
+ time: 2019-12-30 03:00:00 +02:00
+---
+test case: 2021-03-31 03:00:00 +03:00 - 1M
+in:
+ timezone: :Europe/Riga
+ time: 2021-03-31 03:00:00 +03:00
+ param: 1M
+out:
+ time: 2021-02-28 03:00:00 +02:00
+---
+test case: 2021-03-31 03:00:00 +03:00 - 13M
+in:
+ timezone: :Europe/Riga
+ time: 2021-03-31 03:00:00 +03:00
+ param: 13M
+out:
+ time: 2020-02-29 03:00:00 +02:00
+---
+test case: 2020-02-29 03:00:00 +03:00 - 1y
+in:
+ timezone: :Europe/Riga
+ time: 2020-02-29 03:00:00 +02:00
+ param: 1y
+out:
+ time: 2019-02-28 03:00:00 +02:00
...
diff --git a/tests/libs/zbxconf/parse_cfg_file.c b/tests/libs/zbxconf/parse_cfg_file.c
index a1e3f1d8279..7311da01aee 100644
--- a/tests/libs/zbxconf/parse_cfg_file.c
+++ b/tests/libs/zbxconf/parse_cfg_file.c
@@ -229,7 +229,7 @@ void zbx_mock_test_entry(void **state)
cfg = zbx_realloc(cfg, (parameter_count + 1) * sizeof(struct cfg_line));
cfg[parameter_count].parameter = NULL;
- parse_cfg_file(cfg_file, cfg, ZBX_CFG_FILE_REQUIRED, strict);
+ parse_cfg_file(cfg_file, cfg, ZBX_CFG_FILE_REQUIRED, strict, ZBX_CFG_EXIT_FAILURE);
if (ZBX_MOCK_NO_EXIT_CODE != (error = zbx_mock_exit_code(&exit_code)))
{
@@ -357,7 +357,7 @@ void zbx_mock_test_entry(void **state)
switch (cfg[i].type)
{
case TYPE_MULTISTRING:
- zbx_strarr_free(*(char ***)cfg[i].variable);
+ zbx_strarr_free((char ***)cfg[i].variable);
zbx_free(cfg[i].variable);
zbx_free(expected_values[i]);
break;
diff --git a/tests/libs/zbxdbcache/Makefile.am b/tests/libs/zbxdbcache/Makefile.am
index 422a9299a0f..2eadda645b8 100644
--- a/tests/libs/zbxdbcache/Makefile.am
+++ b/tests/libs/zbxdbcache/Makefile.am
@@ -42,11 +42,12 @@ CACHE_LIBS = \
$(top_srcdir)/src/libs/zbxavailability/libzbxavailability.a \
$(top_srcdir)/src/zabbix_server/availability/libavailability.a \
$(top_srcdir)/src/libs/zbxipcservice/libzbxipcservice.a \
- $(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
$(top_srcdir)/src/zabbix_server/libzbxserver.a \
$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
$(top_srcdir)/src/libs/zbxservice/libzbxservice.a \
$(top_srcdir)/src/zabbix_server/service/libservice.a \
+ $(top_srcdir)/src/libs/zbxtrends/libzbxtrends_baseline.a \
+ $(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
$(top_srcdir)/src/libs/zbxeval/libzbxeval.a \
$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
$(top_srcdir)/src/libs/zbxxml/libzbxxml.a \
diff --git a/tests/libs/zbxdbhigh/Makefile.am b/tests/libs/zbxdbhigh/Makefile.am
index 17e6c42c3c9..685190bb75e 100644
--- a/tests/libs/zbxdbhigh/Makefile.am
+++ b/tests/libs/zbxdbhigh/Makefile.am
@@ -16,6 +16,7 @@ COMMON_FLAGS = -I@top_srcdir@/tests
COMMON_LIB = \
$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
+ $(top_srcdir)/src/libs/zbxtrends/libzbxtrends_baseline.a \
$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
$(top_srcdir)/src/libs/zbxhistory/libzbxhistory.a \
$(top_srcdir)/src/libs/zbxmemory/libzbxmemory.a \
@@ -93,6 +94,7 @@ SERVER_COMMON_LIB = \
$(top_srcdir)/src/zabbix_server/service/libservice.a \
$(top_srcdir)/src/libs/zbxipcservice/libzbxipcservice.a \
$(top_srcdir)/src/libs/zbxaudit/libzbxaudit.a \
+ $(top_srcdir)/src/libs/zbxtrends/libzbxtrends_baseline.a \
$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
$(COMMON_LIB)
diff --git a/tests/libs/zbxeval/Makefile.am b/tests/libs/zbxeval/Makefile.am
index 3f62d6a9e90..b1bea8d1259 100755
--- a/tests/libs/zbxeval/Makefile.am
+++ b/tests/libs/zbxeval/Makefile.am
@@ -41,6 +41,7 @@ COMMON_LIB_FILES = \
$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
$(top_srcdir)/src/libs/zbxeval/libzbxeval.a \
+ $(top_srcdir)/src/libs/zbxtrends/libzbxtrends_baseline.a \
$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
diff --git a/tests/libs/zbxserver/Makefile.am b/tests/libs/zbxserver/Makefile.am
index 48bcd7a0228..fbf6ce93814 100755
--- a/tests/libs/zbxserver/Makefile.am
+++ b/tests/libs/zbxserver/Makefile.am
@@ -1,6 +1,8 @@
if SERVER
SERVER_tests = \
evaluate_function \
+ evaluate_stl \
+ evaluate_percentage_deviations_in_remainder \
substitute_lld_macros \
macro_fmttime \
valuemaps
@@ -35,6 +37,7 @@ COMMON_LIB_FILES = \
$(top_srcdir)/src/zabbix_server/preprocessor/libpreprocessor.a \
$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
+ $(top_srcdir)/src/libs/zbxtrends/libzbxtrends_baseline.a \
$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
$(top_srcdir)/src/libs/zbxsysinfo/common/libcommonsysinfo.a \
@@ -71,6 +74,7 @@ COMMON_LIB_FILES = \
$(top_srcdir)/src/libs/zbxdbcache/libzbxdbcache.a \
$(top_srcdir)/src/libs/zbxserver/libzbxserver.a \
$(top_srcdir)/src/libs/zbxjson/libzbxjson.a \
+ $(top_srcdir)/src/libs/zbxtrends/libzbxtrends_baseline.a \
$(top_srcdir)/src/libs/zbxtrends/libzbxtrends.a \
$(top_srcdir)/src/libs/zbxnix/libzbxnix.a \
$(top_srcdir)/src/libs/zbxsysinfo/libzbxserversysinfo.a \
@@ -153,6 +157,32 @@ evaluate_function_LDADD += @SERVER_LIBS@
evaluate_function_LDFLAGS = @SERVER_LDFLAGS@ $(VALUECACHE_WRAP_FUNCS)
+evaluate_stl_SOURCES = \
+ evaluate_stl.c \
+ $(COMMON_SRC_FILES)
+
+evaluate_stl_LDADD = \
+ $(top_srcdir)/tests/mocks/valuecache/libvaluecachemock.a
+
+evaluate_stl_LDADD += $(COMMON_LIB_FILES)
+
+evaluate_stl_LDADD += @SERVER_LIBS@
+
+evaluate_stl_LDFLAGS = @SERVER_LDFLAGS@ $(VALUECACHE_WRAP_FUNCS)
+
+evaluate_percentage_deviations_in_remainder_SOURCES = \
+ evaluate_percentage_deviations_in_remainder.c \
+ $(COMMON_SRC_FILES)
+
+evaluate_percentage_deviations_in_remainder_LDADD = \
+ $(top_srcdir)/tests/mocks/valuecache/libvaluecachemock.a
+
+evaluate_percentage_deviations_in_remainder_LDADD += $(COMMON_LIB_FILES)
+
+evaluate_percentage_deviations_in_remainder_LDADD += @SERVER_LIBS@
+
+evaluate_percentage_deviations_in_remainder_LDFLAGS = @SERVER_LDFLAGS@ $(VALUECACHE_WRAP_FUNCS)
+
valuemaps_SOURCES = \
valuemaps.c \
$(COMMON_SRC_FILES)
@@ -187,6 +217,16 @@ evaluate_function_CFLAGS = $(COMMON_COMPILER_FLAGS) \
-I@top_srcdir@/src/libs/zbxdbcache \
-I@top_srcdir@/src/libs/zbxhistory
+evaluate_stl_CFLAGS = $(COMMON_COMPILER_FLAGS) \
+ -I@top_srcdir@/src/libs/zbxalgo \
+ -I@top_srcdir@/src/libs/zbxdbcache \
+ -I@top_srcdir@/src/libs/zbxhistory
+
+evaluate_percentage_deviations_in_remainder_CFLAGS = $(COMMON_COMPILER_FLAGS) \
+ -I@top_srcdir@/src/libs/zbxalgo \
+ -I@top_srcdir@/src/libs/zbxdbcache \
+ -I@top_srcdir@/src/libs/zbxhistory
+
valuemaps_CFLAGS = $(COMMON_COMPILER_FLAGS) \
-I@top_srcdir@/src/libs/zbxalgo \
-I@top_srcdir@/src/libs/zbxdbcache \
diff --git a/tests/libs/zbxserver/evaluate_function.c b/tests/libs/zbxserver/evaluate_function.c
index 9a6a79dbd37..d60777cff5b 100644
--- a/tests/libs/zbxserver/evaluate_function.c
+++ b/tests/libs/zbxserver/evaluate_function.c
@@ -120,6 +120,7 @@ void zbx_mock_test_entry(void **state)
zbx_uint64_t expected_ui64;
handle = zbx_mock_get_parameter_handle("out.value");
+
if (ZBX_MOCK_SUCCESS != (err = zbx_mock_string_ex(handle, &expected_value)))
fail_msg("Cannot read output value: %s", zbx_mock_error_string(err));
@@ -132,9 +133,9 @@ void zbx_mock_test_entry(void **state)
case ZBX_VARIANT_UI64:
if (SUCCEED != is_uint64(expected_value, &expected_ui64))
{
- fail_msg("function result '" ZBX_FS_UI64 "' does not match expected result '%s'",
+ fail_msg("function result '" ZBX_FS_UI64
+ "' does not match expected result '%s'",
returned_value.data.ui64, expected_value);
-
}
zbx_mock_assert_uint64_eq("function result", expected_ui64, returned_value.data.ui64);
break;
diff --git a/tests/libs/zbxserver/evaluate_function.yaml b/tests/libs/zbxserver/evaluate_function.yaml
index 339fd15f434..fb9335d00a3 100644
--- a/tests/libs/zbxserver/evaluate_function.yaml
+++ b/tests/libs/zbxserver/evaluate_function.yaml
@@ -2100,6 +2100,33 @@ out:
return: SUCCEED
value: 34.751499
---
+test case: Evaluate stddevpop(6m) FLOAT 135.190000
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 1
+ ts: 2021-03-27 10:01:00.000000000 +00:00
+ - value: 135.190000
+ ts: 2021-03-27 10:02:00.000000000 +00:00
+ - value: 122.200000
+ ts: 2021-03-27 10:03:00.000000000 +00:00
+ - value: 66.700000
+ ts: 2021-03-27 10:04:00.000000000 +00:00
+ - value: 58.990000
+ ts: 2021-03-27 10:05:00.000000000 +00:00
+ - value: 40.000000
+ ts: 2021-03-27 10:06:00.000000000 +00:00
+ - value: 47.420000
+ ts: 2021-03-27 10:07:00.000000000 +00:00
+ time: 2021-03-27 10:07:00.000000000 +00:00
+ function: stddevpop
+ params: 6m
+out:
+ return: SUCCEED
+ value: 36.723065
+---
test case: Evaluate stddevpop(6m) UINT64 26, 12, 16, 56, 112, 24
in:
history:
@@ -3695,7 +3722,6 @@ in:
out:
return: SUCCEED
value: 1
-
---
test case: Evaluate default all changecount() with UINT64 data (all values different)
in:
diff --git a/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.c b/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.c
new file mode 100644
index 00000000000..2cb748f15a1
--- /dev/null
+++ b/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.c
@@ -0,0 +1,186 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#include "common.h"
+
+#include "zbxmocktest.h"
+#include "zbxmockdata.h"
+#include "zbxmockassert.h"
+#include "zbxmockutil.h"
+
+#include "valuecache.h"
+#include "zbxserver.h"
+#include "zbxtrends.h"
+
+#include "mocks/valuecache/valuecache_mock.h"
+
+#include "../../../src/libs/zbxserver/anomalystl.h"
+#include "../../../src/libs/zbxserver/evalfunc_common.h"
+
+int __wrap_substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event,
+ zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item,
+ DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const zbx_service_alarm_t *service_alarm,
+ const DB_SERVICE *service, const char *tz, char **data, int macro_type, char *error,
+ int maxerrlen);
+
+int __wrap_DCget_data_expected_from(zbx_uint64_t itemid, int *seconds);
+
+int __wrap_substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event,
+ zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item,
+ DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const zbx_service_alarm_t *service_alarm,
+ const DB_SERVICE *service, const char *tz, char **data, int macro_type, char *error,
+ int maxerrlen)
+{
+ ZBX_UNUSED(actionid);
+ ZBX_UNUSED(event);
+ ZBX_UNUSED(r_event);
+ ZBX_UNUSED(userid);
+ ZBX_UNUSED(hostid);
+ ZBX_UNUSED(dc_host);
+ ZBX_UNUSED(dc_item);
+ ZBX_UNUSED(alert);
+ ZBX_UNUSED(ack);
+ ZBX_UNUSED(tz);
+ ZBX_UNUSED(data);
+ ZBX_UNUSED(macro_type);
+ ZBX_UNUSED(error);
+ ZBX_UNUSED(maxerrlen);
+ ZBX_UNUSED(service_alarm);
+ ZBX_UNUSED(service);
+
+ return SUCCEED;
+}
+
+int __wrap_DCget_data_expected_from(zbx_uint64_t itemid, int *seconds)
+{
+ ZBX_UNUSED(itemid);
+ *seconds = zbx_vcmock_get_ts().sec - 600;
+
+ return SUCCEED;
+}
+
+void zbx_mock_test_entry(void **state)
+{
+ int start_detect_period, end_detect_period, detect_period_season_shift, err,
+ detect_period, start_evaluate_period, end_evaluate_period, evaluate_seconds = 0,
+ evaluate_nvalues = 0;
+ double deviations_count, result;
+ char *error = NULL, *evaluate_period = NULL;
+ const char *params, *dev_alg = NULL;
+ DC_ITEM item;
+ zbx_vcmock_ds_item_t *ds_item;
+ zbx_timespec_t ts, ts_evaluate_end;
+ zbx_mock_handle_t handle;
+ zbx_vector_history_record_t values_in;
+ zbx_value_type_t detect_period_season_type;
+
+ /* ZBX_DOUBLE_EPSILON = 0.000001; results into output that is different from python test case output */
+ ZBX_DOUBLE_EPSILON = 0.0001;
+
+ zbx_history_record_vector_create(&values_in);
+
+ err = zbx_vc_init(&error);
+ zbx_mock_assert_result_eq("Value cache initialization failed", SUCCEED, err);
+ zbx_vc_enable();
+ zbx_vcmock_ds_init();
+ memset(&item, 0, sizeof(DC_ITEM));
+ ds_item = zbx_vcmock_ds_first_item();
+ item.itemid = ds_item->itemid;
+ item.value_type = ds_item->value_type;
+
+ deviations_count = zbx_mock_get_parameter_float("in.deviations_count");
+ dev_alg = zbx_mock_get_parameter_string("in.dev_alg");
+ handle = zbx_mock_get_parameter_handle("in");
+ zbx_vcmock_set_time(handle, "time");
+ ts = zbx_vcmock_get_ts();
+ ts_evaluate_end = ts;
+
+ params = zbx_mock_get_parameter_string("in.params");
+
+ if (2 != num_param(params))
+ {
+ fail_msg("invalid number of parameters");
+ goto out;
+ }
+
+ if (SUCCEED != get_function_parameter_str(params, 1, &evaluate_period))
+ {
+ fail_msg("invalid second parameter");
+ goto out;
+ }
+
+ if (SUCCEED != zbx_trends_parse_range(ts.sec, evaluate_period, &start_evaluate_period, &end_evaluate_period,
+ &error))
+ {
+ fail_msg("failed to parse seconds parameter: %s", error);
+ goto out;
+ }
+
+ ts_evaluate_end.sec = end_evaluate_period;
+ evaluate_seconds = end_evaluate_period - start_evaluate_period;
+
+ if (SUCCEED != get_function_parameter_hist_range(ts.sec, params, 2, &detect_period, &detect_period_season_type,
+ &detect_period_season_shift))
+ {
+ fail_msg("invalid third parameter");
+ goto out;
+ }
+
+ start_detect_period = ts_evaluate_end.sec - detect_period;
+ end_detect_period = ts_evaluate_end.sec;
+
+ if (FAIL == zbx_vc_get_values(item.itemid, item.value_type, &values_in, evaluate_seconds, evaluate_nvalues,
+ &ts_evaluate_end))
+ {
+ fail_msg("cannot get values from value cache");
+ goto out;
+ }
+
+ zbx_vc_flush_stats();
+
+ if (0 >= values_in.values_num)
+ {
+ fail_msg("not enough data");
+ goto out;
+ }
+
+ if (SUCCEED != zbx_get_percentage_of_deviations_in_stl_remainder(&values_in, deviations_count, dev_alg,
+ start_detect_period, end_detect_period, &result, &error))
+ {
+ fail_msg("zbx_get_percentage_of_deviations_in_stl_remainder returned error: %s\n", error);
+ zbx_free(error);
+ }
+ else
+ {
+ const char *expected_value;
+
+ handle = zbx_mock_get_parameter_handle("out.value");
+
+ if (ZBX_MOCK_SUCCESS != (err = zbx_mock_string_ex(handle, &expected_value)))
+ fail_msg("Cannot read output value: %s", zbx_mock_error_string(err));
+
+ zbx_mock_assert_double_eq("function result", atof(expected_value), result);
+ }
+out:
+ zbx_history_record_vector_destroy(&values_in, item.value_type);
+
+ zbx_vcmock_ds_destroy();
+ zbx_free(evaluate_period);
+ ZBX_UNUSED(state);
+}
diff --git a/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.yaml b/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.yaml
new file mode 100644
index 00000000000..e92b98d4c4d
--- /dev/null
+++ b/tests/libs/zbxserver/evaluate_percentage_deviations_in_remainder.yaml
@@ -0,0 +1,191 @@
+---
+test case: mad, 2 dc, 1 entry is excluded from the detection period
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 1
+ ts: 2021-03-27 14:00:00.000000001 +00:00
+ - value: 2
+ ts: 2021-03-27 13:00:00.000000000 +00:00
+ - value: 3
+ ts: 2021-03-27 12:00:00.000000000 +00:00
+ - value: 4
+ ts: 2021-03-27 11:00:00.000000000 +00:00
+ - value: 5
+ ts: 2021-03-27 10:00:00.000000000 +00:00
+ - value: 1
+ ts: 2021-03-27 09:00:00.000000000 +00:00
+ time: 2021-03-27 15:00:00.000000000 +00:00
+ deviations_count: 2.0
+ dev_alg: mad
+ detect_period: 1d
+ detect_period_type: 1
+ params: '7h:now/h,4h'
+out:
+ return: SUCCEED
+ value: 0.75
+---
+test case: mad, 2 dc, no entries excluded from the detection period
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 1
+ ts: 2021-03-27 15:00:00.000000001 +00:00
+ - value: 2
+ ts: 2021-03-27 14:00:00.000000000 +00:00
+ - value: 3
+ ts: 2021-03-27 13:00:00.000000000 +00:00
+ - value: 4
+ ts: 2021-03-27 12:00:00.000000000 +00:00
+ - value: 5
+ ts: 2021-03-27 11:00:00.000000000 +00:00
+ - value: 1
+ ts: 2021-03-27 10:00:00.000000000 +00:00
+ time: 2021-03-27 16:00:00.000000000 +00:00
+ deviations_count: 2.1
+ dev_alg: mad
+ detect_period: 1d
+ detect_period_type: 1
+ params: '7h:now/h,5h'
+out:
+ return: SUCCEED
+ value: 0.6
+---
+test case: mad, 0 dc
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 1
+ ts: 2021-03-27 15:00:00.000000001 +00:00
+ - value: 2
+ ts: 2021-03-27 14:00:00.000000000 +00:00
+ - value: 3
+ ts: 2021-03-27 13:00:00.000000000 +00:00
+ - value: 4
+ ts: 2021-03-27 11:00:00.000000000 +00:00
+ - value: 5
+ ts: 2021-03-27 10:00:00.000000000 +00:00
+ time: 2021-03-27 16:00:00.000000000 +00:00
+ deviations_count: 0
+ dev_alg: mad
+ detect_period: 1d
+ detect_period_type: 1
+ params: '7h:now/h,7h'
+out:
+ return: SUCCEED
+ value: 1
+---
+test case: mad, 1 dc, stable series
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 1
+ ts: 2021-03-27 15:00:00.000000001 +00:00
+ - value: 1
+ ts: 2021-03-27 14:00:00.000000000 +00:00
+ - value: 1
+ ts: 2021-03-27 13:00:00.000000000 +00:00
+ - value: 1
+ ts: 2021-03-27 11:00:00.000000000 +00:00
+ - value: 666
+ ts: 2021-03-27 10:00:00.000000000 +00:00
+ time: 2021-03-27 16:00:00.000000000 +00:00
+ deviations_count: 1.0001
+ dev_alg: mad
+ detect_period: 1d
+ detect_period_type: 1
+ params: '7h:now/h,7h'
+out:
+ return: SUCCEED
+ value: 1.0
+---
+test case: mad, 4 dc
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 1
+ ts: 2021-03-27 15:00:00.000000001 +00:00
+ - value: 3
+ ts: 2021-03-27 14:00:00.000000000 +00:00
+ - value: 5
+ ts: 2021-03-27 13:00:00.000000000 +00:00
+ - value: 3
+ ts: 2021-03-27 11:00:00.000000000 +00:00
+ - value: 666
+ ts: 2021-03-27 10:00:00.000000000 +00:00
+ time: 2021-03-27 16:00:00.000000000 +00:00
+ deviations_count: 3.9999
+ dev_alg: mad
+ detect_period: 1d
+ detect_period_type: 1
+ params: '7h:now/h,7h'
+out:
+ return: SUCCEED
+ value: 0.5
+---
+test case: mad, time shift, 4 dc, small detection period
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 1
+ ts: 2021-03-27 15:00:00.000000001 +00:00
+ - value: 2
+ ts: 2021-03-27 14:00:00.000000000 +00:00
+ - value: 3
+ ts: 2021-03-27 13:00:00.000000000 +00:00
+ - value: 666
+ ts: 2021-03-27 12:00:00.000000000 +00:00
+ - value: 4
+ ts: 2021-03-27 11:00:00.000000000 +00:00
+ - value: 10000
+ ts: 2021-03-27 10:00:00.000000000 +00:00
+ time: 2021-03-27 16:00:00.000000000 +00:00
+ deviations_count: 4
+ dev_alg: mad
+ detect_period: 1d
+ detect_period_type: 1
+ params: '7h:now/h-2h,3h'
+out:
+ return: SUCCEED
+ value: 0.25
+---
+test case: mad, 4 dc, detection period removes all remainder
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 1
+ ts: 2021-03-27 15:00:00.000000001 +00:00
+ - value: 2
+ ts: 2021-03-27 14:00:00.000000000 +00:00
+ - value: 3
+ ts: 2021-03-27 13:00:00.000000000 +00:00
+ - value: 666
+ ts: 2026-03-27 12:00:00.000000000 +00:00
+ - value: 4
+ ts: 2021-03-27 11:00:00.000000000 +00:00
+ - value: 10000
+ ts: 2021-03-27 10:00:00.000000000 +00:00
+ time: 2021-03-27 16:00:00.000000000 +00:00
+ deviations_count: 4
+ dev_alg: mad
+ detect_period: 1d
+ detect_period_type: 1
+ params: '7h:now/h,1h'
+out:
+ return: SUCCEED
+ value: 0
+...
diff --git a/tests/libs/zbxserver/evaluate_stl.c b/tests/libs/zbxserver/evaluate_stl.c
new file mode 100644
index 00000000000..fce264abcc9
--- /dev/null
+++ b/tests/libs/zbxserver/evaluate_stl.c
@@ -0,0 +1,224 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#include "common.h"
+
+#include "zbxmocktest.h"
+#include "zbxmockdata.h"
+#include "zbxmockassert.h"
+#include "zbxmockutil.h"
+
+#include "valuecache.h"
+#include "zbxserver.h"
+
+#include "mocks/valuecache/valuecache_mock.h"
+
+#include "../../../src/libs/zbxserver/anomalystl.h"
+
+int __wrap_substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event,
+ zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item,
+ DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const zbx_service_alarm_t *service_alarm,
+ const DB_SERVICE *service, const char *tz, char **data, int macro_type, char *error,
+ int maxerrlen);
+
+int __wrap_DCget_data_expected_from(zbx_uint64_t itemid, int *seconds);
+
+int __wrap_substitute_simple_macros(zbx_uint64_t *actionid, const DB_EVENT *event, const DB_EVENT *r_event,
+ zbx_uint64_t *userid, const zbx_uint64_t *hostid, const DC_HOST *dc_host, const DC_ITEM *dc_item,
+ DB_ALERT *alert, const DB_ACKNOWLEDGE *ack, const zbx_service_alarm_t *service_alarm,
+ const DB_SERVICE *service, const char *tz, char **data, int macro_type, char *error,
+ int maxerrlen)
+{
+ ZBX_UNUSED(actionid);
+ ZBX_UNUSED(event);
+ ZBX_UNUSED(r_event);
+ ZBX_UNUSED(userid);
+ ZBX_UNUSED(hostid);
+ ZBX_UNUSED(dc_host);
+ ZBX_UNUSED(dc_item);
+ ZBX_UNUSED(alert);
+ ZBX_UNUSED(ack);
+ ZBX_UNUSED(tz);
+ ZBX_UNUSED(data);
+ ZBX_UNUSED(macro_type);
+ ZBX_UNUSED(error);
+ ZBX_UNUSED(maxerrlen);
+ ZBX_UNUSED(service_alarm);
+ ZBX_UNUSED(service);
+
+ return SUCCEED;
+}
+
+int __wrap_DCget_data_expected_from(zbx_uint64_t itemid, int *seconds)
+{
+ ZBX_UNUSED(itemid);
+ *seconds = zbx_vcmock_get_ts().sec - 600;
+
+ return SUCCEED;
+}
+
+static void zbx_vcmock_history_dump(unsigned char value_type, const zbx_vector_history_record_t *values)
+{
+ int i;
+ char buffer[256];
+
+ for (i = 0; i < values->values_num; i++)
+ {
+ const zbx_history_record_t *rec = &values->values[i];
+
+ zbx_timespec_to_strtime(&rec->timestamp, buffer, sizeof(buffer));
+ printf(" - %s\n", buffer);
+ zbx_history_value2str(buffer, sizeof(buffer), &rec->value, value_type);
+ printf(" %s\n", buffer);
+ }
+}
+
+static void read_values_stl(zbx_mock_handle_t hdata, unsigned char value_type, zbx_vector_history_record_t *values)
+{
+ zbx_mock_error_t err;
+ zbx_mock_handle_t hvalue;
+ zbx_history_record_t rec;
+ const char *data;
+
+ ZBX_UNUSED(value_type);
+
+ while (ZBX_MOCK_END_OF_VECTOR != (err = (zbx_mock_vector_element(hdata, &hvalue))))
+ {
+ rec.value.dbl = atof(zbx_mock_get_object_member_string(hvalue, "value"));
+ data = zbx_mock_get_object_member_string(hvalue, "ts");
+
+ if (ZBX_MOCK_SUCCESS != (err = zbx_strtime_to_timespec(data, &rec.timestamp)))
+ fail_msg("Invalid value timestamp \"%s\": %s", data, zbx_mock_error_string(err));
+
+ zbx_vector_history_record_append_ptr(values, &rec);
+ }
+}
+
+static void check_records_stl(const char *prefix, unsigned char value_type,
+ const zbx_vector_history_record_t *expected_values, const zbx_vector_history_record_t *returned_values)
+{
+ int i;
+ const zbx_history_record_t *expected, *returned;
+
+ printf("Expected %s:\n", prefix);
+ zbx_vcmock_history_dump(value_type, expected_values);
+
+ printf("Returned %s:\n", prefix);
+ zbx_vcmock_history_dump(value_type, returned_values);
+
+ zbx_mock_assert_int_eq(prefix, expected_values->values_num, returned_values->values_num);
+
+ for (i = 0; i < expected_values->values_num; i++)
+ {
+ expected = &expected_values->values[i];
+ returned = &returned_values->values[i];
+
+ zbx_mock_assert_timespec_eq(prefix, &expected->timestamp, &returned->timestamp);
+ zbx_mock_assert_double_eq(prefix, expected->value.dbl, returned->value.dbl);
+ }
+}
+
+void zbx_mock_test_entry(void **state)
+{
+ int err, expected_ret, returned_ret, nvalues = 0;
+ zbx_uint64_t s_window, season, seconds = 0;
+ char *error = NULL;
+ DC_ITEM item;
+ zbx_vcmock_ds_item_t *ds_item;
+ zbx_timespec_t ts;
+ zbx_mock_handle_t handle;
+ zbx_vector_history_record_t values_in, trend_values_received, trend_values_expected,
+ seasonal_values_received, seasonal_values_expected, remainder_values_received,
+ remainder_values_expected;
+
+ /*ZBX_DOUBLE_EPSILON = 0.000001; results into output that is different from python test case output */
+ ZBX_DOUBLE_EPSILON = 0.0001;
+
+ zbx_history_record_vector_create(&values_in);
+ zbx_history_record_vector_create(&trend_values_received);
+ zbx_history_record_vector_create(&trend_values_expected);
+ zbx_history_record_vector_create(&seasonal_values_received);
+ zbx_history_record_vector_create(&seasonal_values_expected);
+ zbx_history_record_vector_create(&remainder_values_received);
+ zbx_history_record_vector_create(&remainder_values_expected);
+
+ err = zbx_vc_init(&error);
+ zbx_mock_assert_result_eq("Value cache initialization failed", SUCCEED, err);
+ zbx_vc_enable();
+ zbx_vcmock_ds_init();
+ memset(&item, 0, sizeof(DC_ITEM));
+ ds_item = zbx_vcmock_ds_first_item();
+ item.itemid = ds_item->itemid;
+ item.value_type = ds_item->value_type;
+
+ season = zbx_mock_get_parameter_uint64("in.season");
+ s_window = zbx_mock_get_parameter_uint64("in.s_window");
+ seconds = zbx_mock_get_parameter_uint64("in.seconds");
+ handle = zbx_mock_get_parameter_handle("in");
+ zbx_vcmock_set_time(handle, "time");
+ ts = zbx_vcmock_get_ts();
+
+ if (FAIL == zbx_vc_get_values(item.itemid, item.value_type, &values_in, (int)seconds, nvalues, &ts))
+ {
+ error = zbx_strdup(error, "cannot get values from value cache");
+ printf("%s\n", error);
+ zbx_free(error);
+ goto out;
+ }
+
+ if (SUCCEED != (returned_ret = zbx_STL(&values_in, (int)season, ROBUST_DEF, (int)s_window, S_DEGREE_DEF,
+ T_WINDOW_DEF, T_DEGREE_DEF, L_WINDOW_DEF, L_DEGREE_DEF, S_JUMP_DEF, T_JUMP_DEF, L_JUMP_DEF,
+ INNER_DEF, OUTER_DEF, &trend_values_received, &seasonal_values_received,
+ &remainder_values_received, &error)))
+ {
+ printf("zbx_STL returned error: %s\n", error);
+ zbx_free(error);
+ }
+
+ expected_ret = zbx_mock_str_to_return_code(zbx_mock_get_parameter_string("out.return"));
+ zbx_mock_assert_result_eq("return value", expected_ret, returned_ret);
+
+ zbx_vc_flush_stats();
+
+ if (SUCCEED == expected_ret)
+ {
+ read_values_stl(zbx_mock_get_parameter_handle("out.trend"), item.value_type, &trend_values_expected);
+ read_values_stl(zbx_mock_get_parameter_handle("out.seasonal"), item.value_type,
+ &seasonal_values_expected);
+ read_values_stl(zbx_mock_get_parameter_handle("out.remainder"), item.value_type,
+ &remainder_values_expected);
+ check_records_stl("trend values", item.value_type, &trend_values_expected, &trend_values_received);
+ check_records_stl("seasonal values", item.value_type, &seasonal_values_expected,
+ &seasonal_values_received);
+ check_records_stl("remainder values", item.value_type, &remainder_values_expected,
+ &remainder_values_received);
+ }
+out:
+ zbx_history_record_vector_destroy(&trend_values_received, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&trend_values_expected, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&seasonal_values_received, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&seasonal_values_expected, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&remainder_values_received, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&remainder_values_expected, ITEM_VALUE_TYPE_FLOAT);
+ zbx_history_record_vector_destroy(&values_in, item.value_type);
+
+ zbx_vcmock_ds_destroy();
+
+ ZBX_UNUSED(state);
+}
diff --git a/tests/libs/zbxserver/evaluate_stl.yaml b/tests/libs/zbxserver/evaluate_stl.yaml
new file mode 100644
index 00000000000..4351b6b872b
--- /dev/null
+++ b/tests/libs/zbxserver/evaluate_stl.yaml
@@ -0,0 +1,2915 @@
+---
+test case: Evaluate STL reduced set
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 315.58
+ ts: 2021-03-27 10:01:05.000000001 +00:00
+ - value: 316.39
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: 316.79
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: 317.82
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value: 318.39
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+ - value: 318.22
+ ts: 2021-03-27 10:01:00.000000000 +00:00
+ time: 2021-03-27 10:01:06.000000000 +00:00
+ season: 2
+ s_window: 61
+ seconds: 7
+out:
+ return: SUCCEED
+ trend:
+ - value: 315.61471983
+ ts: 2021-03-27 10:01:05.000000001 +00:00
+ - value: 316.28264106
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: 316.96965772
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: 317.68901372
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value: 318.08865273
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+ - value: 318.42158262
+ ts: 2021-03-27 10:01:00.000000000 +00:00
+ seasonal:
+ - value: -0.00498817
+ ts: 2021-03-27 10:01:05.000000001 +00:00
+ - value: 0.0049662
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: -0.00494629
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: 0.00492464
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value : -0.00490752
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+ - value: 0.00486858
+ ts: 2021-03-27 10:01:00.000000000 +00:00
+ remainder:
+ - value: -0.02973166
+ ts: 2021-03-27 10:01:05.000000001 +00:00
+ - value: 0.10239275
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: -0.17471143
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: 0.12606164
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value: 0.30625479
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+ - value: -0.2064512
+ ts: 2021-03-27 10:01:00.000000000 +00:00
+---
+test case: Evaluate STL reduced set, season is wrong
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 315.58
+ ts: 2021-03-27 10:01:05.000000001 +00:00
+ - value: 316.39
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: 316.79
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: 317.82
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value: 318.39
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+ - value: 318.22
+ ts: 2021-03-27 10:01:00.000000000 +00:00
+ time: 2021-03-27 10:01:06.000000000 +00:00
+ season: 1
+ s_window: 61
+ seconds: 7
+out:
+ return: FAIL
+---
+test case: Evaluate STL reduced set, not enough data
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 315.58
+ ts: 2021-03-27 10:01:05.000000001 +00:00
+ - value: 316.39
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: 316.79
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: 317.82
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value: 318.39
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+ - value: 318.22
+ ts: 2021-03-27 10:01:00.000000000 +00:00
+ time: 2021-03-27 10:01:03.000000000 +00:00
+ season: 2
+ s_window: 61
+ seconds: 7
+out:
+ return: FAIL
+---
+test case: Evaluate STL full set
+in:
+ history:
+ - itemid: 1
+ value type: ITEM_VALUE_TYPE_FLOAT
+ data:
+ - value: 315.58
+ ts: 2021-03-27 10:06:48.000000000 +00:00
+ - value: 316.39
+ ts: 2021-03-27 10:06:47.000000000 +00:00
+ - value: 316.79
+ ts: 2021-03-27 10:06:46.000000000 +00:00
+ - value: 317.82
+ ts: 2021-03-27 10:06:45.000000000 +00:00
+ - value: 318.39
+ ts: 2021-03-27 10:06:44.000000000 +00:00
+ - value: 318.22
+ ts: 2021-03-27 10:06:43.000000000 +00:00
+ - value: 316.68
+ ts: 2021-03-27 10:06:42.000000000 +00:00
+ - value: 315.01
+ ts: 2021-03-27 10:06:41.000000000 +00:00
+ - value: 314.02
+ ts: 2021-03-27 10:06:40.000000000 +00:00
+ - value: 313.55
+ ts: 2021-03-27 10:06:39.000000000 +00:00
+ - value: 315.02
+ ts: 2021-03-27 10:06:38.000000000 +00:00
+ - value: 315.75
+ ts: 2021-03-27 10:06:37.000000000 +00:00
+ - value: 316.52
+ ts: 2021-03-27 10:06:36.000000000 +00:00
+ - value: 317.10
+ ts: 2021-03-27 10:06:35.000000000 +00:00
+ - value: 317.79
+ ts: 2021-03-27 10:06:34.000000000 +00:00
+ - value: 319.22
+ ts: 2021-03-27 10:06:33.000000000 +00:00
+ - value: 320.08
+ ts: 2021-03-27 10:06:32.000000000 +00:00
+ - value: 319.70
+ ts: 2021-03-27 10:06:31.000000000 +00:00
+ - value: 318.27
+ ts: 2021-03-27 10:06:30.000000000 +00:00
+ - value: 315.99
+ ts: 2021-03-27 10:06:29.000000000 +00:00
+ - value: 314.24
+ ts: 2021-03-27 10:06:28.000000000 +00:00
+ - value: 314.05
+ ts: 2021-03-27 10:06:27.000000000 +00:00
+ - value: 315.05
+ ts: 2021-03-27 10:06:26.000000000 +00:00
+ - value: 316.23
+ ts: 2021-03-27 10:06:25.000000000 +00:00
+ - value: 316.92
+ ts: 2021-03-27 10:06:24.000000000 +00:00
+ - value: 317.76
+ ts: 2021-03-27 10:06:23.000000000 +00:00
+ - value: 318.54
+ ts: 2021-03-27 10:06:22.000000000 +00:00
+ - value: 319.49
+ ts: 2021-03-27 10:06:21.000000000 +00:00
+ - value: 320.64
+ ts: 2021-03-27 10:06:20.000000000 +00:00
+ - value: 319.85
+ ts: 2021-03-27 10:06:19.000000000 +00:00
+ - value: 318.70
+ ts: 2021-03-27 10:06:18.000000000 +00:00
+ - value: 316.96
+ ts: 2021-03-27 10:06:17.000000000 +00:00
+ - value: 315.17
+ ts: 2021-03-27 10:06:16.000000000 +00:00
+ - value: 315.47
+ ts: 2021-03-27 10:06:15.000000000 +00:00
+ - value: 316.19
+ ts: 2021-03-27 10:06:14.000000000 +00:00
+ - value: 317.17
+ ts: 2021-03-27 10:06:13.000000000 +00:00
+ - value: 318.12
+ ts: 2021-03-27 10:06:12.000000000 +00:00
+ - value: 318.72
+ ts: 2021-03-27 10:06:11.000000000 +00:00
+ - value: 319.79
+ ts: 2021-03-27 10:06:10.000000000 +00:00
+ - value: 320.68
+ ts: 2021-03-27 10:06:09.000000000 +00:00
+ - value: 321.28
+ ts: 2021-03-27 10:06:08.000000000 +00:00
+ - value: 320.89
+ ts: 2021-03-27 10:06:07.000000000 +00:00
+ - value: 319.79
+ ts: 2021-03-27 10:06:06.000000000 +00:00
+ - value: 317.56
+ ts: 2021-03-27 10:06:05.000000000 +00:00
+ - value: 316.46
+ ts: 2021-03-27 10:06:04.000000000 +00:00
+ - value: 315.59
+ ts: 2021-03-27 10:06:03.000000000 +00:00
+ - value: 316.85
+ ts: 2021-03-27 10:06:02.000000000 +00:00
+ - value: 317.87
+ ts: 2021-03-27 10:06:01.000000000 +00:00
+ - value: 318.87
+ ts: 2021-03-27 10:06:00.000000000 +00:00
+ - value: 319.25
+ ts: 2021-03-27 10:05:59.000000000 +00:00
+ - value: 320.13
+ ts: 2021-03-27 10:05:58.000000000 +00:00
+ - value: 321.49
+ ts: 2021-03-27 10:05:57.000000000 +00:00
+ - value: 322.34
+ ts: 2021-03-27 10:05:56.000000000 +00:00
+ - value: 321.62
+ ts: 2021-03-27 10:05:55.000000000 +00:00
+ - value: 319.85
+ ts: 2021-03-27 10:05:54.000000000 +00:00
+ - value: 317.87
+ ts: 2021-03-27 10:05:53.000000000 +00:00
+ - value: 316.36
+ ts: 2021-03-27 10:05:52.000000000 +00:00
+ - value: 316.24
+ ts: 2021-03-27 10:05:51.000000000 +00:00
+ - value: 317.13
+ ts: 2021-03-27 10:05:50.000000000 +00:00
+ - value: 318.46
+ ts: 2021-03-27 10:05:49.000000000 +00:00
+ - value: 319.57
+ ts: 2021-03-27 10:05:48.000000000 +00:00
+ - value: 320.23
+ ts: 2021-03-27 10:05:47.000000000 +00:00
+ - value: 320.89
+ ts: 2021-03-27 10:05:46.000000000 +00:00
+ - value: 321.54
+ ts: 2021-03-27 10:05:45.000000000 +00:00
+ - value: 322.20
+ ts: 2021-03-27 10:05:44.000000000 +00:00
+ - value: 321.90
+ ts: 2021-03-27 10:05:43.000000000 +00:00
+ - value: 320.42
+ ts: 2021-03-27 10:05:42.000000000 +00:00
+ - value: 318.60
+ ts: 2021-03-27 10:05:41.000000000 +00:00
+ - value: 316.73
+ ts: 2021-03-27 10:05:40.000000000 +00:00
+ - value: 317.15
+ ts: 2021-03-27 10:05:39.000000000 +00:00
+ - value: 317.94
+ ts: 2021-03-27 10:05:38.000000000 +00:00
+ - value: 318.91
+ ts: 2021-03-27 10:05:37.000000000 +00:00
+ - value: 319.73
+ ts: 2021-03-27 10:05:36.000000000 +00:00
+ - value: 320.78
+ ts: 2021-03-27 10:05:35.000000000 +00:00
+ - value: 321.23
+ ts: 2021-03-27 10:05:34.000000000 +00:00
+ - value: 322.49
+ ts: 2021-03-27 10:05:33.000000000 +00:00
+ - value: 322.59
+ ts: 2021-03-27 10:05:32.000000000 +00:00
+ - value: 322.35
+ ts: 2021-03-27 10:05:31.000000000 +00:00
+ - value: 321.61
+ ts: 2021-03-27 10:05:30.000000000 +00:00
+ - value: 319.24
+ ts: 2021-03-27 10:05:29.000000000 +00:00
+ - value: 318.23
+ ts: 2021-03-27 10:05:28.000000000 +00:00
+ - value: 317.76
+ ts: 2021-03-27 10:05:27.000000000 +00:00
+ - value: 319.36
+ ts: 2021-03-27 10:05:26.000000000 +00:00
+ - value: 319.50
+ ts: 2021-03-27 10:05:25.000000000 +00:00
+ - value: 320.35
+ ts: 2021-03-27 10:05:24.000000000 +00:00
+ - value: 321.40
+ ts: 2021-03-27 10:05:23.000000000 +00:00
+ - value: 322.22
+ ts: 2021-03-27 10:05:22.000000000 +00:00
+ - value: 323.45
+ ts: 2021-03-27 10:05:21.000000000 +00:00
+ - value: 323.80
+ ts: 2021-03-27 10:05:20.000000000 +00:00
+ - value: 323.50
+ ts: 2021-03-27 10:05:19.000000000 +00:00
+ - value: 322.16
+ ts: 2021-03-27 10:05:18.000000000 +00:00
+ - value: 320.09
+ ts: 2021-03-27 10:05:17.000000000 +00:00
+ - value: 318.26
+ ts: 2021-03-27 10:05:16.000000000 +00:00
+ - value: 317.66
+ ts: 2021-03-27 10:05:15.000000000 +00:00
+ - value: 319.47
+ ts: 2021-03-27 10:05:14.000000000 +00:00
+ - value: 320.70
+ ts: 2021-03-27 10:05:13.000000000 +00:00
+ - value: 322.06
+ ts: 2021-03-27 10:05:12.000000000 +00:00
+ - value: 322.23
+ ts: 2021-03-27 10:05:11.000000000 +00:00
+ - value: 322.78
+ ts: 2021-03-27 10:05:10.000000000 +00:00
+ - value: 324.10
+ ts: 2021-03-27 10:05:09.000000000 +00:00
+ - value: 324.63
+ ts: 2021-03-27 10:05:08.000000000 +00:00
+ - value: 323.79
+ ts: 2021-03-27 10:05:07.000000000 +00:00
+ - value: 322.34
+ ts: 2021-03-27 10:05:06.000000000 +00:00
+ - value: 320.73
+ ts: 2021-03-27 10:05:05.000000000 +00:00
+ - value: 319.00
+ ts: 2021-03-27 10:05:04.000000000 +00:00
+ - value: 318.99
+ ts: 2021-03-27 10:05:03.000000000 +00:00
+ - value: 320.41
+ ts: 2021-03-27 10:05:02.000000000 +00:00
+ - value: 321.68
+ ts: 2021-03-27 10:05:01.000000000 +00:00
+ - value: 322.30
+ ts: 2021-03-27 10:05:00.000000000 +00:00
+ - value: 322.89
+ ts: 2021-03-27 10:04:59.000000000 +00:00
+ - value: 323.59
+ ts: 2021-03-27 10:04:58.000000000 +00:00
+ - value: 324.65
+ ts: 2021-03-27 10:04:57.000000000 +00:00
+ - value: 325.30
+ ts: 2021-03-27 10:04:56.000000000 +00:00
+ - value: 325.15
+ ts: 2021-03-27 10:04:55.000000000 +00:00
+ - value: 323.88
+ ts: 2021-03-27 10:04:54.000000000 +00:00
+ - value: 321.80
+ ts: 2021-03-27 10:04:53.000000000 +00:00
+ - value: 319.99
+ ts: 2021-03-27 10:04:52.000000000 +00:00
+ - value: 319.86
+ ts: 2021-03-27 10:04:51.000000000 +00:00
+ - value: 320.88
+ ts: 2021-03-27 10:04:50.000000000 +00:00
+ - value: 322.36
+ ts: 2021-03-27 10:04:49.000000000 +00:00
+ - value: 323.59
+ ts: 2021-03-27 10:04:48.000000000 +00:00
+ - value: 324.23
+ ts: 2021-03-27 10:04:47.000000000 +00:00
+ - value: 325.34
+ ts: 2021-03-27 10:04:46.000000000 +00:00
+ - value: 326.33
+ ts: 2021-03-27 10:04:45.000000000 +00:00
+ - value: 327.03
+ ts: 2021-03-27 10:04:44.000000000 +00:00
+ - value: 326.24
+ ts: 2021-03-27 10:04:43.000000000 +00:00
+ - value: 325.39
+ ts: 2021-03-27 10:04:42.000000000 +00:00
+ - value: 323.16
+ ts: 2021-03-27 10:04:41.000000000 +00:00
+ - value: 321.87
+ ts: 2021-03-27 10:04:40.000000000 +00:00
+ - value: 321.31
+ ts: 2021-03-27 10:04:39.000000000 +00:00
+ - value: 322.34
+ ts: 2021-03-27 10:04:38.000000000 +00:00
+ - value: 323.74
+ ts: 2021-03-27 10:04:37.000000000 +00:00
+ - value: 324.61
+ ts: 2021-03-27 10:04:36.000000000 +00:00
+ - value: 325.58
+ ts: 2021-03-27 10:04:35.000000000 +00:00
+ - value: 326.55
+ ts: 2021-03-27 10:04:34.000000000 +00:00
+ - value: 327.81
+ ts: 2021-03-27 10:04:33.000000000 +00:00
+ - value: 327.82
+ ts: 2021-03-27 10:04:32.000000000 +00:00
+ - value: 327.53
+ ts: 2021-03-27 10:04:31.000000000 +00:00
+ - value: 326.29
+ ts: 2021-03-27 10:04:30.000000000 +00:00
+ - value: 324.66
+ ts: 2021-03-27 10:04:29.000000000 +00:00
+ - value: 323.12
+ ts: 2021-03-27 10:04:28.000000000 +00:00
+ - value: 323.09
+ ts: 2021-03-27 10:04:27.000000000 +00:00
+ - value: 324.01
+ ts: 2021-03-27 10:04:26.000000000 +00:00
+ - value: 325.10
+ ts: 2021-03-27 10:04:25.000000000 +00:00
+ - value: 326.12
+ ts: 2021-03-27 10:04:24.000000000 +00:00
+ - value: 326.62
+ ts: 2021-03-27 10:04:23.000000000 +00:00
+ - value: 327.16
+ ts: 2021-03-27 10:04:22.000000000 +00:00
+ - value: 327.94
+ ts: 2021-03-27 10:04:21.000000000 +00:00
+ - value: 329.15
+ ts: 2021-03-27 10:04:20.000000000 +00:00
+ - value: 328.79
+ ts: 2021-03-27 10:04:19.000000000 +00:00
+ - value: 327.53
+ ts: 2021-03-27 10:04:18.000000000 +00:00
+ - value: 325.65
+ ts: 2021-03-27 10:04:17.000000000 +00:00
+ - value: 323.60
+ ts: 2021-03-27 10:04:16.000000000 +00:00
+ - value: 323.78
+ ts: 2021-03-27 10:04:15.000000000 +00:00
+ - value: 325.13
+ ts: 2021-03-27 10:04:14.000000000 +00:00
+ - value: 326.26
+ ts: 2021-03-27 10:04:13.000000000 +00:00
+ - value: 326.93
+ ts: 2021-03-27 10:04:12.000000000 +00:00
+ - value: 327.84
+ ts: 2021-03-27 10:04:11.000000000 +00:00
+ - value: 327.96
+ ts: 2021-03-27 10:04:10.000000000 +00:00
+ - value: 329.93
+ ts: 2021-03-27 10:04:09.000000000 +00:00
+ - value: 330.25
+ ts: 2021-03-27 10:04:08.000000000 +00:00
+ - value: 329.24
+ ts: 2021-03-27 10:04:07.000000000 +00:00
+ - value: 328.13
+ ts: 2021-03-27 10:04:06.000000000 +00:00
+ - value: 326.42
+ ts: 2021-03-27 10:04:05.000000000 +00:00
+ - value: 324.97
+ ts: 2021-03-27 10:04:04.000000000 +00:00
+ - value: 325.29
+ ts: 2021-03-27 10:04:03.000000000 +00:00
+ - value: 326.56
+ ts: 2021-03-27 10:04:02.000000000 +00:00
+ - value: 327.73
+ ts: 2021-03-27 10:04:01.000000000 +00:00
+ - value: 328.73
+ ts: 2021-03-27 10:04:00.000000000 +00:00
+ - value: 329.70
+ ts: 2021-03-27 10:03:59.000000000 +00:00
+ - value: 330.46
+ ts: 2021-03-27 10:03:58.000000000 +00:00
+ - value: 331.70
+ ts: 2021-03-27 10:03:57.000000000 +00:00
+ - value: 332.66
+ ts: 2021-03-27 10:03:56.000000000 +00:00
+ - value: 332.22
+ ts: 2021-03-27 10:03:55.000000000 +00:00
+ - value: 331.02
+ ts: 2021-03-27 10:03:54.000000000 +00:00
+ - value: 329.39
+ ts: 2021-03-27 10:03:53.000000000 +00:00
+ - value: 327.58
+ ts: 2021-03-27 10:03:52.000000000 +00:00
+ - value: 327.27
+ ts: 2021-03-27 10:03:51.000000000 +00:00
+ - value: 328.30
+ ts: 2021-03-27 10:03:50.000000000 +00:00
+ - value: 328.81
+ ts: 2021-03-27 10:03:49.000000000 +00:00
+ - value: 329.44
+ ts: 2021-03-27 10:03:48.000000000 +00:00
+ - value: 330.89
+ ts: 2021-03-27 10:03:47.000000000 +00:00
+ - value: 331.62
+ ts: 2021-03-27 10:03:46.000000000 +00:00
+ - value: 332.85
+ ts: 2021-03-27 10:03:45.000000000 +00:00
+ - value: 333.29
+ ts: 2021-03-27 10:03:44.000000000 +00:00
+ - value: 332.44
+ ts: 2021-03-27 10:03:43.000000000 +00:00
+ - value: 331.35
+ ts: 2021-03-27 10:03:42.000000000 +00:00
+ - value: 329.58
+ ts: 2021-03-27 10:03:41.000000000 +00:00
+ - value: 327.58
+ ts: 2021-03-27 10:03:40.000000000 +00:00
+ - value: 327.55
+ ts: 2021-03-27 10:03:39.000000000 +00:00
+ - value: 328.56
+ ts: 2021-03-27 10:03:38.000000000 +00:00
+ - value: 329.73
+ ts: 2021-03-27 10:03:37.000000000 +00:00
+ - value: 330.45
+ ts: 2021-03-27 10:03:36.000000000 +00:00
+ - value: 330.98
+ ts: 2021-03-27 10:03:35.000000000 +00:00
+ - value: 331.63
+ ts: 2021-03-27 10:03:34.000000000 +00:00
+ - value: 332.88
+ ts: 2021-03-27 10:03:33.000000000 +00:00
+ - value: 333.63
+ ts: 2021-03-27 10:03:32.000000000 +00:00
+ - value: 333.53
+ ts: 2021-03-27 10:03:31.000000000 +00:00
+ - value: 331.90
+ ts: 2021-03-27 10:03:30.000000000 +00:00
+ - value: 330.08
+ ts: 2021-03-27 10:03:29.000000000 +00:00
+ - value: 328.59
+ ts: 2021-03-27 10:03:28.000000000 +00:00
+ - value: 328.31
+ ts: 2021-03-27 10:03:27.000000000 +00:00
+ - value: 329.44
+ ts: 2021-03-27 10:03:26.000000000 +00:00
+ - value: 330.64
+ ts: 2021-03-27 10:03:25.000000000 +00:00
+ - value: 331.62
+ ts: 2021-03-27 10:03:24.000000000 +00:00
+ - value: 332.45
+ ts: 2021-03-27 10:03:23.000000000 +00:00
+ - value: 333.36
+ ts: 2021-03-27 10:03:22.000000000 +00:00
+ - value: 334.46
+ ts: 2021-03-27 10:03:21.000000000 +00:00
+ - value: 334.84
+ ts: 2021-03-27 10:03:20.000000000 +00:00
+ - value: 334.29
+ ts: 2021-03-27 10:03:19.000000000 +00:00
+ - value: 333.04
+ ts: 2021-03-27 10:03:18.000000000 +00:00
+ - value: 330.88
+ ts: 2021-03-27 10:03:17.000000000 +00:00
+ - value: 329.23
+ ts: 2021-03-27 10:03:16.000000000 +00:00
+ - value: 328.83
+ ts: 2021-03-27 10:03:15.000000000 +00:00
+ - value: 330.18
+ ts: 2021-03-27 10:03:14.000000000 +00:00
+ - value: 331.50
+ ts: 2021-03-27 10:03:13.000000000 +00:00
+ - value: 332.80
+ ts: 2021-03-27 10:03:12.000000000 +00:00
+ - value: 333.22
+ ts: 2021-03-27 10:03:11.000000000 +00:00
+ - value: 334.54
+ ts: 2021-03-27 10:03:10.000000000 +00:00
+ - value: 335.82
+ ts: 2021-03-27 10:03:09.000000000 +00:00
+ - value: 336.45
+ ts: 2021-03-27 10:03:08.000000000 +00:00
+ - value: 335.97
+ ts: 2021-03-27 10:03:07.000000000 +00:00
+ - value: 334.65
+ ts: 2021-03-27 10:03:06.000000000 +00:00
+ - value: 332.40
+ ts: 2021-03-27 10:03:05.000000000 +00:00
+ - value: 331.28
+ ts: 2021-03-27 10:03:04.000000000 +00:00
+ - value: 330.73
+ ts: 2021-03-27 10:03:03.000000000 +00:00
+ - value: 332.05
+ ts: 2021-03-27 10:03:02.000000000 +00:00
+ - value: 333.54
+ ts: 2021-03-27 10:03:01.000000000 +00:00
+ - value: 334.65
+ ts: 2021-03-27 10:03:00.000000000 +00:00
+ - value: 335.06
+ ts: 2021-03-27 10:02:59.000000000 +00:00
+ - value: 336.32
+ ts: 2021-03-27 10:02:58.000000000 +00:00
+ - value: 337.39
+ ts: 2021-03-27 10:02:57.000000000 +00:00
+ - value: 337.66
+ ts: 2021-03-27 10:02:56.000000000 +00:00
+ - value: 337.56
+ ts: 2021-03-27 10:02:55.000000000 +00:00
+ - value: 336.24
+ ts: 2021-03-27 10:02:54.000000000 +00:00
+ - value: 334.39
+ ts: 2021-03-27 10:02:53.000000000 +00:00
+ - value: 332.43
+ ts: 2021-03-27 10:02:52.000000000 +00:00
+ - value: 332.22
+ ts: 2021-03-27 10:02:51.000000000 +00:00
+ - value: 333.61
+ ts: 2021-03-27 10:02:50.000000000 +00:00
+ - value: 334.78
+ ts: 2021-03-27 10:02:49.000000000 +00:00
+ - value: 335.88
+ ts: 2021-03-27 10:02:48.000000000 +00:00
+ - value: 336.43
+ ts: 2021-03-27 10:02:47.000000000 +00:00
+ - value: 337.61
+ ts: 2021-03-27 10:02:46.000000000 +00:00
+ - value: 338.53
+ ts: 2021-03-27 10:02:45.000000000 +00:00
+ - value: 339.06
+ ts: 2021-03-27 10:02:44.000000000 +00:00
+ - value: 338.92
+ ts: 2021-03-27 10:02:43.000000000 +00:00
+ - value: 337.39
+ ts: 2021-03-27 10:02:42.000000000 +00:00
+ - value: 335.72
+ ts: 2021-03-27 10:02:41.000000000 +00:00
+ - value: 333.64
+ ts: 2021-03-27 10:02:40.000000000 +00:00
+ - value: 333.65
+ ts: 2021-03-27 10:02:39.000000000 +00:00
+ - value: 335.07
+ ts: 2021-03-27 10:02:38.000000000 +00:00
+ - value: 336.53
+ ts: 2021-03-27 10:02:37.000000000 +00:00
+ - value: 337.82
+ ts: 2021-03-27 10:02:36.000000000 +00:00
+ - value: 338.19
+ ts: 2021-03-27 10:02:35.000000000 +00:00
+ - value: 339.89
+ ts: 2021-03-27 10:02:34.000000000 +00:00
+ - value: 340.56
+ ts: 2021-03-27 10:02:33.000000000 +00:00
+ - value: 341.22
+ ts: 2021-03-27 10:02:32.000000000 +00:00
+ - value: 340.92
+ ts: 2021-03-27 10:02:31.000000000 +00:00
+ - value: 339.26
+ ts: 2021-03-27 10:02:30.000000000 +00:00
+ - value: 337.27
+ ts: 2021-03-27 10:02:29.000000000 +00:00
+ - value: 335.66
+ ts: 2021-03-27 10:02:28.000000000 +00:00
+ - value: 335.54
+ ts: 2021-03-27 10:02:27.000000000 +00:00
+ - value: 336.71
+ ts: 2021-03-27 10:02:26.000000000 +00:00
+ - value: 337.79
+ ts: 2021-03-27 10:02:25.000000000 +00:00
+ - value: 338.79
+ ts: 2021-03-27 10:02:24.000000000 +00:00
+ - value: 340.06
+ ts: 2021-03-27 10:02:23.000000000 +00:00
+ - value: 340.93
+ ts: 2021-03-27 10:02:22.000000000 +00:00
+ - value: 342.02
+ ts: 2021-03-27 10:02:21.000000000 +00:00
+ - value: 342.65
+ ts: 2021-03-27 10:02:20.000000000 +00:00
+ - value: 341.80
+ ts: 2021-03-27 10:02:19.000000000 +00:00
+ - value: 340.01
+ ts: 2021-03-27 10:02:18.000000000 +00:00
+ - value: 337.94
+ ts: 2021-03-27 10:02:17.000000000 +00:00
+ - value: 336.17
+ ts: 2021-03-27 10:02:16.000000000 +00:00
+ - value: 336.28
+ ts: 2021-03-27 10:02:15.000000000 +00:00
+ - value: 337.76
+ ts: 2021-03-27 10:02:14.000000000 +00:00
+ - value: 339.05
+ ts: 2021-03-27 10:02:13.000000000 +00:00
+ - value: 340.18
+ ts: 2021-03-27 10:02:12.000000000 +00:00
+ - value: 341.04
+ ts: 2021-03-27 10:02:11.000000000 +00:00
+ - value: 342.16
+ ts: 2021-03-27 10:02:10.000000000 +00:00
+ - value: 343.01
+ ts: 2021-03-27 10:02:09.000000000 +00:00
+ - value: 343.64
+ ts: 2021-03-27 10:02:08.000000000 +00:00
+ - value: 342.91
+ ts: 2021-03-27 10:02:07.000000000 +00:00
+ - value: 341.72
+ ts: 2021-03-27 10:02:06.000000000 +00:00
+ - value: 339.52
+ ts: 2021-03-27 10:02:05.000000000 +00:00
+ - value: 337.75
+ ts: 2021-03-27 10:02:04.000000000 +00:00
+ - value: 337.68
+ ts: 2021-03-27 10:02:03.000000000 +00:00
+ - value: 339.14
+ ts: 2021-03-27 10:02:02.000000000 +00:00
+ - value: 340.37
+ ts: 2021-03-27 10:02:01.000000000 +00:00
+ - value: 341.32
+ ts: 2021-03-27 10:02:00.000000000 +00:00
+ - value: 342.45
+ ts: 2021-03-27 10:01:59.000000000 +00:00
+ - value: 343.05
+ ts: 2021-03-27 10:01:58.000000000 +00:00
+ - value: 344.91
+ ts: 2021-03-27 10:01:57.000000000 +00:00
+ - value: 345.77
+ ts: 2021-03-27 10:01:56.000000000 +00:00
+ - value: 345.30
+ ts: 2021-03-27 10:01:55.000000000 +00:00
+ - value: 343.98
+ ts: 2021-03-27 10:01:54.000000000 +00:00
+ - value: 342.41
+ ts: 2021-03-27 10:01:53.000000000 +00:00
+ - value: 339.89
+ ts: 2021-03-27 10:01:52.000000000 +00:00
+ - value: 340.03
+ ts: 2021-03-27 10:01:51.000000000 +00:00
+ - value: 341.19
+ ts: 2021-03-27 10:01:50.000000000 +00:00
+ - value: 342.87
+ ts: 2021-03-27 10:01:49.000000000 +00:00
+ - value: 343.74
+ ts: 2021-03-27 10:01:48.000000000 +00:00
+ - value: 344.55
+ ts: 2021-03-27 10:01:47.000000000 +00:00
+ - value: 345.28
+ ts: 2021-03-27 10:01:46.000000000 +00:00
+ - value: 347.00
+ ts: 2021-03-27 10:01:45.000000000 +00:00
+ - value: 347.37
+ ts: 2021-03-27 10:01:44.000000000 +00:00
+ - value: 346.74
+ ts: 2021-03-27 10:01:43.000000000 +00:00
+ - value: 345.36
+ ts: 2021-03-27 10:01:42.000000000 +00:00
+ - value: 343.19
+ ts: 2021-03-27 10:01:41.000000000 +00:00
+ - value: 340.97
+ ts: 2021-03-27 10:01:40.000000000 +00:00
+ - value: 341.20
+ ts: 2021-03-27 10:01:39.000000000 +00:00
+ - value: 342.76
+ ts: 2021-03-27 10:01:38.000000000 +00:00
+ - value: 343.96
+ ts: 2021-03-27 10:01:37.000000000 +00:00
+ - value: 344.82
+ ts: 2021-03-27 10:01:36.000000000 +00:00
+ - value: 345.82
+ ts: 2021-03-27 10:01:35.000000000 +00:00
+ - value: 347.24
+ ts: 2021-03-27 10:01:34.000000000 +00:00
+ - value: 348.09
+ ts: 2021-03-27 10:01:33.000000000 +00:00
+ - value: 348.66
+ ts: 2021-03-27 10:01:32.000000000 +00:00
+ - value: 347.90
+ ts: 2021-03-27 10:01:31.000000000 +00:00
+ - value: 346.27
+ ts: 2021-03-27 10:01:30.000000000 +00:00
+ - value: 344.21
+ ts: 2021-03-27 10:01:29.000000000 +00:00
+ - value: 342.88
+ ts: 2021-03-27 10:01:28.000000000 +00:00
+ - value: 342.58
+ ts: 2021-03-27 10:01:27.000000000 +00:00
+ - value: 343.99
+ ts: 2021-03-27 10:01:26.000000000 +00:00
+ - value: 345.31
+ ts: 2021-03-27 10:01:25.000000000 +00:00
+ - value: 345.98
+ ts: 2021-03-27 10:01:24.000000000 +00:00
+ - value: 346.72
+ ts: 2021-03-27 10:01:23.000000000 +00:00
+ - value: 347.63
+ ts: 2021-03-27 10:01:22.000000000 +00:00
+ - value: 349.24
+ ts: 2021-03-27 10:01:21.000000000 +00:00
+ - value: 349.83
+ ts: 2021-03-27 10:01:20.000000000 +00:00
+ - value: 349.10
+ ts: 2021-03-27 10:01:19.000000000 +00:00
+ - value: 347.52
+ ts: 2021-03-27 10:01:18.000000000 +00:00
+ - value: 345.43
+ ts: 2021-03-27 10:01:17.000000000 +00:00
+ - value: 344.48
+ ts: 2021-03-27 10:01:16.000000000 +00:00
+ - value: 343.89
+ ts: 2021-03-27 10:01:15.000000000 +00:00
+ - value: 345.29
+ ts: 2021-03-27 10:01:14.000000000 +00:00
+ - value: 346.54
+ ts: 2021-03-27 10:01:13.000000000 +00:00
+ - value: 347.66
+ ts: 2021-03-27 10:01:12.000000000 +00:00
+ - value: 348.07
+ ts: 2021-03-27 10:01:11.000000000 +00:00
+ - value: 349.12
+ ts: 2021-03-27 10:01:10.000000000 +00:00
+ - value: 350.55
+ ts: 2021-03-27 10:01:09.000000000 +00:00
+ - value: 351.34
+ ts: 2021-03-27 10:01:08.000000000 +00:00
+ - value: 350.80
+ ts: 2021-03-27 10:01:07.000000000 +00:00
+ - value: 349.10
+ ts: 2021-03-27 10:01:06.000000000 +00:00
+ - value: 347.54
+ ts: 2021-03-27 10:01:05.000000000 +00:00
+ - value: 346.20
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: 346.20
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: 347.44
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value: 348.67
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+ time: 2021-03-27 10:07:00.000000000 +00:00
+ season: 12
+ s_window: 3461
+ seconds: 600
+out:
+ return: SUCCEED
+ trend:
+ - value: 315.44235513
+ ts: 2021-03-27 10:06:48.000000000 +00:00
+ - value: 315.55469629
+ ts: 2021-03-27 10:06:47.000000000 +00:00
+ - value: 315.66703746
+ ts: 2021-03-27 10:06:46.000000000 +00:00
+ - value: 315.77856276
+ ts: 2021-03-27 10:06:45.000000000 +00:00
+ - value: 315.89008807
+ ts: 2021-03-27 10:06:44.000000000 +00:00
+ - value: 315.9967004
+ ts: 2021-03-27 10:06:43.000000000 +00:00
+ - value: 316.10331272
+ ts: 2021-03-27 10:06:42.000000000 +00:00
+ - value: 316.20652199
+ ts: 2021-03-27 10:06:41.000000000 +00:00
+ - value: 316.30973127
+ ts: 2021-03-27 10:06:40.000000000 +00:00
+ - value: 316.42409853
+ ts: 2021-03-27 10:06:39.000000000 +00:00
+ - value: 316.5384658
+ ts: 2021-03-27 10:06:38.000000000 +00:00
+ - value: 316.64508256
+ ts: 2021-03-27 10:06:37.000000000 +00:00
+ - value: 316.75169933
+ ts: 2021-03-27 10:06:36.000000000 +00:00
+ - value: 316.82633578
+ ts: 2021-03-27 10:06:35.000000000 +00:00
+ - value: 316.90097223
+ ts: 2021-03-27 10:06:34.000000000 +00:00
+ - value: 316.9438621
+ ts: 2021-03-27 10:06:33.000000000 +00:00
+ - value: 316.98675196
+ ts: 2021-03-27 10:06:32.000000000 +00:00
+ - value: 317.02616963
+ ts: 2021-03-27 10:06:31.000000000 +00:00
+ - value: 317.06558729
+ ts: 2021-03-27 10:06:30.000000000 +00:00
+ - value: 317.10463209
+ ts: 2021-03-27 10:06:29.000000000 +00:00
+ - value: 317.14367688
+ ts: 2021-03-27 10:06:28.000000000 +00:00
+ - value: 317.17202571
+ ts: 2021-03-27 10:06:27.000000000 +00:00
+ - value: 317.20037454
+ ts: 2021-03-27 10:06:26.000000000 +00:00
+ - value: 317.23283373
+ ts: 2021-03-27 10:06:25.000000000 +00:00
+ - value: 317.26529292
+ ts: 2021-03-27 10:06:24.000000000 +00:00
+ - value: 317.33190094
+ ts: 2021-03-27 10:06:23.000000000 +00:00
+ - value: 317.39850896
+ ts: 2021-03-27 10:06:22.000000000 +00:00
+ - value: 317.49626055
+ ts: 2021-03-27 10:06:21.000000000 +00:00
+ - value: 317.59401214
+ ts: 2021-03-27 10:06:20.000000000 +00:00
+ - value: 317.69685909
+ ts: 2021-03-27 10:06:19.000000000 +00:00
+ - value: 317.79970605
+ ts: 2021-03-27 10:06:18.000000000 +00:00
+ - value: 317.89593895
+ ts: 2021-03-27 10:06:17.000000000 +00:00
+ - value: 317.99217184
+ ts: 2021-03-27 10:06:16.000000000 +00:00
+ - value: 318.07505671
+ ts: 2021-03-27 10:06:15.000000000 +00:00
+ - value: 318.15794157
+ ts: 2021-03-27 10:06:14.000000000 +00:00
+ - value: 318.22817609
+ ts: 2021-03-27 10:06:13.000000000 +00:00
+ - value: 318.29841061
+ ts: 2021-03-27 10:06:12.000000000 +00:00
+ - value: 318.36431552
+ ts: 2021-03-27 10:06:11.000000000 +00:00
+ - value: 318.43022044
+ ts: 2021-03-27 10:06:10.000000000 +00:00
+ - value: 318.49205232
+ ts: 2021-03-27 10:06:09.000000000 +00:00
+ - value: 318.55388421
+ ts: 2021-03-27 10:06:08.000000000 +00:00
+ - value: 318.61323711
+ ts: 2021-03-27 10:06:07.000000000 +00:00
+ - value: 318.67259002
+ ts: 2021-03-27 10:06:06.000000000 +00:00
+ - value: 318.72430356
+ ts: 2021-03-27 10:06:05.000000000 +00:00
+ - value: 318.7760171
+ ts: 2021-03-27 10:06:04.000000000 +00:00
+ - value: 318.82747026
+ ts: 2021-03-27 10:06:03.000000000 +00:00
+ - value: 318.87892343
+ ts: 2021-03-27 10:06:02.000000000 +00:00
+ - value: 318.92129351
+ ts: 2021-03-27 10:06:01.000000000 +00:00
+ - value: 318.96366359
+ ts: 2021-03-27 10:06:00.000000000 +00:00
+ - value: 318.99123209
+ ts: 2021-03-27 10:05:59.000000000 +00:00
+ - value: 319.01880058
+ ts: 2021-03-27 10:05:58.000000000 +00:00
+ - value: 319.04930416
+ ts: 2021-03-27 10:05:57.000000000 +00:00
+ - value: 319.07980774
+ ts: 2021-03-27 10:05:56.000000000 +00:00
+ - value: 319.12718484
+ ts: 2021-03-27 10:05:55.000000000 +00:00
+ - value: 319.17456194
+ ts: 2021-03-27 10:05:54.000000000 +00:00
+ - value: 319.22508912
+ ts: 2021-03-27 10:05:53.000000000 +00:00
+ - value: 319.27561631
+ ts: 2021-03-27 10:05:52.000000000 +00:00
+ - value: 319.30865908
+ ts: 2021-03-27 10:05:51.000000000 +00:00
+ - value: 319.34170186
+ ts: 2021-03-27 10:05:50.000000000 +00:00
+ - value: 319.3697836
+ ts: 2021-03-27 10:05:49.000000000 +00:00
+ - value: 319.39786534
+ ts: 2021-03-27 10:05:48.000000000 +00:00
+ - value: 319.44034093
+ ts: 2021-03-27 10:05:47.000000000 +00:00
+ - value: 319.48281651
+ ts: 2021-03-27 10:05:46.000000000 +00:00
+ - value: 319.531549
+ ts: 2021-03-27 10:05:45.000000000 +00:00
+ - value: 319.58028149
+ ts: 2021-03-27 10:05:44.000000000 +00:00
+ - value: 319.62447036
+ ts: 2021-03-27 10:05:43.000000000 +00:00
+ - value: 319.66865922
+ ts: 2021-03-27 10:05:42.000000000 +00:00
+ - value: 319.71435007
+ ts: 2021-03-27 10:05:41.000000000 +00:00
+ - value: 319.76004093
+ ts: 2021-03-27 10:05:40.000000000 +00:00
+ - value: 319.8112329
+ ts: 2021-03-27 10:05:39.000000000 +00:00
+ - value: 319.86242486
+ ts: 2021-03-27 10:05:38.000000000 +00:00
+ - value: 319.9164258
+ ts: 2021-03-27 10:05:37.000000000 +00:00
+ - value: 319.97042675
+ ts: 2021-03-27 10:05:36.000000000 +00:00
+ - value: 320.03734986
+ ts: 2021-03-27 10:05:35.000000000 +00:00
+ - value: 320.10427297
+ ts: 2021-03-27 10:05:34.000000000 +00:00
+ - value: 320.18870017
+ ts: 2021-03-27 10:05:33.000000000 +00:00
+ - value: 320.27312737
+ ts: 2021-03-27 10:05:32.000000000 +00:00
+ - value: 320.3530152
+ ts: 2021-03-27 10:05:31.000000000 +00:00
+ - value: 320.43290302
+ ts: 2021-03-27 10:05:30.000000000 +00:00
+ - value: 320.50847736
+ ts: 2021-03-27 10:05:29.000000000 +00:00
+ - value: 320.5840517
+ ts: 2021-03-27 10:05:28.000000000 +00:00
+ - value: 320.66206771
+ ts: 2021-03-27 10:05:27.000000000 +00:00
+ - value: 320.74008371
+ ts: 2021-03-27 10:05:26.000000000 +00:00
+ - value: 320.80865032
+ ts: 2021-03-27 10:05:25.000000000 +00:00
+ - value: 320.87721693
+ ts: 2021-03-27 10:05:24.000000000 +00:00
+ - value: 320.91614981
+ ts: 2021-03-27 10:05:23.000000000 +00:00
+ - value: 320.95508268
+ ts: 2021-03-27 10:05:22.000000000 +00:00
+ - value: 320.98724809
+ ts: 2021-03-27 10:05:21.000000000 +00:00
+ - value: 321.01941349
+ ts: 2021-03-27 10:05:20.000000000 +00:00
+ - value: 321.08403423
+ ts: 2021-03-27 10:05:19.000000000 +00:00
+ - value: 321.14865497
+ ts: 2021-03-27 10:05:18.000000000 +00:00
+ - value: 321.2271537
+ ts: 2021-03-27 10:05:17.000000000 +00:00
+ - value: 321.30565244
+ ts: 2021-03-27 10:05:16.000000000 +00:00
+ - value: 321.3676952
+ ts: 2021-03-27 10:05:15.000000000 +00:00
+ - value: 321.42973797
+ ts: 2021-03-27 10:05:14.000000000 +00:00
+ - value: 321.47723215
+ ts: 2021-03-27 10:05:13.000000000 +00:00
+ - value: 321.52472632
+ ts: 2021-03-27 10:05:12.000000000 +00:00
+ - value: 321.57501425
+ ts: 2021-03-27 10:05:11.000000000 +00:00
+ - value: 321.62530218
+ ts: 2021-03-27 10:05:10.000000000 +00:00
+ - value: 321.68707948
+ ts: 2021-03-27 10:05:09.000000000 +00:00
+ - value: 321.74885677
+ ts: 2021-03-27 10:05:08.000000000 +00:00
+ - value: 321.81079132
+ ts: 2021-03-27 10:05:07.000000000 +00:00
+ - value: 321.87272588
+ ts: 2021-03-27 10:05:06.000000000 +00:00
+ - value: 321.9358974
+ ts: 2021-03-27 10:05:05.000000000 +00:00
+ - value: 321.99906891
+ ts: 2021-03-27 10:05:04.000000000 +00:00
+ - value: 322.07231434
+ ts: 2021-03-27 10:05:03.000000000 +00:00
+ - value: 322.14555977
+ ts: 2021-03-27 10:05:02.000000000 +00:00
+ - value: 322.23371478
+ ts: 2021-03-27 10:05:01.000000000 +00:00
+ - value: 322.3218698
+ ts: 2021-03-27 10:05:00.000000000 +00:00
+ - value: 322.40933937
+ ts: 2021-03-27 10:04:59.000000000 +00:00
+ - value: 322.49680894
+ ts: 2021-03-27 10:04:58.000000000 +00:00
+ - value: 322.56545086
+ ts: 2021-03-27 10:04:57.000000000 +00:00
+ - value: 322.63409279
+ ts: 2021-03-27 10:04:56.000000000 +00:00
+ - value: 322.71026886
+ ts: 2021-03-27 10:04:55.000000000 +00:00
+ - value: 322.78644493
+ ts: 2021-03-27 10:04:54.000000000 +00:00
+ - value: 322.8988799
+ ts: 2021-03-27 10:04:53.000000000 +00:00
+ - value: 323.01131487
+ ts: 2021-03-27 10:04:52.000000000 +00:00
+ - value: 323.14199777
+ ts: 2021-03-27 10:04:51.000000000 +00:00
+ - value: 323.27268066
+ ts: 2021-03-27 10:04:50.000000000 +00:00
+ - value: 323.39995094
+ ts: 2021-03-27 10:04:49.000000000 +00:00
+ - value: 323.52722122
+ ts: 2021-03-27 10:04:48.000000000 +00:00
+ - value: 323.65938152
+ ts: 2021-03-27 10:04:47.000000000 +00:00
+ - value: 323.79154181
+ ts: 2021-03-27 10:04:46.000000000 +00:00
+ - value: 323.9200177
+ ts: 2021-03-27 10:04:45.000000000 +00:00
+ - value: 324.04849359
+ ts: 2021-03-27 10:04:44.000000000 +00:00
+ - value: 324.15543716
+ ts: 2021-03-27 10:04:43.000000000 +00:00
+ - value: 324.26238073
+ ts: 2021-03-27 10:04:42.000000000 +00:00
+ - value: 324.36048452
+ ts: 2021-03-27 10:04:41.000000000 +00:00
+ - value: 324.45858831
+ ts: 2021-03-27 10:04:40.000000000 +00:00
+ - value: 324.55787737
+ ts: 2021-03-27 10:04:39.000000000 +00:00
+ - value: 324.65716643
+ ts: 2021-03-27 10:04:38.000000000 +00:00
+ - value: 324.75351242
+ ts: 2021-03-27 10:04:37.000000000 +00:00
+ - value: 324.8498584
+ ts: 2021-03-27 10:04:36.000000000 +00:00
+ - value: 324.95794546
+ ts: 2021-03-27 10:04:35.000000000 +00:00
+ - value: 325.06603252
+ ts: 2021-03-27 10:04:34.000000000 +00:00
+ - value: 325.19349461
+ ts: 2021-03-27 10:04:33.000000000 +00:00
+ - value: 325.3209567
+ ts: 2021-03-27 10:04:32.000000000 +00:00
+ - value: 325.44391616
+ ts: 2021-03-27 10:04:31.000000000 +00:00
+ - value: 325.56687561
+ ts: 2021-03-27 10:04:30.000000000 +00:00
+ - value: 325.65912851
+ ts: 2021-03-27 10:04:29.000000000 +00:00
+ - value: 325.75138141
+ ts: 2021-03-27 10:04:28.000000000 +00:00
+ - value: 325.82354993
+ ts: 2021-03-27 10:04:27.000000000 +00:00
+ - value: 325.89571846
+ ts: 2021-03-27 10:04:26.000000000 +00:00
+ - value: 325.97084529
+ ts: 2021-03-27 10:04:25.000000000 +00:00
+ - value: 326.04597213
+ ts: 2021-03-27 10:04:24.000000000 +00:00
+ - value: 326.11423829
+ ts: 2021-03-27 10:04:23.000000000 +00:00
+ - value: 326.18250444
+ ts: 2021-03-27 10:04:22.000000000 +00:00
+ - value: 326.25372034
+ ts: 2021-03-27 10:04:21.000000000 +00:00
+ - value: 326.32493623
+ ts: 2021-03-27 10:04:20.000000000 +00:00
+ - value: 326.41567428
+ ts: 2021-03-27 10:04:19.000000000 +00:00
+ - value: 326.50641233
+ ts: 2021-03-27 10:04:18.000000000 +00:00
+ - value: 326.60895426
+ ts: 2021-03-27 10:04:17.000000000 +00:00
+ - value: 326.7114962
+ ts: 2021-03-27 10:04:16.000000000 +00:00
+ - value: 326.80988567
+ ts: 2021-03-27 10:04:15.000000000 +00:00
+ - value: 326.90827514
+ ts: 2021-03-27 10:04:14.000000000 +00:00
+ - value: 326.97943271
+ ts: 2021-03-27 10:04:13.000000000 +00:00
+ - value: 327.05059028
+ ts: 2021-03-27 10:04:12.000000000 +00:00
+ - value: 327.12085189
+ ts: 2021-03-27 10:04:11.000000000 +00:00
+ - value: 327.1911135
+ ts: 2021-03-27 10:04:10.000000000 +00:00
+ - value: 327.29111703
+ ts: 2021-03-27 10:04:09.000000000 +00:00
+ - value: 327.39112057
+ ts: 2021-03-27 10:04:08.000000000 +00:00
+ - value: 327.52515167
+ ts: 2021-03-27 10:04:07.000000000 +00:00
+ - value: 327.65918277
+ ts: 2021-03-27 10:04:06.000000000 +00:00
+ - value: 327.82811499
+ ts: 2021-03-27 10:04:05.000000000 +00:00
+ - value: 327.99704721
+ ts: 2021-03-27 10:04:04.000000000 +00:00
+ - value: 328.1961702
+ ts: 2021-03-27 10:04:03.000000000 +00:00
+ - value: 328.39529319
+ ts: 2021-03-27 10:04:02.000000000 +00:00
+ - value: 328.61931296
+ ts: 2021-03-27 10:04:01.000000000 +00:00
+ - value: 328.84333274
+ ts: 2021-03-27 10:04:00.000000000 +00:00
+ - value: 329.06600476
+ ts: 2021-03-27 10:03:59.000000000 +00:00
+ - value: 329.28867678
+ ts: 2021-03-27 10:03:58.000000000 +00:00
+ - value: 329.46913866
+ ts: 2021-03-27 10:03:57.000000000 +00:00
+ - value: 329.64960053
+ ts: 2021-03-27 10:03:56.000000000 +00:00
+ - value: 329.77054779
+ ts: 2021-03-27 10:03:55.000000000 +00:00
+ - value: 329.89149505
+ ts: 2021-03-27 10:03:54.000000000 +00:00
+ - value: 329.97561167
+ ts: 2021-03-27 10:03:53.000000000 +00:00
+ - value: 330.05972829
+ ts: 2021-03-27 10:03:52.000000000 +00:00
+ - value: 330.11886712
+ ts: 2021-03-27 10:03:51.000000000 +00:00
+ - value: 330.17800595
+ ts: 2021-03-27 10:03:50.000000000 +00:00
+ - value: 330.20684798
+ ts: 2021-03-27 10:03:49.000000000 +00:00
+ - value: 330.23569002
+ ts: 2021-03-27 10:03:48.000000000 +00:00
+ - value: 330.25322081
+ ts: 2021-03-27 10:03:47.000000000 +00:00
+ - value: 330.27075161
+ ts: 2021-03-27 10:03:46.000000000 +00:00
+ - value: 330.30600586
+ ts: 2021-03-27 10:03:45.000000000 +00:00
+ - value: 330.34126011
+ ts: 2021-03-27 10:03:44.000000000 +00:00
+ - value: 330.39107764
+ ts: 2021-03-27 10:03:43.000000000 +00:00
+ - value: 330.44089516
+ ts: 2021-03-27 10:03:42.000000000 +00:00
+ - value: 330.472278
+ ts: 2021-03-27 10:03:41.000000000 +00:00
+ - value: 330.50366084
+ ts: 2021-03-27 10:03:40.000000000 +00:00
+ - value: 330.52317596
+ ts: 2021-03-27 10:03:39.000000000 +00:00
+ - value: 330.54269107
+ ts: 2021-03-27 10:03:38.000000000 +00:00
+ - value: 330.58106926
+ ts: 2021-03-27 10:03:37.000000000 +00:00
+ - value: 330.61944744
+ ts: 2021-03-27 10:03:36.000000000 +00:00
+ - value: 330.67620113
+ ts: 2021-03-27 10:03:35.000000000 +00:00
+ - value: 330.73295481
+ ts: 2021-03-27 10:03:34.000000000 +00:00
+ - value: 330.80680089
+ ts: 2021-03-27 10:03:33.000000000 +00:00
+ - value: 330.88064697
+ ts: 2021-03-27 10:03:32.000000000 +00:00
+ - value: 330.9755257
+ ts: 2021-03-27 10:03:31.000000000 +00:00
+ - value: 331.07040444
+ ts: 2021-03-27 10:03:30.000000000 +00:00
+ - value: 331.18772647
+ ts: 2021-03-27 10:03:29.000000000 +00:00
+ - value: 331.3050485
+ ts: 2021-03-27 10:03:28.000000000 +00:00
+ - value: 331.42067524
+ ts: 2021-03-27 10:03:27.000000000 +00:00
+ - value: 331.53630198
+ ts: 2021-03-27 10:03:26.000000000 +00:00
+ - value: 331.6276612
+ ts: 2021-03-27 10:03:25.000000000 +00:00
+ - value: 331.71902043
+ ts: 2021-03-27 10:03:24.000000000 +00:00
+ - value: 331.78971371
+ ts: 2021-03-27 10:03:23.000000000 +00:00
+ - value: 331.86040699
+ ts: 2021-03-27 10:03:22.000000000 +00:00
+ - value: 331.91753383
+ ts: 2021-03-27 10:03:21.000000000 +00:00
+ - value: 331.97466067
+ ts: 2021-03-27 10:03:20.000000000 +00:00
+ - value: 332.03532615
+ ts: 2021-03-27 10:03:19.000000000 +00:00
+ - value: 332.09599162
+ ts: 2021-03-27 10:03:18.000000000 +00:00
+ - value: 332.17475772
+ ts: 2021-03-27 10:03:17.000000000 +00:00
+ - value: 332.25352382
+ ts: 2021-03-27 10:03:16.000000000 +00:00
+ - value: 332.36532672
+ ts: 2021-03-27 10:03:15.000000000 +00:00
+ - value: 332.47712962
+ ts: 2021-03-27 10:03:14.000000000 +00:00
+ - value: 332.61852169
+ ts: 2021-03-27 10:03:13.000000000 +00:00
+ - value: 332.75991377
+ ts: 2021-03-27 10:03:12.000000000 +00:00
+ - value: 332.91651662
+ ts: 2021-03-27 10:03:11.000000000 +00:00
+ - value: 333.07311948
+ ts: 2021-03-27 10:03:10.000000000 +00:00
+ - value: 333.2324149
+ ts: 2021-03-27 10:03:09.000000000 +00:00
+ - value: 333.39171033
+ ts: 2021-03-27 10:03:08.000000000 +00:00
+ - value: 333.5448842
+ ts: 2021-03-27 10:03:07.000000000 +00:00
+ - value: 333.69805806
+ ts: 2021-03-27 10:03:06.000000000 +00:00
+ - value: 333.841515
+ ts: 2021-03-27 10:03:05.000000000 +00:00
+ - value: 333.98497193
+ ts: 2021-03-27 10:03:04.000000000 +00:00
+ - value: 334.1183699
+ ts: 2021-03-27 10:03:03.000000000 +00:00
+ - value: 334.25176787
+ ts: 2021-03-27 10:03:02.000000000 +00:00
+ - value: 334.38535118
+ ts: 2021-03-27 10:03:01.000000000 +00:00
+ - value: 334.5189345
+ ts: 2021-03-27 10:03:00.000000000 +00:00
+ - value: 334.65356379
+ ts: 2021-03-27 10:02:59.000000000 +00:00
+ - value: 334.78819309
+ ts: 2021-03-27 10:02:58.000000000 +00:00
+ - value: 334.90946321
+ ts: 2021-03-27 10:02:57.000000000 +00:00
+ - value: 335.03073333
+ ts: 2021-03-27 10:02:56.000000000 +00:00
+ - value: 335.1383318
+ ts: 2021-03-27 10:02:55.000000000 +00:00
+ - value: 335.24593026
+ ts: 2021-03-27 10:02:54.000000000 +00:00
+ - value: 335.35057584
+ ts: 2021-03-27 10:02:53.000000000 +00:00
+ - value: 335.45522142
+ ts: 2021-03-27 10:02:52.000000000 +00:00
+ - value: 335.56124549
+ ts: 2021-03-27 10:02:51.000000000 +00:00
+ - value: 335.66726956
+ ts: 2021-03-27 10:02:50.000000000 +00:00
+ - value: 335.77616863
+ ts: 2021-03-27 10:02:49.000000000 +00:00
+ - value: 335.88506769
+ ts: 2021-03-27 10:02:48.000000000 +00:00
+ - value: 335.99565512
+ ts: 2021-03-27 10:02:47.000000000 +00:00
+ - value: 336.10624254
+ ts: 2021-03-27 10:02:46.000000000 +00:00
+ - value: 336.22365213
+ ts: 2021-03-27 10:02:45.000000000 +00:00
+ - value: 336.34106173
+ ts: 2021-03-27 10:02:44.000000000 +00:00
+ - value: 336.47339792
+ ts: 2021-03-27 10:02:43.000000000 +00:00
+ - value: 336.6057341
+ ts: 2021-03-27 10:02:42.000000000 +00:00
+ - value: 336.76422278
+ ts: 2021-03-27 10:02:41.000000000 +00:00
+ - value: 336.92271145
+ ts: 2021-03-27 10:02:40.000000000 +00:00
+ - value: 337.09938926
+ ts: 2021-03-27 10:02:39.000000000 +00:00
+ - value: 337.27606706
+ ts: 2021-03-27 10:02:38.000000000 +00:00
+ - value: 337.45288347
+ ts: 2021-03-27 10:02:37.000000000 +00:00
+ - value: 337.62969988
+ ts: 2021-03-27 10:02:36.000000000 +00:00
+ - value: 337.79306005
+ ts: 2021-03-27 10:02:35.000000000 +00:00
+ - value: 337.95642022
+ ts: 2021-03-27 10:02:34.000000000 +00:00
+ - value: 338.0972586
+ ts: 2021-03-27 10:02:33.000000000 +00:00
+ - value: 338.23809697
+ ts: 2021-03-27 10:02:32.000000000 +00:00
+ - value: 338.34657255
+ ts: 2021-03-27 10:02:31.000000000 +00:00
+ - value: 338.45504814
+ ts: 2021-03-27 10:02:30.000000000 +00:00
+ - value: 338.55641637
+ ts: 2021-03-27 10:02:29.000000000 +00:00
+ - value: 338.65778461
+ ts: 2021-03-27 10:02:28.000000000 +00:00
+ - value: 338.76690713
+ ts: 2021-03-27 10:02:27.000000000 +00:00
+ - value: 338.87602965
+ ts: 2021-03-27 10:02:26.000000000 +00:00
+ - value: 338.97548534
+ ts: 2021-03-27 10:02:25.000000000 +00:00
+ - value: 339.07494103
+ ts: 2021-03-27 10:02:24.000000000 +00:00
+ - value: 339.14737143
+ ts: 2021-03-27 10:02:23.000000000 +00:00
+ - value: 339.21980184
+ ts: 2021-03-27 10:02:22.000000000 +00:00
+ - value: 339.28181981
+ ts: 2021-03-27 10:02:21.000000000 +00:00
+ - value: 339.34383778
+ ts: 2021-03-27 10:02:20.000000000 +00:00
+ - value: 339.41468242
+ ts: 2021-03-27 10:02:19.000000000 +00:00
+ - value: 339.48552706
+ ts: 2021-03-27 10:02:18.000000000 +00:00
+ - value: 339.56912781
+ ts: 2021-03-27 10:02:17.000000000 +00:00
+ - value: 339.65272856
+ ts: 2021-03-27 10:02:16.000000000 +00:00
+ - value: 339.75489065
+ ts: 2021-03-27 10:02:15.000000000 +00:00
+ - value: 339.85705275
+ ts: 2021-03-27 10:02:14.000000000 +00:00
+ - value: 339.98564966
+ ts: 2021-03-27 10:02:13.000000000 +00:00
+ - value: 340.11424657
+ ts: 2021-03-27 10:02:12.000000000 +00:00
+ - value: 340.24874535
+ ts: 2021-03-27 10:02:11.000000000 +00:00
+ - value: 340.38324414
+ ts: 2021-03-27 10:02:10.000000000 +00:00
+ - value: 340.49605566
+ ts: 2021-03-27 10:02:09.000000000 +00:00
+ - value: 340.60886719
+ ts: 2021-03-27 10:02:08.000000000 +00:00
+ - value: 340.70145262
+ ts: 2021-03-27 10:02:07.000000000 +00:00
+ - value: 340.79403805
+ ts: 2021-03-27 10:02:06.000000000 +00:00
+ - value: 340.89300582
+ ts: 2021-03-27 10:02:05.000000000 +00:00
+ - value: 340.99197358
+ ts: 2021-03-27 10:02:04.000000000 +00:00
+ - value: 341.13296417
+ ts: 2021-03-27 10:02:03.000000000 +00:00
+ - value: 341.27395475
+ ts: 2021-03-27 10:02:02.000000000 +00:00
+ - value: 341.46874342
+ ts: 2021-03-27 10:02:01.000000000 +00:00
+ - value: 341.66353209
+ ts: 2021-03-27 10:02:00.000000000 +00:00
+ - value: 341.88008414
+ ts: 2021-03-27 10:01:59.000000000 +00:00
+ - value: 342.09663618
+ ts: 2021-03-27 10:01:58.000000000 +00:00
+ - value: 342.30074289
+ ts: 2021-03-27 10:01:57.000000000 +00:00
+ - value: 342.50484959
+ ts: 2021-03-27 10:01:56.000000000 +00:00
+ - value: 342.69330764
+ ts: 2021-03-27 10:01:55.000000000 +00:00
+ - value: 342.88176568
+ ts: 2021-03-27 10:01:54.000000000 +00:00
+ - value: 343.05559052
+ ts: 2021-03-27 10:01:53.000000000 +00:00
+ - value: 343.22941535
+ ts: 2021-03-27 10:01:52.000000000 +00:00
+ - value: 343.38272674
+ ts: 2021-03-27 10:01:51.000000000 +00:00
+ - value: 343.53603813
+ ts: 2021-03-27 10:01:50.000000000 +00:00
+ - value: 343.66710016
+ ts: 2021-03-27 10:01:49.000000000 +00:00
+ - value: 343.79816219
+ ts: 2021-03-27 10:01:48.000000000 +00:00
+ - value: 343.90851777
+ ts: 2021-03-27 10:01:47.000000000 +00:00
+ - value: 344.01887335
+ ts: 2021-03-27 10:01:46.000000000 +00:00
+ - value: 344.11549181
+ ts: 2021-03-27 10:01:45.000000000 +00:00
+ - value: 344.21211027
+ ts: 2021-03-27 10:01:44.000000000 +00:00
+ - value: 344.29964066
+ ts: 2021-03-27 10:01:43.000000000 +00:00
+ - value: 344.38717106
+ ts: 2021-03-27 10:01:42.000000000 +00:00
+ - value: 344.48578694
+ ts: 2021-03-27 10:01:41.000000000 +00:00
+ - value: 344.58440283
+ ts: 2021-03-27 10:01:40.000000000 +00:00
+ - value: 344.69813634
+ ts: 2021-03-27 10:01:39.000000000 +00:00
+ - value: 344.81186985
+ ts: 2021-03-27 10:01:38.000000000 +00:00
+ - value: 344.93016318
+ ts: 2021-03-27 10:01:37.000000000 +00:00
+ - value: 345.04845651
+ ts: 2021-03-27 10:01:36.000000000 +00:00
+ - value: 345.16602241
+ ts: 2021-03-27 10:01:35.000000000 +00:00
+ - value: 345.2835883
+ ts: 2021-03-27 10:01:34.000000000 +00:00
+ - value: 345.39286858
+ ts: 2021-03-27 10:01:33.000000000 +00:00
+ - value: 345.50214886
+ ts: 2021-03-27 10:01:32.000000000 +00:00
+ - value: 345.58901642
+ ts: 2021-03-27 10:01:31.000000000 +00:00
+ - value: 345.67588398
+ ts: 2021-03-27 10:01:30.000000000 +00:00
+ - value: 345.74661236
+ ts: 2021-03-27 10:01:29.000000000 +00:00
+ - value: 345.81734074
+ ts: 2021-03-27 10:01:28.000000000 +00:00
+ - value: 345.90106625
+ ts: 2021-03-27 10:01:27.000000000 +00:00
+ - value: 345.98479175
+ ts: 2021-03-27 10:01:26.000000000 +00:00
+ - value: 346.09320613
+ ts: 2021-03-27 10:01:25.000000000 +00:00
+ - value: 346.20162051
+ ts: 2021-03-27 10:01:24.000000000 +00:00
+ - value: 346.31636971
+ ts: 2021-03-27 10:01:23.000000000 +00:00
+ - value: 346.43111891
+ ts: 2021-03-27 10:01:22.000000000 +00:00
+ - value: 346.540898
+ ts: 2021-03-27 10:01:21.000000000 +00:00
+ - value: 346.6506771
+ ts: 2021-03-27 10:01:20.000000000 +00:00
+ - value: 346.76305226
+ ts: 2021-03-27 10:01:19.000000000 +00:00
+ - value: 346.87542743
+ ts: 2021-03-27 10:01:18.000000000 +00:00
+ - value: 346.98947353
+ ts: 2021-03-27 10:01:17.000000000 +00:00
+ - value: 347.10351964
+ ts: 2021-03-27 10:01:16.000000000 +00:00
+ - value: 347.22655047
+ ts: 2021-03-27 10:01:15.000000000 +00:00
+ - value: 347.34958129
+ ts: 2021-03-27 10:01:14.000000000 +00:00
+ - value: 347.48916804
+ ts: 2021-03-27 10:01:13.000000000 +00:00
+ - value: 347.62875478
+ ts: 2021-03-27 10:01:12.000000000 +00:00
+ - value: 347.7857571
+ ts: 2021-03-27 10:01:11.000000000 +00:00
+ - value: 347.94275943
+ ts: 2021-03-27 10:01:10.000000000 +00:00
+ - value: 348.11871507
+ ts: 2021-03-27 10:01:09.000000000 +00:00
+ - value: 348.29467071
+ ts: 2021-03-27 10:01:08.000000000 +00:00
+ - value: 348.47321542
+ ts: 2021-03-27 10:01:07.000000000 +00:00
+ - value: 348.65176014
+ ts: 2021-03-27 10:01:06.000000000 +00:00
+ - value: 348.83041631
+ ts: 2021-03-27 10:01:05.000000000 +00:00
+ - value: 349.00907248
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: 349.18934895
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: 349.36962543
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value: 349.55167095
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+ seasonal:
+ - value: -0.11610623
+ ts: 2021-03-27 10:06:48.000000000 +00:00
+ - value: 0.51702998
+ ts: 2021-03-27 10:06:47.000000000 +00:00
+ - value: 1.26913132
+ ts: 2021-03-27 10:06:46.000000000 +00:00
+ - value: 2.36141824
+ ts: 2021-03-27 10:06:45.000000000 +00:00
+ - value: 2.87680888
+ ts: 2021-03-27 10:06:44.000000000 +00:00
+ - value: 2.30218851
+ ts: 2021-03-27 10:06:43.000000000 +00:00
+ - value: 0.86825797
+ ts: 2021-03-27 10:06:42.000000000 +00:00
+ - value: -1.15161986
+ ts: 2021-03-27 10:06:41.000000000 +00:00
+ - value: -2.86735966
+ ts: 2021-03-27 10:06:40.000000000 +00:00
+ - value: -3.13006713
+ ts: 2021-03-27 10:06:39.000000000 +00:00
+ - value: -1.99001616
+ ts: 2021-03-27 10:06:38.000000000 +00:00
+ - value: -0.93966591
+ ts: 2021-03-27 10:06:37.000000000 +00:00
+ - value: -0.11610622
+ ts: 2021-03-27 10:06:36.000000000 +00:00
+ - value: 0.51702999
+ ts: 2021-03-27 10:06:35.000000000 +00:00
+ - value: 1.26913134
+ ts: 2021-03-27 10:06:34.000000000 +00:00
+ - value: 2.36141828
+ ts: 2021-03-27 10:06:33.000000000 +00:00
+ - value: 2.87680891
+ ts: 2021-03-27 10:06:32.000000000 +00:00
+ - value: 2.30218852
+ ts: 2021-03-27 10:06:31.000000000 +00:00
+ - value: 0.86825796
+ ts: 2021-03-27 10:06:30.000000000 +00:00
+ - value: -1.15161987
+ ts: 2021-03-27 10:06:29.000000000 +00:00
+ - value: -2.8673597
+ ts: 2021-03-27 10:06:28.000000000 +00:00
+ - value: -3.13006716
+ ts: 2021-03-27 10:06:27.000000000 +00:00
+ - value: -1.99001618
+ ts: 2021-03-27 10:06:26.000000000 +00:00
+ - value: -0.93966591
+ ts: 2021-03-27 10:06:25.000000000 +00:00
+ - value: -0.11610622
+ ts: 2021-03-27 10:06:24.000000000 +00:00
+ - value: 0.51702999
+ ts: 2021-03-27 10:06:23.000000000 +00:00
+ - value: 1.26913137
+ ts: 2021-03-27 10:06:22.000000000 +00:00
+ - value: 2.36141832
+ ts: 2021-03-27 10:06:21.000000000 +00:00
+ - value: 2.87680894
+ ts: 2021-03-27 10:06:20.000000000 +00:00
+ - value: 2.30218853
+ ts: 2021-03-27 10:06:19.000000000 +00:00
+ - value: 0.86825794
+ ts: 2021-03-27 10:06:18.000000000 +00:00
+ - value: -1.15161989
+ ts: 2021-03-27 10:06:17.000000000 +00:00
+ - value: -2.86735973
+ ts: 2021-03-27 10:06:16.000000000 +00:00
+ - value: -3.13006719
+ ts: 2021-03-27 10:06:15.000000000 +00:00
+ - value: -1.99001619
+ ts: 2021-03-27 10:06:14.000000000 +00:00
+ - value: -0.9396659
+ ts: 2021-03-27 10:06:13.000000000 +00:00
+ - value: -0.11610622
+ ts: 2021-03-27 10:06:12.000000000 +00:00
+ - value: 0.51702999
+ ts: 2021-03-27 10:06:11.000000000 +00:00
+ - value: 1.2691314
+ ts: 2021-03-27 10:06:10.000000000 +00:00
+ - value: 2.36141836
+ ts: 2021-03-27 10:06:09.000000000 +00:00
+ - value: 2.87680896
+ ts: 2021-03-27 10:06:08.000000000 +00:00
+ - value: 2.30218854
+ ts: 2021-03-27 10:06:07.000000000 +00:00
+ - value: 0.86825793
+ ts: 2021-03-27 10:06:06.000000000 +00:00
+ - value: -1.1516199
+ ts: 2021-03-27 10:06:05.000000000 +00:00
+ - value: -2.86735977
+ ts: 2021-03-27 10:06:04.000000000 +00:00
+ - value: -3.13006722
+ ts: 2021-03-27 10:06:03.000000000 +00:00
+ - value: -1.99001621
+ ts: 2021-03-27 10:06:02.000000000 +00:00
+ - value: -0.9396659
+ ts: 2021-03-27 10:06:01.000000000 +00:00
+ - value: -0.11610622
+ ts: 2021-03-27 10:06:00.000000000 +00:00
+ - value: 0.51702999
+ ts: 2021-03-27 10:05:59.000000000 +00:00
+ - value: 1.26913143
+ ts: 2021-03-27 10:05:58.000000000 +00:00
+ - value: 2.36141839
+ ts: 2021-03-27 10:05:57.000000000 +00:00
+ - value: 2.87680899
+ ts: 2021-03-27 10:05:56.000000000 +00:00
+ - value: 2.30218855
+ ts: 2021-03-27 10:05:55.000000000 +00:00
+ - value: 0.86825792
+ ts: 2021-03-27 10:05:54.000000000 +00:00
+ - value: -1.15161992
+ ts: 2021-03-27 10:05:53.000000000 +00:00
+ - value: -2.8673598
+ ts: 2021-03-27 10:05:52.000000000 +00:00
+ - value: -3.13006725
+ ts: 2021-03-27 10:05:51.000000000 +00:00
+ - value: -1.99001623
+ ts: 2021-03-27 10:05:50.000000000 +00:00
+ - value: -0.93966589
+ ts: 2021-03-27 10:05:49.000000000 +00:00
+ - value: -0.11610622
+ ts: 2021-03-27 10:05:48.000000000 +00:00
+ - value: 0.51702999
+ ts: 2021-03-27 10:05:47.000000000 +00:00
+ - value: 1.26913146
+ ts: 2021-03-27 10:05:46.000000000 +00:00
+ - value: 2.36141843
+ ts: 2021-03-27 10:05:45.000000000 +00:00
+ - value: 2.87680902
+ ts: 2021-03-27 10:05:44.000000000 +00:00
+ - value: 2.30218855
+ ts: 2021-03-27 10:05:43.000000000 +00:00
+ - value: 0.8682579
+ ts: 2021-03-27 10:05:42.000000000 +00:00
+ - value: -1.15161993
+ ts: 2021-03-27 10:05:41.000000000 +00:00
+ - value: -2.86735984
+ ts: 2021-03-27 10:05:40.000000000 +00:00
+ - value: -3.13006728
+ ts: 2021-03-27 10:05:39.000000000 +00:00
+ - value: -1.99001624
+ ts: 2021-03-27 10:05:38.000000000 +00:00
+ - value: -0.93966588
+ ts: 2021-03-27 10:05:37.000000000 +00:00
+ - value: -0.11610622
+ ts: 2021-03-27 10:05:36.000000000 +00:00
+ - value: 0.51703
+ ts: 2021-03-27 10:05:35.000000000 +00:00
+ - value: 1.26913148
+ ts: 2021-03-27 10:05:34.000000000 +00:00
+ - value: 2.36141847
+ ts: 2021-03-27 10:05:33.000000000 +00:00
+ - value: 2.87680904
+ ts: 2021-03-27 10:05:32.000000000 +00:00
+ - value: 2.30218856
+ ts: 2021-03-27 10:05:31.000000000 +00:00
+ - value: 0.86825789
+ ts: 2021-03-27 10:05:30.000000000 +00:00
+ - value: -1.15161995
+ ts: 2021-03-27 10:05:29.000000000 +00:00
+ - value: -2.86735987
+ ts: 2021-03-27 10:05:28.000000000 +00:00
+ - value: -3.13006731
+ ts: 2021-03-27 10:05:27.000000000 +00:00
+ - value: -1.99001626
+ ts: 2021-03-27 10:05:26.000000000 +00:00
+ - value: -0.93966588
+ ts: 2021-03-27 10:05:25.000000000 +00:00
+ - value: -0.11610621
+ ts: 2021-03-27 10:05:24.000000000 +00:00
+ - value: 0.51703
+ ts: 2021-03-27 10:05:23.000000000 +00:00
+ - value: 1.26913151
+ ts: 2021-03-27 10:05:22.000000000 +00:00
+ - value: 2.36141851
+ ts: 2021-03-27 10:05:21.000000000 +00:00
+ - value: 2.87680907
+ ts: 2021-03-27 10:05:20.000000000 +00:00
+ - value: 2.30218857
+ ts: 2021-03-27 10:05:19.000000000 +00:00
+ - value: 0.86825787
+ ts: 2021-03-27 10:05:18.000000000 +00:00
+ - value: -1.15161996
+ ts: 2021-03-27 10:05:17.000000000 +00:00
+ - value: -2.86735991
+ ts: 2021-03-27 10:05:16.000000000 +00:00
+ - value: -3.13006734
+ ts: 2021-03-27 10:05:15.000000000 +00:00
+ - value: -1.99001627
+ ts: 2021-03-27 10:05:14.000000000 +00:00
+ - value: -0.93966587
+ ts: 2021-03-27 10:05:13.000000000 +00:00
+ - value: -0.11610621
+ ts: 2021-03-27 10:05:12.000000000 +00:00
+ - value: 0.51703
+ ts: 2021-03-27 10:05:11.000000000 +00:00
+ - value: 1.26913154
+ ts: 2021-03-27 10:05:10.000000000 +00:00
+ - value: 2.36141855
+ ts: 2021-03-27 10:05:09.000000000 +00:00
+ - value: 2.8768091
+ ts: 2021-03-27 10:05:08.000000000 +00:00
+ - value: 2.30218858
+ ts: 2021-03-27 10:05:07.000000000 +00:00
+ - value: 0.86825786
+ ts: 2021-03-27 10:05:06.000000000 +00:00
+ - value: -1.15161998
+ ts: 2021-03-27 10:05:05.000000000 +00:00
+ - value: -2.86735994
+ ts: 2021-03-27 10:05:04.000000000 +00:00
+ - value: -3.13006737
+ ts: 2021-03-27 10:05:03.000000000 +00:00
+ - value: -1.99001629
+ ts: 2021-03-27 10:05:02.000000000 +00:00
+ - value: -0.93966587
+ ts: 2021-03-27 10:05:01.000000000 +00:00
+ - value: -0.11610621
+ ts: 2021-03-27 10:05:00.000000000 +00:00
+ - value: 0.51703
+ ts: 2021-03-27 10:04:59.000000000 +00:00
+ - value: 1.26913157
+ ts: 2021-03-27 10:04:58.000000000 +00:00
+ - value: 2.36141859
+ ts: 2021-03-27 10:04:57.000000000 +00:00
+ - value: 2.87680913
+ ts: 2021-03-27 10:04:56.000000000 +00:00
+ - value: 2.30218859
+ ts: 2021-03-27 10:04:55.000000000 +00:00
+ - value: 0.86825784
+ ts: 2021-03-27 10:04:54.000000000 +00:00
+ - value: -1.15161999
+ ts: 2021-03-27 10:04:53.000000000 +00:00
+ - value: -2.86735998
+ ts: 2021-03-27 10:04:52.000000000 +00:00
+ - value: -3.1300674
+ ts: 2021-03-27 10:04:51.000000000 +00:00
+ - value: -1.99001631
+ ts: 2021-03-27 10:04:50.000000000 +00:00
+ - value: -0.93966586
+ ts: 2021-03-27 10:04:49.000000000 +00:00
+ - value: -0.11610621
+ ts: 2021-03-27 10:04:48.000000000 +00:00
+ - value: 0.51703
+ ts: 2021-03-27 10:04:47.000000000 +00:00
+ - value: 1.26913159
+ ts: 2021-03-27 10:04:46.000000000 +00:00
+ - value: 2.36141863
+ ts: 2021-03-27 10:04:45.000000000 +00:00
+ - value: 2.87680915
+ ts: 2021-03-27 10:04:44.000000000 +00:00
+ - value: 2.3021886
+ ts: 2021-03-27 10:04:43.000000000 +00:00
+ - value: 0.86825783
+ ts: 2021-03-27 10:04:42.000000000 +00:00
+ - value: -1.15162001
+ ts: 2021-03-27 10:04:41.000000000 +00:00
+ - value: -2.86736001
+ ts: 2021-03-27 10:04:40.000000000 +00:00
+ - value: -3.13006743
+ ts: 2021-03-27 10:04:39.000000000 +00:00
+ - value: -1.99001632
+ ts: 2021-03-27 10:04:38.000000000 +00:00
+ - value: -0.93966586
+ ts: 2021-03-27 10:04:37.000000000 +00:00
+ - value: -0.11610621
+ ts: 2021-03-27 10:04:36.000000000 +00:00
+ - value: 0.51703
+ ts: 2021-03-27 10:04:35.000000000 +00:00
+ - value: 1.26913162
+ ts: 2021-03-27 10:04:34.000000000 +00:00
+ - value: 2.36141866
+ ts: 2021-03-27 10:04:33.000000000 +00:00
+ - value: 2.87680918
+ ts: 2021-03-27 10:04:32.000000000 +00:00
+ - value: 2.30218861
+ ts: 2021-03-27 10:04:31.000000000 +00:00
+ - value: 0.86825782
+ ts: 2021-03-27 10:04:30.000000000 +00:00
+ - value: -1.15162002
+ ts: 2021-03-27 10:04:29.000000000 +00:00
+ - value: -2.86736005
+ ts: 2021-03-27 10:04:28.000000000 +00:00
+ - value: -3.13006746
+ ts: 2021-03-27 10:04:27.000000000 +00:00
+ - value: -1.99001634
+ ts: 2021-03-27 10:04:26.000000000 +00:00
+ - value: -0.93966585
+ ts: 2021-03-27 10:04:25.000000000 +00:00
+ - value: -0.11610621
+ ts: 2021-03-27 10:04:24.000000000 +00:00
+ - value: 0.51703
+ ts: 2021-03-27 10:04:23.000000000 +00:00
+ - value: 1.26913165
+ ts: 2021-03-27 10:04:22.000000000 +00:00
+ - value: 2.3614187
+ ts: 2021-03-27 10:04:21.000000000 +00:00
+ - value: 2.87680921
+ ts: 2021-03-27 10:04:20.000000000 +00:00
+ - value: 2.30218862
+ ts: 2021-03-27 10:04:19.000000000 +00:00
+ - value: 0.8682578
+ ts: 2021-03-27 10:04:18.000000000 +00:00
+ - value: -1.15162004
+ ts: 2021-03-27 10:04:17.000000000 +00:00
+ - value: -2.86736008
+ ts: 2021-03-27 10:04:16.000000000 +00:00
+ - value: -3.13006749
+ ts: 2021-03-27 10:04:15.000000000 +00:00
+ - value: -1.99001635
+ ts: 2021-03-27 10:04:14.000000000 +00:00
+ - value: -0.93966584
+ ts: 2021-03-27 10:04:13.000000000 +00:00
+ - value: -0.11610621
+ ts: 2021-03-27 10:04:12.000000000 +00:00
+ - value: 0.51703001
+ ts: 2021-03-27 10:04:11.000000000 +00:00
+ - value: 1.26913168
+ ts: 2021-03-27 10:04:10.000000000 +00:00
+ - value: 2.36141874
+ ts: 2021-03-27 10:04:09.000000000 +00:00
+ - value: 2.87680923
+ ts: 2021-03-27 10:04:08.000000000 +00:00
+ - value: 2.30218863
+ ts: 2021-03-27 10:04:07.000000000 +00:00
+ - value: 0.86825779
+ ts: 2021-03-27 10:04:06.000000000 +00:00
+ - value: -1.15162006
+ ts: 2021-03-27 10:04:05.000000000 +00:00
+ - value: -2.86736012
+ ts: 2021-03-27 10:04:04.000000000 +00:00
+ - value: -3.13006753
+ ts: 2021-03-27 10:04:03.000000000 +00:00
+ - value: -1.99001637
+ ts: 2021-03-27 10:04:02.000000000 +00:00
+ - value: -0.93966584
+ ts: 2021-03-27 10:04:01.000000000 +00:00
+ - value: -0.1161062
+ ts: 2021-03-27 10:04:00.000000000 +00:00
+ - value: 0.51703001
+ ts: 2021-03-27 10:03:59.000000000 +00:00
+ - value: 1.2691317
+ ts: 2021-03-27 10:03:58.000000000 +00:00
+ - value: 2.36141878
+ ts: 2021-03-27 10:03:57.000000000 +00:00
+ - value: 2.87680926
+ ts: 2021-03-27 10:03:56.000000000 +00:00
+ - value: 2.30218864
+ ts: 2021-03-27 10:03:55.000000000 +00:00
+ - value: 0.86825777
+ ts: 2021-03-27 10:03:54.000000000 +00:00
+ - value: -1.15162007
+ ts: 2021-03-27 10:03:53.000000000 +00:00
+ - value: -2.86736015
+ ts: 2021-03-27 10:03:52.000000000 +00:00
+ - value: -3.13006756
+ ts: 2021-03-27 10:03:51.000000000 +00:00
+ - value: -1.99001639
+ ts: 2021-03-27 10:03:50.000000000 +00:00
+ - value: -0.93966583
+ ts: 2021-03-27 10:03:49.000000000 +00:00
+ - value: -0.1161062
+ ts: 2021-03-27 10:03:48.000000000 +00:00
+ - value: 0.51703001
+ ts: 2021-03-27 10:03:47.000000000 +00:00
+ - value: 1.26913173
+ ts: 2021-03-27 10:03:46.000000000 +00:00
+ - value: 2.36141882
+ ts: 2021-03-27 10:03:45.000000000 +00:00
+ - value: 2.87680929
+ ts: 2021-03-27 10:03:44.000000000 +00:00
+ - value: 2.30218865
+ ts: 2021-03-27 10:03:43.000000000 +00:00
+ - value: 0.86825776
+ ts: 2021-03-27 10:03:42.000000000 +00:00
+ - value: -1.15162009
+ ts: 2021-03-27 10:03:41.000000000 +00:00
+ - value: -2.86736019
+ ts: 2021-03-27 10:03:40.000000000 +00:00
+ - value: -3.13006759
+ ts: 2021-03-27 10:03:39.000000000 +00:00
+ - value: -1.9900164
+ ts: 2021-03-27 10:03:38.000000000 +00:00
+ - value: -0.93966583
+ ts: 2021-03-27 10:03:37.000000000 +00:00
+ - value: -0.1161062
+ ts: 2021-03-27 10:03:36.000000000 +00:00
+ - value: 0.51703001
+ ts: 2021-03-27 10:03:35.000000000 +00:00
+ - value: 1.26913176
+ ts: 2021-03-27 10:03:34.000000000 +00:00
+ - value: 2.36141886
+ ts: 2021-03-27 10:03:33.000000000 +00:00
+ - value: 2.87680931
+ ts: 2021-03-27 10:03:32.000000000 +00:00
+ - value: 2.30218865
+ ts: 2021-03-27 10:03:31.000000000 +00:00
+ - value: 0.86825774
+ ts: 2021-03-27 10:03:30.000000000 +00:00
+ - value: -1.1516201
+ ts: 2021-03-27 10:03:29.000000000 +00:00
+ - value: -2.86736022
+ ts: 2021-03-27 10:03:28.000000000 +00:00
+ - value: -3.13006762
+ ts: 2021-03-27 10:03:27.000000000 +00:00
+ - value: -1.99001642
+ ts: 2021-03-27 10:03:26.000000000 +00:00
+ - value: -0.93966582
+ ts: 2021-03-27 10:03:25.000000000 +00:00
+ - value: -0.1161062
+ ts: 2021-03-27 10:03:24.000000000 +00:00
+ - value: 0.51703001
+ ts: 2021-03-27 10:03:23.000000000 +00:00
+ - value: 1.26913179
+ ts: 2021-03-27 10:03:22.000000000 +00:00
+ - value: 2.36141889
+ ts: 2021-03-27 10:03:21.000000000 +00:00
+ - value: 2.87680934
+ ts: 2021-03-27 10:03:20.000000000 +00:00
+ - value: 2.30218866
+ ts: 2021-03-27 10:03:19.000000000 +00:00
+ - value: 0.86825773
+ ts: 2021-03-27 10:03:18.000000000 +00:00
+ - value: -1.15162012
+ ts: 2021-03-27 10:03:17.000000000 +00:00
+ - value: -2.86736026
+ ts: 2021-03-27 10:03:16.000000000 +00:00
+ - value: -3.13006765
+ ts: 2021-03-27 10:03:15.000000000 +00:00
+ - value: -1.99001643
+ ts: 2021-03-27 10:03:14.000000000 +00:00
+ - value: -0.93966582
+ ts: 2021-03-27 10:03:13.000000000 +00:00
+ - value: -0.1161062
+ ts: 2021-03-27 10:03:12.000000000 +00:00
+ - value: 0.51703001
+ ts: 2021-03-27 10:03:11.000000000 +00:00
+ - value: 1.26913181
+ ts: 2021-03-27 10:03:10.000000000 +00:00
+ - value: 2.36141893
+ ts: 2021-03-27 10:03:09.000000000 +00:00
+ - value: 2.87680937
+ ts: 2021-03-27 10:03:08.000000000 +00:00
+ - value: 2.30218867
+ ts: 2021-03-27 10:03:07.000000000 +00:00
+ - value: 0.86825772
+ ts: 2021-03-27 10:03:06.000000000 +00:00
+ - value: -1.15162013
+ ts: 2021-03-27 10:03:05.000000000 +00:00
+ - value: -2.86736029
+ ts: 2021-03-27 10:03:04.000000000 +00:00
+ - value: -3.13006768
+ ts: 2021-03-27 10:03:03.000000000 +00:00
+ - value: -1.99001645
+ ts: 2021-03-27 10:03:02.000000000 +00:00
+ - value: -0.93966581
+ ts: 2021-03-27 10:03:01.000000000 +00:00
+ - value: -0.1161062
+ ts: 2021-03-27 10:03:00.000000000 +00:00
+ - value: 0.51703001
+ ts: 2021-03-27 10:02:59.000000000 +00:00
+ - value: 1.26913184
+ ts: 2021-03-27 10:02:58.000000000 +00:00
+ - value: 2.36141897
+ ts: 2021-03-27 10:02:57.000000000 +00:00
+ - value: 2.87680939
+ ts: 2021-03-27 10:02:56.000000000 +00:00
+ - value: 2.30218868
+ ts: 2021-03-27 10:02:55.000000000 +00:00
+ - value: 0.8682577
+ ts: 2021-03-27 10:02:54.000000000 +00:00
+ - value: -1.15162015
+ ts: 2021-03-27 10:02:53.000000000 +00:00
+ - value: -2.86736033
+ ts: 2021-03-27 10:02:52.000000000 +00:00
+ - value: -3.13006771
+ ts: 2021-03-27 10:02:51.000000000 +00:00
+ - value: -1.99001647
+ ts: 2021-03-27 10:02:50.000000000 +00:00
+ - value: -0.9396658
+ ts: 2021-03-27 10:02:49.000000000 +00:00
+ - value: -0.11610619
+ ts: 2021-03-27 10:02:48.000000000 +00:00
+ - value: 0.51703002
+ ts: 2021-03-27 10:02:47.000000000 +00:00
+ - value: 1.26913187
+ ts: 2021-03-27 10:02:46.000000000 +00:00
+ - value: 2.36141901
+ ts: 2021-03-27 10:02:45.000000000 +00:00
+ - value: 2.87680942
+ ts: 2021-03-27 10:02:44.000000000 +00:00
+ - value: 2.30218869
+ ts: 2021-03-27 10:02:43.000000000 +00:00
+ - value: 0.86825769
+ ts: 2021-03-27 10:02:42.000000000 +00:00
+ - value: -1.15162016
+ ts: 2021-03-27 10:02:41.000000000 +00:00
+ - value: -2.86736036
+ ts: 2021-03-27 10:02:40.000000000 +00:00
+ - value: -3.13006774
+ ts: 2021-03-27 10:02:39.000000000 +00:00
+ - value: -1.99001648
+ ts: 2021-03-27 10:02:38.000000000 +00:00
+ - value: -0.9396658
+ ts: 2021-03-27 10:02:37.000000000 +00:00
+ - value: -0.11610619
+ ts: 2021-03-27 10:02:36.000000000 +00:00
+ - value: 0.51703002
+ ts: 2021-03-27 10:02:35.000000000 +00:00
+ - value: 1.2691319
+ ts: 2021-03-27 10:02:34.000000000 +00:00
+ - value: 2.36141905
+ ts: 2021-03-27 10:02:33.000000000 +00:00
+ - value: 2.87680945
+ ts: 2021-03-27 10:02:32.000000000 +00:00
+ - value: 2.3021887
+ ts: 2021-03-27 10:02:31.000000000 +00:00
+ - value: 0.86825767
+ ts: 2021-03-27 10:02:30.000000000 +00:00
+ - value: -1.15162018
+ ts: 2021-03-27 10:02:29.000000000 +00:00
+ - value: -2.8673604
+ ts: 2021-03-27 10:02:28.000000000 +00:00
+ - value: -3.13006777
+ ts: 2021-03-27 10:02:27.000000000 +00:00
+ - value: -1.9900165
+ ts: 2021-03-27 10:02:26.000000000 +00:00
+ - value: -0.93966579
+ ts: 2021-03-27 10:02:25.000000000 +00:00
+ - value: -0.11610619
+ ts: 2021-03-27 10:02:24.000000000 +00:00
+ - value: 0.51703002
+ ts: 2021-03-27 10:02:23.000000000 +00:00
+ - value: 1.26913192
+ ts: 2021-03-27 10:02:22.000000000 +00:00
+ - value: 2.36141909
+ ts: 2021-03-27 10:02:21.000000000 +00:00
+ - value: 2.87680948
+ ts: 2021-03-27 10:02:20.000000000 +00:00
+ - value: 2.30218871
+ ts: 2021-03-27 10:02:19.000000000 +00:00
+ - value: 0.86825766
+ ts: 2021-03-27 10:02:18.000000000 +00:00
+ - value: -1.15162019
+ ts: 2021-03-27 10:02:17.000000000 +00:00
+ - value: -2.86736043
+ ts: 2021-03-27 10:02:16.000000000 +00:00
+ - value: -3.1300678
+ ts: 2021-03-27 10:02:15.000000000 +00:00
+ - value: -1.99001651
+ ts: 2021-03-27 10:02:14.000000000 +00:00
+ - value: -0.93966579
+ ts: 2021-03-27 10:02:13.000000000 +00:00
+ - value: -0.11610619
+ ts: 2021-03-27 10:02:12.000000000 +00:00
+ - value: 0.51703002
+ ts: 2021-03-27 10:02:11.000000000 +00:00
+ - value: 1.26913195
+ ts: 2021-03-27 10:02:10.000000000 +00:00
+ - value: 2.36141913
+ ts: 2021-03-27 10:02:09.000000000 +00:00
+ - value: 2.8768095
+ ts: 2021-03-27 10:02:08.000000000 +00:00
+ - value: 2.30218872
+ ts: 2021-03-27 10:02:07.000000000 +00:00
+ - value: 0.86825764
+ ts: 2021-03-27 10:02:06.000000000 +00:00
+ - value: -1.15162021
+ ts: 2021-03-27 10:02:05.000000000 +00:00
+ - value: -2.86736047
+ ts: 2021-03-27 10:02:04.000000000 +00:00
+ - value: -3.13006783
+ ts: 2021-03-27 10:02:03.000000000 +00:00
+ - value: -1.99001653
+ ts: 2021-03-27 10:02:02.000000000 +00:00
+ - value: -0.93966578
+ ts: 2021-03-27 10:02:01.000000000 +00:00
+ - value: -0.11610619
+ ts: 2021-03-27 10:02:00.000000000 +00:00
+ - value: 0.51703002
+ ts: 2021-03-27 10:01:59.000000000 +00:00
+ - value: 1.26913198
+ ts: 2021-03-27 10:01:58.000000000 +00:00
+ - value: 2.36141916
+ ts: 2021-03-27 10:01:57.000000000 +00:00
+ - value: 2.87680953
+ ts: 2021-03-27 10:01:56.000000000 +00:00
+ - value: 2.30218873
+ ts: 2021-03-27 10:01:55.000000000 +00:00
+ - value: 0.86825763
+ ts: 2021-03-27 10:01:54.000000000 +00:00
+ - value: -1.15162022
+ ts: 2021-03-27 10:01:53.000000000 +00:00
+ - value: -2.8673605
+ ts: 2021-03-27 10:01:52.000000000 +00:00
+ - value: -3.13006786
+ ts: 2021-03-27 10:01:51.000000000 +00:00
+ - value: -1.99001655
+ ts: 2021-03-27 10:01:50.000000000 +00:00
+ - value: -0.93966578
+ ts: 2021-03-27 10:01:49.000000000 +00:00
+ - value: -0.11610619
+ ts: 2021-03-27 10:01:48.000000000 +00:00
+ - value: 0.51703002
+ ts: 2021-03-27 10:01:47.000000000 +00:00
+ - value: 1.26913201
+ ts: 2021-03-27 10:01:46.000000000 +00:00
+ - value: 2.3614192
+ ts: 2021-03-27 10:01:45.000000000 +00:00
+ - value: 2.87680956
+ ts: 2021-03-27 10:01:44.000000000 +00:00
+ - value: 2.30218874
+ ts: 2021-03-27 10:01:43.000000000 +00:00
+ - value: 0.86825762
+ ts: 2021-03-27 10:01:42.000000000 +00:00
+ - value: -1.15162024
+ ts: 2021-03-27 10:01:41.000000000 +00:00
+ - value: -2.86736054
+ ts: 2021-03-27 10:01:40.000000000 +00:00
+ - value: -3.13006789
+ ts: 2021-03-27 10:01:39.000000000 +00:00
+ - value: -1.99001656
+ ts: 2021-03-27 10:01:38.000000000 +00:00
+ - value: -0.93966577
+ ts: 2021-03-27 10:01:37.000000000 +00:00
+ - value: -0.11610619
+ ts: 2021-03-27 10:01:36.000000000 +00:00
+ - value: 0.51703003
+ ts: 2021-03-27 10:01:35.000000000 +00:00
+ - value: 1.26913203
+ ts: 2021-03-27 10:01:34.000000000 +00:00
+ - value: 2.36141924
+ ts: 2021-03-27 10:01:33.000000000 +00:00
+ - value: 2.87680958
+ ts: 2021-03-27 10:01:32.000000000 +00:00
+ - value: 2.30218875
+ ts: 2021-03-27 10:01:31.000000000 +00:00
+ - value: 0.8682576
+ ts: 2021-03-27 10:01:30.000000000 +00:00
+ - value: -1.15162025
+ ts: 2021-03-27 10:01:29.000000000 +00:00
+ - value: -2.86736057
+ ts: 2021-03-27 10:01:28.000000000 +00:00
+ - value: -3.13006792
+ ts: 2021-03-27 10:01:27.000000000 +00:00
+ - value: -1.99001658
+ ts: 2021-03-27 10:01:26.000000000 +00:00
+ - value: -0.93966577
+ ts: 2021-03-27 10:01:25.000000000 +00:00
+ - value: -0.11610618
+ ts: 2021-03-27 10:01:24.000000000 +00:00
+ - value: 0.51703003
+ ts: 2021-03-27 10:01:23.000000000 +00:00
+ - value: 1.26913206
+ ts: 2021-03-27 10:01:22.000000000 +00:00
+ - value: 2.36141928
+ ts: 2021-03-27 10:01:21.000000000 +00:00
+ - value: 2.87680961
+ ts: 2021-03-27 10:01:20.000000000 +00:00
+ - value: 2.30218875
+ ts: 2021-03-27 10:01:19.000000000 +00:00
+ - value: 0.86825759
+ ts: 2021-03-27 10:01:18.000000000 +00:00
+ - value: -1.15162027
+ ts: 2021-03-27 10:01:17.000000000 +00:00
+ - value: -2.86736061
+ ts: 2021-03-27 10:01:16.000000000 +00:00
+ - value: -3.13006795
+ ts: 2021-03-27 10:01:15.000000000 +00:00
+ - value: -1.99001659
+ ts: 2021-03-27 10:01:14.000000000 +00:00
+ - value: -0.93966576
+ ts: 2021-03-27 10:01:13.000000000 +00:00
+ - value: -0.11610618
+ ts: 2021-03-27 10:01:12.000000000 +00:00
+ - value: 0.51703003
+ ts: 2021-03-27 10:01:11.000000000 +00:00
+ - value: 1.26913209
+ ts: 2021-03-27 10:01:10.000000000 +00:00
+ - value: 2.36141932
+ ts: 2021-03-27 10:01:09.000000000 +00:00
+ - value: 2.87680964
+ ts: 2021-03-27 10:01:08.000000000 +00:00
+ - value: 2.30218876
+ ts: 2021-03-27 10:01:07.000000000 +00:00
+ - value: 0.86825757
+ ts: 2021-03-27 10:01:06.000000000 +00:00
+ - value: -1.15162028
+ ts: 2021-03-27 10:01:05.000000000 +00:00
+ - value: -2.86736065
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: -3.13006799
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: -1.99001661
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value: -0.93966576
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+ remainder:
+ - value: 0.2537511
+ ts: 2021-03-27 10:06:48.000000000 +00:00
+ - value: 0.31827372
+ ts: 2021-03-27 10:06:47.000000000 +00:00
+ - value: -0.14616877
+ ts: 2021-03-27 10:06:46.000000000 +00:00
+ - value: -0.319981
+ ts: 2021-03-27 10:06:45.000000000 +00:00
+ - value: -0.37689695
+ ts: 2021-03-27 10:06:44.000000000 +00:00
+ - value: -0.0788889
+ ts: 2021-03-27 10:06:43.000000000 +00:00
+ - value: -0.29157069
+ ts: 2021-03-27 10:06:42.000000000 +00:00
+ - value: -0.04490213
+ ts: 2021-03-27 10:06:41.000000000 +00:00
+ - value: 0.5776284
+ ts: 2021-03-27 10:06:40.000000000 +00:00
+ - value: 0.2559686
+ ts: 2021-03-27 10:06:39.000000000 +00:00
+ - value: 0.47155036
+ ts: 2021-03-27 10:06:38.000000000 +00:00
+ - value: 0.04458335
+ ts: 2021-03-27 10:06:37.000000000 +00:00
+ - value: -0.1155931
+ ts: 2021-03-27 10:06:36.000000000 +00:00
+ - value: -0.24336576
+ ts: 2021-03-27 10:06:35.000000000 +00:00
+ - value: -0.38010357
+ ts: 2021-03-27 10:06:34.000000000 +00:00
+ - value: -0.08528037
+ ts: 2021-03-27 10:06:33.000000000 +00:00
+ - value: 0.21643913
+ ts: 2021-03-27 10:06:32.000000000 +00:00
+ - value: 0.37164185
+ ts: 2021-03-27 10:06:31.000000000 +00:00
+ - value: 0.33615475
+ ts: 2021-03-27 10:06:30.000000000 +00:00
+ - value: 0.03698779
+ ts: 2021-03-27 10:06:29.000000000 +00:00
+ - value: -0.03631719
+ ts: 2021-03-27 10:06:28.000000000 +00:00
+ - value: 0.00804145
+ ts: 2021-03-27 10:06:27.000000000 +00:00
+ - value: -0.16035836
+ ts: 2021-03-27 10:06:26.000000000 +00:00
+ - value: -0.06316782
+ ts: 2021-03-27 10:06:25.000000000 +00:00
+ - value: -0.22918669
+ ts: 2021-03-27 10:06:24.000000000 +00:00
+ - value: -0.08893093
+ ts: 2021-03-27 10:06:23.000000000 +00:00
+ - value: -0.12764034
+ ts: 2021-03-27 10:06:22.000000000 +00:00
+ - value: -0.36767887
+ ts: 2021-03-27 10:06:21.000000000 +00:00
+ - value: 0.16917893
+ ts: 2021-03-27 10:06:20.000000000 +00:00
+ - value: -0.14904762
+ ts: 2021-03-27 10:06:19.000000000 +00:00
+ - value: 0.03203601
+ ts: 2021-03-27 10:06:18.000000000 +00:00
+ - value: 0.21568094
+ ts: 2021-03-27 10:06:17.000000000 +00:00
+ - value: 0.04518789
+ ts: 2021-03-27 10:06:16.000000000 +00:00
+ - value: 0.52501048
+ ts: 2021-03-27 10:06:15.000000000 +00:00
+ - value: 0.02207463
+ ts: 2021-03-27 10:06:14.000000000 +00:00
+ - value: -0.11851019
+ ts: 2021-03-27 10:06:13.000000000 +00:00
+ - value: -0.06230439
+ ts: 2021-03-27 10:06:12.000000000 +00:00
+ - value: -0.16134551
+ ts: 2021-03-27 10:06:11.000000000 +00:00
+ - value: 0.09064816
+ ts: 2021-03-27 10:06:10.000000000 +00:00
+ - value: -0.17347068
+ ts: 2021-03-27 10:06:09.000000000 +00:00
+ - value: -0.15069317
+ ts: 2021-03-27 10:06:08.000000000 +00:00
+ - value: -0.02542565
+ ts: 2021-03-27 10:06:07.000000000 +00:00
+ - value: 0.24915205
+ ts: 2021-03-27 10:06:06.000000000 +00:00
+ - value: -0.01268365
+ ts: 2021-03-27 10:06:05.000000000 +00:00
+ - value: 0.55134267
+ ts: 2021-03-27 10:06:04.000000000 +00:00
+ - value: -0.10740304
+ ts: 2021-03-27 10:06:03.000000000 +00:00
+ - value: -0.03890722
+ ts: 2021-03-27 10:06:02.000000000 +00:00
+ - value: -0.11162761
+ ts: 2021-03-27 10:06:01.000000000 +00:00
+ - value: 0.02244263
+ ts: 2021-03-27 10:06:00.000000000 +00:00
+ - value: -0.25826208
+ ts: 2021-03-27 10:05:59.000000000 +00:00
+ - value: -0.15793201
+ ts: 2021-03-27 10:05:58.000000000 +00:00
+ - value: 0.07927745
+ ts: 2021-03-27 10:05:57.000000000 +00:00
+ - value: 0.38338327
+ ts: 2021-03-27 10:05:56.000000000 +00:00
+ - value: 0.19062662
+ ts: 2021-03-27 10:05:55.000000000 +00:00
+ - value: -0.19281985
+ ts: 2021-03-27 10:05:54.000000000 +00:00
+ - value: -0.2034692
+ ts: 2021-03-27 10:05:53.000000000 +00:00
+ - value: -0.0482565
+ ts: 2021-03-27 10:05:52.000000000 +00:00
+ - value: 0.06140817
+ ts: 2021-03-27 10:05:51.000000000 +00:00
+ - value: -0.22168563
+ ts: 2021-03-27 10:05:50.000000000 +00:00
+ - value: 0.02988229
+ ts: 2021-03-27 10:05:49.000000000 +00:00
+ - value: 0.28824088
+ ts: 2021-03-27 10:05:48.000000000 +00:00
+ - value: 0.27262908
+ ts: 2021-03-27 10:05:47.000000000 +00:00
+ - value: 0.13805203
+ ts: 2021-03-27 10:05:46.000000000 +00:00
+ - value: -0.35296744
+ ts: 2021-03-27 10:05:45.000000000 +00:00
+ - value: -0.25709051
+ ts: 2021-03-27 10:05:44.000000000 +00:00
+ - value: -0.02665891
+ ts: 2021-03-27 10:05:43.000000000 +00:00
+ - value: -0.11691712
+ ts: 2021-03-27 10:05:42.000000000 +00:00
+ - value: 0.03726986
+ ts: 2021-03-27 10:05:41.000000000 +00:00
+ - value: -0.16268109
+ ts: 2021-03-27 10:05:40.000000000 +00:00
+ - value: 0.46883438
+ ts: 2021-03-27 10:05:39.000000000 +00:00
+ - value: 0.06759138
+ ts: 2021-03-27 10:05:38.000000000 +00:00
+ - value: -0.06675992
+ ts: 2021-03-27 10:05:37.000000000 +00:00
+ - value: -0.12432053
+ ts: 2021-03-27 10:05:36.000000000 +00:00
+ - value: 0.22562015
+ ts: 2021-03-27 10:05:35.000000000 +00:00
+ - value: -0.14340446
+ ts: 2021-03-27 10:05:34.000000000 +00:00
+ - value: -0.06011864
+ ts: 2021-03-27 10:05:33.000000000 +00:00
+ - value: -0.55993642
+ ts: 2021-03-27 10:05:32.000000000 +00:00
+ - value: -0.30520376
+ ts: 2021-03-27 10:05:31.000000000 +00:00
+ - value: 0.30883909
+ ts: 2021-03-27 10:05:30.000000000 +00:00
+ - value: -0.11685741
+ ts: 2021-03-27 10:05:29.000000000 +00:00
+ - value: 0.51330817
+ ts: 2021-03-27 10:05:28.000000000 +00:00
+ - value: 0.2279996
+ ts: 2021-03-27 10:05:27.000000000 +00:00
+ - value: 0.60993255
+ ts: 2021-03-27 10:05:26.000000000 +00:00
+ - value: -0.36898444
+ ts: 2021-03-27 10:05:25.000000000 +00:00
+ - value: -0.41111071
+ ts: 2021-03-27 10:05:24.000000000 +00:00
+ - value: -0.0331798
+ ts: 2021-03-27 10:05:23.000000000 +00:00
+ - value: -0.0042142
+ ts: 2021-03-27 10:05:22.000000000 +00:00
+ - value: 0.1013334
+ ts: 2021-03-27 10:05:21.000000000 +00:00
+ - value: -0.09622256
+ ts: 2021-03-27 10:05:20.000000000 +00:00
+ - value: 0.1137772
+ ts: 2021-03-27 10:05:19.000000000 +00:00
+ - value: 0.14308716
+ ts: 2021-03-27 10:05:18.000000000 +00:00
+ - value: 0.01446626
+ ts: 2021-03-27 10:05:17.000000000 +00:00
+ - value: -0.17829253
+ ts: 2021-03-27 10:05:16.000000000 +00:00
+ - value: -0.57762786
+ ts: 2021-03-27 10:05:15.000000000 +00:00
+ - value: 0.0302783
+ ts: 2021-03-27 10:05:14.000000000 +00:00
+ - value: 0.16243373
+ ts: 2021-03-27 10:05:13.000000000 +00:00
+ - value: 0.65137989
+ ts: 2021-03-27 10:05:12.000000000 +00:00
+ - value: 0.13795575
+ ts: 2021-03-27 10:05:11.000000000 +00:00
+ - value: -0.11443372
+ ts: 2021-03-27 10:05:10.000000000 +00:00
+ - value: 0.05150198
+ ts: 2021-03-27 10:05:09.000000000 +00:00
+ - value: 0.00433414
+ ts: 2021-03-27 10:05:08.000000000 +00:00
+ - value: -0.3229799
+ ts: 2021-03-27 10:05:07.000000000 +00:00
+ - value: -0.40098374
+ ts: 2021-03-27 10:05:06.000000000 +00:00
+ - value: -0.05427742
+ ts: 2021-03-27 10:05:05.000000000 +00:00
+ - value: -0.13170897
+ ts: 2021-03-27 10:05:04.000000000 +00:00
+ - value: 0.04775303
+ ts: 2021-03-27 10:05:03.000000000 +00:00
+ - value: 0.25445652
+ ts: 2021-03-27 10:05:02.000000000 +00:00
+ - value: 0.38595108
+ ts: 2021-03-27 10:05:01.000000000 +00:00
+ - value: 0.09423641
+ ts: 2021-03-27 10:05:00.000000000 +00:00
+ - value: -0.03636937
+ ts: 2021-03-27 10:04:59.000000000 +00:00
+ - value: -0.1759405
+ ts: 2021-03-27 10:04:58.000000000 +00:00
+ - value: -0.27686945
+ ts: 2021-03-27 10:04:57.000000000 +00:00
+ - value: -0.21090192
+ ts: 2021-03-27 10:04:56.000000000 +00:00
+ - value: 0.13754255
+ ts: 2021-03-27 10:04:55.000000000 +00:00
+ - value: 0.22529723
+ ts: 2021-03-27 10:04:54.000000000 +00:00
+ - value: 0.05274009
+ ts: 2021-03-27 10:04:53.000000000 +00:00
+ - value: -0.1539549
+ ts: 2021-03-27 10:04:52.000000000 +00:00
+ - value: -0.15193036
+ ts: 2021-03-27 10:04:51.000000000 +00:00
+ - value: -0.40266435
+ ts: 2021-03-27 10:04:50.000000000 +00:00
+ - value: -0.10028508
+ ts: 2021-03-27 10:04:49.000000000 +00:00
+ - value: 0.17888499
+ ts: 2021-03-27 10:04:48.000000000 +00:00
+ - value: 0.05358848
+ ts: 2021-03-27 10:04:47.000000000 +00:00
+ - value: 0.27932659
+ ts: 2021-03-27 10:04:46.000000000 +00:00
+ - value: 0.04856367
+ ts: 2021-03-27 10:04:45.000000000 +00:00
+ - value: 0.10469726
+ ts: 2021-03-27 10:04:44.000000000 +00:00
+ - value: -0.21762576
+ ts: 2021-03-27 10:04:43.000000000 +00:00
+ - value: 0.25936144
+ ts: 2021-03-27 10:04:42.000000000 +00:00
+ - value: -0.04886451
+ ts: 2021-03-27 10:04:41.000000000 +00:00
+ - value: 0.2787717
+ ts: 2021-03-27 10:04:40.000000000 +00:00
+ - value: -0.11780994
+ ts: 2021-03-27 10:04:39.000000000 +00:00
+ - value: -0.32715011
+ ts: 2021-03-27 10:04:38.000000000 +00:00
+ - value: -0.07384656
+ ts: 2021-03-27 10:04:37.000000000 +00:00
+ - value: -0.12375219
+ ts: 2021-03-27 10:04:36.000000000 +00:00
+ - value: 0.10502454
+ ts: 2021-03-27 10:04:35.000000000 +00:00
+ - value: 0.21483586
+ ts: 2021-03-27 10:04:34.000000000 +00:00
+ - value: 0.25508672
+ ts: 2021-03-27 10:04:33.000000000 +00:00
+ - value: -0.37776588
+ ts: 2021-03-27 10:04:32.000000000 +00:00
+ - value: -0.21610477
+ ts: 2021-03-27 10:04:31.000000000 +00:00
+ - value: -0.14513343
+ ts: 2021-03-27 10:04:30.000000000 +00:00
+ - value: 0.15249151
+ ts: 2021-03-27 10:04:29.000000000 +00:00
+ - value: 0.23597864
+ ts: 2021-03-27 10:04:28.000000000 +00:00
+ - value: 0.39651753
+ ts: 2021-03-27 10:04:27.000000000 +00:00
+ - value: 0.10429788
+ ts: 2021-03-27 10:04:26.000000000 +00:00
+ - value: 0.06882056
+ ts: 2021-03-27 10:04:25.000000000 +00:00
+ - value: 0.19013408
+ ts: 2021-03-27 10:04:24.000000000 +00:00
+ - value: -0.01126829
+ ts: 2021-03-27 10:04:23.000000000 +00:00
+ - value: -0.29163609
+ ts: 2021-03-27 10:04:22.000000000 +00:00
+ - value: -0.67513904
+ ts: 2021-03-27 10:04:21.000000000 +00:00
+ - value: -0.05174544
+ ts: 2021-03-27 10:04:20.000000000 +00:00
+ - value: 0.0721371
+ ts: 2021-03-27 10:04:19.000000000 +00:00
+ - value: 0.15532987
+ ts: 2021-03-27 10:04:18.000000000 +00:00
+ - value: 0.19266578
+ ts: 2021-03-27 10:04:17.000000000 +00:00
+ - value: -0.24413611
+ ts: 2021-03-27 10:04:16.000000000 +00:00
+ - value: 0.10018183
+ ts: 2021-03-27 10:04:15.000000000 +00:00
+ - value: 0.21174122
+ ts: 2021-03-27 10:04:14.000000000 +00:00
+ - value: 0.22023314
+ ts: 2021-03-27 10:04:13.000000000 +00:00
+ - value: -0.00448408
+ ts: 2021-03-27 10:04:12.000000000 +00:00
+ - value: 0.20211811
+ ts: 2021-03-27 10:04:11.000000000 +00:00
+ - value: -0.50024517
+ ts: 2021-03-27 10:04:10.000000000 +00:00
+ - value: 0.27746423
+ ts: 2021-03-27 10:04:09.000000000 +00:00
+ - value: -0.0179298
+ ts: 2021-03-27 10:04:08.000000000 +00:00
+ - value: -0.5873403
+ ts: 2021-03-27 10:04:07.000000000 +00:00
+ - value: -0.39744056
+ ts: 2021-03-27 10:04:06.000000000 +00:00
+ - value: -0.25649493
+ ts: 2021-03-27 10:04:05.000000000 +00:00
+ - value: -0.15968709
+ ts: 2021-03-27 10:04:04.000000000 +00:00
+ - value: 0.22389733
+ ts: 2021-03-27 10:04:03.000000000 +00:00
+ - value: 0.15472318
+ ts: 2021-03-27 10:04:02.000000000 +00:00
+ - value: 0.05035288
+ ts: 2021-03-27 10:04:01.000000000 +00:00
+ - value: 0.00277347
+ ts: 2021-03-27 10:04:00.000000000 +00:00
+ - value: 0.11696524
+ ts: 2021-03-27 10:03:59.000000000 +00:00
+ - value: -0.09780848
+ ts: 2021-03-27 10:03:58.000000000 +00:00
+ - value: -0.13055743
+ ts: 2021-03-27 10:03:57.000000000 +00:00
+ - value: 0.13359021
+ ts: 2021-03-27 10:03:56.000000000 +00:00
+ - value: 0.14726357
+ ts: 2021-03-27 10:03:55.000000000 +00:00
+ - value: 0.26024718
+ ts: 2021-03-27 10:03:54.000000000 +00:00
+ - value: 0.5660084
+ ts: 2021-03-27 10:03:53.000000000 +00:00
+ - value: 0.38763186
+ ts: 2021-03-27 10:03:52.000000000 +00:00
+ - value: 0.28120044
+ ts: 2021-03-27 10:03:51.000000000 +00:00
+ - value: 0.11201044
+ ts: 2021-03-27 10:03:50.000000000 +00:00
+ - value: -0.45718215
+ ts: 2021-03-27 10:03:49.000000000 +00:00
+ - value: -0.67958382
+ ts: 2021-03-27 10:03:48.000000000 +00:00
+ - value: 0.11974918
+ ts: 2021-03-27 10:03:47.000000000 +00:00
+ - value: 0.08011666
+ ts: 2021-03-27 10:03:46.000000000 +00:00
+ - value: 0.18257533
+ ts: 2021-03-27 10:03:45.000000000 +00:00
+ - value: 0.07193061
+ ts: 2021-03-27 10:03:44.000000000 +00:00
+ - value: -0.25326628
+ ts: 2021-03-27 10:03:43.000000000 +00:00
+ - value: 0.04084708
+ ts: 2021-03-27 10:03:42.000000000 +00:00
+ - value: 0.25934208
+ ts: 2021-03-27 10:03:41.000000000 +00:00
+ - value: -0.05630065
+ ts: 2021-03-27 10:03:40.000000000 +00:00
+ - value: 0.15689163
+ ts: 2021-03-27 10:03:39.000000000 +00:00
+ - value: 0.00732533
+ ts: 2021-03-27 10:03:38.000000000 +00:00
+ - value: 0.08859657
+ ts: 2021-03-27 10:03:37.000000000 +00:00
+ - value: -0.05334124
+ ts: 2021-03-27 10:03:36.000000000 +00:00
+ - value: -0.21323114
+ ts: 2021-03-27 10:03:35.000000000 +00:00
+ - value: -0.37208657
+ ts: 2021-03-27 10:03:34.000000000 +00:00
+ - value: -0.28821975
+ ts: 2021-03-27 10:03:33.000000000 +00:00
+ - value: -0.12745628
+ ts: 2021-03-27 10:03:32.000000000 +00:00
+ - value: 0.25228564
+ ts: 2021-03-27 10:03:31.000000000 +00:00
+ - value: -0.03866218
+ ts: 2021-03-27 10:03:30.000000000 +00:00
+ - value: 0.04389363
+ ts: 2021-03-27 10:03:29.000000000 +00:00
+ - value: 0.15231172
+ ts: 2021-03-27 10:03:28.000000000 +00:00
+ - value: 0.01939238
+ ts: 2021-03-27 10:03:27.000000000 +00:00
+ - value: -0.10628556
+ ts: 2021-03-27 10:03:26.000000000 +00:00
+ - value: -0.04799538
+ ts: 2021-03-27 10:03:25.000000000 +00:00
+ - value: 0.01708577
+ ts: 2021-03-27 10:03:24.000000000 +00:00
+ - value: 0.14325628
+ ts: 2021-03-27 10:03:23.000000000 +00:00
+ - value: 0.23046122
+ ts: 2021-03-27 10:03:22.000000000 +00:00
+ - value: 0.18104727
+ ts: 2021-03-27 10:03:21.000000000 +00:00
+ - value: -0.01147001
+ ts: 2021-03-27 10:03:20.000000000 +00:00
+ - value: -0.04751481
+ ts: 2021-03-27 10:03:19.000000000 +00:00
+ - value: 0.07575065
+ ts: 2021-03-27 10:03:18.000000000 +00:00
+ - value: -0.1431376
+ ts: 2021-03-27 10:03:17.000000000 +00:00
+ - value: -0.15616356
+ ts: 2021-03-27 10:03:16.000000000 +00:00
+ - value: -0.40525907
+ ts: 2021-03-27 10:03:15.000000000 +00:00
+ - value: -0.30711318
+ ts: 2021-03-27 10:03:14.000000000 +00:00
+ - value: -0.17885588
+ ts: 2021-03-27 10:03:13.000000000 +00:00
+ - value: 0.15619242
+ ts: 2021-03-27 10:03:12.000000000 +00:00
+ - value: -0.21354664
+ ts: 2021-03-27 10:03:11.000000000 +00:00
+ - value: 0.19774871
+ ts: 2021-03-27 10:03:10.000000000 +00:00
+ - value: 0.22616617
+ ts: 2021-03-27 10:03:09.000000000 +00:00
+ - value: 0.18148031
+ ts: 2021-03-27 10:03:08.000000000 +00:00
+ - value: 0.12292713
+ ts: 2021-03-27 10:03:07.000000000 +00:00
+ - value: 0.08368422
+ ts: 2021-03-27 10:03:06.000000000 +00:00
+ - value: -0.28989487
+ ts: 2021-03-27 10:03:05.000000000 +00:00
+ - value: 0.16238836
+ ts: 2021-03-27 10:03:04.000000000 +00:00
+ - value: -0.25830222
+ ts: 2021-03-27 10:03:03.000000000 +00:00
+ - value: -0.21175142
+ ts: 2021-03-27 10:03:02.000000000 +00:00
+ - value: 0.09431463
+ ts: 2021-03-27 10:03:01.000000000 +00:00
+ - value: 0.2471717
+ ts: 2021-03-27 10:03:00.000000000 +00:00
+ - value: -0.11059381
+ ts: 2021-03-27 10:02:59.000000000 +00:00
+ - value: 0.26267507
+ ts: 2021-03-27 10:02:58.000000000 +00:00
+ - value: 0.11911782
+ ts: 2021-03-27 10:02:57.000000000 +00:00
+ - value: -0.24754273
+ ts: 2021-03-27 10:02:56.000000000 +00:00
+ - value: 0.11947952
+ ts: 2021-03-27 10:02:55.000000000 +00:00
+ - value: 0.12581204
+ ts: 2021-03-27 10:02:54.000000000 +00:00
+ - value: 0.1910443
+ ts: 2021-03-27 10:02:53.000000000 +00:00
+ - value: -0.15786109
+ ts: 2021-03-27 10:02:52.000000000 +00:00
+ - value: -0.21117778
+ ts: 2021-03-27 10:02:51.000000000 +00:00
+ - value: -0.0672531
+ ts: 2021-03-27 10:02:50.000000000 +00:00
+ - value: -0.05650282
+ ts: 2021-03-27 10:02:49.000000000 +00:00
+ - value: 0.1110385
+ ts: 2021-03-27 10:02:48.000000000 +00:00
+ - value: -0.08268513
+ ts: 2021-03-27 10:02:47.000000000 +00:00
+ - value: 0.23462559
+ ts: 2021-03-27 10:02:46.000000000 +00:00
+ - value: -0.05507114
+ ts: 2021-03-27 10:02:45.000000000 +00:00
+ - value: -0.15787115
+ ts: 2021-03-27 10:02:44.000000000 +00:00
+ - value: 0.14441339
+ ts: 2021-03-27 10:02:43.000000000 +00:00
+ - value: -0.08399179
+ ts: 2021-03-27 10:02:42.000000000 +00:00
+ - value: 0.10739738
+ ts: 2021-03-27 10:02:41.000000000 +00:00
+ - value: -0.41535109
+ ts: 2021-03-27 10:02:40.000000000 +00:00
+ - value: -0.31932152
+ ts: 2021-03-27 10:02:39.000000000 +00:00
+ - value: -0.21605058
+ ts: 2021-03-27 10:02:38.000000000 +00:00
+ - value: 0.01678233
+ ts: 2021-03-27 10:02:37.000000000 +00:00
+ - value: 0.30640632
+ ts: 2021-03-27 10:02:36.000000000 +00:00
+ - value: -0.12009007
+ ts: 2021-03-27 10:02:35.000000000 +00:00
+ - value: 0.66444788
+ ts: 2021-03-27 10:02:34.000000000 +00:00
+ - value: 0.10132235
+ ts: 2021-03-27 10:02:33.000000000 +00:00
+ - value: 0.10509358
+ ts: 2021-03-27 10:02:32.000000000 +00:00
+ - value: 0.27123875
+ ts: 2021-03-27 10:02:31.000000000 +00:00
+ - value: -0.06330581
+ ts: 2021-03-27 10:02:30.000000000 +00:00
+ - value: -0.1347962
+ ts: 2021-03-27 10:02:29.000000000 +00:00
+ - value: -0.13042421
+ ts: 2021-03-27 10:02:28.000000000 +00:00
+ - value: -0.09683936
+ ts: 2021-03-27 10:02:27.000000000 +00:00
+ - value: -0.17601315
+ ts: 2021-03-27 10:02:26.000000000 +00:00
+ - value: -0.24581954
+ ts: 2021-03-27 10:02:25.000000000 +00:00
+ - value: -0.16883483
+ ts: 2021-03-27 10:02:24.000000000 +00:00
+ - value: 0.39559855
+ ts: 2021-03-27 10:02:23.000000000 +00:00
+ - value: 0.44106624
+ ts: 2021-03-27 10:02:22.000000000 +00:00
+ - value: 0.37676111
+ ts: 2021-03-27 10:02:21.000000000 +00:00
+ - value: 0.42935275
+ ts: 2021-03-27 10:02:20.000000000 +00:00
+ - value: 0.08312887
+ ts: 2021-03-27 10:02:19.000000000 +00:00
+ - value: -0.34378471
+ ts: 2021-03-27 10:02:18.000000000 +00:00
+ - value: -0.47750762
+ ts: 2021-03-27 10:02:17.000000000 +00:00
+ - value: -0.61536813
+ ts: 2021-03-27 10:02:16.000000000 +00:00
+ - value: -0.34482285
+ ts: 2021-03-27 10:02:15.000000000 +00:00
+ - value: -0.10703624
+ ts: 2021-03-27 10:02:14.000000000 +00:00
+ - value: 0.00401613
+ ts: 2021-03-27 10:02:13.000000000 +00:00
+ - value: 0.18185962
+ ts: 2021-03-27 10:02:12.000000000 +00:00
+ - value: 0.27422463
+ ts: 2021-03-27 10:02:11.000000000 +00:00
+ - value: 0.50762391
+ ts: 2021-03-27 10:02:10.000000000 +00:00
+ - value: 0.15252521
+ ts: 2021-03-27 10:02:09.000000000 +00:00
+ - value: 0.15432331
+ ts: 2021-03-27 10:02:08.000000000 +00:00
+ - value: -0.09364134
+ ts: 2021-03-27 10:02:07.000000000 +00:00
+ - value: 0.0577043
+ ts: 2021-03-27 10:02:06.000000000 +00:00
+ - value: -0.22138561
+ ts: 2021-03-27 10:02:05.000000000 +00:00
+ - value: -0.37461312
+ ts: 2021-03-27 10:02:04.000000000 +00:00
+ - value: -0.32289634
+ ts: 2021-03-27 10:02:03.000000000 +00:00
+ - value: -0.14393822
+ ts: 2021-03-27 10:02:02.000000000 +00:00
+ - value: -0.15907764
+ ts: 2021-03-27 10:02:01.000000000 +00:00
+ - value: -0.2274259
+ ts: 2021-03-27 10:02:00.000000000 +00:00
+ - value: 0.05288584
+ ts: 2021-03-27 10:01:59.000000000 +00:00
+ - value: -0.31576816
+ ts: 2021-03-27 10:01:58.000000000 +00:00
+ - value: 0.24783795
+ ts: 2021-03-27 10:01:57.000000000 +00:00
+ - value: 0.38834088
+ ts: 2021-03-27 10:01:56.000000000 +00:00
+ - value: 0.30450363
+ ts: 2021-03-27 10:01:55.000000000 +00:00
+ - value: 0.22997669
+ ts: 2021-03-27 10:01:54.000000000 +00:00
+ - value: 0.5060297
+ ts: 2021-03-27 10:01:53.000000000 +00:00
+ - value: -0.47205485
+ ts: 2021-03-27 10:01:52.000000000 +00:00
+ - value: -0.22265888
+ ts: 2021-03-27 10:01:51.000000000 +00:00
+ - value: -0.35602159
+ ts: 2021-03-27 10:01:50.000000000 +00:00
+ - value: 0.14256561
+ ts: 2021-03-27 10:01:49.000000000 +00:00
+ - value: 0.05794399
+ ts: 2021-03-27 10:01:48.000000000 +00:00
+ - value: 0.12445221
+ ts: 2021-03-27 10:01:47.000000000 +00:00
+ - value: -0.00800535
+ ts: 2021-03-27 10:01:46.000000000 +00:00
+ - value: 0.52308899
+ ts: 2021-03-27 10:01:45.000000000 +00:00
+ - value: 0.28108018
+ ts: 2021-03-27 10:01:44.000000000 +00:00
+ - value: 0.1381706
+ ts: 2021-03-27 10:01:43.000000000 +00:00
+ - value: 0.10457133
+ ts: 2021-03-27 10:01:42.000000000 +00:00
+ - value: -0.14416671
+ ts: 2021-03-27 10:01:41.000000000 +00:00
+ - value: -0.7470423
+ ts: 2021-03-27 10:01:40.000000000 +00:00
+ - value: -0.36806845
+ ts: 2021-03-27 10:01:39.000000000 +00:00
+ - value: -0.06185329
+ ts: 2021-03-27 10:01:38.000000000 +00:00
+ - value: -0.03049741
+ ts: 2021-03-27 10:01:37.000000000 +00:00
+ - value: -0.11235032
+ ts: 2021-03-27 10:01:36.000000000 +00:00
+ - value: 0.13694757
+ ts: 2021-03-27 10:01:35.000000000 +00:00
+ - value: 0.68727966
+ ts: 2021-03-27 10:01:34.000000000 +00:00
+ - value: 0.33571218
+ ts: 2021-03-27 10:01:33.000000000 +00:00
+ - value: 0.28104156
+ ts: 2021-03-27 10:01:32.000000000 +00:00
+ - value: 0.00879484
+ ts: 2021-03-27 10:01:31.000000000 +00:00
+ - value: -0.27414158
+ ts: 2021-03-27 10:01:30.000000000 +00:00
+ - value: -0.38499211
+ ts: 2021-03-27 10:01:29.000000000 +00:00
+ - value: -0.06998017
+ ts: 2021-03-27 10:01:28.000000000 +00:00
+ - value: -0.19099832
+ ts: 2021-03-27 10:01:27.000000000 +00:00
+ - value: -0.00477517
+ ts: 2021-03-27 10:01:26.000000000 +00:00
+ - value: 0.15645964
+ ts: 2021-03-27 10:01:25.000000000 +00:00
+ - value: -0.10551433
+ ts: 2021-03-27 10:01:24.000000000 +00:00
+ - value: -0.11339974
+ ts: 2021-03-27 10:01:23.000000000 +00:00
+ - value: -0.07025097
+ ts: 2021-03-27 10:01:22.000000000 +00:00
+ - value: 0.33768272
+ ts: 2021-03-27 10:01:21.000000000 +00:00
+ - value: 0.30251329
+ ts: 2021-03-27 10:01:20.000000000 +00:00
+ - value: 0.03475898
+ ts: 2021-03-27 10:01:19.000000000 +00:00
+ - value: -0.22368502
+ ts: 2021-03-27 10:01:18.000000000 +00:00
+ - value: -0.40785327
+ ts: 2021-03-27 10:01:17.000000000 +00:00
+ - value: 0.24384097
+ ts: 2021-03-27 10:01:16.000000000 +00:00
+ - value: -0.20648251
+ ts: 2021-03-27 10:01:15.000000000 +00:00
+ - value: -0.0695647
+ ts: 2021-03-27 10:01:14.000000000 +00:00
+ - value: -0.00950228
+ ts: 2021-03-27 10:01:13.000000000 +00:00
+ - value: 0.14735141
+ ts: 2021-03-27 10:01:12.000000000 +00:00
+ - value: -0.23278713
+ ts: 2021-03-27 10:01:11.000000000 +00:00
+ - value: -0.09189152
+ ts: 2021-03-27 10:01:10.000000000 +00:00
+ - value: 0.06986562
+ ts: 2021-03-27 10:01:09.000000000 +00:00
+ - value: 0.16851966
+ ts: 2021-03-27 10:01:08.000000000 +00:00
+ - value: 0.02459582
+ ts: 2021-03-27 10:01:07.000000000 +00:00
+ - value: -0.42001771
+ ts: 2021-03-27 10:01:06.000000000 +00:00
+ - value: -0.13879603
+ ts: 2021-03-27 10:01:05.000000000 +00:00
+ - value: 0.05828816
+ ts: 2021-03-27 10:01:04.000000000 +00:00
+ - value: 0.14071903
+ ts: 2021-03-27 10:01:03.000000000 +00:00
+ - value: 0.06039119
+ ts: 2021-03-27 10:01:02.000000000 +00:00
+ - value: 0.0579948
+ ts: 2021-03-27 10:01:01.000000000 +00:00
+...
diff --git a/tests/libs/zbxtrends/Makefile.am b/tests/libs/zbxtrends/Makefile.am
index ec4e190ff14..b87d5df95fe 100644
--- a/tests/libs/zbxtrends/Makefile.am
+++ b/tests/libs/zbxtrends/Makefile.am
@@ -1,6 +1,7 @@
if SERVER
SERVER_tests = \
- zbx_trends_parse_range
+ zbx_trends_parse_range \
+ zbx_baseline_get_data
endif
noinst_PROGRAMS = $(SERVER_tests)
@@ -41,4 +42,25 @@ zbx_trends_parse_range_LDFLAGS = @SERVER_LDFLAGS@ \
zbx_trends_parse_range_CFLAGS = $(COMMON_COMPILER_FLAGS)
+# zbx_baseline_get_data
+
+zbx_baseline_get_data_SOURCES = \
+ zbx_baseline_get_data.c \
+ $(COMMON_SRC_FILES)
+
+zbx_baseline_get_data_LDADD = \
+ $(top_srcdir)/src/libs/zbxtrends/libzbxtrends_baseline.a \
+ $(COMMON_LIB_FILES)
+
+zbx_baseline_get_data_LDADD += @SERVER_LIBS@
+
+zbx_baseline_get_data_LDFLAGS = @SERVER_LDFLAGS@ \
+ -Wl,--wrap=DBfetch \
+ -Wl,--wrap=DBselect \
+ -Wl,--wrap=DBis_null \
+ -Wl,--wrap=zbx_trends_get_avg
+
+zbx_baseline_get_data_CFLAGS = $(COMMON_COMPILER_FLAGS)
+
+
endif
diff --git a/tests/libs/zbxtrends/zbx_baseline_get_data.c b/tests/libs/zbxtrends/zbx_baseline_get_data.c
new file mode 100644
index 00000000000..e9d500e01f8
--- /dev/null
+++ b/tests/libs/zbxtrends/zbx_baseline_get_data.c
@@ -0,0 +1,124 @@
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+#include "zbxmocktest.h"
+#include "zbxmockdata.h"
+#include "zbxmockassert.h"
+#include "zbxmockutil.h"
+
+#include "common.h"
+#include "zbxtrends.h"
+#include "log.h"
+
+int __wrap_DBis_null(const char *field);
+DB_ROW __wrap_DBfetch(DB_RESULT result);
+DB_RESULT __wrap_DBselect(const char *fmt, ...);
+
+int __wrap_DBis_null(const char *field)
+{
+ ZBX_UNUSED(field);
+ return SUCCEED;
+}
+
+DB_ROW __wrap_DBfetch(DB_RESULT result)
+{
+ ZBX_UNUSED(result);
+ return NULL;
+}
+
+DB_RESULT __wrap_DBselect(const char *fmt, ...)
+{
+ ZBX_UNUSED(fmt);
+ return NULL;
+}
+
+static zbx_mock_handle_t hout;
+static int iteration;
+
+zbx_trend_state_t __wrap_zbx_trends_get_avg(const char *table, zbx_uint64_t itemid, int start, int end, double *value)
+{
+ zbx_mock_handle_t htime;
+ zbx_timespec_t start_exp, end_exp, start_ret = {start, 0}, end_ret = {end, 0};
+
+ ZBX_UNUSED(table);
+ ZBX_UNUSED(itemid);
+
+ *value = 0;
+
+ printf("iteration: %d\n", ++iteration);
+
+ if (ZBX_MOCK_SUCCESS != zbx_mock_vector_element(hout, &htime))
+ fail_msg("got more data than expected");
+
+ if (ZBX_MOCK_SUCCESS != zbx_strtime_to_timespec(zbx_mock_get_object_member_string(htime, "start"), &start_exp))
+ fail_msg("invalid start time format");
+
+ if (ZBX_MOCK_SUCCESS != zbx_strtime_to_timespec(zbx_mock_get_object_member_string(htime, "end"), &end_exp))
+ fail_msg("invalid end time format");
+
+ zbx_mock_assert_timespec_eq("start time", &start_exp, &start_ret);
+ zbx_mock_assert_timespec_eq("end time", &end_exp, &end_ret);
+
+ return ZBX_TREND_STATE_NORMAL;
+}
+
+void zbx_mock_test_entry(void **state)
+{
+ zbx_timespec_t ts;
+ const char *period;
+ char *error = NULL;
+ int skip, season_num;
+ zbx_time_unit_t season_unit;
+ zbx_vector_dbl_t values;
+ zbx_vector_uint64_t index;
+ zbx_mock_handle_t handle;
+
+ ZBX_UNUSED(state);
+
+ if (0 != setenv("TZ", zbx_mock_get_parameter_string("in.timezone"), 1))
+ fail_msg("Cannot set 'TZ' environment variable: %s", zbx_strerror(errno));
+
+ tzset();
+
+ if (ZBX_MOCK_SUCCESS != zbx_strtime_to_timespec(zbx_mock_get_parameter_string("in.time"), &ts))
+ fail_msg("Invalid input time format");
+
+ period = zbx_mock_get_parameter_string("in.period");
+ season_num = atoi(zbx_mock_get_parameter_string("in.season_num"));
+ season_unit = zbx_tm_str_to_unit(zbx_mock_get_parameter_string("in.season"));
+
+ skip = atoi(zbx_mock_get_parameter_string("in.skip"));
+
+ zbx_vector_dbl_create(&values);
+ zbx_vector_uint64_create(&index);
+
+ hout = zbx_mock_get_parameter_handle("out.data");
+
+ if (FAIL == zbx_baseline_get_data(0, ITEM_VALUE_TYPE_FLOAT, ts.sec, period, season_num, season_unit, skip,
+ &values, &index, &error))
+ {
+ fail_msg("failed to get baseline data: %s", error);
+ }
+
+ zbx_vector_uint64_destroy(&index);
+ zbx_vector_dbl_destroy(&values);
+
+ if (ZBX_MOCK_END_OF_VECTOR != zbx_mock_vector_element(hout, &handle))
+ fail_msg("expected more values");
+}
diff --git a/tests/libs/zbxtrends/zbx_baseline_get_data.yaml b/tests/libs/zbxtrends/zbx_baseline_get_data.yaml
new file mode 100644
index 00000000000..cea22315944
--- /dev/null
+++ b/tests/libs/zbxtrends/zbx_baseline_get_data.yaml
@@ -0,0 +1,245 @@
+---
+test case: 2021-11-10 12:30:00 +02:00 baseline(1h:now/h, 4h, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-11-10 12:30:00 +02:00
+ period: 1h:now/h
+ season_num: 4
+ season: h
+ skip: 0
+out:
+ data:
+ - end: 2021-11-10 11:00:00 +02:00
+ start: 2021-11-10 11:00:00 +02:00
+ - end: 2021-11-10 10:00:00 +02:00
+ start: 2021-11-10 10:00:00 +02:00
+ - end: 2021-11-10 9:00:00 +02:00
+ start: 2021-11-10 9:00:00 +02:00
+ - end: 2021-11-10 8:00:00 +02:00
+ start: 2021-11-10 8:00:00 +02:00
+ - end: 2021-11-10 7:00:00 +02:00
+ start: 2021-11-10 7:00:00 +02:00
+---
+test case: 2021-11-10 12:30:00 +02:00 baseline(1h:now/h, 4h, 1)
+in:
+ timezone: :Europe/Riga
+ time: 2021-11-10 12:30:00 +02:00
+ period: 1h:now/h
+ season_num: 4
+ season: h
+ skip: 1
+out:
+ data:
+ - end: 2021-11-10 10:00:00 +02:00
+ start: 2021-11-10 10:00:00 +02:00
+ - end: 2021-11-10 9:00:00 +02:00
+ start: 2021-11-10 9:00:00 +02:00
+ - end: 2021-11-10 8:00:00 +02:00
+ start: 2021-11-10 8:00:00 +02:00
+ - end: 2021-11-10 7:00:00 +02:00
+ start: 2021-11-10 7:00:00 +02:00
+---
+test case: 2021-11-10 12:30:00 +02:00 baseline(1h:now/h, 4h, 2)
+in:
+ timezone: :Europe/Riga
+ time: 2021-11-10 12:30:00 +02:00
+ period: 1h:now/h
+ season_num: 4
+ season: h
+ skip: 2
+out:
+ data:
+ - end: 2021-11-10 9:00:00 +02:00
+ start: 2021-11-10 9:00:00 +02:00
+ - end: 2021-11-10 8:00:00 +02:00
+ start: 2021-11-10 8:00:00 +02:00
+ - end: 2021-11-10 7:00:00 +02:00
+ start: 2021-11-10 7:00:00 +02:00
+---
+test case: 2021-11-10 12:30:00 +02:00 baseline(2h:now/h, 2h, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-11-10 12:30:00 +02:00
+ period: 2h:now/h
+ season_num: 2
+ season: h
+ skip: 0
+out:
+ data:
+ - end: 2021-11-10 11:00:00 +02:00
+ start: 2021-11-10 10:00:00 +02:00
+ - end: 2021-11-10 10:00:00 +02:00
+ start: 2021-11-10 9:00:00 +02:00
+ - end: 2021-11-10 9:00:00 +02:00
+ start: 2021-11-10 8:00:00 +02:00
+---
+test case: 2021-11-10 12:30:00 +02:00 baseline(9h:now/d-6h, 2d, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-11-10 12:30:00 +02:00
+ period: 9h:now/d-6h
+ season_num: 2
+ season: d
+ skip: 0
+out:
+ data:
+ - start: 2021-11-9 9:00:00 +02:00
+ end: 2021-11-9 17:00:00 +02:00
+ - start: 2021-11-8 9:00:00 +02:00
+ end: 2021-11-8 17:00:00 +02:00
+ - start: 2021-11-7 9:00:00 +02:00
+ end: 2021-11-7 17:00:00 +02:00
+---
+test case: 2021-11-10 12:30:00 +02:00 baseline(1d:now/d, 2w, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-11-10 12:30:00 +02:00
+ period: 1d:now/d
+ season_num: 2
+ season: w
+ skip: 0
+out:
+ data:
+ - start: 2021-11-9 0:00:00 +02:00
+ end: 2021-11-9 23:00:00 +02:00
+ - start: 2021-11-2 0:00:00 +02:00
+ end: 2021-11-2 23:00:00 +02:00
+ - start: 2021-10-26 0:00:00 +03:00
+ end: 2021-10-26 23:00:00 +03:00
+---
+test case: 2021-11-10 12:30:00 +02:00 baseline(2d:now/w, 2w, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-11-10 12:30:00 +02:00
+ period: 2d:now/w
+ season_num: 2
+ season: w
+ skip: 0
+out:
+ data:
+ - start: 2021-11-6 0:00:00 +02:00
+ end: 2021-11-7 23:00:00 +02:00
+ - start: 2021-10-30 0:00:00 +03:00
+ end: 2021-10-31 23:00:00 +02:00
+ - start: 2021-10-23 0:00:00 +03:00
+ end: 2021-10-24 23:00:00 +03:00
+---
+test case: 2021-03-31 12:30:00 +02:00 baseline(1d:now/d, 2M, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-03-31 12:30:00 +02:00
+ period: 1d:now/d
+ season_num: 2
+ season: M
+ skip: 0
+out:
+ data:
+ - start: 2021-03-30 0:00:00 +03:00
+ end: 2021-03-30 23:00:00 +03:00
+ - start: 2021-02-27 0:00:00 +02:00
+ end: 2021-02-27 23:00:00 +02:00
+ - start: 2021-01-30 0:00:00 +02:00
+ end: 2021-01-30 23:00:00 +02:00
+---
+test case: 2021-03-31 12:30:00 +02:00 baseline(1M:now/M, 2M, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-03-31 12:30:00 +02:00
+ period: 1M:now/M
+ season_num: 2
+ season: M
+ skip: 0
+out:
+ data:
+ - start: 2021-02-01 0:00:00 +02:00
+ end: 2021-02-28 23:00:00 +02:00
+ - start: 2021-01-01 0:00:00 +02:00
+ end: 2021-01-31 23:00:00 +02:00
+ - start: 2020-12-01 0:00:00 +02:00
+ end: 2020-12-31 23:00:00 +02:00
+---
+test case: 2021-03-31 12:30:00 +02:00 baseline(1M:now/M, 2y, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-03-31 12:30:00 +02:00
+ period: 1M:now/M
+ season_num: 2
+ season: y
+ skip: 0
+out:
+ data:
+ - start: 2021-02-01 0:00:00 +02:00
+ end: 2021-02-28 23:00:00 +02:00
+ - start: 2020-02-01 0:00:00 +02:00
+ end: 2020-02-29 23:00:00 +02:00
+ - start: 2019-02-01 0:00:00 +02:00
+ end: 2019-02-28 23:00:00 +02:00
+---
+test case: 2021-03-31 12:30:00 +02:00 baseline(1y:now/y, 2y, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-03-31 12:30:00 +02:00
+ period: 1y:now/y
+ season_num: 2
+ season: y
+ skip: 0
+out:
+ data:
+ - start: 2020-01-01 0:00:00 +02:00
+ end: 2020-12-31 23:00:00 +02:00
+ - start: 2019-01-01 0:00:00 +02:00
+ end: 2019-12-31 23:00:00 +02:00
+ - start: 2018-01-01 0:00:00 +02:00
+ end: 2018-12-31 23:00:00 +02:00
+---
+test case: 2021-11-11 12:30:00 +02:00 baseline(1w:now/w, 2y, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-11-11 12:30:00 +02:00
+ period: 1w:now/w
+ season_num: 2
+ season: y
+ skip: 0
+out:
+ data:
+ - start: 2021-11-01 0:00:00 +02:00
+ end: 2021-11-07 23:00:00 +02:00
+ - start: 2020-10-26 0:00:00 +02:00
+ end: 2020-11-01 23:00:00 +02:00
+ - start: 2019-10-28 0:00:00 +02:00
+ end: 2019-11-03 23:00:00 +02:00
+---
+test case: 2021-01-11 12:30:00 +02:00 baseline(1w:now/w, 2y, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-01-11 12:30:00 +02:00
+ period: 1w:now/w
+ season_num: 2
+ season: y
+ skip: 0
+out:
+ data:
+ - start: 2021-01-04 0:00:00 +02:00
+ end: 2021-01-10 23:00:00 +02:00
+ - start: 2019-12-30 0:00:00 +02:00
+ end: 2020-01-05 23:00:00 +02:00
+ - start: 2018-12-31 0:00:00 +02:00
+ end: 2019-01-06 23:00:00 +02:00
+---
+test case: 2021-01-10 12:30:00 +02:00 baseline(1w:now/w, 2y, 0)
+in:
+ timezone: :Europe/Riga
+ time: 2021-01-10 12:30:00 +02:00
+ period: 1w:now/w
+ season_num: 2
+ season: y
+ skip: 0
+out:
+ data:
+ - start: 2020-12-28 0:00:00 +02:00
+ end: 2021-01-03 23:00:00 +02:00
+ - start: 2019-12-23 0:00:00 +02:00
+ end: 2019-12-29 23:00:00 +02:00
+ - start: 2018-12-24 0:00:00 +02:00
+ end: 2018-12-30 23:00:00 +02:00
+...
diff --git a/tests/mocks/valuecache/valuecache_mock.h b/tests/mocks/valuecache/valuecache_mock.h
index 606f64e4965..230157dff58 100644
--- a/tests/mocks/valuecache/valuecache_mock.h
+++ b/tests/mocks/valuecache/valuecache_mock.h
@@ -34,8 +34,6 @@ typedef struct
}
zbx_vcmock_ds_t;
-unsigned char zbx_mock_str_to_value_type(const char *value_type);
-
void zbx_vcmock_ds_init(void);
void zbx_vcmock_ds_destroy(void);
void zbx_vcmock_ds_dump(void);
diff --git a/tests/zbxmocktime.c b/tests/zbxmocktime.c
index dfae7bb3110..1c8c621b28e 100644
--- a/tests/zbxmocktime.c
+++ b/tests/zbxmocktime.c
@@ -254,19 +254,6 @@ static zbx_mock_error_t ts_get_tz(const char *text, int *sec, const char **pnext
/******************************************************************************
* *
- * Function: is_leap_year *
- * *
- * Return value: SUCCEED - year is a leap year *
- * FAIL - year is not a leap year *
- * *
- ******************************************************************************/
-static int is_leap_year(int year)
-{
- return 0 == year % 4 && (0 != year % 100 || 0 == year % 400) ? SUCCEED : FAIL;
-}
-
-/******************************************************************************
- * *
* Function: zbx_time_to_localtime *
* *
* Purpose: converts timestamp to a broken-down time representation and *
@@ -295,10 +282,10 @@ static zbx_mock_error_t zbx_time_to_localtime(time_t timestamp, struct tm *local
(tm_local.tm_min - tm_utc.tm_min) * SEC_PER_MIN;
while (tm_local.tm_year > tm_utc.tm_year)
- *tz_offset += (SUCCEED == is_leap_year(tm_utc.tm_year++) ? SEC_PER_YEAR + SEC_PER_DAY : SEC_PER_YEAR);
+ *tz_offset += (SUCCEED == zbx_is_leap_year(tm_utc.tm_year++) ? SEC_PER_YEAR + SEC_PER_DAY : SEC_PER_YEAR);
while (tm_local.tm_year < tm_utc.tm_year)
- *tz_offset -= (SUCCEED == is_leap_year(--tm_utc.tm_year) ? SEC_PER_YEAR + SEC_PER_DAY : SEC_PER_YEAR);
+ *tz_offset -= (SUCCEED == zbx_is_leap_year(--tm_utc.tm_year) ? SEC_PER_YEAR + SEC_PER_DAY : SEC_PER_YEAR);
*local = tm_local;
diff --git a/ui/actionconf.php b/ui/actionconf.php
index 760ed6ff81a..424be7ed4b5 100644
--- a/ui/actionconf.php
+++ b/ui/actionconf.php
@@ -81,6 +81,11 @@ $fields = [
null,
_('Pause operations for suppressed problems')
],
+ 'notify_if_canceled' => [T_ZBX_STR, O_OPT, null,
+ IN([ACTION_NOTIFY_IF_CANCELED_FALSE, ACTION_NOTIFY_IF_CANCELED_TRUE]),
+ null,
+ _('Notify about canceled escalations')
+ ],
'add' => [T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null],
'update' => [T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null],
'delete' => [T_ZBX_STR, O_OPT, P_SYS|P_ACT, null, null],
@@ -248,6 +253,7 @@ if (hasRequest('add') || hasRequest('update')) {
if ($eventsource == EVENT_SOURCE_TRIGGERS) {
$action['pause_suppressed'] = getRequest('pause_suppressed', ACTION_PAUSE_SUPPRESSED_FALSE);
+ $action['notify_if_canceled'] = getRequest('notify_if_canceled', ACTION_NOTIFY_IF_CANCELED_FALSE);
}
switch ($eventsource) {
@@ -514,7 +520,9 @@ if (hasRequest('form')) {
if ($data['actionid']) {
$data['action'] = API::Action()->get([
- 'output' => ['actionid', 'name', 'eventsource', 'status', 'esc_period', 'pause_suppressed'],
+ 'output' => ['actionid', 'name', 'eventsource', 'status', 'esc_period', 'pause_suppressed',
+ 'notify_if_canceled'
+ ],
'selectFilter' => ['evaltype', 'formula', 'conditions'],
'selectOperations' => ['operationtype', 'esc_period', 'esc_step_from', 'esc_step_to', 'evaltype',
'opconditions', 'opmessage', 'opmessage_grp', 'opmessage_usr', 'opcommand', 'opcommand_grp',
@@ -556,6 +564,9 @@ if (hasRequest('form')) {
if ($data['actionid'] && hasRequest('form_refresh')) {
if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) {
$data['action']['pause_suppressed'] = getRequest('pause_suppressed', ACTION_PAUSE_SUPPRESSED_FALSE);
+ $data['action']['notify_if_canceled'] = getRequest('notify_if_canceled',
+ ACTION_NOTIFY_IF_CANCELED_FALSE
+ );
}
}
else {
@@ -563,6 +574,9 @@ if (hasRequest('form')) {
$data['action']['pause_suppressed'] = getRequest('pause_suppressed',
hasRequest('form_refresh') ? ACTION_PAUSE_SUPPRESSED_FALSE : ACTION_PAUSE_SUPPRESSED_TRUE
);
+ $data['action']['notify_if_canceled'] = getRequest('notify_if_canceled',
+ hasRequest('form_refresh') ? ACTION_NOTIFY_IF_CANCELED_FALSE : ACTION_NOTIFY_IF_CANCELED_TRUE
+ );
}
}
}
diff --git a/ui/app/controllers/CControllerHintboxEventlist.php b/ui/app/controllers/CControllerHintboxEventlist.php
index 49299955099..221e6673593 100644
--- a/ui/app/controllers/CControllerHintboxEventlist.php
+++ b/ui/app/controllers/CControllerHintboxEventlist.php
@@ -75,7 +75,7 @@ class CControllerHintboxEventlist extends CController {
foreach ($filter_tags as $filter_tag) {
$fields = [
'tag' => 'required|string',
- 'operator' => 'required|in '.implode(',', [TAG_OPERATOR_EQUAL, TAG_OPERATOR_LIKE]),
+ 'operator' => 'required|in '.implode(',', [TAG_OPERATOR_LIKE, TAG_OPERATOR_EQUAL, TAG_OPERATOR_NOT_LIKE, TAG_OPERATOR_NOT_EQUAL, TAG_OPERATOR_EXISTS, TAG_OPERATOR_NOT_EXISTS]),
'value' => 'required|string'
];
diff --git a/ui/app/controllers/CControllerHostUpdate.php b/ui/app/controllers/CControllerHostUpdate.php
index bb4f054e93f..d1aed0ace6e 100644
--- a/ui/app/controllers/CControllerHostUpdate.php
+++ b/ui/app/controllers/CControllerHostUpdate.php
@@ -75,6 +75,11 @@ class CControllerHostUpdate extends CControllerHostUpdateGeneral {
$inventory_enabled = true;
}
+ $clear_templates = array_diff(
+ $this->getInput('clear_templates', []),
+ $this->getInput('add_templates', [])
+ );
+
$host = [
'hostid' => $this->host['hostid'],
'host' => $this->getInput('host', $this->host['host']),
@@ -87,7 +92,7 @@ class CControllerHostUpdate extends CControllerHostUpdateGeneral {
'templates' => $this->processTemplates([
$this->getInput('add_templates', []), $this->getInput('templates', [])
]),
- 'templates_clear' => zbx_toObject($this->getInput('clear_templates', []), 'templateid'),
+ 'templates_clear' => zbx_toObject($clear_templates, 'templateid'),
'macros' => $this->processUserMacros($this->getInput('macros', [])),
'inventory' => $inventory_enabled ? $this->getInput('host_inventory', []) : [],
'tls_connect' => $this->getInput('tls_connect', $this->host['tls_connect']),
diff --git a/ui/app/controllers/CControllerPopupMassupdateTemplate.php b/ui/app/controllers/CControllerPopupMassupdateTemplate.php
index d3776b07b48..8b173f7d7de 100644
--- a/ui/app/controllers/CControllerPopupMassupdateTemplate.php
+++ b/ui/app/controllers/CControllerPopupMassupdateTemplate.php
@@ -206,7 +206,7 @@ class CControllerPopupMassupdateTemplate extends CControllerPopupMassupdateAbstr
? array_column($template['parentTemplates'], 'templateid')
: [];
- switch ($this->hasInput('mass_action_tpls')) {
+ switch ($this->getInput('mass_action_tpls')) {
case ZBX_ACTION_ADD:
$template['templates'] = array_unique(
array_merge($parent_templateids, $this->getInput('linked_templates', []))
@@ -215,6 +215,7 @@ class CControllerPopupMassupdateTemplate extends CControllerPopupMassupdateAbstr
case ZBX_ACTION_REPLACE:
$template['templates'] = $this->getInput('linked_templates', []);
+
if ($this->getInput('mass_clear_tpls', 0)) {
$template['templates_clear'] = array_unique(
array_diff($parent_templateids, $this->getInput('linked_templates', []))
@@ -226,6 +227,7 @@ class CControllerPopupMassupdateTemplate extends CControllerPopupMassupdateAbstr
$template['templates'] = array_unique(
array_diff($parent_templateids, $this->getInput('linked_templates', []))
);
+
if ($this->getInput('mass_clear_tpls', 0)) {
$template['templates_clear'] = array_unique($this->getInput('linked_templates', []));
}
@@ -344,8 +346,12 @@ class CControllerPopupMassupdateTemplate extends CControllerPopupMassupdateAbstr
DBend($result);
if ($result) {
+ $output = [
+ 'title' => _('Templates updated'),
+ 'script_inline' => (new CScriptTag('sessionStorage.removeItem("cb_templates");'))->toString()
+ ];
$messages = CMessageHelper::getMessages();
- $output = ['title' => _('Templates updated')];
+
if (count($messages)) {
$output['messages'] = array_column($messages, 'message');
}
diff --git a/ui/app/controllers/CControllerPopupTriggerExpr.php b/ui/app/controllers/CControllerPopupTriggerExpr.php
index 0bd90919dd1..6fa6352bcf1 100644
--- a/ui/app/controllers/CControllerPopupTriggerExpr.php
+++ b/ui/app/controllers/CControllerPopupTriggerExpr.php
@@ -42,6 +42,7 @@ class CControllerPopupTriggerExpr extends CController {
private $functions = [];
private $operators = ['=', '<>', '>', '<', '>=', '<='];
private $period_optional = [];
+ private $period_seasons = [];
protected function init() {
$this->disableSIDvalidation();
@@ -98,6 +99,36 @@ class CControllerPopupTriggerExpr extends CController {
]
];
+ $this->period_seasons = [
+ 'last' => [
+ 'C' => _('Period').' (T)',
+ 'T' => T_ZBX_INT,
+ 'A' => true
+ ],
+ 'period_shift' => [
+ 'C' => _('Period shift'),
+ 'T' => T_ZBX_INT,
+ 'A' => true
+ ],
+ 'season_unit' => [
+ 'C' => _('Season'),
+ 'T' => T_ZBX_STR,
+ 'A' => true,
+ 'options' => [
+ 'h' => _('Hour'),
+ 'd' => _('Day'),
+ 'w' => _('Week'),
+ 'M' => _("Month"),
+ 'y' => _('Year')
+ ]
+ ],
+ 'num_seasons' => [
+ 'C' => _('Number of seasons'),
+ 'T' => T_ZBX_INT,
+ 'A' => true
+ ]
+ ];
+
$this->param1Sec = [
'last' => [
'C' => _('Last of').' (T)',
@@ -1016,6 +1047,20 @@ class CControllerPopupTriggerExpr extends CController {
'allowed_types' => $this->allowedTypesNumeric,
'operators' => $this->operators
],
+ 'baselinedev' => [
+ 'types' => [ZBX_FUNCTION_TYPE_HISTORY],
+ 'description' => _('baselinedev() - Returns the number of deviations between data periods in seasons and the last data period'),
+ 'params' => $this->period_seasons,
+ 'allowed_types' => $this->allowedTypesNumeric,
+ 'operators' => $this->operators
+ ],
+ 'baselinewma' => [
+ 'types' => [ZBX_FUNCTION_TYPE_HISTORY],
+ 'description' => _('baselinewma() - Calculates baseline by averaging data periods in seasons'),
+ 'params' => $this->period_seasons,
+ 'allowed_types' => $this->allowedTypesNumeric,
+ 'operators' => $this->operators
+ ],
'trendcount' => [
'types' => [ZBX_FUNCTION_TYPE_HISTORY],
'description' => _('trendcount() - Number of successfully retrieved values for period T'),
@@ -1037,6 +1082,49 @@ class CControllerPopupTriggerExpr extends CController {
'allowed_types' => $this->allowedTypesNumeric,
'operators' => $this->operators
],
+ 'trendstl' => [
+ 'types' => [ZBX_FUNCTION_TYPE_HISTORY],
+ 'description' => _('trendstl() - Anomaly detection for period T'),
+ 'params' => [
+ 'last' => [
+ 'C' => _('Evaluation period').' (T)',
+ 'T' => T_ZBX_INT,
+ 'A' => true
+ ],
+ 'period_shift' => [
+ 'C' => _('Period shift'),
+ 'T' => T_ZBX_INT,
+ 'A' => true
+ ],
+ 'detect_period' => [
+ 'C' => _('Detection period'),
+ 'T' => T_ZBX_STR,
+ 'A' => true
+ ],
+ 'season' => [
+ 'C' => _('Season'),
+ 'T' => T_ZBX_INT,
+ 'A' => true
+ ],
+ 'deviations' => [
+ 'C' => _('Deviations'),
+ 'T' => T_ZBX_DBL,
+ 'A' => false
+ ],
+ 'algorithm' => [
+ 'C' => _('Algorithm'),
+ 'T' => T_ZBX_STR,
+ 'A' => false
+ ],
+ 'season_window' => [
+ 'C' => _('Season deviation window'),
+ 'T' => T_ZBX_INT,
+ 'A' => false
+ ]
+ ],
+ 'allowed_types' => $this->allowedTypesNumeric,
+ 'operators' => $this->operators
+ ],
'trendsum' => [
'types' => [ZBX_FUNCTION_TYPE_HISTORY],
'description' => _('trendsum() - Sum of values of a period T with exact period shift'),
@@ -1399,13 +1487,22 @@ class CControllerPopupTriggerExpr extends CController {
}
elseif ($data['item_description']) {
// Quote function string parameters.
- foreach ($data['params'] as $param_key => $param) {
- if (!in_array($param_key, ['v', 'o', 'chars', 'fit', 'mode', 'pattern', 'replace', 'string'])
- || !array_key_exists($param_key, $data['params'])
- || $data['params'][$param_key] === '') {
- continue;
- }
+ $quote_params = [
+ 'algorithm',
+ 'chars',
+ 'fit',
+ 'mode',
+ 'o',
+ 'pattern',
+ 'replace',
+ 'season_unit',
+ 'string',
+ 'v'
+ ];
+ $quote_params = array_intersect_key($data['params'], array_fill_keys($quote_params, ''));
+ $quote_params = array_filter($quote_params, 'strlen');
+ foreach ($quote_params as $param_key => $param) {
$data['params'][$param_key] = quoteFunctionParam($param, true);
}
diff --git a/ui/app/controllers/CControllerWidgetSvgGraphView.php b/ui/app/controllers/CControllerWidgetSvgGraphView.php
index 12752851836..273e1f7df89 100644
--- a/ui/app/controllers/CControllerWidgetSvgGraphView.php
+++ b/ui/app/controllers/CControllerWidgetSvgGraphView.php
@@ -51,7 +51,7 @@ class CControllerWidgetSvgGraphView extends CControllerWidget {
$height = (int) $this->getInput('content_height', self::GRAPH_HEIGHT_MIN);
$preview = (bool) $this->getInput('preview', 0); // Configuration preview.
- $parser = new CNumberParser(['with_suffix' => true]);
+ $parser = new CNumberParser(['with_size_suffix' => true, 'with_time_suffix' => true]);
$lefty_min = $parser->parse($fields['lefty_min']) == CParser::PARSE_SUCCESS ? $parser->calcValue() : '';
$lefty_max = $parser->parse($fields['lefty_max']) == CParser::PARSE_SUCCESS ? $parser->calcValue() : '';
$righty_min = $parser->parse($fields['righty_min']) == CParser::PARSE_SUCCESS ? $parser->calcValue() : '';
diff --git a/ui/app/partials/administration.system.info.php b/ui/app/partials/administration.system.info.php
index b0a6dc7f0fc..01a7f0baffd 100644
--- a/ui/app/partials/administration.system.info.php
+++ b/ui/app/partials/administration.system.info.php
@@ -115,10 +115,10 @@ if ($data['user_type'] == USER_TYPE_SUPER_ADMIN) {
}
}
-// Warn if database history $info_tables have not been upgraded.
+// Warn if database history tables have not been upgraded.
if (!$data['system_info']['float_double_precision']) {
$info_table->addRow([
- _('Database history $info_tables upgraded'),
+ _('Database history tables upgraded'),
(new CSpan(_('No')))->addClass(ZBX_STYLE_RED),
''
]);
diff --git a/ui/app/partials/configuration.host.edit.html.php b/ui/app/partials/configuration.host.edit.html.php
index 63ac4daebf9..0226d8e8cf9 100644
--- a/ui/app/partials/configuration.host.edit.html.php
+++ b/ui/app/partials/configuration.host.edit.html.php
@@ -100,6 +100,119 @@ $host_tab = (new CFormGrid())
(new CTextBox('visiblename', $data['host']['visiblename'], $host_is_discovered, DB::getFieldLength('hosts', 'name')))
->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
)
+ ]);
+
+$templates_field_items = [];
+
+if ($host_is_discovered) {
+ if ($data['host']['parentTemplates']) {
+ $linked_templates = (new CTable())
+ ->setHeader([_('Name')])
+ ->setId('linked-templates')
+ ->addClass(ZBX_STYLE_TABLE_FORMS)
+ ->addStyle('width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px;');
+
+ foreach ($data['host']['parentTemplates'] as $template) {
+ if ($data['allowed_ui_conf_templates']
+ && array_key_exists($template['templateid'], $data['editable_templates'])) {
+ $template_link = (new CLink($template['name'],
+ (new CUrl('templates.php'))
+ ->setArgument('form','update')
+ ->setArgument('templateid', $template['templateid'])
+ ))->setTarget('_blank');
+ }
+ else {
+ $template_link = new CSpan($template['name']);
+ }
+
+ $linked_templates->addRow(
+ (new CCol([
+ $template_link,
+ (new CVar('templates[' . $template['templateid'] . ']', $template['templateid']))->removeId()
+ ]))
+ ->addClass(ZBX_STYLE_WORDWRAP)
+ ->addStyle('max-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
+ );
+ }
+
+ $templates_field_items[] = $linked_templates;
+ }
+}
+else {
+ if ($data['host']['parentTemplates']) {
+ $linked_templates = (new CTable())
+ ->setHeader([_('Name'), _('Action')])
+ ->setId('linked-templates')
+ ->addClass(ZBX_STYLE_TABLE_FORMS)
+ ->addStyle('width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px;');
+
+ foreach ($data['host']['parentTemplates'] as $template) {
+ if ($data['allowed_ui_conf_templates']
+ && array_key_exists($template['templateid'], $data['editable_templates'])) {
+ $template_link = (new CLink($template['name'],
+ (new CUrl('templates.php'))
+ ->setArgument('form','update')
+ ->setArgument('templateid', $template['templateid'])
+ ))->setTarget('_blank');
+ }
+ else {
+ $template_link = new CSpan($template['name']);
+ }
+
+ $linked_templates->addRow([
+ (new CCol([
+ $template_link,
+ (new CVar('templates[]', $template['templateid']))->removeId()
+ ]))
+ ->addClass(ZBX_STYLE_WORDWRAP)
+ ->addStyle('max-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;'),
+ (new CCol(
+ new CHorList([
+ (new CSimpleButton(_('Unlink')))
+ ->onClick('host_edit.unlinkTemplate(this)')
+ ->addClass(ZBX_STYLE_BTN_LINK),
+ $data['clone_hostid'] === null
+ ? (new CSimpleButton(_('Unlink and clear')))
+ ->onClick('host_edit.unlinkAndClearTemplate(this, '.
+ json_encode($template['templateid']).')'
+ )
+ ->addClass(ZBX_STYLE_BTN_LINK)
+ : null
+ ])
+ ))->addClass(ZBX_STYLE_NOWRAP)
+ ]);
+ }
+
+ $templates_field_items[] = $linked_templates;
+ }
+
+ $templates_field_items[] = (new CMultiSelect([
+ 'name' => 'add_templates[]',
+ 'object_name' => 'templates',
+ 'data' => array_key_exists('add_templates', $data['host'])
+ ? $data['host']['add_templates']
+ : [],
+ 'popup' => [
+ 'parameters' => [
+ 'srctbl' => 'templates',
+ 'srcfld1' => 'hostid',
+ 'srcfld2' => 'host',
+ 'dstfrm' => $host_form->getName(),
+ 'dstfld1' => 'add_templates_',
+ 'disableids' => array_column($data['host']['parentTemplates'], 'templateid')
+ ]
+ ]
+ ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH);
+}
+
+$host_tab
+ ->addItem([
+ new CLabel(_('Templates')),
+ (new CFormField(
+ (count($templates_field_items) > 1)
+ ? (new CDiv($templates_field_items))->addClass('linked-templates')
+ : $templates_field_items
+ ))
])
->addItem([
(new CLabel(_('Groups'), 'groups__ms'))->setAsteriskMark(),
@@ -116,7 +229,8 @@ $host_tab = (new CFormGrid())
'srcfld1' => 'groupid',
'dstfrm' => $host_form->getName(),
'dstfld1' => 'groups_',
- 'editable' => true
+ 'editable' => true,
+ 'disableids' => array_column($data['groups_ms'], 'id')
]
]
]))
@@ -128,8 +242,9 @@ $host_tab = (new CFormGrid())
new CLabel(_('Interfaces')),
new CFormField([
new CDiv([renderInterfaceHeaders(), $agent_interfaces, $snmp_interfaces, $jmx_interfaces, $ipmi_interfaces]),
- (!$host_is_discovered)
- ? new CDiv(
+ $host_is_discovered
+ ? null
+ : new CDiv(
(new CButton(null, _('Add')))
->addClass(ZBX_STYLE_BTN_LINK)
->setMenuPopup([
@@ -140,7 +255,6 @@ $host_tab = (new CFormGrid())
])
->setAttribute('aria-label', _('Add new interface'))
)
- : null
])
])
->addItem([
@@ -169,125 +283,6 @@ $host_tab = (new CFormGrid())
)
]);
-// Templates tab.
-$templates_tab = new CFormGrid();
-
-if ($host_is_discovered) {
- $linked_template_table = (new CTable())
- ->setHeader([_('Name')])
- ->addClass(ZBX_STYLE_TABLE_FORMS)
- ->setId('linked-template')
- ->addStyle('width: 100%;');
-
- foreach ($data['host']['parentTemplates'] as $template) {
- if ($data['allowed_ui_conf_templates']
- && array_key_exists($template['templateid'], $data['editable_templates'])) {
- $template_link = (new CLink($template['name'],
- (new CUrl('templates.php'))
- ->setArgument('form','update')
- ->setArgument('templateid', $template['templateid'])
- ))->setTarget('_blank');
- }
- else {
- $template_link = new CSpan($template['name']);
- }
-
- $linked_template_table->addRow(
- (new CCol([
- $template_link,
- (new CVar('templates[' . $template['templateid'] . ']', $template['templateid']))->removeId()
- ]))
- ->addClass(ZBX_STYLE_WORDWRAP)
- ->addStyle('max-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
- );
- }
-
- $templates_tab->addItem([
- new CLabel(_('Linked templates')),
- new CFormField(
- (new CDiv($linked_template_table))
- ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
- ->setAdaptiveWidth(ZBX_TEXTAREA_BIG_WIDTH)
- )
- ]);
-}
-else {
- $linked_template_table = (new CTable())
- ->setHeader([_('Name'), _('Action')])
- ->addClass(ZBX_STYLE_TABLE_FORMS)
- ->setId('linked-template')
- ->setAttribute('style', 'width: 100%;');
-
- foreach ($data['host']['parentTemplates'] as $template) {
- if ($data['allowed_ui_conf_templates']
- && array_key_exists($template['templateid'], $data['editable_templates'])) {
- $template_link = (new CLink($template['name'],
- (new CUrl('templates.php'))
- ->setArgument('form','update')
- ->setArgument('templateid', $template['templateid'])
- ))->setTarget('_blank');
- }
- else {
- $template_link = new CSpan($template['name']);
- }
-
- $linked_template_table->addRow([
- (new CCol([
- $template_link,
- (new CVar('templates[]', $template['templateid']))->removeId()
- ]))
- ->addClass(ZBX_STYLE_WORDWRAP)
- ->addStyle('max-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;'),
- (new CCol(
- new CHorList([
- (new CSimpleButton(_('Unlink')))
- ->onClick('host_edit.unlinkTemplate(this)')
- ->addClass(ZBX_STYLE_BTN_LINK),
- $data['clone_hostid'] === null
- ? (new CSimpleButton(_('Unlink and clear')))
- ->onClick('host_edit.unlinkAndClearTemplate(this, '.json_encode($template['templateid']).')')
- ->addClass(ZBX_STYLE_BTN_LINK)
- : null
- ])
- ))->addClass(ZBX_STYLE_NOWRAP)
- ]);
- }
-
- $add_templates_ms = (new CMultiSelect([
- 'name' => 'add_templates[]',
- 'object_name' => 'templates',
- 'data' => array_key_exists('add_templates', $data['host']) ? $data['host']['add_templates'] : [],
- 'popup' => [
- 'parameters' => [
- 'srctbl' => 'templates',
- 'srcfld1' => 'hostid',
- 'srcfld2' => 'host',
- 'dstfrm' => $host_form->getName(),
- 'dstfld1' => 'add_templates_',
- 'disableids' => array_column($data['host']['parentTemplates'], 'templateid')
- ]
- ]
- ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH);
-
- $templates_tab
- ->addItem([
- new CLabel(_('Linked templates')),
- new CFormField(
- (new CDiv($linked_template_table))
- ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
- ->setAdaptiveWidth(ZBX_TEXTAREA_BIG_WIDTH)
- )
- ])
- ->addItem([
- (new CLabel(_('Link new templates'), 'add_templates__ms')),
- new CFormField(
- (new CDiv($add_templates_ms))
- ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
- ->setAdaptiveWidth(ZBX_TEXTAREA_BIG_WIDTH)
- )
- ]);
-}
-
// IPMI tab.
if ($host_is_discovered) {
$ipmi_authtype_select = [
@@ -525,7 +520,6 @@ if (!$host_is_discovered) {
$tabs = (new CTabView(['id' => 'host-tabs']))
->setSelected(0)
->addTab('host-tab', _('Host'), $host_tab)
- ->addTab('template-tab', _('Templates'), $templates_tab, TAB_INDICATOR_LINKED_TEMPLATE)
->addTab('ipmi-tab', _('IPMI'), $ipmi_tab)
->addTab('tags-tab', _('Tags'), $tags_tab, TAB_INDICATOR_TAGS)
->addTab('macros-tab', _('Macros'), $macros_tab, TAB_INDICATOR_MACROS)
diff --git a/ui/app/partials/js/configuration.host.edit.html.js.php b/ui/app/partials/js/configuration.host.edit.html.js.php
index c70cad9454e..7e8ed2deea7 100644
--- a/ui/app/partials/js/configuration.host.edit.html.js.php
+++ b/ui/app/partials/js/configuration.host.edit.html.js.php
@@ -135,9 +135,22 @@
['input', 'paste'].forEach((event_type) => {
host_field.addEventListener(event_type, (e) => this.setVisibleNamePlaceholder(e.target.value));
});
- this.setVisibleNamePlaceholder(host_field.value);
+ this.setVisibleNamePlaceholder(host_field.value);
this.initHostInterfaces(host_interfaces, host_is_discovered);
+
+ const $groups_ms = $('#groups_');
+ const $template_ms = $('#add_templates_');
+
+ $template_ms.on('change', (e) => {
+ $template_ms.multiSelect('setDisabledEntries', this.getAllTemplates());
+ });
+
+ $groups_ms.on('change', (e) => {
+ $groups_ms.multiSelect('setDisabledEntries',
+ [... document.querySelectorAll('[name^="groups["]')].map((input) => input.value)
+ );
+ });
},
/**
@@ -161,11 +174,15 @@
}
},
- // Templates tab functions.
-
unlinkTemplate(button) {
+ const linked_templates = button.closest('table');
+
button.closest('tr').remove();
- this.resetNewTemplatesField();
+ $('#add_templates_').trigger('change');
+
+ if (linked_templates.querySelector('tbody:empty') !== null) {
+ linked_templates.remove();
+ }
},
unlinkAndClearTemplate(button, templateid) {
@@ -179,37 +196,6 @@
},
/**
- * Replaces template multiselect with a copy that has disabled templates updated.
- */
- resetNewTemplatesField() {
- const $old_multiselect = $('#add_templates_');
- const $new_multiselect = $('<div>');
- const data = $old_multiselect.multiSelect('getData');
-
- $('#add_templates_').parent().html($new_multiselect);
-
- $new_multiselect
- .addClass('multiselect active')
- .css('width', '<?= ZBX_TEXTAREA_STANDARD_WIDTH ?>px')
- .attr('id', 'add_templates_')
- .multiSelectHelper({
- object_name: 'templates',
- name: 'add_templates[]',
- data: data,
- popup: {
- parameters: {
- srctbl: 'templates',
- srcfld1: 'hostid',
- dstfrm: this.form_name,
- dstfld1: 'add_templates_',
- multiselect: '1',
- disableids: this.getLinkedTemplates()
- }
- }
- });
- },
-
- /**
* Helper to get linked template IDs as an array.
*
* @return {array} Templateids.
@@ -264,7 +250,7 @@
$('#host-tabs').on('tabscreate tabsactivate', (e, ui) => {
const panel = (e.type === 'tabscreate') ? ui.panel : ui.newPanel;
- const show_inherited_macros = $show_inherited_macros.filter(':checked').val() == 1;
+ const show_inherited_macros = ($show_inherited_macros.filter(':checked').val() == 1);
if (panel.attr('id') === 'macros-tab') {
// Please note that macro initialization must take place once and only when the tab is visible.
diff --git a/ui/app/views/js/popup.massupdate.js.php b/ui/app/views/js/popup.massupdate.js.php
index 2575c264324..d841309f0b9 100644
--- a/ui/app/views/js/popup.massupdate.js.php
+++ b/ui/app/views/js/popup.massupdate.js.php
@@ -32,22 +32,29 @@ $('#tabs').on('tabsactivate', (event, ui) => {
});
// Host groups.
-<?php if (CWebUser:: getType() == USER_TYPE_SUPER_ADMIN): ?>
+<?php if (CWebUser::getType() == USER_TYPE_SUPER_ADMIN): ?>
(() => {
const groups_elem = document.querySelector('#groups-div');
- if (!groups_elem) {
+
+ if (groups_elem === null) {
return false;
}
- let obj = groups_elem
- if (groups_elem.tagName === 'SPAN') {
- obj = groups_elem.originalObject;
- }
+ const obj = groups_elem.tagName === 'SPAN' ? groups_elem.originalObject : groups_elem;
+ const $groups_ms = $(groups_elem).find('#groups_');
- [...obj.querySelectorAll('input[name=mass_update_groups]')].map((elem) => {
- elem.addEventListener('change', (event) => {
- $('#groups_').multiSelect('modify', {
- 'addNew': (event.currentTarget.value == <?= ZBX_ACTION_ADD ?> || event.currentTarget.value == <?= ZBX_ACTION_REPLACE ?>)
+ $groups_ms.on('change', (e) => {
+ $groups_ms.multiSelect('setDisabledEntries',
+ [... document.querySelectorAll('[name^="groups["]')].map((input) => input.value)
+ );
+ });
+
+ [... obj.querySelectorAll('input[name=mass_update_groups]')].map((elem) => {
+ elem.addEventListener('change', (e) => {
+ const action_value = e.currentTarget.value;
+
+ $groups_ms.multiSelect('modify', {
+ 'addNew': (action_value == <?= ZBX_ACTION_ADD ?> || action_value == <?= ZBX_ACTION_REPLACE ?>)
});
})
});
@@ -122,25 +129,31 @@ $('#tabs').on('tabsactivate', (event, ui) => {
// Linked templates.
(() => {
const template_visible = document.querySelector('#linked-templates-div');
+
if (!template_visible) {
return false;
}
- let obj = template_visible
- if (template_visible.tagName === 'SPAN') {
- obj = template_visible.originalObject;
- }
-
+ const obj = template_visible.tagName === 'SPAN' ? template_visible.originalObject : template_visible;
const mass_action_tpls = obj.querySelector('#mass_action_tpls');
- if (!mass_action_tpls) {
+ if (mass_action_tpls === null) {
return false;
}
- mass_action_tpls.addEventListener('change', (ev) => {
+ const $template_ms = $(template_visible).find('#templates_, #linked_templates_');
+
+ $template_ms.on('change', (e) => {
+ $template_ms.multiSelect('setDisabledEntries',
+ [... template_visible.querySelectorAll('[name^="templates["], [name^="linked_templates["]')]
+ .map((input) => input.value)
+ );
+ });
+
+ mass_action_tpls.addEventListener('change', (e) => {
const action = obj.querySelector('input[name="mass_action_tpls"]:checked').value;
- obj.querySelector('#mass_clear_tpls').disabled = action === '<?= ZBX_ACTION_ADD ?>';
+ obj.querySelector('#mass_clear_tpls').disabled = (action === '<?= ZBX_ACTION_ADD ?>');
});
mass_action_tpls.dispatchEvent(new CustomEvent('change', {}));
diff --git a/ui/app/views/js/popup.service.edit.js.php b/ui/app/views/js/popup.service.edit.js.php
index 5220d947fea..4344bddd94f 100644
--- a/ui/app/views/js/popup.service.edit.js.php
+++ b/ui/app/views/js/popup.service.edit.js.php
@@ -59,7 +59,6 @@ window.service_edit_popup = {
this.overlay = overlays_stack.getById('service_edit');
this.dialogue = this.overlay.$dialogue[0];
this.form = this.overlay.$dialogue.$body[0].querySelector('form');
- this.header = this.overlay.$dialogue.$header[0];
this.footer = this.overlay.$dialogue.$footer[0];
for (const status_rule of status_rules) {
@@ -215,7 +214,7 @@ window.service_edit_popup = {
<input type="hidden" id="times_#{row_index}_note" name="times[#{row_index}][note]" value="#{note}">
</td>
<td>#{from} - #{till}</td>
- <td class="wordwrap" style="max-width: 540px;"></td>
+ <td class="wordwrap" style="max-width: 540px;">#{note}</td>
<td>
<ul class="<?= ZBX_STYLE_HOR_LIST ?>">
<li>
@@ -556,7 +555,8 @@ window.service_edit_popup = {
this.removeAllChildren();
- this.header.textContent = dialog_title;
+ this.overlay.setProperties({title: dialog_title});
+ this.overlay.unsetLoading();
for (const element of this.footer.querySelectorAll('.js-update, .js-clone')) {
element.classList.add('<?= ZBX_STYLE_DISPLAY_NONE ?>');
diff --git a/ui/app/views/popup.massupdate.host.php b/ui/app/views/popup.massupdate.host.php
index 15a547d39db..5180e9bf30c 100644
--- a/ui/app/views/popup.massupdate.host.php
+++ b/ui/app/views/popup.massupdate.host.php
@@ -38,10 +38,47 @@ $form = (new CForm())
->addVar('location_url', $data['location_url'])
->disablePasswordAutofill();
-// create form list
-$hostFormList = new CFormList('hostFormList');
+$host_tab = new CFormList('hostFormList');
-$hostFormList->addRow(
+$link_templates = (new CTable())
+ ->addRow(
+ (new CRadioButtonList('mass_action_tpls', ZBX_ACTION_ADD))
+ ->addValue(_('Link'), ZBX_ACTION_ADD)
+ ->addValue(_('Replace'), ZBX_ACTION_REPLACE)
+ ->addValue(_('Unlink'), ZBX_ACTION_REMOVE)
+ ->setModern(true)
+ )
+ ->addRow([
+ (new CMultiSelect([
+ 'name' => 'templates[]',
+ 'object_name' => 'templates',
+ 'data' => [],
+ 'popup' => [
+ 'parameters' => [
+ 'srctbl' => 'templates',
+ 'srcfld1' => 'hostid',
+ 'srcfld2' => 'host',
+ 'dstfrm' => $form->getName(),
+ 'dstfld1' => 'templates_'
+ ]
+ ]
+ ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+ ])
+ ->addRow([
+ (new CList())
+ ->addClass(ZBX_STYLE_LIST_CHECK_RADIO)
+ ->addItem((new CCheckBox('mass_clear_tpls'))->setLabel(_('Clear when unlinking')))
+ ]);
+
+$host_tab->addRow(
+ (new CVisibilityBox('visible[templates]', 'linked-templates-div', _('Original')))
+ ->setLabel(_('Link templates')),
+ (new CDiv($link_templates))
+ ->setId('linked-templates-div')
+ ->addStyle('margin-top: -5px;')
+);
+
+$host_tab->addRow(
(new CVisibilityBox('visible[groups]', 'groups-div', _('Original')))
->setLabel(_('Host groups'))
->setAttribute('autofocus', 'autofocus'),
@@ -71,7 +108,7 @@ $hostFormList->addRow(
);
// append description to form list
-$hostFormList->addRow(
+$host_tab->addRow(
(new CVisibilityBox('visible[description]', 'description', _('Original')))->setLabel(_('Description')),
(new CTextArea('description', ''))
->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
@@ -83,16 +120,18 @@ $proxy_select = (new CSelect('proxy_hostid'))
->setId('proxy_hostid')
->setValue(0)
->addOption(new CSelectOption(0, _('(no proxy)')));
+
foreach ($data['proxies'] as $proxie) {
$proxy_select->addOption(new CSelectOption($proxie['proxyid'], $proxie['host']));
}
-$hostFormList->addRow(
+
+$host_tab->addRow(
(new CVisibilityBox('visible[proxy_hostid]', 'proxy_hostid', _('Original')))->setLabel(_('Monitored by proxy')),
$proxy_select
);
// append status to form list
-$hostFormList->addRow(
+$host_tab->addRow(
(new CVisibilityBox('visible[status]', 'status', _('Original')))->setLabel(_('Status')),
(new CSelect('status'))
->setValue(HOST_STATUS_MONITORED)
@@ -103,84 +142,41 @@ $hostFormList->addRow(
]))
);
-$templatesFormList = new CFormList('templatesFormList');
-
-// append templates table to form list
-$newTemplateTable = (new CTable())
- ->addRow(
- (new CRadioButtonList('mass_action_tpls', ZBX_ACTION_ADD))
- ->addValue(_('Link'), ZBX_ACTION_ADD)
- ->addValue(_('Replace'), ZBX_ACTION_REPLACE)
- ->addValue(_('Unlink'), ZBX_ACTION_REMOVE)
- ->setModern(true)
- )
- ->addRow([
- (new CMultiSelect([
- 'name' => 'templates[]',
- 'object_name' => 'templates',
- 'data' => [],
- 'popup' => [
- 'parameters' => [
- 'srctbl' => 'templates',
- 'srcfld1' => 'hostid',
- 'srcfld2' => 'host',
- 'dstfrm' => $form->getName(),
- 'dstfld1' => 'templates_'
- ]
- ]
- ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
- ])
- ->addRow([
- (new CList())
- ->addClass(ZBX_STYLE_LIST_CHECK_RADIO)
- ->addItem((new CCheckBox('mass_clear_tpls'))->setLabel(_('Clear when unlinking')))
- ]);
-
-$templatesFormList->addRow(
- (new CVisibilityBox('visible[templates]', 'linked-templates-div', _('Original')))->setLabel(_('Link templates')),
- (new CDiv($newTemplateTable))
- ->setId('linked-templates-div')
- ->addStyle('margin-top: -5px;')
-);
-
-$ipmiFormList = new CFormList('ipmiFormList');
+$ipmi_tab = new CFormList('ipmiFormList');
// append ipmi to form list
-$ipmiFormList->addRow(
+$ipmi_tab->addRow(
(new CVisibilityBox('visible[ipmi_authtype]', 'ipmi_authtype', _('Original')))
->setLabel(_('Authentication algorithm')),
(new CSelect('ipmi_authtype'))
->setId('ipmi_authtype')
->setValue(IPMI_AUTHTYPE_DEFAULT)
->addOptions(CSelect::createOptionsFromArray(ipmiAuthTypes()))
-);
-
-$ipmiFormList->addRow(
+)
+->addRow(
(new CVisibilityBox('visible[ipmi_privilege]', 'ipmi_privilege', _('Original')))->setLabel(_('Privilege level')),
(new CSelect('ipmi_privilege'))
->setId('ipmi_privilege')
->addOptions(CSelect::createOptionsFromArray(ipmiPrivileges()))
->setValue(IPMI_PRIVILEGE_USER)
-);
-
-$ipmiFormList->addRow(
+)
+->addRow(
(new CVisibilityBox('visible[ipmi_username]', 'ipmi_username', _('Original')))->setLabel(_('Username')),
(new CTextBox('ipmi_username', ''))
->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)
->disableAutocomplete()
-);
-
-$ipmiFormList->addRow(
+)
+->addRow(
(new CVisibilityBox('visible[ipmi_password]', 'ipmi_password', _('Original')))->setLabel(_('Password')),
(new CTextBox('ipmi_password', ''))
->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)
->disableAutocomplete()
);
-$inventoryFormList = new CFormList('inventoryFormList');
+$inventory_tab = new CFormList('inventoryFormList');
// append inventories to form list
-$inventoryFormList->addRow(
+$inventory_tab->addRow(
(new CVisibilityBox('visible[inventory_mode]', 'inventory_mode_div', _('Original')))->setLabel(_('Inventory mode')),
(new CDiv(
(new CRadioButtonList('inventory_mode', HOST_INVENTORY_DISABLED))
@@ -191,10 +187,10 @@ $inventoryFormList->addRow(
))->setId('inventory_mode_div')
);
-$tags_form_list = new CFormList('tagsFormList');
+$tags_tab = new CFormList('tagsFormList');
// append tags table to form list
-$tags_form_list->addRow(
+$tags_tab->addRow(
(new CVisibilityBox('visible[tags]', 'tags-div', _('Original')))->setLabel(_('Tags')),
(new CDiv([
(new CRadioButtonList('mass_update_tags', ZBX_ACTION_ADD))
@@ -222,14 +218,13 @@ foreach ($data['inventories'] as $field => $fieldInfo) {
->setAttribute('maxlength', $hostInventoryTable['fields'][$field]['length']);
}
- $inventoryFormList->addRow(
+ $inventory_tab->addRow(
(new CVisibilityBox('visible['.$field.']', $fieldInput->getId(), _('Original')))->setLabel($fieldInfo['title']),
$fieldInput, null, 'formrow-inventory'
);
}
-// Encryption
-$encryption_form_list = new CFormList('encryption');
+$encryption_tab = new CFormList('encryption');
$encryption_table = (new CFormList('encryption'))
->addRow(_('Connections to host'),
@@ -278,7 +273,7 @@ $encryption_table = (new CFormList('encryption'))
->setAdaptiveWidth(ZBX_TEXTAREA_BIG_WIDTH)
);
-$encryption_form_list->addRow(
+$encryption_tab->addRow(
(new CVisibilityBox('visible[encryption]', 'encryption_div', _('Original')))->setLabel(_('Connections')),
(new CDiv($encryption_table))
->setId('encryption_div')
@@ -287,10 +282,9 @@ $encryption_form_list->addRow(
// append tabs to form
$tabs = (new CTabView())
- ->addTab('hostTab', _('Host'), $hostFormList)
- ->addTab('templatesTab', _('Templates'), $templatesFormList)
- ->addTab('ipmiTab', _('IPMI'), $ipmiFormList)
- ->addTab('tagsTab', _('Tags'), $tags_form_list)
+ ->addTab('hostTab', _('Host'), $host_tab)
+ ->addTab('ipmiTab', _('IPMI'), $ipmi_tab)
+ ->addTab('tagsTab', _('Tags'), $tags_tab)
->addTab('macros_tab', _('Macros'), new CPartial('massupdate.macros.tab', [
'visible' => [],
'macros' => [['macro' => '', 'type' => ZBX_MACRO_TYPE_TEXT, 'value' => '', 'description' => '']],
@@ -298,8 +292,8 @@ $tabs = (new CTabView())
ZBX_ACTION_REMOVE_ALL => 0
]
]))
- ->addTab('inventoryTab', _('Inventory'), $inventoryFormList)
- ->addTab('encryptionTab', _('Encryption'), $encryption_form_list)
+ ->addTab('inventoryTab', _('Inventory'), $inventory_tab)
+ ->addTab('encryptionTab', _('Encryption'), $encryption_tab)
->setSelected(0);
if (!$data['discovered_host']) {
diff --git a/ui/app/views/popup.massupdate.template.php b/ui/app/views/popup.massupdate.template.php
index 20d49e9abb4..f6a88eb2c2c 100644
--- a/ui/app/views/popup.massupdate.template.php
+++ b/ui/app/views/popup.massupdate.template.php
@@ -40,50 +40,9 @@ $form = (new CForm())
/*
* Template tab
*/
-$template_form_list = new CFormList('template-form-list');
+$template_tab = new CFormList('template-form-list');
-$template_form_list
- ->addRow(
- (new CVisibilityBox('visible[groups]', 'groups-div', _('Original')))
- ->setLabel(_('Host groups'))
- ->setAttribute('autofocus', 'autofocus'),
- (new CDiv([
- (new CRadioButtonList('mass_update_groups', ZBX_ACTION_ADD))
- ->addValue(_('Add'), ZBX_ACTION_ADD)
- ->addValue(_('Replace'), ZBX_ACTION_REPLACE)
- ->addValue(_('Remove'), ZBX_ACTION_REMOVE)
- ->setModern(true)
- ->addStyle('margin-bottom: 5px;'),
- (new CMultiSelect([
- 'name' => 'groups[]',
- 'object_name' => 'hostGroup',
- 'add_new' => (CWebUser::getType() == USER_TYPE_SUPER_ADMIN),
- 'data' => [],
- 'popup' => [
- 'parameters' => [
- 'srctbl' => 'host_groups',
- 'srcfld1' => 'groupid',
- 'dstfrm' => $form->getName(),
- 'dstfld1' => 'groups_',
- 'editable' => true
- ]
- ]
- ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
- ]))->setId('groups-div')
- )
- ->addRow(
- (new CVisibilityBox('visible[description]', 'description', _('Original')))->setLabel(_('Description')),
- (new CTextArea('description', ''))
- ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
- ->setMaxlength(DB::getFieldLength('hosts', 'description'))
- );
-
-/*
- * Linked templates tab
- */
-$linked_templates_form_list = new CFormList('linked-templates-form-list');
-
-$new_template_table = (new CTable())
+$link_templates = (new CTable())
->addRow(
(new CRadioButtonList('mass_action_tpls', ZBX_ACTION_ADD))
->addValue(_('Link'), ZBX_ACTION_ADD)
@@ -115,18 +74,51 @@ $new_template_table = (new CTable())
)
]);
-$linked_templates_form_list->addRow(
+$template_tab->addRow(
(new CVisibilityBox('visible[linked_templates]', 'linked-templates-div', _('Original')))
->setLabel(_('Link templates')),
- (new CDiv($new_template_table))
+ (new CDiv($link_templates))
->setId('linked-templates-div')
->addStyle('min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
);
-/*
- * Tags tab
- */
-$tags_form_list = (new CFormList('tags-form-list'))
+$template_tab
+ ->addRow(
+ (new CVisibilityBox('visible[groups]', 'groups-div', _('Original')))
+ ->setLabel(_('Host groups'))
+ ->setAttribute('autofocus', 'autofocus'),
+ (new CDiv([
+ (new CRadioButtonList('mass_update_groups', ZBX_ACTION_ADD))
+ ->addValue(_('Add'), ZBX_ACTION_ADD)
+ ->addValue(_('Replace'), ZBX_ACTION_REPLACE)
+ ->addValue(_('Remove'), ZBX_ACTION_REMOVE)
+ ->setModern(true)
+ ->addStyle('margin-bottom: 5px;'),
+ (new CMultiSelect([
+ 'name' => 'groups[]',
+ 'object_name' => 'hostGroup',
+ 'add_new' => (CWebUser::getType() == USER_TYPE_SUPER_ADMIN),
+ 'data' => [],
+ 'popup' => [
+ 'parameters' => [
+ 'srctbl' => 'host_groups',
+ 'srcfld1' => 'groupid',
+ 'dstfrm' => $form->getName(),
+ 'dstfld1' => 'groups_',
+ 'editable' => true
+ ]
+ ]
+ ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+ ]))->setId('groups-div')
+ )
+ ->addRow(
+ (new CVisibilityBox('visible[description]', 'description', _('Original')))->setLabel(_('Description')),
+ (new CTextArea('description', ''))
+ ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+ ->setMaxlength(DB::getFieldLength('hosts', 'description'))
+ );
+
+$tags_tab = (new CFormList('tags-form-list'))
->addRow(
(new CVisibilityBox('visible[tags]', 'tags-div', _('Original')))->setLabel(_('Tags')),
(new CDiv([
@@ -144,9 +136,8 @@ $tags_form_list = (new CFormList('tags-form-list'))
// Append tabs to the form.
$tabs = (new CTabView())
- ->addTab('template_tab', _('Template'), $template_form_list)
- ->addTab('linked_templates_tab', _('Linked templates'), $linked_templates_form_list)
- ->addTab('tags_tab', _('Tags'), $tags_form_list)
+ ->addTab('template_tab', _('Template'), $template_tab)
+ ->addTab('tags_tab', _('Tags'), $tags_tab)
->setSelected(0);
// Macros.
diff --git a/ui/app/views/popup.triggerexpr.php b/ui/app/views/popup.triggerexpr.php
index 06703b4db10..89f12da8a46 100644
--- a/ui/app/views/popup.triggerexpr.php
+++ b/ui/app/views/popup.triggerexpr.php
@@ -102,6 +102,7 @@ if ($data['item_required']) {
$function_select = (new CSelect('function_select'))
->setFocusableElementId('label-function')
->setId('function-select')
+ ->setAttribute('autofocus', 'autofocus')
->setValue($data['function_type'].'_'.$data['function']);
$function_types = [
@@ -181,7 +182,16 @@ if (array_key_exists('params', $data['functions'][$data['selectedFunction']])) {
$param_type_element = _('Period');
}
- $param_field = (new CTextBox('params['.$param_name.']', $param_value))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH);
+ if (array_key_exists('options', $param_function)) {
+ $param_field = (new CSelect('params['.$param_name.']'))
+ ->setValue($param_value)
+ ->addOptions(CSelect::createOptionsFromArray($param_function['options']));
+ }
+ else {
+ $param_field = new CTextBox('params['.$param_name.']', $param_value);
+ }
+
+ $param_field->setWidth(ZBX_TEXTAREA_SMALL_WIDTH);
if ($param_name === 'period_shift') {
$param_field->setAttribute('placeholder', 'now/h');
@@ -197,9 +207,18 @@ if (array_key_exists('params', $data['functions'][$data['selectedFunction']])) {
]);
}
else {
- $expression_form_list->addRow($label,
- (new CTextBox('params['.$param_name.']', $param_value))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)
- );
+ if (array_key_exists('options', $param_function)) {
+ $param_field = (new CSelect('params['.$param_name.']'))
+ ->setValue($param_value)
+ ->addOptions(CSelect::createOptionsFromArray($param_function['options']));
+ }
+ else {
+ $param_field = new CTextBox('params['.$param_name.']', $param_value);
+ }
+
+ $param_field->setWidth(ZBX_TEXTAREA_SMALL_WIDTH);
+ $expression_form_list->addRow($label, $param_field);
+
if ($paramid === 0) {
$expression_form->addItem((new CVar('paramtype', PARAM_TYPE_TIME))->removeId());
}
diff --git a/ui/assets/styles/blue-theme.css b/ui/assets/styles/blue-theme.css
index e0786205fb0..5e625a82dbb 100644
--- a/ui/assets/styles/blue-theme.css
+++ b/ui/assets/styles/blue-theme.css
@@ -6552,6 +6552,15 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty),
.overlay-dialogue #host-form #valuemap-formlist .table-forms-td-right {
width: 100%; }
+.linked-templates > .table-forms {
+ margin-bottom: 5px;
+ line-height: 24px; }
+ .linked-templates > .table-forms td, .linked-templates > .table-forms th {
+ padding: 0 5px 0 0; }
+ .linked-templates > .table-forms td:last-child, .linked-templates > .table-forms th:last-child {
+ width: 0;
+ padding-right: 0; }
+
.audit-details-popup-wrapper {
margin: 5px 10px; }
.audit-details-popup-wrapper .audit-details-popup-textarea {
diff --git a/ui/assets/styles/dark-theme.css b/ui/assets/styles/dark-theme.css
index 8dac39f21e4..d38df4b1e6f 100644
--- a/ui/assets/styles/dark-theme.css
+++ b/ui/assets/styles/dark-theme.css
@@ -6559,6 +6559,15 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty),
.overlay-dialogue #host-form #valuemap-formlist .table-forms-td-right {
width: 100%; }
+.linked-templates > .table-forms {
+ margin-bottom: 5px;
+ line-height: 24px; }
+ .linked-templates > .table-forms td, .linked-templates > .table-forms th {
+ padding: 0 5px 0 0; }
+ .linked-templates > .table-forms td:last-child, .linked-templates > .table-forms th:last-child {
+ width: 0;
+ padding-right: 0; }
+
.audit-details-popup-wrapper {
margin: 5px 10px; }
.audit-details-popup-wrapper .audit-details-popup-textarea {
diff --git a/ui/assets/styles/hc-dark.css b/ui/assets/styles/hc-dark.css
index 3d4523c5878..449a3909c8f 100644
--- a/ui/assets/styles/hc-dark.css
+++ b/ui/assets/styles/hc-dark.css
@@ -6503,6 +6503,15 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty),
.overlay-dialogue #host-form #valuemap-formlist .table-forms-td-right {
width: 100%; }
+.linked-templates > .table-forms {
+ margin-bottom: 5px;
+ line-height: 24px; }
+ .linked-templates > .table-forms td, .linked-templates > .table-forms th {
+ padding: 0 5px 0 0; }
+ .linked-templates > .table-forms td:last-child, .linked-templates > .table-forms th:last-child {
+ width: 0;
+ padding-right: 0; }
+
.audit-details-popup-wrapper {
margin: 5px 10px; }
.audit-details-popup-wrapper .audit-details-popup-textarea {
diff --git a/ui/assets/styles/hc-light.css b/ui/assets/styles/hc-light.css
index fcfe4497df8..a9315d15a18 100644
--- a/ui/assets/styles/hc-light.css
+++ b/ui/assets/styles/hc-light.css
@@ -6503,6 +6503,15 @@ z-select.z-select-host-interface li[disabled] .description:not(:empty),
.overlay-dialogue #host-form #valuemap-formlist .table-forms-td-right {
width: 100%; }
+.linked-templates > .table-forms {
+ margin-bottom: 5px;
+ line-height: 24px; }
+ .linked-templates > .table-forms td, .linked-templates > .table-forms th {
+ padding: 0 5px 0 0; }
+ .linked-templates > .table-forms td:last-child, .linked-templates > .table-forms th:last-child {
+ width: 0;
+ padding-right: 0; }
+
.audit-details-popup-wrapper {
margin: 5px 10px; }
.audit-details-popup-wrapper .audit-details-popup-textarea {
diff --git a/ui/host_prototypes.php b/ui/host_prototypes.php
index 3bed4c1a630..209f8b5b24e 100644
--- a/ui/host_prototypes.php
+++ b/ui/host_prototypes.php
@@ -530,6 +530,16 @@ if (hasRequest('form')) {
'add_templates' => array_map('strval', array_keys($data['host_prototype']['add_templates']))
];
+ $data['groups_ms'] = [];
+
+ foreach ($data['groups'] as $group) {
+ $data['groups_ms'][] = [
+ 'id' => $group['groupid'],
+ 'name' => $group['name'],
+ 'inaccessible' => (array_key_exists('inaccessible', $group) && $group['inaccessible'])
+ ];
+ }
+
// Render view.
echo (new CView('configuration.host.prototype.edit', $data))->getOutput();
}
diff --git a/ui/include/classes/api/services/CAction.php b/ui/include/classes/api/services/CAction.php
index 93d81ad6cd0..7a673ca663a 100644
--- a/ui/include/classes/api/services/CAction.php
+++ b/ui/include/classes/api/services/CAction.php
@@ -2520,6 +2520,10 @@ class CAction extends CApiService {
['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_TRIGGERS], 'type' => API_OBJECTS, 'fields' => self::getOperationValidationRules(ACTION_UPDATE_OPERATION, EVENT_SOURCE_TRIGGERS)],
['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_SERVICE], 'type' => API_OBJECTS, 'fields' => self::getOperationValidationRules(ACTION_UPDATE_OPERATION, EVENT_SOURCE_SERVICE)],
['else' => true, 'type' => API_UNEXPECTED]
+ ]],
+ 'notify_if_canceled' => ['type' => API_MULTIPLE, 'rules' => [
+ ['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_TRIGGERS], 'type' => API_INT32, 'in' => implode(',', [ACTION_NOTIFY_IF_CANCELED_FALSE, ACTION_NOTIFY_IF_CANCELED_TRUE])],
+ ['else' => true, 'type' => API_UNEXPECTED]
]]
]];
@@ -2561,7 +2565,9 @@ class CAction extends CApiService {
}
$db_actions = $this->get([
- 'output' => ['actionid', 'name', 'eventsource', 'status', 'esc_period', 'pause_suppressed'],
+ 'output' => ['actionid', 'name', 'eventsource', 'status', 'esc_period', 'pause_suppressed',
+ 'notify_if_canceled'
+ ],
'actionids' => array_column($actions, 'actionid'),
'editable' => true,
'preservekeys' => true
@@ -2611,6 +2617,10 @@ class CAction extends CApiService {
['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_TRIGGERS], 'type' => API_OBJECTS, 'fields' => self::getOperationValidationRules(ACTION_UPDATE_OPERATION, EVENT_SOURCE_TRIGGERS)],
['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_SERVICE], 'type' => API_OBJECTS, 'fields' => self::getOperationValidationRules(ACTION_UPDATE_OPERATION, EVENT_SOURCE_SERVICE)],
['else' => true, 'type' => API_UNEXPECTED]
+ ]],
+ 'notify_if_canceled' => ['type' => API_MULTIPLE, 'rules' => [
+ ['if' => ['field' => 'eventsource', 'in' => EVENT_SOURCE_TRIGGERS], 'type' => API_INT32, 'in' => implode(',', [ACTION_NOTIFY_IF_CANCELED_FALSE, ACTION_NOTIFY_IF_CANCELED_TRUE])],
+ ['else' => true, 'type' => API_UNEXPECTED]
]]
]];
diff --git a/ui/include/classes/api/services/CScript.php b/ui/include/classes/api/services/CScript.php
index 6dc9e6621b2..e18764f98ba 100644
--- a/ui/include/classes/api/services/CScript.php
+++ b/ui/include/classes/api/services/CScript.php
@@ -40,7 +40,9 @@ class CScript extends CApiService {
/**
* Fields from "actions" table. Used in get() validation and addRelatedObjects() when selecting action fields.
*/
- private $action_fields = ['actionid', 'name', 'eventsource', 'status', 'esc_period', 'pause_suppressed'];
+ private $action_fields = ['actionid', 'name', 'eventsource', 'status', 'esc_period', 'pause_suppressed',
+ 'notify_if_canceled'
+ ];
/**
* This property, if filled out, will contain all hostrgroup ids
diff --git a/ui/include/classes/data/CHistFunctionData.php b/ui/include/classes/data/CHistFunctionData.php
index ca9ef66bd32..3b19ae5710c 100644
--- a/ui/include/classes/data/CHistFunctionData.php
+++ b/ui/include/classes/data/CHistFunctionData.php
@@ -228,6 +228,28 @@ final class CHistFunctionData {
['rules' => [['type' => 'query']]],
['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_TREND]]]
],
+ 'baselinedev' => [
+ ['rules' => [['type' => 'query']]],
+ ['rules' => [[
+ 'type' => 'period',
+ 'mode' => self::PERIOD_MODE_TREND,
+ 'min' => SEC_PER_HOUR,
+ 'aligned_shift' => true
+ ]]],
+ ['rules' => [['type' => 'regexp', 'pattern' => '/^[hdwMy]$/']]],
+ ['rules' => [['type' => 'number', 'with_suffix' => false, 'min' => 1, 'with_float' => false]]]
+ ],
+ 'baselinewma' => [
+ ['rules' => [['type' => 'query']]],
+ ['rules' => [[
+ 'type' => 'period',
+ 'mode' => self::PERIOD_MODE_TREND,
+ 'min' => SEC_PER_HOUR,
+ 'aligned_shift' => true
+ ]]],
+ ['rules' => [['type' => 'regexp', 'pattern' => '/^[hdwMy]$/']]],
+ ['rules' => [['type' => 'number', 'with_suffix' => false, 'min' => 1, 'with_float' => false]]]
+ ],
'trendcount' => [
['rules' => [['type' => 'query']]],
['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_TREND]]]
@@ -240,6 +262,23 @@ final class CHistFunctionData {
['rules' => [['type' => 'query']]],
['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_TREND]]]
],
+ 'trendstl' => [
+ ['rules' => [['type' => 'query']]],
+ ['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_TREND]]],
+ ['rules' => [['type' => 'time', 'min' => SEC_PER_HOUR]]],
+ ['rules' => [['type' => 'time', 'min' => SEC_PER_HOUR * 2]]],
+ ['rules' => [
+ ['type' => 'regexp', 'pattern' => '/^((\d+(\.\d{0,4})?)|(\.\d{1,4}))$/'],
+ ['type' => 'number', 'min' => 1, 'max' => ZBX_MAX_INT32]
+ ], 'required' => false],
+ ['rules' => [
+ ['type' => 'regexp', 'pattern' => '/^(mad|stddevpop|stddevsamp)$/']
+ ], 'required' => false],
+ ['rules' => [
+ ['type' => 'regexp', 'pattern' => '/^\d+$/'],
+ ['type' => 'number', 'min' => 7, 'max' => ZBX_MAX_INT32]
+ ], 'required' => false]
+ ],
'trendsum' => [
['rules' => [['type' => 'query']]],
['rules' => [['type' => 'period', 'mode' => self::PERIOD_MODE_TREND]]]
@@ -379,9 +418,12 @@ final class CHistFunctionData {
'sumofsquares' => self::ITEM_VALUE_TYPES_NUM,
'timeleft' => self::ITEM_VALUE_TYPES_NUM,
'trendavg' => self::ITEM_VALUE_TYPES_NUM,
+ 'baselinedev' => self::ITEM_VALUE_TYPES_NUM,
+ 'baselinewma' => self::ITEM_VALUE_TYPES_NUM,
'trendcount' => self::ITEM_VALUE_TYPES_NUM,
'trendmax' => self::ITEM_VALUE_TYPES_NUM,
'trendmin' => self::ITEM_VALUE_TYPES_NUM,
+ 'trendstl' => self::ITEM_VALUE_TYPES_NUM,
'trendsum' => self::ITEM_VALUE_TYPES_NUM,
'varpop' => self::ITEM_VALUE_TYPES_NUM,
'varsamp' => self::ITEM_VALUE_TYPES_NUM
diff --git a/ui/include/classes/data/CItemData.php b/ui/include/classes/data/CItemData.php
index 5d5eed11c16..7201b76b15f 100644
--- a/ui/include/classes/data/CItemData.php
+++ b/ui/include/classes/data/CItemData.php
@@ -128,10 +128,10 @@ final class CItemData {
'kernel.maxfiles',
'kernel.maxproc',
'kernel.openfiles',
- 'log.count[file,<regexp>,<encoding>,<maxproclines>,<mode>,<maxdelay>,<options>]',
- 'log[file,<regexp>,<encoding>,<maxlines>,<mode>,<output>,<maxdelay>,<options>]',
- 'logrt.count[file_regexp,<regexp>,<encoding>,<maxproclines>,<mode>,<maxdelay>,<options>]',
- 'logrt[file_regexp,<regexp>,<encoding>,<maxlines>,<mode>,<output>,<maxdelay>,<options>]',
+ 'log.count[file,<regexp>,<encoding>,<maxproclines>,<mode>,<maxdelay>,<options>,<persistent_dir>]',
+ 'log[file,<regexp>,<encoding>,<maxlines>,<mode>,<output>,<maxdelay>,<options>,<persistent_dir>]',
+ 'logrt.count[file_regexp,<regexp>,<encoding>,<maxproclines>,<mode>,<maxdelay>,<options>,<persistent_dir>]',
+ 'logrt[file_regexp,<regexp>,<encoding>,<maxlines>,<mode>,<output>,<maxdelay>,<options>,<persistent_dir>]',
'modbus.get[endpoint,<slaveid>,<function>,<address>,<count>,<type>,<endianness>,<offset>]',
'mqtt.get[<broker_url>,topic]',
'net.dns.record[<ip>,name,<type>,<timeout>,<count>,<protocol>]',
@@ -904,19 +904,19 @@ final class CItemData {
'description' => _('Number of currently open file descriptors. Returns integer'),
'value_type' => ITEM_VALUE_TYPE_UINT64
],
- 'log.count[file,<regexp>,<encoding>,<maxproclines>,<mode>,<maxdelay>,<options>]' => [
+ 'log.count[file,<regexp>,<encoding>,<maxproclines>,<mode>,<maxdelay>,<options>,<persistent_dir>]' => [
'description' => _('Count of matched lines in log file monitoring. Returns integer'),
'value_type' => ITEM_VALUE_TYPE_UINT64
],
- 'log[file,<regexp>,<encoding>,<maxlines>,<mode>,<output>,<maxdelay>,<options>]' => [
+ 'log[file,<regexp>,<encoding>,<maxlines>,<mode>,<output>,<maxdelay>,<options>,<persistent_dir>]' => [
'description' => _('Log file monitoring. Returns log'),
'value_type' => ITEM_VALUE_TYPE_LOG
],
- 'logrt.count[file_regexp,<regexp>,<encoding>,<maxproclines>,<mode>,<maxdelay>,<options>]' => [
+ 'logrt.count[file_regexp,<regexp>,<encoding>,<maxproclines>,<mode>,<maxdelay>,<options>,<persistent_dir>]' => [
'description' => _('Count of matched lines in log file monitoring with log rotation support. Returns integer'),
'value_type' => ITEM_VALUE_TYPE_UINT64
],
- 'logrt[file_regexp,<regexp>,<encoding>,<maxlines>,<mode>,<output>,<maxdelay>,<options>]' => [
+ 'logrt[file_regexp,<regexp>,<encoding>,<maxlines>,<mode>,<output>,<maxdelay>,<options>,<persistent_dir>]' => [
'description' => _('Log file monitoring with log rotation support. Returns log'),
'value_type' => ITEM_VALUE_TYPE_LOG
],
diff --git a/ui/include/classes/graphdraw/CLineGraphDraw.php b/ui/include/classes/graphdraw/CLineGraphDraw.php
index 3ce91bd840d..1edff865011 100644
--- a/ui/include/classes/graphdraw/CLineGraphDraw.php
+++ b/ui/include/classes/graphdraw/CLineGraphDraw.php
@@ -423,7 +423,7 @@ class CLineGraphDraw extends CGraphDraw {
return;
}
- $number_parser = new CNumberParser(['with_suffix' => true]);
+ $number_parser = new CNumberParser(['with_size_suffix' => true, 'with_time_suffix' => true]);
$max = 3;
$cnt = 0;
diff --git a/ui/include/classes/helpers/CEncryptHelper.php b/ui/include/classes/helpers/CEncryptHelper.php
index 9efbc46601c..64c27ff5266 100644
--- a/ui/include/classes/helpers/CEncryptHelper.php
+++ b/ui/include/classes/helpers/CEncryptHelper.php
@@ -32,8 +32,6 @@ class CEncryptHelper {
/**
* Session secret key.
*
- * @static
- *
* @var string
*/
private static $key;
@@ -41,8 +39,6 @@ class CEncryptHelper {
/**
* Return session key.
*
- * @static
- *
* @return string|null
*/
private static function getKey(): ?string {
@@ -67,8 +63,6 @@ class CEncryptHelper {
/**
* Timing attack safe string comparison.
*
- * @static
- *
* @param string $known_string
* @param string $user_string
*
@@ -81,8 +75,6 @@ class CEncryptHelper {
/**
* Encrypt string with session key.
*
- * @static
- *
* @param string $data
*
* @return string
@@ -96,8 +88,6 @@ class CEncryptHelper {
/**
* Generate random 16 bytes key.
*
- * @static
- *
* @return string
*/
public static function generateKey(): string {
@@ -107,8 +97,6 @@ class CEncryptHelper {
/**
* Update secret session key.
*
- * @static
- *
* @param string $key
*
* @return boolean
@@ -122,4 +110,15 @@ class CEncryptHelper {
' WHERE '.dbConditionInt('configid', [$db_config['configid']])
);
}
+
+ /**
+ * Generate a hash value.
+ *
+ * @param string $message
+ *
+ * @return string
+ */
+ public static function hash(string $message): string {
+ return hash('sha256', $message, false);
+ }
}
diff --git a/ui/include/classes/import/CImportReferencer.php b/ui/include/classes/import/CImportReferencer.php
index e55e8378fc7..d83cd94628d 100644
--- a/ui/include/classes/import/CImportReferencer.php
+++ b/ui/include/classes/import/CImportReferencer.php
@@ -1404,7 +1404,7 @@ class CImportReferencer {
$this->db_proxies = API::Proxy()->get([
'output' => ['host'],
- 'search' => ['host' => array_keys($this->proxies)],
+ 'filter' => ['host' => array_keys($this->proxies)],
'preservekeys' => true
]);
diff --git a/ui/include/classes/import/converters/C52AggregateItemKeyConverter.php b/ui/include/classes/import/converters/C52AggregateItemKeyConverter.php
index c40d7f3ebd5..c53d76fbb41 100644
--- a/ui/include/classes/import/converters/C52AggregateItemKeyConverter.php
+++ b/ui/include/classes/import/converters/C52AggregateItemKeyConverter.php
@@ -101,7 +101,11 @@ class C52AggregateItemKeyConverter extends CConverter {
}
private function isQuotableTimeperiod(string $timeperiod): bool {
- $number_parser = new CNumberParser(['with_minus' => false, 'with_suffix' => true]);
+ $number_parser = new CNumberParser([
+ 'with_minus' => false,
+ 'with_size_suffix' => true,
+ 'with_time_suffix' => true
+ ]);
if ($number_parser->parse($timeperiod) == CParser::PARSE_SUCCESS) {
return false;
diff --git a/ui/include/classes/parsers/C10TriggerExpression.php b/ui/include/classes/parsers/C10TriggerExpression.php
index 2ff4e0df9ab..c4d35e2341f 100644
--- a/ui/include/classes/parsers/C10TriggerExpression.php
+++ b/ui/include/classes/parsers/C10TriggerExpression.php
@@ -226,7 +226,11 @@ class C10TriggerExpression {
$this->lld_macro_parser = new CLLDMacroParser();
$this->lld_macro_function_parser = new CLLDMacroFunctionParser;
$this->user_macro_parser = new CUserMacroParser();
- $this->number_parser = new CNumberParser(['with_minus' => false, 'with_suffix' => true]);
+ $this->number_parser = new CNumberParser([
+ 'with_minus' => false,
+ 'with_size_suffix' => true,
+ 'with_time_suffix' => true
+ ]);
}
/**
@@ -871,7 +875,7 @@ class C10TriggerExpression {
*/
public static function quoteString(string $value, bool $allow_macros = true, bool $force = false): string {
if (!$force) {
- $number_parser = new CNumberParser(['with_suffix' => true]);
+ $number_parser = new CNumberParser(['with_size_suffix' => true, 'with_time_suffix' => true]);
if ($number_parser->parse($value) == CParser::PARSE_SUCCESS) {
return $value;
diff --git a/ui/include/classes/parsers/CExpressionParser.php b/ui/include/classes/parsers/CExpressionParser.php
index faf4585d4af..c934a5979be 100644
--- a/ui/include/classes/parsers/CExpressionParser.php
+++ b/ui/include/classes/parsers/CExpressionParser.php
@@ -758,7 +758,11 @@ class CExpressionParser extends CParser {
* @return bool returns true if parsed successfully, false otherwise
*/
private static function parseNumber(string $source, int &$pos, array &$tokens): bool {
- $number_parser = new CNumberParser(['with_minus' => false, 'with_suffix' => true]);
+ $number_parser = new CNumberParser([
+ 'with_minus' => false,
+ 'with_size_suffix' => true,
+ 'with_time_suffix' => true
+ ]);
if ($number_parser->parse($source, $pos) == CParser::PARSE_FAIL) {
return false;
@@ -830,7 +834,7 @@ class CExpressionParser extends CParser {
*/
public static function quoteString(string $value, bool $allow_macros = true, bool $force = false): string {
if (!$force) {
- $number_parser = new CNumberParser(['with_suffix' => true]);
+ $number_parser = new CNumberParser(['with_size_suffix' => true, 'with_time_suffix' => true]);
if ($number_parser->parse($value) == CParser::PARSE_SUCCESS) {
return $value;
diff --git a/ui/include/classes/parsers/CHistFunctionParser.php b/ui/include/classes/parsers/CHistFunctionParser.php
index 3d68b136289..cc04f3fd386 100644
--- a/ui/include/classes/parsers/CHistFunctionParser.php
+++ b/ui/include/classes/parsers/CHistFunctionParser.php
@@ -60,7 +60,8 @@ class CHistFunctionParser extends CParser {
private $user_macro_parser;
private $lld_macro_parser;
private $lld_macro_function_parser;
- private $number_parser;
+ private $time_parser;
+ private $size_parser;
/**
* Parsed function name.
@@ -94,17 +95,17 @@ class CHistFunctionParser extends CParser {
'usermacros' => $this->options['usermacros'],
'lldmacros' => $this->options['lldmacros']
]);
+ $this->size_parser = new CNumberParser(['with_size_suffix' => true]);
+ $this->time_parser = new CNumberParser(['with_time_suffix' => true, 'with_year' => true]);
+
if ($this->options['usermacros']) {
$this->user_macro_parser = new CUserMacroParser();
}
+
if ($this->options['lldmacros']) {
$this->lld_macro_parser = new CLLDMacroParser();
$this->lld_macro_function_parser = new CLLDMacroFunctionParser();
}
- $this->number_parser = new CNumberParser([
- 'with_minus' => true,
- 'with_suffix' => true
- ]);
}
/**
@@ -157,7 +158,7 @@ class CHistFunctionParser extends CParser {
$num = 0;
// The list of parsers for unquoted parameters.
- $parsers = [$this->number_parser];
+ $parsers = [$this->size_parser, $this->time_parser];
if ($this->options['usermacros']) {
$parsers[] = $this->user_macro_parser;
}
@@ -274,8 +275,12 @@ class CHistFunctionParser extends CParser {
break;
default:
+ $length = 0;
+ $new_p = $p;
+
foreach ($parsers as $parser) {
- if ($parser->parse($source, $p) != CParser::PARSE_FAIL) {
+ if ($parser->parse($source, $p) != CParser::PARSE_FAIL
+ && $parser->getLength() > $length) {
$_parameters[$num] = [
'type' => self::PARAM_TYPE_UNQUOTED,
'pos' => $p,
@@ -283,7 +288,8 @@ class CHistFunctionParser extends CParser {
'length' => $parser->getLength()
];
- $p += $parser->getLength() - 1;
+ $new_p = $p + $parser->getLength() - 1;
+ $length = $parser->getLength();
$state = self::STATE_END;
}
}
@@ -291,6 +297,8 @@ class CHistFunctionParser extends CParser {
if ($state != self::STATE_END) {
break 3;
}
+
+ $p = $new_p;
}
}
}
diff --git a/ui/include/classes/parsers/CNumberParser.php b/ui/include/classes/parsers/CNumberParser.php
index 1e83d03d0e4..953c86570de 100644
--- a/ui/include/classes/parsers/CNumberParser.php
+++ b/ui/include/classes/parsers/CNumberParser.php
@@ -32,7 +32,9 @@ class CNumberParser extends CParser {
private $options = [
'with_minus' => true,
'with_float' => true,
- 'with_suffix' => false
+ 'with_size_suffix' => false,
+ 'with_time_suffix' => false,
+ 'with_year' => false
];
/**
@@ -54,17 +56,31 @@ class CNumberParser extends CParser {
*
* @var string
*/
- private static $suffixes = ZBX_TIME_SUFFIXES.ZBX_BYTE_SUFFIXES;
+ private $suffixes;
/**
* Suffix multiplier table for value calculation.
*
* @var array
*/
- private static $suffix_multipliers = ZBX_BYTE_SUFFIX_MULTIPLIERS + ZBX_TIME_SUFFIX_MULTIPLIERS;
+ private static $suffix_multipliers;
public function __construct(array $options = []) {
$this->options = array_replace($this->options, array_intersect_key($options, $this->options));
+
+ if ($this->options['with_size_suffix'] && $this->options['with_year']) {
+ throw new Exception('Ambiguous options.');
+ }
+
+ if ($this->options['with_size_suffix']) {
+ $this->suffixes .= ZBX_BYTE_SUFFIXES;
+ self::$suffix_multipliers = ZBX_BYTE_SUFFIX_MULTIPLIERS;
+ }
+
+ if ($this->options['with_time_suffix']) {
+ $this->suffixes .= $this->options['with_year'] ? ZBX_TIME_SUFFIXES_WITH_YEAR : ZBX_TIME_SUFFIXES;
+ self::$suffix_multipliers += ZBX_TIME_SUFFIX_MULTIPLIERS;
+ }
}
/**
@@ -86,8 +102,8 @@ class CNumberParser extends CParser {
$fragment = substr($source, $pos);
$pattern = $this->options['with_float'] ? ZBX_PREG_NUMBER : ZBX_PREG_INT;
- $pattern = $this->options['with_suffix']
- ? '/^'.$pattern.'(?<suffix>['.self::$suffixes.'])?/'
+ $pattern = ($this->options['with_size_suffix'] || $this->options['with_time_suffix'])
+ ? '/^'.$pattern.'(?<suffix>['.$this->suffixes.'])?/'
: '/^'.$pattern.'/';
if (!preg_match($pattern, $fragment, $matches)) {
diff --git a/ui/include/classes/parsers/CRangeParser.php b/ui/include/classes/parsers/CRangeParser.php
index afd2aafd67d..d42c7da588b 100644
--- a/ui/include/classes/parsers/CRangeParser.php
+++ b/ui/include/classes/parsers/CRangeParser.php
@@ -67,7 +67,7 @@ class CRangeParser extends CParser {
* lldmacros Allow lldmacros in ranges.
* with_minus Allow negative ranges.
* with_float Allow float number ranges.
- * with_suffix Allow number ranges with suffix, supported suffixes see CNumberParser::$suffixes.
+ * with_suffix Allow number ranges with size and time suffixes.
*
* @var array
*/
@@ -87,7 +87,8 @@ class CRangeParser extends CParser {
$this->number_parser = new CNumberParser([
'with_minus' => $this->options['with_minus'],
'with_float' => $this->options['with_float'],
- 'with_suffix' => $this->options['with_suffix']
+ 'with_size_suffix' => $this->options['with_suffix'],
+ 'with_time_suffix' => $this->options['with_suffix']
]);
if ($this->options['usermacros']) {
diff --git a/ui/include/classes/validators/CApiInputValidator.php b/ui/include/classes/validators/CApiInputValidator.php
index b81966b4059..0861959722e 100644
--- a/ui/include/classes/validators/CApiInputValidator.php
+++ b/ui/include/classes/validators/CApiInputValidator.php
@@ -1600,7 +1600,7 @@ class CApiInputValidator {
return true;
}
- $number_parser = new CNumberParser(['with_suffix' => true]);
+ $number_parser = new CNumberParser(['with_size_suffix' => true, 'with_time_suffix' => true]);
if ($number_parser->parse($data) != CParser::PARSE_SUCCESS) {
$error = _s('Invalid parameter "%1$s": %2$s.', $path, _('a number is expected'));
diff --git a/ui/include/classes/validators/CHistFunctionValidator.php b/ui/include/classes/validators/CHistFunctionValidator.php
index 9149eeb3a27..7d7d8ac0f42 100644
--- a/ui/include/classes/validators/CHistFunctionValidator.php
+++ b/ui/include/classes/validators/CHistFunctionValidator.php
@@ -64,7 +64,9 @@ class CHistFunctionValidator extends CValidator {
_('invalid second parameter in function "%1$s"'),
_('invalid third parameter in function "%1$s"'),
_('invalid fourth parameter in function "%1$s"'),
- _('invalid fifth parameter in function "%1$s"')
+ _('invalid fifth parameter in function "%1$s"'),
+ _('invalid sixth parameter in function "%1$s"'),
+ _('invalid seventh parameter in function "%1$s"')
];
if (!array_key_exists($token['data']['function'], $this->options['parameters'])) {
@@ -220,12 +222,51 @@ class CHistFunctionValidator extends CValidator {
return false;
}
+ // Make sure time shift uses units no less than one used in period.
+ if (array_key_exists('aligned_shift', $rule) && $rule['aligned_shift']) {
+ if (self::hasMacros($param['data']['sec_num'], $options)
+ || self::hasMacros($param['data']['time_shift'], $options)) {
+ return true;
+ }
+
+ $period_parser = new CNumberParser([
+ 'with_time_suffix' => true,
+ 'with_year' => true
+ ]);
+
+ if ($period_parser->parse($param['data']['sec_num']) != CParser::PARSE_SUCCESS) {
+ return false;
+ }
+
+ $period_unit_length = timeUnitToSeconds('1'.$period_parser->getSuffix(), true);
+ $shift_parser = new CRelativeTimeParser();
+
+ if ($shift_parser->parse($param['data']['time_shift']) != CParser::PARSE_SUCCESS) {
+ return false;
+ }
+
+ foreach ($shift_parser->getTokens() as $token) {
+ if (timeUnitToSeconds('1'.$token['suffix'], true) < $period_unit_length) {
+ return false;
+ }
+ }
+ }
+
break;
case 'number':
- $with_suffix = array_key_exists('with_suffix', $rule) && $rule['with_suffix'];
+ $with_suffix = (array_key_exists('with_suffix', $rule) && $rule['with_suffix']);
+ $with_float = true;
- $parser = new CNumberParser(['with_minus' => true, 'with_suffix' => $with_suffix]);
+ if (array_key_exists('with_float', $rule) && $rule['with_float'] === false) {
+ $with_float = false;
+ }
+
+ $parser = new CNumberParser([
+ 'with_size_suffix' => $with_suffix,
+ 'with_time_suffix' => $with_suffix,
+ 'with_float' => $with_float
+ ]);
if ($parser->parse($param_match_unquoted) != CParser::PARSE_SUCCESS) {
return false;
@@ -248,13 +289,21 @@ class CHistFunctionValidator extends CValidator {
break;
case 'time':
- $with_year = array_key_exists('with_year', $rule) && $rule['with_year'];
+ $parser = new CNumberParser([
+ 'with_float' => false,
+ 'with_time_suffix' => true,
+ 'with_year' => (array_key_exists('with_year', $rule) && $rule['with_year'])
+ ]);
+
+ if ($parser->parse($param_match_unquoted) != CParser::PARSE_SUCCESS) {
+ return false;
+ }
+
+ $sec = $parser->calcValue();
$min = array_key_exists('min', $rule) ? $rule['min'] : ZBX_MIN_INT32;
$max = array_key_exists('max', $rule) ? $rule['max'] : ZBX_MAX_INT32;
- $sec = timeUnitToSeconds($param_match_unquoted, $with_year);
-
- if ($sec === null || $sec < $min || $sec > $max) {
+ if ($sec < $min || $sec > $max) {
return false;
}
diff --git a/ui/include/classes/widgets/forms/CWidgetFormSvgGraph.php b/ui/include/classes/widgets/forms/CWidgetFormSvgGraph.php
index 3be03b8f64c..0ee09ef34f3 100644
--- a/ui/include/classes/widgets/forms/CWidgetFormSvgGraph.php
+++ b/ui/include/classes/widgets/forms/CWidgetFormSvgGraph.php
@@ -471,7 +471,7 @@ class CWidgetFormSvgGraph extends CWidgetForm {
));
}
- $number_parser = new CNumberParser(['with_suffix' => true]);
+ $number_parser = new CNumberParser(['with_size_suffix' => true, 'with_time_suffix' => true]);
// Validate Min/Max values in Axes tab.
if ($this->fields['lefty']->getValue() == SVG_GRAPH_AXIS_SHOW) {
diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php
index e81cbc47157..192e5cbe47f 100644
--- a/ui/include/defines.inc.php
+++ b/ui/include/defines.inc.php
@@ -18,11 +18,11 @@
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**/
-define('ZABBIX_VERSION', '6.0.0alpha7');
+define('ZABBIX_VERSION', '6.0.0alpha8');
define('ZABBIX_API_VERSION', '6.0.0');
define('ZABBIX_EXPORT_VERSION', '6.0');
-define('ZABBIX_DB_VERSION', 5050138);
+define('ZABBIX_DB_VERSION', 5050140);
define('DB_VERSION_SUPPORTED', 0);
define('DB_VERSION_LOWER_THAN_MINIMUM', 1);
@@ -647,18 +647,6 @@ define('MAP_LINK_DRAWTYPE_DASHED_LINE', 4);
define('ZBX_SLA_MAX_REPORTING_PERIODS', 100);
define('ZBX_SLA_DEFAULT_REPORTING_PERIODS', 20);
-define('ZBX_SLA_STATUS_DISABLED', 0);
-define('ZBX_SLA_STATUS_ENABLED', 1);
-
-define('ZBX_SLA_PERIOD_DAILY', 0);
-define('ZBX_SLA_PERIOD_WEEKLY', 1);
-define('ZBX_SLA_PERIOD_MONTHLY', 2);
-define('ZBX_SLA_PERIOD_QUARTERLY', 3);
-define('ZBX_SLA_PERIOD_ANNUALLY', 4);
-
-define('ZBX_SLA_SERVICE_TAG_OPERATOR_EQUAL', 0);
-define('ZBX_SLA_SERVICE_TAG_OPERATOR_LIKE', 2);
-
define('ZBX_SERVICE_STATUS_CALC_SET_OK', 0);
define('ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ALL', 1);
define('ZBX_SERVICE_STATUS_CALC_MOST_CRITICAL_ONE', 2);
@@ -749,6 +737,9 @@ define('ACTION_STATUS_DISABLED', 1);
define('ACTION_PAUSE_SUPPRESSED_FALSE', 0);
define('ACTION_PAUSE_SUPPRESSED_TRUE', 1);
+define('ACTION_NOTIFY_IF_CANCELED_FALSE', 0);
+define('ACTION_NOTIFY_IF_CANCELED_TRUE', 1);
+
define('OPERATION_TYPE_MESSAGE', 0);
define('OPERATION_TYPE_COMMAND', 1);
define('OPERATION_TYPE_HOST_ADD', 2);
@@ -1619,14 +1610,12 @@ define('ZBX_POPUP_CONDITION_TYPE_ACTION_OPERATION', 2);
// Tab indicator names.
define('TAB_INDICATOR_MACROS', 'macros');
-define('TAB_INDICATOR_LINKED_TEMPLATE', 'linked-template');
define('TAB_INDICATOR_TAGS', 'tags');
define('TAB_INDICATOR_AUTH_HTTP', 'http');
define('TAB_INDICATOR_AUTH_LDAP', 'ldap');
define('TAB_INDICATOR_AUTH_SAML', 'saml');
define('TAB_INDICATOR_INVENTORY', 'inventory');
define('TAB_INDICATOR_ENCRYPTION', 'encryption');
-define('TAB_INDICATOR_GROUPS', 'groups');
define('TAB_INDICATOR_PREPROCESSING', 'preprocessing');
define('TAB_INDICATOR_DEPENDENCY', 'dependency');
define('TAB_INDICATOR_LLD_MACROS', 'lld-macros');
@@ -1636,6 +1625,7 @@ define('TAB_INDICATOR_STEPS', 'steps');
define('TAB_INDICATOR_HTTP_AUTH', 'http-auth');
define('TAB_INDICATOR_OPERATIONS', 'operations');
define('TAB_INDICATOR_SLA', 'sla');
+define('TAB_INDICATOR_SLA_DOWNTIMES', 'sla-downtimes');
define('TAB_INDICATOR_CHILD_SERVICES', 'child-services');
define('TAB_INDICATOR_TIME', 'time');
define('TAB_INDICATOR_TAG_FILTER', 'tag-filter');
diff --git a/ui/include/items.inc.php b/ui/include/items.inc.php
index a8a4fca2ca2..c7d779c2e8e 100644
--- a/ui/include/items.inc.php
+++ b/ui/include/items.inc.php
@@ -1465,7 +1465,7 @@ function getItemFunctionalValue($item, $function, $parameter) {
return UNRESOLVED_MACRO_STRING;
}
- $number_parser = new CNumberParser(['with_suffix' => true]);
+ $number_parser = new CNumberParser(['with_size_suffix' => true, 'with_time_suffix' => true]);
if ($number_parser->parse($parameter) != CParser::PARSE_SUCCESS) {
return UNRESOLVED_MACRO_STRING;
diff --git a/ui/include/schema.inc.php b/ui/include/schema.inc.php
index be730b886b6..88c59f417ab 100644
--- a/ui/include/schema.inc.php
+++ b/ui/include/schema.inc.php
@@ -1770,7 +1770,7 @@ return [
'formula' => [
'null' => false,
'type' => DB::FIELD_TYPE_CHAR,
- 'length' => 255,
+ 'length' => 1024,
'default' => ''
],
'pause_suppressed' => [
@@ -1778,6 +1778,12 @@ return [
'type' => DB::FIELD_TYPE_INT,
'length' => 10,
'default' => '1'
+ ],
+ 'notify_if_canceled' => [
+ 'null' => false,
+ 'type' => DB::FIELD_TYPE_INT,
+ 'length' => 10,
+ 'default' => '1'
]
]
],
diff --git a/ui/include/triggers.inc.php b/ui/include/triggers.inc.php
index 6de900b2d8c..84add9830f8 100644
--- a/ui/include/triggers.inc.php
+++ b/ui/include/triggers.inc.php
@@ -1642,6 +1642,8 @@ function get_item_function_info(string $expr) {
$hist_functions = [
'avg' => $rules['numeric_as_float'],
+ 'baselinedev' => $rules['numeric_as_float'],
+ 'baselinewma' => $rules['numeric_as_float'],
'change' => $rules['numeric'] + $rules['string_as_0or1'],
'count' => $rules['numeric_as_uint'] + $rules['string_as_uint'],
'changecount' => $rules['numeric_as_uint'] + $rules['string_as_uint'],
@@ -1658,6 +1660,8 @@ function get_item_function_info(string $expr) {
'mad' => $rules['numeric_as_float'],
'max' => $rules['numeric'],
'min' => $rules['numeric'],
+ 'monodec' => $rules['numeric_as_uint'],
+ 'monoinc' => $rules['numeric_as_uint'],
'nodata' => $rules['numeric_as_0or1'] + $rules['string_as_0or1'],
'percentile' => $rules['numeric'],
'rate' => $rules['numeric'],
@@ -1671,6 +1675,7 @@ function get_item_function_info(string $expr) {
'trendcount' => $rules['numeric'],
'trendmax' => $rules['numeric'],
'trendmin' => $rules['numeric'],
+ 'trendstl' => $rules['numeric'],
'trendsum' => $rules['numeric'],
'varpop' => $rules['numeric_as_float'],
'varsamp' => $rules['numeric_as_float']
diff --git a/ui/include/validate.inc.php b/ui/include/validate.inc.php
index d8b1be13f43..d0eeba81bd5 100644
--- a/ui/include/validate.inc.php
+++ b/ui/include/validate.inc.php
@@ -168,7 +168,7 @@ function check_type(&$field, $flags, &$var, $type, $caption = null) {
}
}
elseif ($type == T_ZBX_DBL) {
- $number_parser = new CNumberParser(['with_suffix' => false]);
+ $number_parser = new CNumberParser();
if ($number_parser->parse($var) != CParser::PARSE_SUCCESS) {
$error = true;
diff --git a/ui/include/views/configuration.action.edit.php b/ui/include/views/configuration.action.edit.php
index f30e6c01691..5f17a7760a7 100644
--- a/ui/include/views/configuration.action.edit.php
+++ b/ui/include/views/configuration.action.edit.php
@@ -108,7 +108,9 @@ if ($data['action']['filter']['conditions']) {
}
}
-$formula = (new CTextBox('formula', $data['action']['filter']['formula']))
+$formula = (new CTextBox('formula', $data['action']['filter']['formula'], false,
+ DB::getFieldLength('actions', 'formula')
+ ))
->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
->setId('formula')
->setAttribute('placeholder', 'A or (B and C) &hellip;');
@@ -159,13 +161,6 @@ if (in_array($data['eventsource'], [EVENT_SOURCE_TRIGGERS, EVENT_SOURCE_INTERNAL
);
}
-if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) {
- $operation_tab->addRow(_('Pause operations for suppressed problems'),
- (new CCheckBox('pause_suppressed', ACTION_PAUSE_SUPPRESSED_TRUE))
- ->setChecked($data['action']['pause_suppressed'] == ACTION_PAUSE_SUPPRESSED_TRUE)
- );
-}
-
// create operation table
$operations_table = (new CTable())
->setId('op-table')
@@ -473,6 +468,18 @@ if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS || $data['eventsource'] == EVE
);
}
+if ($data['eventsource'] == EVENT_SOURCE_TRIGGERS) {
+ $operation_tab
+ ->addRow(_('Pause operations for suppressed problems'),
+ (new CCheckBox('pause_suppressed', ACTION_PAUSE_SUPPRESSED_TRUE))
+ ->setChecked($data['action']['pause_suppressed'] == ACTION_PAUSE_SUPPRESSED_TRUE)
+ )
+ ->addRow(_('Notify about canceled escalations'),
+ (new CCheckBox('notify_if_canceled', ACTION_NOTIFY_IF_CANCELED_TRUE))
+ ->setChecked($data['action']['notify_if_canceled'] == ACTION_NOTIFY_IF_CANCELED_TRUE)
+ );
+}
+
// Append tabs to form.
$action_tabs = (new CTabView())
->addTab('actionTab', _('Action'), $action_tab)
diff --git a/ui/include/views/configuration.host.prototype.edit.php b/ui/include/views/configuration.host.prototype.edit.php
index 40b53baba6b..41f2eca46b3 100644
--- a/ui/include/views/configuration.host.prototype.edit.php
+++ b/ui/include/views/configuration.host.prototype.edit.php
@@ -23,57 +23,202 @@
* @var CView $this
*/
-$discoveryRule = $data['discovery_rule'];
-$hostPrototype = $data['host_prototype'];
-$parentHost = $data['parent_host'];
+require_once __DIR__.'/js/configuration.host.prototype.edit.js.php';
+require_once __DIR__.'/js/common.template.edit.js.php';
-require_once dirname(__FILE__).'/js/configuration.host.prototype.edit.js.php';
-require_once dirname(__FILE__).'/js/common.template.edit.js.php';
+$host_prototype = $data['host_prototype'];
+$parent_host = $data['parent_host'];
$widget = (new CWidget())
->setTitle(_('Host prototypes'))
- ->setNavigation(getHostNavigation('hosts', $discoveryRule['hostid'], $discoveryRule['itemid']));
+ ->setNavigation(getHostNavigation('hosts', $data['discovery_rule']['hostid'], $data['discovery_rule']['itemid']));
-$divTabs = new CTabView();
+$tabs = new CTabView();
if (!hasRequest('form_refresh')) {
- $divTabs->setSelected(0);
+ $tabs->setSelected(0);
}
$url = (new CUrl('host_prototypes.php'))
->setArgument('context', $data['context'])
->getUrl();
-$frmHost = (new CForm('post', $url))
+$form = (new CForm('post', $url))
->setId('host-prototype-form')
->setName('hostPrototypeForm')
->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', getRequest('form', 1))
- ->addVar('parent_discoveryid', $discoveryRule['itemid'])
- ->addVar('tls_accept', $parentHost['tls_accept']);
+ ->addVar('parent_discoveryid', $data['discovery_rule']['itemid'])
+ ->addVar('tls_accept', $parent_host['tls_accept']);
-if ($hostPrototype['hostid'] != 0) {
- $frmHost->addVar('hostid', $hostPrototype['hostid']);
+if ($host_prototype['hostid'] != 0) {
+ $form->addVar('hostid', $host_prototype['hostid']);
}
-$hostList = new CFormList('hostlist');
+$host_tab = new CFormList('hostlist');
if ($data['templates']) {
- $hostList->addRow(_('Parent discovery rules'), $data['templates']);
+ $host_tab->addRow(_('Parent discovery rules'), $data['templates']);
}
-$hostTB = (new CTextBox('host', $hostPrototype['host'], (bool) $hostPrototype['templateid']))
- ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
- ->setAttribute('maxlength', 128)
- ->setAriaRequired()
- ->setAttribute('autofocus', 'autofocus');
-$hostList->addRow((new CLabel(_('Host name'), 'host'))->setAsteriskMark(), $hostTB);
+$host_tab->addRow(
+ (new CLabel(_('Host name'), 'host'))->setAsteriskMark(),
+ (new CTextBox('host', $host_prototype['host'], (bool) $host_prototype['templateid']))
+ ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+ ->setAttribute('maxlength', 128)
+ ->setAriaRequired()
+ ->setAttribute('autofocus', 'autofocus')
+);
+
+$name = ($host_prototype['name'] != $host_prototype['host']) ? $host_prototype['name'] : '';
+
+$host_tab->addRow(
+ _('Visible name'),
+ (new CTextBox('name', $name, (bool) $host_prototype['templateid']))
+ ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+ ->setAttribute('maxlength', 128)
+);
+
+$templates_field_items = [];
+
+if ($host_prototype['templateid']) {
+ if ($host_prototype['templates']) {
+ $linked_templates = (new CTable())
+ ->setHeader([_('Name')])
+ ->setId('linked-templates')
+ ->addClass(ZBX_STYLE_TABLE_FORMS)
+ ->addStyle('width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px;');
+
+ foreach ($host_prototype['templates'] as $template) {
+ $host_tab->addItem(
+ (new CVar('templates['.$template['templateid'].']', $template['templateid']))->removeId()
+ );
+
+ if ($data['allowed_ui_conf_templates']
+ && array_key_exists($template['templateid'], $host_prototype['writable_templates'])) {
+ $template_link = (new CLink($template['name'],
+ (new CUrl('templates.php'))
+ ->setArgument('form', 'update')
+ ->setArgument('templateid', $template['templateid'])
+ ))->setTarget('_blank');
+ }
+ else {
+ $template_link = new CSpan($template['name']);
+ }
+
+ $linked_templates->addRow([$template_link->addClass(ZBX_STYLE_WORDWRAP)]);
+ }
+
+ $templates_field_items[] = $linked_templates;
+ }
+}
+else {
+ if ($host_prototype['templates']) {
+ $linked_templates = (new CTable())
+ ->setHeader([_('Name'), _('Action')])
+ ->setId('linked-templates')
+ ->addClass(ZBX_STYLE_TABLE_FORMS)
+ ->addStyle('width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px;');
+
+ foreach ($host_prototype['templates'] as $template) {
+ $host_tab->addItem((new CVar('templates['.$template['templateid'].']', $template['templateid']))->removeId());
+
+ if ($data['allowed_ui_conf_templates']
+ && array_key_exists($template['templateid'], $host_prototype['writable_templates'])) {
+ $template_link = (new CLink($template['name'],
+ (new CUrl('templates.php'))
+ ->setArgument('form', 'update')
+ ->setArgument('templateid', $template['templateid'])
+ ))->setTarget('_blank');
+ }
+ else {
+ $template_link = new CSpan($template['name']);
+ }
+
+ $unlink_parameters = array_map('json_encode', [
+ $form->getName(),
+ 'unlink['.$template['templateid'].']',
+ '1'
+ ]);
+
+ $linked_templates->addRow([
+ $template_link->addClass(ZBX_STYLE_WORDWRAP),
+ (new CCol(
+ (new CSimpleButton(_('Unlink')))
+ ->onClick('submitFormWithParam('.implode(', ', $unlink_parameters).');')
+ ->addClass(ZBX_STYLE_BTN_LINK)
+ ))->addClass(ZBX_STYLE_NOWRAP)
+ ]);
+ }
+
+ $templates_field_items[] = $linked_templates;
+ }
-$name = ($hostPrototype['name'] != $hostPrototype['host']) ? $hostPrototype['name'] : '';
-$visiblenameTB = (new CTextBox('name', $name, (bool) $hostPrototype['templateid']))
- ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
- ->setAttribute('maxlength', 128);
-$hostList->addRow(_('Visible name'), $visiblenameTB);
+ $templates_field_items[] = (new CMultiSelect([
+ 'name' => 'add_templates[]',
+ 'object_name' => 'templates',
+ 'data' => $host_prototype['add_templates'],
+ 'popup' => [
+ 'parameters' => [
+ 'srctbl' => 'templates',
+ 'srcfld1' => 'hostid',
+ 'srcfld2' => 'host',
+ 'dstfrm' => $form->getName(),
+ 'dstfld1' => 'add_templates_',
+ 'disableids' => array_column($host_prototype['templates'], 'templateid')
+ ]
+ ]
+ ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH);
+}
+
+$host_tab
+ ->addRow(_('Templates'),
+ (count($templates_field_items) > 1)
+ ? (new CDiv($templates_field_items))->addClass('linked-templates')
+ : $templates_field_items
+ );
+
+// Existing groups.
+$host_tab->addRow(
+ (new CLabel(_('Groups'), 'group_links__ms'))->setAsteriskMark(),
+ (new CMultiSelect([
+ 'name' => 'group_links[]',
+ 'object_name' => 'hostGroup',
+ 'disabled' => (bool) $host_prototype['templateid'],
+ 'data' => $data['groups_ms'],
+ 'popup' => [
+ 'parameters' => [
+ 'srctbl' => 'host_groups',
+ 'srcfld1' => 'groupid',
+ 'dstfrm' => $form->getName(),
+ 'dstfld1' => 'group_links_',
+ 'editable' => true,
+ 'normal_only' => true,
+ 'disableids' => array_column($data['groups_ms'], 'id')
+ ]
+ ]
+ ]))
+ ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+ ->setAriaRequired()
+);
+
+// New group prototypes.
+$host_tab->addRow(
+ _('Group prototypes'),
+ (new CDiv(
+ (new CTable())
+ ->setId('tbl_group_prototypes')
+ ->addRow(
+ (new CRow())
+ ->setId('row_new_group_prototype')
+ ->addItem(
+ (new CCol(
+ (new CButton('group_prototype_add', _('Add')))->addClass(ZBX_STYLE_BTN_LINK)
+ ))->setAttribute('colspan', 5)
+ )
+ )
+ ))->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
+);
$interface_header = renderInterfaceHeaders();
@@ -97,13 +242,14 @@ $ipmi_interfaces = (new CDiv())
->addClass(ZBX_STYLE_HOST_INTERFACE_CONTAINER)
->setAttribute('data-type', 'ipmi');
-$hostList->addRow(new CLabel(_('Interfaces')),
+$host_tab->addRow(
+ new CLabel(_('Interfaces')),
[
- (new CRadioButtonList('custom_interfaces', (int) $hostPrototype['custom_interfaces']))
+ (new CRadioButtonList('custom_interfaces', (int) $host_prototype['custom_interfaces']))
->addValue(_('Inherit'), HOST_PROT_INTERFACES_INHERIT)
->addValue(_('Custom'), HOST_PROT_INTERFACES_CUSTOM)
->setModern(true)
- ->setReadonly($hostPrototype['templateid'] != 0),
+ ->setReadonly($host_prototype['templateid'] != 0),
(new CDiv([$interface_header, $agent_interfaces, $snmp_interfaces, $jmx_interfaces, $ipmi_interfaces]))
->setId('interfaces-table'),
new CDiv(
@@ -116,216 +262,65 @@ $hostList->addRow(new CLabel(_('Interfaces')),
]
])
->setAttribute('aria-label', _('Add new interface'))
- ->addStyle(($hostPrototype['custom_interfaces'] == HOST_PROT_INTERFACES_CUSTOM)
+ ->addStyle(($host_prototype['custom_interfaces'] == HOST_PROT_INTERFACES_CUSTOM)
? null
: 'display: none'
)
- ->setEnabled($hostPrototype['templateid'] == 0)
+ ->setEnabled($host_prototype['templateid'] == 0)
)
]
);
// Display inherited parameters only for hosts prototypes on hosts.
-if ($parentHost['status'] != HOST_STATUS_TEMPLATE) {
- // proxy
- $proxyTb = (new CTextBox('proxy_hostid',
- $parentHost['proxy_hostid'] != 0 ? $this->data['proxy']['host'] : _('(no proxy)'), true
- ))
- ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH);
- $hostList->addRow(_('Monitored by proxy'), $proxyTb);
+if ($parent_host['status'] != HOST_STATUS_TEMPLATE) {
+ $host_tab->addRow(
+ _('Monitored by proxy'),
+ (new CTextBox(
+ 'proxy_hostid',
+ ($parent_host['proxy_hostid'] != 0) ? $this->data['proxy']['host'] : _('(no proxy)'),
+ true
+ ))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+ );
}
-$hostList->addRow(_('Create enabled'),
+$host_tab->addRow(_('Create enabled'),
(new CCheckBox('status', HOST_STATUS_MONITORED))
- ->setChecked(HOST_STATUS_MONITORED == $hostPrototype['status'])
+ ->setChecked(HOST_STATUS_MONITORED == $host_prototype['status'])
);
-$hostList->addRow(_('Discover'),
+$host_tab->addRow(_('Discover'),
(new CCheckBox('discover', ZBX_PROTOTYPE_DISCOVER))
- ->setChecked($hostPrototype['discover'] == ZBX_PROTOTYPE_DISCOVER)
+ ->setChecked($host_prototype['discover'] == ZBX_PROTOTYPE_DISCOVER)
->setUncheckedValue(ZBX_PROTOTYPE_NO_DISCOVER)
);
-$divTabs->addTab('hostTab', _('Host'), $hostList);
-
-// groups
-$groupList = new CFormList();
-
-// existing groups
-$groups = [];
-foreach ($data['groups'] as $group) {
- $groups[] = [
- 'id' => $group['groupid'],
- 'name' => $group['name'],
- 'inaccessible' => (array_key_exists('inaccessible', $group) && $group['inaccessible'])
- ];
-}
-$groupList->addRow(
- (new CLabel(_('Groups'), 'group_links__ms'))->setAsteriskMark(),
- (new CMultiSelect([
- 'name' => 'group_links[]',
- 'object_name' => 'hostGroup',
- 'disabled' => (bool) $hostPrototype['templateid'],
- 'data' => $groups,
- 'popup' => [
- 'parameters' => [
- 'srctbl' => 'host_groups',
- 'srcfld1' => 'groupid',
- 'dstfrm' => $frmHost->getName(),
- 'dstfld1' => 'group_links_',
- 'editable' => true,
- 'normal_only' => true
- ]
- ]
- ]))
- ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
- ->setAriaRequired()
-);
-
-// new group prototypes
-$customGroupTable = (new CTable())->setId('tbl_group_prototypes');
-
-// buttons
-$buttonColumn = (new CCol(
- (new CButton('group_prototype_add', _('Add')))->addClass(ZBX_STYLE_BTN_LINK)
-))->setAttribute('colspan', 5);
-
-$buttonRow = (new CRow())
- ->setId('row_new_group_prototype')
- ->addItem($buttonColumn);
-
-$customGroupTable->addRow($buttonRow);
-$groupList->addRow(_('Group prototypes'), (new CDiv($customGroupTable))->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR));
-
-$divTabs->addTab('groupTab', _('Groups'), $groupList, TAB_INDICATOR_GROUPS);
-
-// templates
-$tmplList = new CFormList();
-
-if ($hostPrototype['templateid']) {
- $linkedTemplateTable = (new CTable())
- ->setId('linked-template')
- ->setAttribute('style', 'width: 100%;')
- ->setHeader([_('Name')]);
-
- foreach ($hostPrototype['templates'] as $template) {
- $tmplList->addItem((new CVar('templates['.$template['templateid'].']', $template['templateid']))->removeId());
-
- if ($data['allowed_ui_conf_templates']
- && array_key_exists($template['templateid'], $hostPrototype['writable_templates'])) {
- $template_link = (new CLink($template['name'],
- (new CUrl('templates.php'))
- ->setArgument('form', 'update')
- ->setArgument('templateid', $template['templateid'])
- ))->setTarget('_blank');
- }
- else {
- $template_link = new CSpan($template['name']);
- }
-
- $linkedTemplateTable->addRow([$template_link]);
- }
-
- $tmplList->addRow(_('Linked templates'),
- (new CDiv($linkedTemplateTable))
- ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
- ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
- );
-}
-else {
- $disableids = [];
-
- $linkedTemplateTable = (new CTable())
- ->setId('linked-template')
- ->setAttribute('style', 'width: 100%;')
- ->setHeader([_('Name'), _('Action')]);
-
- foreach ($hostPrototype['templates'] as $template) {
- $tmplList->addItem((new CVar('templates['.$template['templateid'].']', $template['templateid']))->removeId());
-
- if ($data['allowed_ui_conf_templates']
- && array_key_exists($template['templateid'], $hostPrototype['writable_templates'])) {
- $template_link = (new CLink($template['name'],
- (new CUrl('templates.php'))
- ->setArgument('form', 'update')
- ->setArgument('templateid', $template['templateid'])
- ))->setTarget('_blank');
- }
- else {
- $template_link = new CSpan($template['name']);
- }
+$tabs->addTab('hostTab', _('Host'), $host_tab);
- $linkedTemplateTable->addRow([
- $template_link,
- (new CCol(
- (new CSimpleButton(_('Unlink')))
- ->onClick('javascript: submitFormWithParam('.
- '"'.$frmHost->getName().'", "unlink['.$template['templateid'].']", "1"'.
- ');')
- ->addClass(ZBX_STYLE_BTN_LINK)
- ))->addClass(ZBX_STYLE_NOWRAP)
- ]);
-
- $disableids[] = $template['templateid'];
- }
-
- $add_templates_ms = (new CMultiSelect([
- 'name' => 'add_templates[]',
- 'object_name' => 'templates',
- 'data' => $hostPrototype['add_templates'],
- 'popup' => [
- 'parameters' => [
- 'srctbl' => 'templates',
- 'srcfld1' => 'hostid',
- 'srcfld2' => 'host',
- 'dstfrm' => $frmHost->getName(),
- 'dstfld1' => 'add_templates_',
- 'disableids' => $disableids
- ]
- ]
- ]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH);
-
- $tmplList
- ->addRow(_('Linked templates'),
- (new CDiv($linkedTemplateTable))
- ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
- ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
- )
- ->addRow((new CLabel(_('Link new templates'), 'add_templates__ms')),
- (new CDiv(
- (new CTable())->addRow([$add_templates_ms])
- ))
- ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
- ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
- );
-}
-
-$divTabs->addTab('templateTab', _('Templates'), $tmplList, TAB_INDICATOR_LINKED_TEMPLATE);
-
-// display inherited parameters only for hosts prototypes on hosts
-if ($parentHost['status'] != HOST_STATUS_TEMPLATE) {
+// Display inherited parameters only for hosts prototypes on hosts.
+if ($parent_host['status'] != HOST_STATUS_TEMPLATE) {
// IPMI
- $ipmiList = new CFormList();
+ $ipmi_tab = new CFormList();
- $ipmiList->addRow(_('Authentication algorithm'),
- (new CTextBox('ipmi_authtype', ipmiAuthTypes($parentHost['ipmi_authtype']), true))
+ $ipmi_tab->addRow(_('Authentication algorithm'),
+ (new CTextBox('ipmi_authtype', ipmiAuthTypes($parent_host['ipmi_authtype']), true))
->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)
);
- $ipmiList->addRow(_('Privilege level'),
- (new CTextBox('ipmi_privilege', ipmiPrivileges($parentHost['ipmi_privilege']), true))
+ $ipmi_tab->addRow(_('Privilege level'),
+ (new CTextBox('ipmi_privilege', ipmiPrivileges($parent_host['ipmi_privilege']), true))
->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)
);
- $ipmiList->addRow(_('Username'),
- (new CTextBox('ipmi_username', $parentHost['ipmi_username'], true))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)
+ $ipmi_tab->addRow(_('Username'),
+ (new CTextBox('ipmi_username', $parent_host['ipmi_username'], true))
+ ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)
);
- $ipmiList->addRow(_('Password'),
- (new CTextBox('ipmi_password', $parentHost['ipmi_password'], true))->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)
+ $ipmi_tab->addRow(_('Password'),
+ (new CTextBox('ipmi_password', $parent_host['ipmi_password'], true))
+ ->setWidth(ZBX_TEXTAREA_SMALL_WIDTH)
);
- $divTabs->addTab('ipmiTab', _('IPMI'), $ipmiList);
+ $tabs->addTab('ipmiTab', _('IPMI'), $ipmi_tab);
}
-// tags
-$divTabs->addTab('tags-tab', _('Tags'), new CPartial('configuration.tags.tab', [
+$tabs->addTab('tags-tab', _('Tags'), new CPartial('configuration.tags.tab', [
'source' => 'host_prototype',
'tags' => $data['tags'],
'readonly' => $data['readonly'],
@@ -333,39 +328,48 @@ $divTabs->addTab('tags-tab', _('Tags'), new CPartial('configuration.tags.tab', [
]), TAB_INDICATOR_TAGS
);
-// macros
-$tmpl = $data['show_inherited_macros'] ? 'hostmacros.inherited.list.html' : 'hostmacros.list.html';
-$divTabs->addTab('macroTab', _('Macros'),
+$tabs->addTab('macroTab', _('Macros'),
(new CFormList('macrosFormList'))
->addRow(null, (new CRadioButtonList('show_inherited_macros', (int) $data['show_inherited_macros']))
->addValue(_('Host prototype macros'), 0)
->addValue(_('Inherited and host prototype macros'), 1)
->setModern(true)
)
- ->addRow(null, new CPartial($tmpl, [
- 'macros' => $data['macros'],
- 'parent_hostid' => $data['parent_host']['hostid'],
- 'readonly' => $data['readonly']
- ]), 'macros_container'),
+ ->addRow(
+ null,
+ new CPartial(
+ $data['show_inherited_macros']
+ ? 'hostmacros.inherited.list.html'
+ : 'hostmacros.list.html',
+ [
+ 'macros' => $data['macros'],
+ 'parent_hostid' => $data['parent_host']['hostid'],
+ 'readonly' => $data['readonly']
+ ]
+ ),
+ 'macros_container'
+ ),
TAB_INDICATOR_MACROS
);
-$inventoryFormList = (new CFormList('inventorylist'))
- ->addRow(null,
- (new CRadioButtonList('inventory_mode', (int) $hostPrototype['inventory_mode']))
- ->addValue(_('Disabled'), HOST_INVENTORY_DISABLED)
- ->addValue(_('Manual'), HOST_INVENTORY_MANUAL)
- ->addValue(_('Automatic'), HOST_INVENTORY_AUTOMATIC)
- ->setReadonly($hostPrototype['templateid'] != 0)
- ->setModern(true)
- );
-
-$divTabs->addTab('inventoryTab', _('Inventory'), $inventoryFormList, TAB_INDICATOR_INVENTORY);
+$tabs->addTab('inventoryTab', _('Inventory'),
+ (new CFormList('inventorylist'))
+ ->addRow(
+ null,
+ (new CRadioButtonList('inventory_mode', (int) $host_prototype['inventory_mode']))
+ ->addValue(_('Disabled'), HOST_INVENTORY_DISABLED)
+ ->addValue(_('Manual'), HOST_INVENTORY_MANUAL)
+ ->addValue(_('Automatic'), HOST_INVENTORY_AUTOMATIC)
+ ->setReadonly($host_prototype['templateid'] != 0)
+ ->setModern(true)
+ ),
+ TAB_INDICATOR_INVENTORY
+);
-// Encryption form list.
-$encryption_form_list = (new CFormList('encryption'))
+// Encryption tab.
+$encryption_tab = (new CFormList('encryption'))
->addRow(_('Connections to host'),
- (new CRadioButtonList('tls_connect', (int) $parentHost['tls_connect']))
+ (new CRadioButtonList('tls_connect', (int) $parent_host['tls_connect']))
->addValue(_('No encryption'), HOST_ENCRYPTION_NONE)
->addValue(_('PSK'), HOST_ENCRYPTION_PSK)
->addValue(_('Certificate'), HOST_ENCRYPTION_CERTIFICATE)
@@ -396,45 +400,39 @@ $encryption_form_list = (new CFormList('encryption'))
'tls_psk'
)
->addRow(_('Issuer'),
- (new CTextBox('tls_issuer', $parentHost['tls_issuer'], false, 1024))
+ (new CTextBox('tls_issuer', $parent_host['tls_issuer'], false, 1024))
->setWidth(ZBX_TEXTAREA_BIG_WIDTH)
->setAttribute('disabled', 'disabled')
)
->addRow(_x('Subject', 'encryption certificate'),
- (new CTextBox('tls_subject', $parentHost['tls_subject'], false, 1024))
+ (new CTextBox('tls_subject', $parent_host['tls_subject'], false, 1024))
->setWidth(ZBX_TEXTAREA_BIG_WIDTH)
->setAttribute('disabled', 'disabled')
);
-$divTabs->addTab('encryptionTab', _('Encryption'), $encryption_form_list, TAB_INDICATOR_ENCRYPTION);
-
-/*
- * footer
- */
-if ($hostPrototype['hostid'] != 0) {
- $btnDelete = new CButtonDelete(
- _('Delete selected host prototype?'),
- url_params(['form', 'hostid', 'parent_discoveryid', 'context']), 'context'
- );
- $btnDelete->setEnabled($hostPrototype['templateid'] == 0);
+$tabs->addTab('encryptionTab', _('Encryption'), $encryption_tab, TAB_INDICATOR_ENCRYPTION);
- $divTabs->setFooter(makeFormFooter(
+if ($host_prototype['hostid'] != 0) {
+ $tabs->setFooter(makeFormFooter(
new CSubmit('update', _('Update')),
[
new CSubmit('clone', _('Clone')),
- $btnDelete,
+ (new CButtonDelete(
+ _('Delete selected host prototype?'),
+ url_params(['form', 'hostid', 'parent_discoveryid', 'context']), 'context'
+ ))->setEnabled($host_prototype['templateid'] == 0),
new CButtonCancel(url_params(['parent_discoveryid', 'context']))
]
));
}
else {
- $divTabs->setFooter(makeFormFooter(
+ $tabs->setFooter(makeFormFooter(
new CSubmit('add', _('Add')),
[new CButtonCancel(url_params(['parent_discoveryid', 'context']))]
));
}
-$frmHost->addItem($divTabs);
-$widget->addItem($frmHost);
+$form->addItem($tabs);
+$widget->addItem($form);
$widget->show();
diff --git a/ui/include/views/configuration.template.edit.php b/ui/include/views/configuration.template.edit.php
index b57f30d941c..88e62466291 100644
--- a/ui/include/views/configuration.template.edit.php
+++ b/ui/include/views/configuration.template.edit.php
@@ -23,7 +23,7 @@
* @var CView $this
*/
-require_once dirname(__FILE__).'/js/common.template.edit.js.php';
+require_once __DIR__.'/js/common.template.edit.js.php';
$widget = (new CWidget())->setTitle(_('Templates'));
@@ -31,62 +31,121 @@ if ($data['form'] !== 'clone' && $data['form'] !== 'full_clone') {
$widget->setNavigation(getHostNavigation('', $data['templateid']));
}
-$divTabs = new CTabView();
+$tabs = new CTabView();
if (!hasRequest('form_refresh')) {
- $divTabs->setSelected(0);
+ $tabs->setSelected(0);
}
-$host = getRequest('template_name', '');
-$visiblename = getRequest('visiblename', '');
-$newgroup = getRequest('newgroup', '');
-$templateids = getRequest('templates', []);
-$clear_templates = getRequest('clear_templates', []);
-
-$frm_title = _('Template');
-
-if ($data['templateid'] != 0) {
- $frm_title .= SPACE.' ['.$data['dbTemplate']['name'].']';
-}
-$frmHost = (new CForm())
+$form = (new CForm())
->setId('templates-form')
->setName('templatesForm')
->setAttribute('aria-labeledby', ZBX_STYLE_PAGE_TITLE)
->addVar('form', $data['form']);
if ($data['templateid'] != 0) {
- $frmHost->addVar('templateid', $data['templateid']);
-}
-
-if ($data['templateid'] != 0 && !hasRequest('form_refresh')) {
- $host = $data['dbTemplate']['host'];
- $visiblename = $data['dbTemplate']['name'];
-
- // Display empty visible name if equal to host name.
- if ($visiblename === $host) {
- $visiblename = '';
- }
-
- $templateids = $data['original_templates'];
+ $form->addVar('templateid', $data['templateid']);
}
-$clear_templates = array_intersect($clear_templates, array_keys($data['original_templates']));
-$clear_templates = array_diff($clear_templates, array_keys($templateids));
-
-natcasesort($templateids);
+$form->addVar('clear_templates', $data['clear_templates']);
-$frmHost->addVar('clear_templates', $clear_templates);
-
-$templateList = (new CFormList('hostlist'))
+$template_tab = (new CFormList('hostlist'))
->addRow(
(new CLabel(_('Template name'), 'template_name'))->setAsteriskMark(),
- (new CTextBox('template_name', $host, false, 128))
+ (new CTextBox('template_name', $data['template_name'], false, 128))
->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
->setAriaRequired()
->setAttribute('autofocus', 'autofocus')
)
- ->addRow(_('Visible name'), (new CTextBox('visiblename', $visiblename, false, 128))
- ->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+ ->addRow(
+ _('Visible name'),
+ (new CTextBox('visiblename', $data['visible_name'], false, 128))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH)
+ );
+
+$templates_field_items = [];
+
+if ($data['linked_templates']) {
+ $linked_templates= (new CTable())
+ ->setHeader([_('Name'), _('Action')])
+ ->setId('linked-templates')
+ ->addClass(ZBX_STYLE_TABLE_FORMS)
+ ->addStyle('width: '.ZBX_TEXTAREA_STANDARD_WIDTH.'px;');
+
+ foreach ($data['linked_templates'] as $template) {
+ $linked_templates->addItem(
+ (new CVar('templates['.$template['templateid'].']', $template['templateid']))->removeId()
+ );
+
+ if (array_key_exists($template['templateid'], $data['writable_templates'])) {
+ $template_link = (new CLink(
+ $template['name'],
+ 'templates.php?form=update&templateid='.$template['templateid']
+ ))
+ ->setTarget('_blank');
+ }
+ else {
+ $template_link = new CSpan($template['name']);
+ }
+
+ $template_link->addClass(ZBX_STYLE_WORDWRAP);
+
+ $clone_mode = ($data['form'] === 'clone' || $data['form'] === 'full_clone');
+
+ $unlink_parameters = array_map('json_encode', [
+ $form->getName(),
+ 'unlink['.$template['templateid'].']',
+ '1'
+ ]);
+
+ $unlink_clear_parameters = array_map('json_encode', [
+ $form->getName(),
+ 'unlink_and_clear['.$template['templateid'].']',
+ '1'
+ ]);
+
+ $linked_templates->addRow([
+ $template_link,
+ (new CCol(
+ new CHorList([
+ (new CSimpleButton(_('Unlink')))
+ ->onClick('submitFormWithParam('.implode(', ', $unlink_parameters).');')
+ ->addClass(ZBX_STYLE_BTN_LINK),
+ (array_key_exists($template['templateid'], $data['original_templates']) && !$clone_mode)
+ ? (new CSimpleButton(_('Unlink and clear')))
+ ->onClick('submitFormWithParam('.implode(', ', $unlink_clear_parameters).');')
+ ->addClass(ZBX_STYLE_BTN_LINK)
+ : null
+ ])
+ ))->addClass(ZBX_STYLE_NOWRAP)
+ ], null, 'conditions_'.$template['templateid']);
+ }
+
+ $templates_field_items[] = $linked_templates;
+}
+
+$templates_field_items[] = (new CMultiSelect([
+ 'name' => 'add_templates[]',
+ 'object_name' => 'templates',
+ 'data' => $data['add_templates'],
+ 'popup' => [
+ 'parameters' => [
+ 'srctbl' => 'templates',
+ 'srcfld1' => 'hostid',
+ 'srcfld2' => 'host',
+ 'dstfrm' => $form->getName(),
+ 'dstfld1' => 'add_templates_',
+ 'excludeids' => ($data['templateid'] == 0) ? [] : [$data['templateid']],
+ 'disableids' => array_column($data['linked_templates'], 'templateid')
+ ]
+ ]
+]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH);
+
+$template_tab
+ ->addRow(
+ new CLabel(_('Templates')),
+ (count($templates_field_items) > 1)
+ ? (new CDiv($templates_field_items))->addClass('linked-templates')
+ : $templates_field_items
)
->addRow((new CLabel(_('Groups'), 'groups__ms'))->setAsteriskMark(),
(new CMultiSelect([
@@ -98,9 +157,10 @@ $templateList = (new CFormList('hostlist'))
'parameters' => [
'srctbl' => 'host_groups',
'srcfld1' => 'groupid',
- 'dstfrm' => $frmHost->getName(),
+ 'dstfrm' => $form->getName(),
'dstfld1' => 'groups_',
- 'editable' => true
+ 'editable' => true,
+ 'disableids' => array_column($data['groups_ms'], 'id')
]
]
]))
@@ -113,89 +173,10 @@ $templateList = (new CFormList('hostlist'))
->setMaxlength(DB::getFieldLength('hosts', 'description'))
);
-$cloneOrFullClone = ($data['form'] === 'clone' || $data['form'] === 'full_clone');
-
-$divTabs->addTab('templateTab', _('Template'), $templateList);
-
-// templates
-$tmplList = new CFormList();
-
-$disableids = [];
-
-$linkedTemplateTable = (new CTable())
- ->setId('linked-template')
- ->setHeader([_('Name'), _('Action')])
- ->addStyle('width: 100%;');
-
-foreach ($data['linked_templates'] as $template) {
- $tmplList->addItem((new CVar('templates['.$template['templateid'].']', $template['templateid']))->removeId());
-
- if (array_key_exists($template['templateid'], $data['writable_templates'])) {
- $template_link = (new CLink($template['name'], 'templates.php?form=update&templateid='.$template['templateid']))
- ->setTarget('_blank');
- }
- else {
- $template_link = new CSpan($template['name']);
- }
-
- $linkedTemplateTable->addRow([
- $template_link,
- (new CCol(
- new CHorList([
- (new CSimpleButton(_('Unlink')))
- ->onClick('javascript: submitFormWithParam('.
- '"'.$frmHost->getName().'", "unlink['.$template['templateid'].']", "1"'.
- ');')
- ->addClass(ZBX_STYLE_BTN_LINK),
- (array_key_exists($template['templateid'], $data['original_templates']) && !$cloneOrFullClone)
- ? (new CSimpleButton(_('Unlink and clear')))
- ->onClick('javascript: submitFormWithParam('.
- '"'.$frmHost->getName().'", "unlink_and_clear['.$template['templateid'].']", "1"'.
- ');')
- ->addClass(ZBX_STYLE_BTN_LINK)
- : null
- ])
- ))->addClass(ZBX_STYLE_NOWRAP)
- ], null, 'conditions_'.$template['templateid']);
-
- $disableids[] = $template['templateid'];
-}
-
-$add_templates_ms = (new CMultiSelect([
- 'name' => 'add_templates[]',
- 'object_name' => 'templates',
- 'data' => $data['add_templates'],
- 'popup' => [
- 'parameters' => [
- 'srctbl' => 'templates',
- 'srcfld1' => 'hostid',
- 'srcfld2' => 'host',
- 'dstfrm' => $frmHost->getName(),
- 'dstfld1' => 'add_templates_',
- 'excludeids' => ($data['templateid'] == 0) ? [] : [$data['templateid']],
- 'disableids' => $disableids
- ]
- ]
-]))->setWidth(ZBX_TEXTAREA_STANDARD_WIDTH);
-
-$tmplList
- ->addRow(_('Linked templates'),
- (new CDiv($linkedTemplateTable))
- ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
- ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
- )
- ->addRow((new CLabel(_('Link new templates'), 'add_templates__ms')),
- (new CDiv(
- (new CTable())->addRow([$add_templates_ms])
- ))
- ->addClass(ZBX_STYLE_TABLE_FORMS_SEPARATOR)
- ->setAttribute('style', 'min-width: '.ZBX_TEXTAREA_BIG_WIDTH.'px;')
- );
-
-$divTabs->addTab('tmplTab', _('Linked templates'), $tmplList, TAB_INDICATOR_LINKED_TEMPLATE);
+$tabs->addTab('tmplTab', _('Templates'), $template_tab, false);
// tags
-$divTabs->addTab('tags-tab', _('Tags'), new CPartial('configuration.tags.tab', [
+$tabs->addTab('tags-tab', _('Tags'), new CPartial('configuration.tags.tab', [
'source' => 'template',
'tags' => $data['tags'],
'readonly' => $data['readonly'],
@@ -205,7 +186,7 @@ $divTabs->addTab('tags-tab', _('Tags'), new CPartial('configuration.tags.tab', [
// macros
$tmpl = $data['show_inherited_macros'] ? 'hostmacros.inherited.list.html' : 'hostmacros.list.html';
-$divTabs->addTab('macroTab', _('Macros'),
+$tabs->addTab('macroTab', _('Macros'),
(new CFormList('macrosFormList'))
->addRow(null, (new CRadioButtonList('show_inherited_macros', (int) $data['show_inherited_macros']))
->addValue(_('Template macros'), 0)
@@ -220,7 +201,7 @@ $divTabs->addTab('macroTab', _('Macros'),
);
// Value mapping.
-$divTabs->addTab('valuemap-tab', _('Value mapping'), (new CFormList('valuemap-formlist'))->addRow(null,
+$tabs->addTab('valuemap-tab', _('Value mapping'), (new CFormList('valuemap-formlist'))->addRow(null,
new CPartial('configuration.valuemap', [
'source' => 'template',
'valuemaps' => $data['valuemaps'],
@@ -232,7 +213,7 @@ $divTabs->addTab('valuemap-tab', _('Value mapping'), (new CFormList('valuemap-fo
// footer
if ($data['templateid'] != 0 && $data['form'] !== 'full_clone') {
- $divTabs->setFooter(makeFormFooter(
+ $tabs->setFooter(makeFormFooter(
new CSubmit('update', _('Update')),
[
new CSubmit('clone', _('Clone')),
@@ -249,14 +230,13 @@ if ($data['templateid'] != 0 && $data['form'] !== 'full_clone') {
));
}
else {
- $divTabs->setFooter(makeFormFooter(
+ $tabs->setFooter(makeFormFooter(
new CSubmit('add', _('Add')),
[new CButtonCancel()]
));
}
-$frmHost->addItem($divTabs);
-
-$widget->addItem($frmHost);
+$form->addItem($tabs);
+$widget->addItem($form);
$widget->show();
diff --git a/ui/include/views/js/common.template.edit.js.php b/ui/include/views/js/common.template.edit.js.php
index 45666d533d9..664eb11b2e6 100644
--- a/ui/include/views/js/common.template.edit.js.php
+++ b/ui/include/views/js/common.template.edit.js.php
@@ -139,7 +139,7 @@
var panel = (event.type === 'tabscreate') ? ui.panel : ui.newPanel;
if (panel.attr('id') === 'macroTab') {
- let macros_initialized = panel.data('macros_initialized') || false;
+ const macros_initialized = panel.data('macros_initialized') || false;
// Please note that macro initialization must take place once and only when the tab is visible.
if (event.type === 'tabsactivate') {
@@ -148,9 +148,12 @@
if (panel_templateids.xor(templateids).length > 0) {
panel.data('templateids', templateids);
- window.macros_manager.load($show_inherited_macros.val() == 1,
+
+ window.macros_manager.load(
+ $show_inherited_macros.filter(':checked').val() == 1,
linked_templateids.concat(templateids)
);
+
panel.data('macros_initialized', true);
}
}
@@ -163,7 +166,7 @@
<?php if ($data['readonly']): ?>
$('.<?= ZBX_STYLE_TEXTAREA_FLEXIBLE ?>', '#tbl_macros').textareaFlexible();
<?php else: ?>
- window.macros_manager.initMacroTable($('input[name="show_inherited_macros"]:checked').val() == 1);
+ window.macros_manager.initMacroTable($show_inherited_macros.filter(':checked').val() == 1);
<?php endif ?>
panel.data('macros_initialized', true);
@@ -175,8 +178,25 @@
return;
}
- let templateids = linked_templateids.concat(getAddTemplates());
- window.macros_manager.load($(this).val() == 1, templateids);
+ window.macros_manager.load($(this).val() == 1, linked_templateids.concat(getAddTemplates()));
+ });
+
+ const $groups_ms = $('#groups_, #group_links_');
+ const $template_ms = $('#add_templates_');
+
+ $template_ms.on('change', (e) => {
+ $template_ms.multiSelect('setDisabledEntries',
+ [... document.querySelectorAll('[name^="add_templates["], [name^="templates["]')]
+ .map((input) => input.value)
+ );
+ });
+
+ $groups_ms.on('change', (e) => {
+ console.log('e')
+ $groups_ms.multiSelect('setDisabledEntries',
+ [... document.querySelectorAll('[name^="groups["], [name^="group_links["]')]
+ .map((input) => input.value)
+ );
});
});
</script>
diff --git a/ui/include/views/js/configuration.host.prototype.edit.js.php b/ui/include/views/js/configuration.host.prototype.edit.js.php
index 55d18c0a95c..d0c9e1134f6 100644
--- a/ui/include/views/js/configuration.host.prototype.edit.js.php
+++ b/ui/include/views/js/configuration.host.prototype.edit.js.php
@@ -27,10 +27,13 @@
<script type="text/x-jquery-tmpl" id="groupPrototypeRow">
<tr class="form_row">
<td>
- <input name="group_prototypes[#{i}][name]" type="text" value="#{name}" style="width: <?= ZBX_TEXTAREA_STANDARD_WIDTH ?>px" placeholder="{#MACRO}" maxlength="255" />
+ <input name="group_prototypes[#{i}][name]" type="text" value="#{name}" style="width: 448px"
+ placeholder="{#MACRO}" maxlength="255" />
</td>
<td class="<?= ZBX_STYLE_NOWRAP ?>">
- <button class="<?= ZBX_STYLE_BTN_LINK ?> group-prototype-remove" type="button" name="remove"><?= _('Remove') ?></button>
+ <button class="<?= ZBX_STYLE_BTN_LINK ?> group-prototype-remove" type="button" name="remove">
+ <?= _('Remove') ?>
+ </button>
<input type="hidden" name="group_prototypes[#{i}][group_prototypeid]" value="#{group_prototypeid}" />
</td>
</tr>
@@ -171,10 +174,10 @@
document.getElementById('custom_interfaces'),
document.getElementById('interface-add'),
<?= json_encode([
- 'parent_is_template' => $parentHost['status'] == HOST_STATUS_TEMPLATE,
- 'is_templated' => $hostPrototype['templateid'] != 0,
- 'inherited_interfaces' => array_values($parentHost['interfaces']),
- 'custom_interfaces' => array_values($hostPrototype['interfaces'])
+ 'parent_is_template' => $data['parent_host']['status'] == HOST_STATUS_TEMPLATE,
+ 'is_templated' => $data['host_prototype']['templateid'] != 0,
+ 'inherited_interfaces' => array_values($data['parent_host']['interfaces']),
+ 'custom_interfaces' => array_values($data['host_prototype']['interfaces'])
]) ?>
);
@@ -188,17 +191,17 @@
jQuery(this).closest('.form_row').remove();
});
- <?php if (!$hostPrototype['groupPrototypes']): ?>
+ <?php if (!$data['host_prototype']['groupPrototypes']): ?>
addGroupPrototypeRow({'name': '', 'group_prototypeid': ''});
<?php endif ?>
- <?php foreach ($hostPrototype['groupPrototypes'] as $i => $groupPrototype): ?>
+ <?php foreach ($data['host_prototype']['groupPrototypes'] as $i => $groupPrototype): ?>
addGroupPrototypeRow(<?= json_encode([
'name' => $groupPrototype['name'],
'group_prototypeid' => isset($groupPrototype['group_prototypeid']) ? $groupPrototype['group_prototypeid'] : null
]) ?>);
<?php endforeach ?>
- <?php if ($hostPrototype['templateid']): ?>
+ <?php if ($data['host_prototype']['templateid']): ?>
jQuery('#tbl_group_prototypes').find('input').prop('readonly', true);
jQuery('#tbl_group_prototypes').find('button').prop('disabled', true);
<?php endif ?>
diff --git a/ui/index_sso.php b/ui/index_sso.php
index c1184398901..de42a21221f 100644
--- a/ui/index_sso.php
+++ b/ui/index_sso.php
@@ -194,7 +194,7 @@ try {
);
}
- CSessionHelper::set('saml_data', [
+ $saml_data = [
'username_attribute' => reset(
$user_attributes[CAuthenticationHelper::get(CAuthenticationHelper::SAML_USERNAME_ATTRIBUTE)]
),
@@ -203,7 +203,10 @@ try {
'nameid_name_qualifier' => $auth->getNameIdNameQualifier(),
'nameid_sp_name_qualifier' => $auth->getNameIdSPNameQualifier(),
'session_index' => $auth->getSessionIndex()
- ]);
+ ];
+ $saml_data['sign'] = CEncryptHelper::hash(json_encode($saml_data));
+
+ CSessionHelper::set('saml_data', $saml_data);
if (hasRequest('RelayState') && strpos(getRequest('RelayState'), $baseurl) === false) {
$relay_state = getRequest('RelayState');
@@ -234,6 +237,18 @@ try {
if (CSessionHelper::has('saml_data')) {
$saml_data = CSessionHelper::get('saml_data');
+
+ if (!array_key_exists('sign', $saml_data)) {
+ throw new Exception(_('Session initialization error.'));
+ }
+
+ $saml_data_sign = $saml_data['sign'];
+ $saml_data_sign_check = CEncryptHelper::hash(json_encode(array_diff_key($saml_data, array_flip(['sign']))));
+
+ if (!CEncryptHelper::checkSign($saml_data_sign, $saml_data_sign_check)) {
+ throw new Exception(_('Session initialization error.'));
+ }
+
CWebUser::$data = API::getApiService('user')->loginByUsername($saml_data['username_attribute'],
(CAuthenticationHelper::get(CAuthenticationHelper::SAML_CASE_SENSITIVE) == ZBX_AUTH_CASE_SENSITIVE),
CAuthenticationHelper::get(CAuthenticationHelper::AUTHENTICATION_TYPE)
diff --git a/ui/js/class.tab-indicators.js b/ui/js/class.tab-indicators.js
index 0416a7f10ca..4d566c29c4b 100644
--- a/ui/js/class.tab-indicators.js
+++ b/ui/js/class.tab-indicators.js
@@ -173,8 +173,6 @@ class TabIndicatorFactory {
switch (name) {
case 'Macros':
return new MacrosTabIndicatorItem;
- case 'LinkedTemplate':
- return new LinkedTemplateTabIndicatorItem;
case 'Tags':
return new TagsTabIndicatorItem;
case 'Http':
@@ -187,8 +185,6 @@ class TabIndicatorFactory {
return new InventoryTabIndicatorItem;
case 'Encryption':
return new EncryptionTabIndicatorItem;
- case 'Groups':
- return new GroupsTabIndicatorItem;
case 'Preprocessing':
return new PreprocessingTabIndicatorItem;
case 'Dependency':
@@ -338,62 +334,6 @@ class MacrosTabIndicatorItem extends TabIndicatorItem {
}
}
-class LinkedTemplateTabIndicatorItem extends TabIndicatorItem {
-
- constructor() {
- super(TAB_INDICATOR_TYPE_COUNT);
- }
-
- getValue() {
- let count = 0;
- const target_node = document.querySelector('#linked-template');
-
- if (target_node !== null) {
- count += target_node
- .querySelectorAll('tbody tr')
- .length;
- }
-
- const multiselect_node = document.querySelector('#add_templates_');
-
- if (multiselect_node !== null) {
- count += multiselect_node
- .querySelectorAll('.selected li')
- .length;
- }
-
- return count;
- }
-
- initObserver(element) {
- const linked_node = document.querySelector('#linked-template');
-
- if (linked_node !== null) {
- const linked_observer = new MutationObserver(() => {
- this.addAttributes(element)
- });
-
- linked_observer.observe(linked_node, {
- childList: true,
- subtree: true
- });
- }
-
- const multiselect_node = document.querySelector('#add_templates_');
-
- if (multiselect_node !== null) {
- const multiselect_observer = new MutationObserver(() => {
- this.addAttributes(element)
- });
-
- multiselect_observer.observe(multiselect_node.parentNode, {
- childList: true,
- subtree: true
- });
- }
- }
-}
-
class TagsTabIndicatorItem extends TabIndicatorItem {
constructor() {
@@ -574,34 +514,6 @@ class EncryptionTabIndicatorItem extends TabIndicatorItem {
}
}
-class GroupsTabIndicatorItem extends TabIndicatorItem {
-
- constructor() {
- super(TAB_INDICATOR_TYPE_COUNT);
- }
-
- getValue() {
- return document
- .querySelectorAll('#group_links_ .multiselect-list li')
- .length;
- }
-
- initObserver(element) {
- const target_node = document.querySelector('#group_links_ .multiselect-list');
-
- if (target_node !== null) {
- const observer = new MutationObserver(() => {
- this.addAttributes(element);
- });
-
- observer.observe(target_node, {
- childList: true,
- subtree: true
- });
- }
- }
-}
-
class PreprocessingTabIndicatorItem extends TabIndicatorItem {
constructor() {
diff --git a/ui/js/hostmacrosmanager.js b/ui/js/hostmacrosmanager.js
index a11767fd532..c2b59eee390 100644
--- a/ui/js/hostmacrosmanager.js
+++ b/ui/js/hostmacrosmanager.js
@@ -205,11 +205,10 @@ class HostMacrosManager {
});
// Init tab indicator observer.
- const macro_indicator = new MacrosTabIndicatorItem();
- const tab = document.querySelector('#tab_macros-tab');
+ const tab = document.querySelector('#tab_macros-tab, #tab_macroTab');
if (tab) {
- macro_indicator.initObserver(tab);
+ new MacrosTabIndicatorItem().initObserver(tab);
}
}
diff --git a/ui/js/multiselect.js b/ui/js/multiselect.js
index bd0a4257687..c5c8e3f852a 100644
--- a/ui/js/multiselect.js
+++ b/ui/js/multiselect.js
@@ -264,6 +264,28 @@
});
return ret;
+ },
+
+ /**
+ * @param array entries IDs to mark disabled.
+ */
+ setDisabledEntries: function (entries) {
+ this.each(function() {
+ const $obj = $(this);
+ const ms_parameters = $obj.data('multiSelect');
+
+ if (typeof ms_parameters === 'undefined') {
+ return;
+ }
+
+ const link = new Curl(ms_parameters.options.url, false);
+ link.setArgument('disabledids', entries);
+
+ ms_parameters.options.url = link.getUrl();
+ ms_parameters.options.popup.parameters.disableids = entries;
+
+ $obj.data('multiSelect', ms_parameters);
+ });
}
};
diff --git a/ui/locale/bg/LC_MESSAGES/frontend.po b/ui/locale/bg/LC_MESSAGES/frontend.po
index 84dbcf6e4bd..9353e96cfd7 100644
--- a/ui/locale/bg/LC_MESSAGES/frontend.po
+++ b/ui/locale/bg/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-01-12 23:52+0300\n"
"Last-Translator: Fahri <fahri_hasan@hotmail.com>\n"
"Language-Team: \n"
@@ -302,10 +302,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(без прокÑи)"
@@ -456,7 +456,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -525,7 +525,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -544,11 +544,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -560,24 +560,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -595,7 +595,7 @@ msgstr ""
msgid "Action"
msgstr "ДейÑтвие"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr ""
@@ -605,7 +605,7 @@ msgstr ""
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "ДейÑтвие добавено"
@@ -614,17 +614,17 @@ msgstr "ДейÑтвие добавено"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "ДейÑтвие изтрито"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] ""
@@ -643,7 +643,7 @@ msgstr ""
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "ДейÑтвие актуализирано"
@@ -690,7 +690,7 @@ msgid "Active till"
msgstr "Ðктивно до"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -749,14 +749,14 @@ msgstr "Ðктивно до"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -772,10 +772,10 @@ msgstr "Ðктивно до"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -787,9 +787,9 @@ msgstr "Ðктивно до"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -807,7 +807,7 @@ msgstr "Ðктивно до"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -852,7 +852,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -877,8 +877,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -891,7 +891,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1025,7 +1025,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1041,6 +1041,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "ПÑевдоним"
@@ -1355,7 +1359,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1435,9 +1439,9 @@ msgstr ""
msgid "Authentication"
msgstr "ÐвтентификациÑ"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Ðлгоритъм за автентификациÑ"
@@ -1498,12 +1502,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Ðвтоматично"
@@ -1619,12 +1623,12 @@ msgstr "Име на връзката (Bind DN)"
msgid "Bind password"
msgstr " Парола за връзката (Bind password)"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1830,7 +1834,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Ðе може да Ñе добави дейÑтвие"
@@ -2129,7 +2133,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Ðе може да Ñе изтрие Zabbix вътрешен потребител \"%1$s\", опитайте Ñ Ð¸Ð·ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ на този потребител."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Ðе може да Ñе изтрие дейÑтвието"
@@ -2296,12 +2300,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Ðе може да Ñе изтрие Ñкрипта"
msgstr[1] "Ðе може да Ñе изтрие Ñкрипта"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Ðе може да Ñе изтриÑÑ‚ Ñкриптовете. Скрипт \"%1$s\" Ñе използва в Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ð° дейÑтвие \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Ðе може да Ñе изтриÑÑ‚ избраните дейÑÑ‚Ð²Ð¸Ñ "
@@ -2318,7 +2322,7 @@ msgstr[1] "Ðе може да Ñе изтрие уÑлугата"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Ðе може да Ñе изтрие шаблона"
@@ -2405,7 +2409,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] ""
@@ -2485,7 +2489,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2715,7 +2719,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] ""
msgstr[1] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2894,7 +2898,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -2960,7 +2964,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Ðе може да Ñе актуализира дейÑтвието"
@@ -3020,7 +3024,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Ðе може да Ñе актуализира хоÑта"
@@ -3124,9 +3128,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Ðе може да Ñе актуализира Ñкрипта"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3153,7 +3157,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "Ðе може да Ñе актуализира шаблона"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3239,14 +3243,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3264,10 +3268,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3307,9 +3311,9 @@ msgstr "Включва Ñимволен низ "
msgid "Character string not included"
msgstr "Ðе включва Ñимволен низ "
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3325,7 +3329,7 @@ msgstr ""
msgid "Check already exists."
msgstr "Проверката вече ÑъщеÑтвува."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Проверете чаÑÑ‚ от израза започваща от \"%1$s\"."
@@ -3447,8 +3451,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr "ИзчиÑти иÑториÑта и динамиката на промените"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "ИзчиÑти когато Ñе прекрати връзката"
@@ -3475,16 +3479,16 @@ msgstr "ЧаÑовник"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3613,7 +3617,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3886,13 +3890,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3900,9 +3904,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4069,10 +4073,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "ЧиÑло"
@@ -4162,7 +4166,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4365,7 +4369,7 @@ msgid "Current value"
msgstr "Текуща ÑтойноÑÑ‚"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4608,7 +4612,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4681,11 +4685,11 @@ msgstr "Дата за изтичане на поддръжката HW"
msgid "Date HW purchased"
msgstr "Дата на закупуване HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Ден"
@@ -4726,8 +4730,8 @@ msgstr "Дек"
msgid "December"
msgstr "Декември"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4737,7 +4741,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4868,7 +4872,7 @@ msgstr "Изтриване"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Изтриване и изчиÑтване"
@@ -4877,11 +4881,11 @@ msgstr "Изтриване и изчиÑтване"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Изтриване и изчиÑтване на избраните шаблони? (Внимание: вÑички Ñвързани хоÑтове ще бъдат изчиÑтени!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Изтриване и изчиÑтване на шаблона? (Внимание: вÑички Ñвързани хоÑтове ще бъдат изчиÑтени!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Изтриване на текущото дейÑтвие?"
@@ -5015,7 +5019,7 @@ msgstr "Изтриване на избраните групи?"
msgid "Delete selected host groups?"
msgstr "Изтриване на избраните хоÑÑ‚ групи?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5123,7 +5127,7 @@ msgstr "Изтриване на избраните потребители?"
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Изтриване на шаблон?"
@@ -5184,7 +5188,7 @@ msgstr ""
msgid "Dependencies"
msgstr "ЗавиÑимоÑти"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "ЗавиÑим"
@@ -5192,7 +5196,7 @@ msgstr "ЗавиÑим"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5203,7 +5207,7 @@ msgid "Deployment status"
msgstr "СъÑтоÑние на разгръщане"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5218,16 +5222,16 @@ msgstr "СъÑтоÑние на разгръщане"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5239,10 +5243,10 @@ msgstr "ОпиÑание"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "ПодробноÑти"
@@ -5251,6 +5255,14 @@ msgstr "ПодробноÑти"
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "УÑтройÑтво"
@@ -5373,7 +5385,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5400,17 +5412,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Изключено"
@@ -5435,7 +5447,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5649,7 +5661,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5666,7 +5678,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5748,7 +5760,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5812,7 +5824,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "ПродължителноÑÑ‚"
@@ -5842,14 +5854,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6105,7 +6117,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6143,13 +6155,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6165,11 +6177,11 @@ msgstr "Ðктивно"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6245,6 +6257,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Грешка: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Събитие"
@@ -6814,8 +6830,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Първи"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6927,12 +6943,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Пълен клонинг"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "ФункциÑ"
@@ -6948,7 +6964,7 @@ msgstr "GSM модем"
msgid "GUI"
msgstr "Графичен потребителÑки Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ (GUI)"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "GUI доÑтъп забранен."
@@ -7298,7 +7314,7 @@ msgstr "Име на група"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7311,12 +7327,11 @@ msgid "Grouping by"
msgstr "Групиране по"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Групи"
@@ -7535,7 +7550,7 @@ msgstr "ИзчиÑтването на иÑториÑта може да отнеÐ
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7566,7 +7581,7 @@ msgid "Horizontal align"
msgstr "Хоризонтално подравнÑване"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7575,7 +7590,7 @@ msgstr "Хоризонтално подравнÑване"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7586,7 +7601,7 @@ msgstr "Хоризонтално подравнÑване"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7712,7 +7727,7 @@ msgid "Host group label type"
msgstr "Тип етикет на хоÑÑ‚ група"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7731,8 +7746,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7782,7 +7797,7 @@ msgstr "Преглед инвентарните данни на хоÑÑ‚"
msgid "Host label type"
msgstr "ХоÑÑ‚ етикет"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7794,7 +7809,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Име на хоÑта"
@@ -7831,7 +7846,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7854,7 +7869,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7879,7 +7894,7 @@ msgstr "ХоÑÑ‚ време"
msgid "Host update failed."
msgstr "ÐктуализациÑта на хоÑта Ñе провали."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "ХоÑÑ‚ актуализиран"
@@ -7956,6 +7971,10 @@ msgstr "МеÑтоположение на хоÑтове"
msgid "Hosts updated"
msgstr "ХоÑтове актуализирани"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "ЧаÑа"
@@ -8025,15 +8044,15 @@ msgstr "IP диапазон"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8270,7 +8289,7 @@ msgstr "ИзображениÑ"
msgid "Images for all maps will be updated!"
msgstr "ИзображениÑта за вÑички карти ще бъдат обновени!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Веднага"
@@ -8352,7 +8371,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8364,11 +8383,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8483,7 +8502,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Ðеправилно дейÑтвие в уÑловие проверка за откриване."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Ðеправилно дейÑтвие в уÑловие проверка за откриване. Проверка за откриване не ÑъщеÑтвува или нÑмате права за доÑтъп до него."
@@ -8491,7 +8510,7 @@ msgstr "Ðеправилно дейÑтвие в уÑловие проверка
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Ðеправилно дейÑтвие в уÑловие правило за откриване. Правило за откриване не ÑъщеÑтвува или нÑмате права за доÑтъп до него."
@@ -8503,15 +8522,15 @@ msgstr "Ðеправилно дейÑтвие в уÑловие ÑÑŠÑтоÑни
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8520,11 +8539,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Ðеправилно дейÑтвие в уÑловие прокÑи. ПрокÑито не ÑъщеÑтвува или нÑмате права за доÑтъп до него."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8532,7 +8551,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Ðеправилно дейÑтвие в уÑловие тригер. Тригера не ÑъщеÑтвува или нÑмате права за доÑтъп до него."
@@ -8542,11 +8561,11 @@ msgstr "Ðеправилно дейÑтвие в уÑловие тип."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Ðеправилно дейÑтвие в Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ð° ÑтойноÑти в Ñтъпка еÑкалациÑ."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8555,11 +8574,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8859,8 +8878,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr "Ðеправилен израз в тригер"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Ðеправилен израз в тригер."
@@ -9258,7 +9277,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9267,11 +9286,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9283,7 +9302,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9303,7 +9322,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Вмъкване"
@@ -9362,8 +9381,8 @@ msgstr "Ð’ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ñ IP \"%1$s\" не може да бъде праÐ
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Ð’ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ñ IP \"%1$s\" не може да бъде празно DNS името."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9455,7 +9474,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9516,10 +9535,10 @@ msgstr "Ðевалидни параметри на метода."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9582,8 +9601,8 @@ msgstr "Ðевалидни параметри на метода."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9805,11 +9824,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "ИнвентаризациÑ"
@@ -9823,7 +9842,7 @@ msgid "Inventory field"
msgstr "Поле за инвентаризациÑ"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Режим на инвентарните данни"
@@ -9831,10 +9850,10 @@ msgstr "Режим на инвентарните данни"
msgid "Is online?"
msgstr "Ðа Ð»Ð¸Ð½Ð¸Ñ Ð»Ð¸ е?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9926,7 +9945,7 @@ msgstr[1] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10379,17 +10398,17 @@ msgstr "Графика за поÑÐ»ÐµÐ´Ð½Ð¸Ñ Ð¼ÐµÑец"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "За поÑледното"
@@ -10466,8 +10485,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10501,8 +10520,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Връзка"
@@ -10525,16 +10544,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Индикатори на връзка"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Прикрепете шаблони"
@@ -10550,13 +10562,6 @@ msgstr "Връзка към шаблони"
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10695,7 +10700,7 @@ msgstr "ЗапиÑите в дневника не Ñъвпадат SNMP traps"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Вход в ÑиÑтемата"
@@ -10777,16 +10782,16 @@ msgstr "Макро \"%1$s\" вече ÑъщеÑтвува в \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Макро \"%1$s\" вече ÑъщеÑтвува."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "МакроÑи"
@@ -10885,12 +10890,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Ръчно"
@@ -11033,16 +11038,16 @@ msgstr "Маркирай оÑтаналите"
msgid "Mark selected"
msgstr "Маркирай избраните"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11075,11 +11080,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11314,7 +11319,7 @@ msgstr ""
msgid "Middle"
msgstr "Средeн"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11416,7 +11421,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "ЛипÑващ ключ \"%1$s\" за хоÑÑ‚ \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11498,9 +11503,9 @@ msgstr "Понеделник"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Ðаблюдава Ñе чрез прокÑи"
@@ -11519,6 +11524,7 @@ msgstr "Мониторинг"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "МеÑец"
@@ -11631,8 +11637,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11702,11 +11708,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11734,8 +11740,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11756,7 +11762,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12046,15 +12052,15 @@ msgstr "Ðе уточнено ID на правило за откриване."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12140,7 +12146,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12177,9 +12183,9 @@ msgstr "ÐÑмате право на доÑтъп до ÑиÑтемата."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12218,7 +12224,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12318,11 +12324,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12381,7 +12387,7 @@ msgid "No public key file specified."
msgstr "Ðе е уточнен файла Ñ Ð¾Ð±Ñ‰ÐµÑтвен ключ."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12402,7 +12408,7 @@ msgid "No target selected."
msgstr "Ðе е избрана цел."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12551,6 +12557,10 @@ msgstr "Доклад за нотификациите"
msgid "Notifications"
msgstr "Ðотификации"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12637,6 +12647,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Брой на промените в ÑÑŠÑтоÑнието"
@@ -12812,7 +12826,7 @@ msgid "Off"
msgstr "Изкл"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12859,7 +12873,7 @@ msgstr ""
msgid "One time only"
msgstr "Само един път"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Еднократна недоÑтъпноÑÑ‚"
@@ -12936,12 +12950,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12975,8 +12989,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Операции"
@@ -13011,7 +13025,7 @@ msgstr "Операции"
msgid "Operator"
msgstr "Оператор"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13051,19 +13065,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13093,10 +13107,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13359,10 +13373,10 @@ msgstr "ПРОБЛЕМ"
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13375,19 +13389,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13439,12 +13453,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "РодителÑки правила за откриване."
@@ -13499,13 +13513,13 @@ msgid "Passive"
msgstr "ПаÑивен"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13513,7 +13527,7 @@ msgstr "ПаÑивен"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13566,12 +13580,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13584,7 +13598,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13608,10 +13622,11 @@ msgstr "Процентна Ð»Ð¸Ð½Ð¸Ñ (вдÑÑно)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13619,7 +13634,9 @@ msgstr ""
msgid "Period"
msgstr "Период"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13683,11 +13700,11 @@ msgstr "Възпроизвеждане на звук"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13773,7 +13790,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13782,7 +13799,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13900,9 +13917,9 @@ msgstr ""
msgid "Private key file"
msgstr "Файл Ñ Ð»Ð¸Ñ‡ÐµÐ½ ключ"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Ðиво на привилегиÑ"
@@ -14309,7 +14326,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14440,20 +14457,20 @@ msgstr "Отдалечена команда"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14462,10 +14479,10 @@ msgstr "Отдалечена команда"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14509,7 +14526,7 @@ msgstr "Отдалечена команда"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14592,14 +14609,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14612,8 +14629,8 @@ msgstr "Смени"
msgid "Replace dependencies"
msgstr "Смени завиÑимоÑтите"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14814,7 +14831,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Резултат"
@@ -15346,7 +15363,7 @@ msgstr ""
msgid "Script"
msgstr "Скрипт"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15411,6 +15428,15 @@ msgstr "Шаблона за Ñ‚ÑŠÑ€Ñене е празен"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Вторичен мобилен телефон за контакт"
@@ -15489,7 +15515,7 @@ msgstr ""
msgid "Selected"
msgstr "Избрано"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Избраните дейÑÑ‚Ð²Ð¸Ñ Ñа изтрити"
@@ -15730,6 +15756,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16183,7 +16210,7 @@ msgstr "ИÑпанÑки (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "УточнениÑÑ‚ Ñкрипт не ÑъщеÑтвува или не разполагате Ñ Ð¿Ñ€Ð°Ð²Ð° за доÑтъп до командата в Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ð° дейÑтвие."
@@ -16218,8 +16245,8 @@ msgstr "Стандартни елементи на данните"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16227,7 +16254,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Започни в"
@@ -16306,7 +16333,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16410,7 +16437,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Стъпка Ñ Ð¸Ð¼Ðµ \\\"%1$s\\\" вече ÑъщеÑтвува."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16464,12 +16491,12 @@ msgstr "Прав"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16490,10 +16517,10 @@ msgstr ""
msgid "Subject"
msgstr "Тема"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16687,7 +16714,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16703,13 +16730,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16726,7 +16753,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16736,7 +16763,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16772,14 +16799,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Шаблон"
@@ -16823,7 +16848,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Шаблон изтрит"
@@ -16835,11 +16860,11 @@ msgstr "Група на шаблон"
msgid "Template linkage"
msgstr "Връзка Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Име на шаблон"
@@ -16874,13 +16899,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16889,10 +16913,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16903,7 +16929,7 @@ msgstr "Шаблони"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Шаблони \"%1$s\" изключени от хоÑтове \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17117,7 +17143,7 @@ msgstr "Тема"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17155,7 +17181,7 @@ msgstr "Тази година"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17188,15 +17214,15 @@ msgstr ""
msgid "Till"
msgstr "До"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17233,13 +17259,13 @@ msgstr ""
msgid "Time period"
msgstr "Период от време"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17931,9 +17957,9 @@ msgstr "Единици за измерване"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "ÐеизвеÑтно"
@@ -17951,7 +17977,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "ÐеизвеÑтен елемент на данните за хоÑÑ‚, нÑма такъв елемент на данните в Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ Ñ…Ð¾ÑÑ‚"
@@ -17983,16 +18009,16 @@ msgstr "ÐеизвеÑтен тип ÑтойноÑÑ‚"
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "ПрекратÑване на връзката"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "ПрекратÑване на връзката и изчиÑтване"
@@ -18088,10 +18114,10 @@ msgstr "ДоÑтъпен"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18100,16 +18126,16 @@ msgstr "ДоÑтъпен"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18138,7 +18164,7 @@ msgstr "Ðктуализиране на ÑъщеÑтвуващото"
msgid "Update interval"
msgstr "Интервал за актуализиране"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18165,7 +18191,7 @@ msgstr "Качване"
msgid "Upper level maps"
msgstr "Ðиво на горните карти"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
#, fuzzy
@@ -18352,7 +18378,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18488,15 +18514,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "ПотребителÑко име"
@@ -18810,11 +18836,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18888,14 +18914,14 @@ msgstr "СтойноÑÑ‚ на реализациите \"%1$s\" вече ÑъщÐ
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "СтойноÑÑ‚ на реализациите"
@@ -18938,7 +18964,7 @@ msgstr "СтойноÑÑ‚: нÑма данни"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19038,7 +19064,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Видимо име"
@@ -19064,7 +19090,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Внимание"
@@ -19173,6 +19199,10 @@ msgstr "СрÑ"
msgid "Wednesday"
msgstr "СрÑда"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19445,7 +19475,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Година"
@@ -19506,7 +19537,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Вие не може да изберете нÑкои от езиците, защото не е инÑталирана Ð»Ð¾ÐºÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð·Ð° Ñ‚ÑÑ… на уеб Ñървъра."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19747,11 +19778,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19846,7 +19877,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19890,11 +19921,11 @@ msgstr "като гервен"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19908,11 +19939,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19934,39 +19965,47 @@ msgstr ""
msgid "avg"
msgstr "Ñред"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19981,7 +20020,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20023,7 +20062,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20111,23 +20150,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20154,7 +20193,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20169,15 +20208,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20185,11 +20224,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20202,15 +20241,15 @@ msgstr "д"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20228,7 +20267,7 @@ msgstr "дни"
msgid "default"
msgstr "по подразбиране"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20305,7 +20344,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20328,11 +20367,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20348,7 +20387,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20362,15 +20401,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20378,7 +20417,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20452,7 +20491,7 @@ msgstr "в"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20461,11 +20500,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20484,7 +20523,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20502,7 +20541,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20562,7 +20601,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20584,6 +20623,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20625,7 +20674,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20641,7 +20690,7 @@ msgctxt "week of month"
msgid "last"
msgstr "поÑледно"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20649,11 +20698,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20661,23 +20710,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20685,7 +20734,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20717,11 +20766,11 @@ msgstr ""
msgid "macro(s)"
msgstr "макроÑ(и)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20757,7 +20806,7 @@ msgstr "макÑ"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20771,7 +20820,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20788,7 +20837,7 @@ msgstr ""
msgid "min"
msgstr "мин"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20803,15 +20852,15 @@ msgstr ""
msgid "mm"
msgstr "мм"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20893,7 +20942,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20927,7 +20976,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20948,7 +20997,7 @@ msgstr "не в"
msgid "not selected"
msgstr "не е избрано"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21035,15 +21084,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21051,15 +21100,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21108,11 +21157,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21136,15 +21185,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21236,23 +21285,23 @@ msgstr "покажи ÑъответÑтвие на икони"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21260,11 +21309,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21272,11 +21321,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21304,7 +21353,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21338,7 +21387,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21385,31 +21434,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21435,11 +21488,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21496,7 +21549,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21539,7 +21592,7 @@ msgstr ""
msgid "unknown"
msgstr "неизвеÑтен"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21738,11 +21791,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/ca/LC_MESSAGES/frontend.po b/ui/locale/ca/LC_MESSAGES/frontend.po
index 3e0b7edfc60..fbd0aab0ac3 100644
--- a/ui/locale/ca/LC_MESSAGES/frontend.po
+++ b/ui/locale/ca/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2021-03-19 18:10+0300\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: none\n"
@@ -301,10 +301,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr ""
@@ -455,7 +455,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -524,7 +524,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -543,11 +543,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -559,24 +559,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -594,7 +594,7 @@ msgstr ""
msgid "Action"
msgstr ""
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr ""
@@ -604,7 +604,7 @@ msgstr ""
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr ""
@@ -613,17 +613,17 @@ msgstr ""
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr ""
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] ""
@@ -642,7 +642,7 @@ msgstr ""
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr ""
@@ -689,7 +689,7 @@ msgid "Active till"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -748,14 +748,14 @@ msgstr ""
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -771,10 +771,10 @@ msgstr ""
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -786,9 +786,9 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -806,7 +806,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -851,7 +851,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -876,8 +876,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -890,7 +890,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1024,7 +1024,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1040,6 +1040,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr ""
@@ -1354,7 +1358,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1434,9 +1438,9 @@ msgstr ""
msgid "Authentication"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr ""
@@ -1497,12 +1501,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr ""
@@ -1617,12 +1621,12 @@ msgstr ""
msgid "Bind password"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1828,7 +1832,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr ""
@@ -2126,7 +2130,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr ""
@@ -2290,12 +2294,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] ""
msgstr[1] ""
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr ""
@@ -2311,7 +2315,7 @@ msgstr[1] ""
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr ""
@@ -2398,7 +2402,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] ""
@@ -2476,7 +2480,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2705,7 +2709,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] ""
msgstr[1] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2884,7 +2888,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -2950,7 +2954,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr ""
@@ -3010,7 +3014,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr ""
@@ -3113,9 +3117,9 @@ msgstr ""
msgid "Cannot update script"
msgstr ""
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3142,7 +3146,7 @@ msgstr ""
msgid "Cannot update template"
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3228,14 +3232,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3253,10 +3257,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3296,9 +3300,9 @@ msgstr ""
msgid "Character string not included"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3314,7 +3318,7 @@ msgstr ""
msgid "Check already exists."
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr ""
@@ -3436,8 +3440,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr ""
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr ""
@@ -3464,16 +3468,16 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3602,7 +3606,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3874,13 +3878,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3888,9 +3892,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4057,10 +4061,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr ""
@@ -4150,7 +4154,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4352,7 +4356,7 @@ msgid "Current value"
msgstr ""
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4595,7 +4599,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4668,11 +4672,11 @@ msgstr ""
msgid "Date HW purchased"
msgstr ""
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr ""
@@ -4713,8 +4717,8 @@ msgstr ""
msgid "December"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4724,7 +4728,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4855,7 +4859,7 @@ msgstr ""
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr ""
@@ -4864,11 +4868,11 @@ msgstr ""
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr ""
@@ -5001,7 +5005,7 @@ msgstr ""
msgid "Delete selected host groups?"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5109,7 +5113,7 @@ msgstr ""
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr ""
@@ -5170,7 +5174,7 @@ msgstr ""
msgid "Dependencies"
msgstr ""
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr ""
@@ -5178,7 +5182,7 @@ msgstr ""
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5189,7 +5193,7 @@ msgid "Deployment status"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5204,16 +5208,16 @@ msgstr ""
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5225,10 +5229,10 @@ msgstr ""
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr ""
@@ -5237,6 +5241,14 @@ msgstr ""
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr ""
@@ -5359,7 +5371,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5386,17 +5398,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr ""
@@ -5421,7 +5433,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5634,7 +5646,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5651,7 +5663,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5733,7 +5745,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5797,7 +5809,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr ""
@@ -5827,14 +5839,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6090,7 +6102,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6128,13 +6140,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6150,11 +6162,11 @@ msgstr ""
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6230,6 +6242,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr ""
@@ -6798,8 +6814,8 @@ msgctxt "page navigation"
msgid "First"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6911,12 +6927,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr ""
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr ""
@@ -6932,7 +6948,7 @@ msgstr ""
msgid "GUI"
msgstr ""
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr ""
@@ -7281,7 +7297,7 @@ msgstr ""
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7294,12 +7310,11 @@ msgid "Grouping by"
msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr ""
@@ -7518,7 +7533,7 @@ msgstr ""
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7549,7 +7564,7 @@ msgid "Horizontal align"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7558,7 +7573,7 @@ msgstr ""
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7569,7 +7584,7 @@ msgstr ""
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7695,7 +7710,7 @@ msgid "Host group label type"
msgstr ""
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7714,8 +7729,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7765,7 +7780,7 @@ msgstr ""
msgid "Host label type"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7777,7 +7792,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr ""
@@ -7814,7 +7829,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7837,7 +7852,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7862,7 +7877,7 @@ msgstr ""
msgid "Host update failed."
msgstr ""
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr ""
@@ -7939,6 +7954,10 @@ msgstr ""
msgid "Hosts updated"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr ""
@@ -8008,15 +8027,15 @@ msgstr ""
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr ""
@@ -8248,7 +8267,7 @@ msgstr ""
msgid "Images for all maps will be updated!"
msgstr ""
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr ""
@@ -8330,7 +8349,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8342,11 +8361,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8461,7 +8480,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr ""
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr ""
@@ -8469,7 +8488,7 @@ msgstr ""
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr ""
@@ -8481,15 +8500,15 @@ msgstr ""
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8498,11 +8517,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8510,7 +8529,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr ""
@@ -8520,11 +8539,11 @@ msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr ""
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8533,11 +8552,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8837,8 +8856,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr ""
@@ -9236,7 +9255,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9245,11 +9264,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9261,7 +9280,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9281,7 +9300,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr ""
@@ -9340,8 +9359,8 @@ msgstr ""
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9433,7 +9452,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9494,10 +9513,10 @@ msgstr ""
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9560,8 +9579,8 @@ msgstr ""
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9783,11 +9802,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr ""
@@ -9801,7 +9820,7 @@ msgid "Inventory field"
msgstr ""
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr ""
@@ -9809,10 +9828,10 @@ msgstr ""
msgid "Is online?"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9904,7 +9923,7 @@ msgstr[1] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10357,17 +10376,17 @@ msgstr ""
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr ""
@@ -10444,8 +10463,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10479,8 +10498,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr ""
@@ -10503,16 +10522,9 @@ msgstr ""
msgid "Link indicators"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr ""
@@ -10528,13 +10540,6 @@ msgstr ""
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10673,7 +10678,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr ""
@@ -10755,16 +10760,16 @@ msgstr ""
msgid "Macro \"%1$s\" already exists."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr ""
@@ -10863,12 +10868,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr ""
@@ -11011,16 +11016,16 @@ msgstr ""
msgid "Mark selected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11053,11 +11058,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11289,7 +11294,7 @@ msgstr ""
msgid "Middle"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11391,7 +11396,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11473,9 +11478,9 @@ msgstr ""
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr ""
@@ -11494,6 +11499,7 @@ msgstr ""
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr ""
@@ -11606,8 +11612,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11677,11 +11683,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11709,8 +11715,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11731,7 +11737,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12021,15 +12027,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12115,7 +12121,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12152,9 +12158,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12193,7 +12199,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12293,11 +12299,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12356,7 +12362,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12377,7 +12383,7 @@ msgid "No target selected."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12526,6 +12532,10 @@ msgstr ""
msgid "Notifications"
msgstr ""
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12612,6 +12622,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr ""
@@ -12787,7 +12801,7 @@ msgid "Off"
msgstr ""
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12834,7 +12848,7 @@ msgstr ""
msgid "One time only"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr ""
@@ -12911,12 +12925,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12950,8 +12964,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr ""
@@ -12986,7 +13000,7 @@ msgstr ""
msgid "Operator"
msgstr ""
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13026,19 +13040,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13068,10 +13082,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13334,10 +13348,10 @@ msgstr ""
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13350,19 +13364,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13414,12 +13428,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13474,13 +13488,13 @@ msgid "Passive"
msgstr ""
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13488,7 +13502,7 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13541,12 +13555,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13559,7 +13573,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13583,10 +13597,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13594,7 +13609,9 @@ msgstr ""
msgid "Period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13658,11 +13675,11 @@ msgstr ""
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13748,7 +13765,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13757,7 +13774,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13874,9 +13891,9 @@ msgstr ""
msgid "Private key file"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr ""
@@ -14283,7 +14300,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14414,20 +14431,20 @@ msgstr ""
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14436,10 +14453,10 @@ msgstr ""
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14483,7 +14500,7 @@ msgstr ""
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14566,14 +14583,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14586,8 +14603,8 @@ msgstr ""
msgid "Replace dependencies"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14788,7 +14805,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr ""
@@ -15320,7 +15337,7 @@ msgstr ""
msgid "Script"
msgstr ""
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15385,6 +15402,15 @@ msgstr ""
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15463,7 +15489,7 @@ msgstr ""
msgid "Selected"
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15703,6 +15729,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16156,7 +16183,7 @@ msgstr ""
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr ""
@@ -16191,8 +16218,8 @@ msgstr ""
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16200,7 +16227,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16279,7 +16306,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16383,7 +16410,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16437,12 +16464,12 @@ msgstr ""
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16463,10 +16490,10 @@ msgstr ""
msgid "Subject"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16660,7 +16687,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16676,13 +16703,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16699,7 +16726,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16709,7 +16736,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16745,14 +16772,12 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr ""
@@ -16796,7 +16821,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr ""
@@ -16808,11 +16833,11 @@ msgstr ""
msgid "Template linkage"
msgstr ""
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr ""
@@ -16847,13 +16872,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16862,10 +16886,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16876,7 +16902,7 @@ msgstr ""
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17090,7 +17116,7 @@ msgstr ""
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17128,7 +17154,7 @@ msgstr ""
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17161,15 +17187,15 @@ msgstr ""
msgid "Till"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17206,13 +17232,13 @@ msgstr ""
msgid "Time period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17904,9 +17930,9 @@ msgstr ""
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr ""
@@ -17924,7 +17950,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr ""
@@ -17956,16 +17982,16 @@ msgstr ""
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr ""
@@ -18061,10 +18087,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18073,16 +18099,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18111,7 +18137,7 @@ msgstr ""
msgid "Update interval"
msgstr ""
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18138,7 +18164,7 @@ msgstr ""
msgid "Upper level maps"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18324,7 +18350,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18460,15 +18486,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr ""
@@ -18782,11 +18808,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18860,14 +18886,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr ""
@@ -18910,7 +18936,7 @@ msgstr ""
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19010,7 +19036,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr ""
@@ -19036,7 +19062,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr ""
@@ -19144,6 +19170,10 @@ msgstr ""
msgid "Wednesday"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19416,7 +19446,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr ""
@@ -19476,7 +19507,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr ""
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19717,11 +19748,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19816,7 +19847,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19860,11 +19891,11 @@ msgstr ""
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19878,11 +19909,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19904,39 +19935,47 @@ msgstr ""
msgid "avg"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19951,7 +19990,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19993,7 +20032,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20081,23 +20120,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20124,7 +20163,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20139,15 +20178,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20155,11 +20194,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20172,15 +20211,15 @@ msgstr ""
msgid "d.M"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20198,7 +20237,7 @@ msgstr ""
msgid "default"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20275,7 +20314,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20298,11 +20337,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20318,7 +20357,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20332,15 +20371,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20348,7 +20387,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20422,7 +20461,7 @@ msgstr ""
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20431,11 +20470,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20454,7 +20493,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20472,7 +20511,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20532,7 +20571,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20554,6 +20593,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20595,7 +20644,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20611,7 +20660,7 @@ msgctxt "week of month"
msgid "last"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20619,11 +20668,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20631,23 +20680,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20655,7 +20704,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20687,11 +20736,11 @@ msgstr ""
msgid "macro(s)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20727,7 +20776,7 @@ msgstr ""
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20741,7 +20790,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20758,7 +20807,7 @@ msgstr ""
msgid "min"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20773,15 +20822,15 @@ msgstr ""
msgid "mm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20863,7 +20912,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20897,7 +20946,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20918,7 +20967,7 @@ msgstr ""
msgid "not selected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21005,15 +21054,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21021,15 +21070,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21078,11 +21127,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21106,15 +21155,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21205,23 +21254,23 @@ msgstr ""
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21229,11 +21278,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21241,11 +21290,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21273,7 +21322,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21307,7 +21356,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21354,31 +21403,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21404,11 +21457,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21465,7 +21518,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21508,7 +21561,7 @@ msgstr ""
msgid "unknown"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21707,11 +21760,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/cs/LC_MESSAGES/frontend.po b/ui/locale/cs/LC_MESSAGES/frontend.po
index cdc4332e68d..363947d3d27 100644
--- a/ui/locale/cs/LC_MESSAGES/frontend.po
+++ b/ui/locale/cs/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2018-09-24 07:57+0300\n"
"Last-Translator: Lukáš <iam@lukasmaly.net>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -319,10 +319,10 @@ msgstr "(0 - použijte výchozí akci)"
msgid "(Only super admins can create groups)"
msgstr "(Skupiny mohou vytvářet jen super administrátoři)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(bez proxy)"
@@ -476,7 +476,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -545,7 +545,7 @@ msgstr "Potvrzené VYŘEŠENÉ události"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -564,11 +564,11 @@ msgstr "Potvrzené VYŘEŠENÉ události"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -580,24 +580,24 @@ msgstr "Potvrzené VYŘEŠENÉ události"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -615,7 +615,7 @@ msgstr "Potvrzené VYŘEŠENÉ události"
msgid "Action"
msgstr "Akce"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Akce \"%1$s\" již existuje."
@@ -625,7 +625,7 @@ msgstr "Akce \"%1$s\" již existuje."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Akce byla přidána"
@@ -634,18 +634,18 @@ msgstr "Akce byla přidána"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Akce byla smazána"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Akce vypnutá"
msgstr[1] "Akce vypnuty"
msgstr[2] "Akce vypnuty"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Akce zapnuta"
@@ -665,7 +665,7 @@ msgstr "Log akcí"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Akce byla aktualizována"
@@ -712,7 +712,7 @@ msgid "Active till"
msgstr "Aktivní do"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -771,14 +771,14 @@ msgstr "Aktivní do"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -794,10 +794,10 @@ msgstr "Aktivní do"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -809,9 +809,9 @@ msgstr "Aktivní do"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -829,7 +829,7 @@ msgstr "Aktivní do"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -874,7 +874,7 @@ msgstr "Přidat podřízený prvek"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -899,8 +899,8 @@ msgstr "Přidat více map"
msgid "Add new data set"
msgstr "Přidej nový set dat"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -913,7 +913,7 @@ msgstr "Přidej nový přepis"
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1047,7 +1047,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1063,6 +1063,10 @@ msgstr ""
msgid "Alert message"
msgstr "Poplašná zpráva"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1381,7 +1385,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "Minimálně jedna operace musí existovat."
@@ -1461,9 +1465,9 @@ msgstr ""
msgid "Authentication"
msgstr "Autentizace"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "AutentizaÄní algoritmus"
@@ -1524,12 +1528,12 @@ msgstr "Možnosti automatického přihlášení a automatického odhlášení ne
msgid "Auto-logout"
msgstr "Automatické odhlášení"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automaticky"
@@ -1644,12 +1648,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind heslo"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1855,7 +1859,7 @@ msgstr "Není možné pÅ™idat neÄíselnou položku \"%1$s\" do grafu \"%2$s\"."
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Není možné pÅ™idat neÄíselnou položku \"%1$s\" k prototypu grafu \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Nelze přidat akci"
@@ -2158,7 +2162,7 @@ msgstr[2] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Není možné smazat interního Zabbix uživatele \"%1$s\", zkuste ho vypnout."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Nelze smazat akci"
@@ -2336,12 +2340,12 @@ msgstr[0] "Nelze smazat skript"
msgstr[1] "Nelze smazat skript"
msgstr[2] "Nelze smazat skript"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Není možné smazat skripty. Skript \"%1$s\" se používá v operaci akce \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Není možné smazat oznaÄené akce"
@@ -2359,7 +2363,7 @@ msgstr[2] "Nelze smazat službu"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Nelze smazat Å¡ablonu"
@@ -2450,7 +2454,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Není možné vypnout akci"
@@ -2539,7 +2543,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Není možné vypnout akci"
@@ -2779,7 +2783,7 @@ msgstr[0] "Není možné importovat šablonu \"%1$s\", připojená šablona \"%2
msgstr[1] "Není možné importovat šablonu \"%1$s\", připojené šablony \"%2$s\" neexistují."
msgstr[2] "Není možné importovat šablonu \"%1$s\", připojené šablony \"%2$s\" neexistují."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Není možné vložit výraz spouÅ¡tÄ›Äe"
@@ -2960,7 +2964,7 @@ msgstr "Není možné zrušit linkování šablony."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Nelze aktualizovat \"%1$s\" pro akci \"%2$s\"."
@@ -3026,7 +3030,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Nelze aktualizovat šablona s webovým scénářem \"%1$s\": %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Nelze upravit akci"
@@ -3087,7 +3091,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Není možné aktualizovat skupiny pro objeveného hosta \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Nelze upravit hostitele"
@@ -3192,9 +3196,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Nelze upravit skript"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3221,7 +3225,7 @@ msgstr "Nelze aktualizovat krok šablony webového scénáře \"%1$s\": %2$s."
msgid "Cannot update template"
msgstr "Nelze upravit Å¡ablonu"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr "Nelze aktualizovat Å¡ablony"
@@ -3309,14 +3313,14 @@ msgstr "Všechny zachycené SNMP trapy, které nebyly chyceny z snmptrap[] items
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Certifikát"
@@ -3334,10 +3338,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Nahradit"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3377,9 +3381,9 @@ msgstr "Obsahuje řetězec"
msgid "Character string not included"
msgstr "Neobsahuje řetězec"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3395,7 +3399,7 @@ msgstr "Informace o šasi. Vráti řetězec"
msgid "Check already exists."
msgstr "Kontrola již existuje."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Zkontrolujte Äást výrazu zaÄínajícího od \"%1$s\"."
@@ -3517,8 +3521,8 @@ msgstr "VyÄistit historii"
msgid "Clear history and trends"
msgstr "VyÄistit historii a trendy"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "ProÄistit pÅ™i odpojování"
@@ -3545,16 +3549,16 @@ msgstr "Hodiny"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3683,7 +3687,7 @@ msgstr "Komprimace"
msgid "Concurrent sessions"
msgstr "Souběžné relace"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3955,13 +3959,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Připojení"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Připojení z hostitele"
@@ -3969,9 +3973,9 @@ msgstr "Připojení z hostitele"
msgid "Connections from proxy"
msgstr "Připojení z proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Připojení na hostitele"
@@ -4142,10 +4146,10 @@ msgstr "KorelaÄní pravidlo"
msgid "Correlation updated"
msgstr "Korelace aktualizována"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "PoÄet"
@@ -4235,7 +4239,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4437,7 +4441,7 @@ msgid "Current value"
msgstr "Aktuální hodnota"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Vlastní"
@@ -4681,7 +4685,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4754,11 +4758,11 @@ msgstr "Datum vypršení údržby HW"
msgid "Date HW purchased"
msgstr "Datum koupÄ› HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Den"
@@ -4799,8 +4803,8 @@ msgstr "Pro"
msgid "December"
msgstr "Prosinec"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4810,7 +4814,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4941,7 +4945,7 @@ msgstr "Smazat"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Smazat a proÄistit"
@@ -4950,11 +4954,11 @@ msgstr "Smazat a proÄistit"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Smazat a vyÄistit zvolené Å¡ablony? (UpozornÄ›ní: tímto smažete vybrané Å¡ablony a proÄistíte vÅ¡echny pÅ™ipojené hostitele!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Smazat a vyÄistit Å¡ablonu? (Pozor: vÅ¡echny pÅ™ipojené hosty budou také vyÄiÅ¡tÄ›né!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Smazat aktuální akci?"
@@ -5087,7 +5091,7 @@ msgstr "Smazat vybrané skupiny?"
msgid "Delete selected host groups?"
msgstr "Smazat oznaÄené skupiny?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Smazat oznaÄený prototyp hosta?"
@@ -5195,7 +5199,7 @@ msgstr "Smazat vybrané uživatele?"
msgid "Delete selected web scenarios?"
msgstr "Smazat oznaÄené scénáře?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Smazat Å¡ablonu?"
@@ -5256,7 +5260,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Závislosti"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Závisející"
@@ -5264,7 +5268,7 @@ msgstr "Závisející"
msgid "Dependent item"
msgstr "Závislá položka"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5275,7 +5279,7 @@ msgid "Deployment status"
msgstr "Stav nasazení"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5290,16 +5294,16 @@ msgstr "Stav nasazení"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5311,10 +5315,10 @@ msgstr "Popis"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detaily"
@@ -5323,6 +5327,14 @@ msgstr "Detaily"
msgid "Details of web scenario"
msgstr "Detaily web scénáře"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Zařízení"
@@ -5445,7 +5457,7 @@ msgstr "Zakázat oznaÄené scénáře?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5472,17 +5484,17 @@ msgstr "Zakázat oznaÄené scénáře?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Zakázáno"
@@ -5507,7 +5519,7 @@ msgstr "Zlikvidovat hodnotu"
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5724,7 +5736,7 @@ msgstr "Zobrazit skládaný graf"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5741,7 +5753,7 @@ msgstr "Zobrazení %1$s do %2$s od %3$s nalezeno"
msgid "Displaying options"
msgstr "Zobrazení možností"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5823,7 +5835,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Stáhnout konfiguraÄní soubor"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5887,7 +5899,7 @@ msgstr "Duplicitní userid \"%1$s\" u uživatele mapy \"%2$s\"."
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Trvání"
@@ -5917,14 +5929,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6180,7 +6192,7 @@ msgstr "Zapnout pasti"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6218,13 +6230,13 @@ msgstr "Zapnout pasti"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6240,11 +6252,11 @@ msgstr "Povoleno"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Šifrování"
@@ -6320,6 +6332,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Chyba: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Událost"
@@ -6889,8 +6905,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "První"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Fit"
@@ -7002,12 +7018,12 @@ msgid "Full"
msgstr "Plný"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Vytvořit úplnou kopii"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funkce"
@@ -7023,7 +7039,7 @@ msgstr "GSM modem"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "GUI přístup vypnut."
@@ -7374,7 +7390,7 @@ msgstr "Název skupiny"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Prototyp skupiny nemůže být založený na zjištěné skupině hostů \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Prototypy skupiny"
@@ -7387,12 +7403,11 @@ msgid "Grouping by"
msgstr "Seskupovat podle"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Skupiny"
@@ -7611,7 +7626,7 @@ msgstr "ProÄiÅ¡tÄ›ní historie může chvíli trvat. PokraÄovat?"
msgid "History data selection"
msgstr "Výběr historických dat"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7642,7 +7657,7 @@ msgid "Horizontal align"
msgstr "Vodorovné zarovnání"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7651,7 +7666,7 @@ msgstr "Vodorovné zarovnání"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7662,7 +7677,7 @@ msgstr "Vodorovné zarovnání"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7791,7 +7806,7 @@ msgid "Host group label type"
msgstr "Typ popisku skupiny"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7810,8 +7825,8 @@ msgstr "Skupina hostů s ID \"%1$s\" není dostupná."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7861,7 +7876,7 @@ msgstr "Přehled inventáře hosta"
msgid "Host label type"
msgstr "Typ popisu hosta"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Host makra"
@@ -7873,7 +7888,7 @@ msgstr "Metadata hosta"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Název hosta"
@@ -7910,7 +7925,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Prototyp hosta byl smazán"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7934,7 +7949,7 @@ msgstr "Prototyp hosta s viditelným názvem \"%1$s\" již existuje ve pravidle
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Prototypy hostů"
@@ -7959,7 +7974,7 @@ msgstr "ÄŒas hosta"
msgid "Host update failed."
msgstr "Aktualizace hosta selhala."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Host byl aktualizován"
@@ -8036,6 +8051,10 @@ msgstr "Umístění hostů"
msgid "Hosts updated"
msgstr "Hosty byly aktualizovány"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Hodin"
@@ -8105,15 +8124,15 @@ msgstr "Rozsah IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "IP rozsah \"%1$s\" přesahuje \"%2$s\" limit adresy"
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8347,7 +8366,7 @@ msgstr "Obrázky"
msgid "Images for all maps will be updated!"
msgstr "Obrázky pro všechny mapy budou aktualizované!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Ihned"
@@ -8429,7 +8448,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "Nedostupná údržba"
@@ -8441,11 +8460,11 @@ msgstr "Nepřístupná mapa"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "Nedostupná šablona"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "Nedostupný spouÅ¡tÄ›Ä"
@@ -8560,7 +8579,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Nesprávná podmínka zjišťování stavu akce."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Nesprávná podmínka zjišťování stavu akce. Kontrola stavu neexistuje nebo k ní nemáte přístup."
@@ -8568,7 +8587,7 @@ msgstr "Nesprávná podmínka zjišťování stavu akce. Kontrola stavu neexistu
msgid "Incorrect action condition discovery object."
msgstr "Nesprávná podmínka zjišťování stavu objektu."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Nesprávná podmínka stavu pravidla nálezu. Pravidlo nálezu neexistuje nebo k němu nemáte přístup."
@@ -8580,15 +8599,15 @@ msgstr "Neplatná podmínka akce pro stav nálezu."
msgid "Incorrect action condition event type."
msgstr "Neplatná podmínka akce pro typ události."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8597,11 +8616,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Neplatná podmínka pro akci portu \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Neplatná podmínka pro akci proxy. Proxy neexistuje nebo k ní nemáte přístup."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8609,7 +8628,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Neplatná podmínka pro akci závažného spuštění."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Neplatná podmínka pro akci spouÅ¡tÄ›Äe. SpouÅ¡tÄ›Ä neexistuje nebo k nÄ›mu nemáte přístup."
@@ -8619,11 +8638,11 @@ msgstr "Neplatná akce pro typ podmínky."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Neplatná operace pro stupně eskalace."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8632,11 +8651,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Nesprávná operace typu \"%1$s\" pro zdroj události \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8936,8 +8955,8 @@ msgstr "Neplatný poÄet kroků Å¡ablony web scénáře."
msgid "Incorrect trigger expression"
msgstr "Neplatný výraz spouÅ¡tÄ›Äe"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Neplatný výraz spouÅ¡tÄ›Äe."
@@ -9335,7 +9354,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Informace o službÄ›. Vrací celé Äíslo s parametrem jako status, startup; Å™etÄ›zec - s parametrem jako displayname, cesta, uživatel; text - s parametrem jako description; SpeciálnÄ› pro status: 0 - běží, 1 - pauza, 2 - start Äeká, 3 - pauza Äeká, 4 - pokraÄovat Äeká, 5 - stop Äeká, 6 - zastavena, 7 - neznámý, 255 - žádná služba; SpeciálnÄ› pro startup: 0 - automaticky, 1 - automaticky zpoždÄ›ný, 2 - manuální, 3 - zakázána, 4 - neznámý"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9344,11 +9363,11 @@ msgstr ""
msgid "Inherited"
msgstr "Zděděné"
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Makra zděděná a makra hosta"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9360,7 +9379,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Makra zděděná a makra šablon"
@@ -9380,7 +9399,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Vložit"
@@ -9439,8 +9458,8 @@ msgstr "Rozhraní s IP \"%1$s\" nemůže mít prázdné DNS jméno, pokud se pou
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Rozhraní s IP \"%1$s\" nemůže mít prázdné DNS jméno."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9532,7 +9551,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "Neplatná akce: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9593,10 +9612,10 @@ msgstr "Neplatné parametry metody."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9659,8 +9678,8 @@ msgstr "Neplatné parametry metody."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9882,11 +9901,11 @@ msgstr "Neplatná Äasová perioda."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventář"
@@ -9900,7 +9919,7 @@ msgid "Inventory field"
msgstr "Pole inventáře"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Režim inventáře"
@@ -9908,10 +9927,10 @@ msgstr "Režim inventáře"
msgid "Is online?"
msgstr "Je přihlášený?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Emitent"
@@ -10006,7 +10025,7 @@ msgstr[2] "Položky povolené"
msgid "Item in \"not supported\" state"
msgstr "Položka je v \"not supported\" stavu"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Položka nevybraná"
@@ -10466,17 +10485,17 @@ msgstr "Graf za poslední měsíc"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Posledních"
@@ -10553,8 +10572,8 @@ msgstr "Levý ořez"
msgid "Legend"
msgstr "Legenda"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10588,8 +10607,8 @@ msgstr "Typ řádku"
msgid "Line width"
msgstr "Šířka řádku"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Spojnice"
@@ -10612,16 +10631,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Ukazatel stavu spojnice"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Připojit šablony"
@@ -10637,13 +10649,6 @@ msgstr "Připojit k šablonám"
msgid "Linked map"
msgstr "Mapa odkazů"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10782,7 +10787,7 @@ msgstr "Logovat i nenastavené SNMP trapy"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Přihlásit"
@@ -10864,16 +10869,16 @@ msgstr "Makro \"%1$s\" již existuje na \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Makro \"%1$s\" již existuje."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Makra"
@@ -10972,12 +10977,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manuál"
@@ -11120,16 +11125,16 @@ msgstr "OznaÄit ostatní"
msgid "Mark selected"
msgstr "OznaÄit vybrané"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Maska"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11162,11 +11167,11 @@ msgstr "Master položka"
msgid "Matches regular expression"
msgstr "Odpovídá regulárnímu výrazu"
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11402,7 +11407,7 @@ msgstr ""
msgid "Middle"
msgstr "Střed"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11505,7 +11510,7 @@ msgstr "Chybějící položky pro prototyp grafu \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "ChybÄ›jící klÃ­Ä \"%1$s\" pro host \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11591,9 +11596,9 @@ msgstr "Pondělí"
msgid "Monitored by"
msgstr "Monitorováno"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Sledován přes proxy"
@@ -11612,6 +11617,7 @@ msgstr "Sledování"
msgid "Monospace"
msgstr "Monospace"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Měsíc"
@@ -11724,8 +11730,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11795,11 +11801,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11827,8 +11833,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11849,7 +11855,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12139,15 +12145,15 @@ msgstr "Žádné stanovené ID pravidla nálezu"
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Bez šifrování"
@@ -12233,7 +12239,7 @@ msgstr "Žádné výběry nenalezené"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12270,9 +12276,9 @@ msgstr "Žádné oprávnění pro přístup do systému."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12311,7 +12317,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12411,11 +12417,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12474,7 +12480,7 @@ msgid "No public key file specified."
msgstr "Žádný specifikovaný soubor s veÅ™ejným klíÄem."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12495,7 +12501,7 @@ msgid "No target selected."
msgstr "Není vybraný cíl."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12644,6 +12650,10 @@ msgstr "Protokol zpráv"
msgid "Notifications"
msgstr "Zprávy"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12730,6 +12740,10 @@ msgstr "PoÄet procesorů na virtuálním stroji VMware, <url> - URL VMware sluÅ
msgid "Number of rows"
msgstr "PoÄet řádek"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "PoÄet zmÄ›n stavu"
@@ -12905,7 +12919,7 @@ msgid "Off"
msgstr "Vypnuté"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12952,7 +12966,7 @@ msgstr "Jedna"
msgid "One time only"
msgstr "Pouze jednou"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Jednorázový downtime"
@@ -13030,12 +13044,12 @@ msgstr "Informace operaÄního systému. Návratová hodnota Å™etÄ›zec"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -13069,8 +13083,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operace"
@@ -13105,7 +13119,7 @@ msgstr "Operace"
msgid "Operator"
msgstr "Operátor"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13145,19 +13159,19 @@ msgstr "Nebo"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13187,10 +13201,10 @@ msgstr "Nebo"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13453,10 +13467,10 @@ msgstr "PROBLÉM"
msgid "PROBLEM event generation mode"
msgstr "PROBLEM režim generování událostí"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13469,19 +13483,19 @@ msgstr "PROBLEM režim generování událostí"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "PSK identita"
@@ -13533,12 +13547,12 @@ msgid "Parameters"
msgstr "Parametry"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Nadřazená pravidla nálezu"
@@ -13593,13 +13607,13 @@ msgid "Passive"
msgstr "Pasivní"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13607,7 +13621,7 @@ msgstr "Pasivní"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13660,12 +13674,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Vlož bez externích odkazů"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "PÅ™eruÅ¡ené operace pro potlaÄené problémy"
@@ -13678,7 +13692,7 @@ msgstr "Vrchol využití paměti: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Procento"
@@ -13702,10 +13716,11 @@ msgstr "Procentuální Äára (vpravo)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Vykonat DNS dotaz. Vrátí řetězec s požadovaným typem informace"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13713,7 +13728,9 @@ msgstr "Vykonat DNS dotaz. Vrátí řetězec s požadovaným typem informace"
msgid "Period"
msgstr "Období"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13777,11 +13794,11 @@ msgstr "Přehrávat zvuk"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Zkontrolujte konfiguraÄní parametry. Je-li vÅ¡e v pořádku, stiskni \"%1$s\" tlaÄítko, nebo \"%2$s\" tlaÄítko pro zmÄ›nu konfiguraÄních parametrů."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13867,7 +13884,7 @@ msgstr "Typ zprávy"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13876,7 +13893,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Shrnutí před instalací"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13993,9 +14010,9 @@ msgstr "Privátní"
msgid "Private key file"
msgstr "Soubor se soukromým klíÄem"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Úroveň oprávnění"
@@ -14403,7 +14420,7 @@ msgstr "Obnovený výraz"
msgid "Recovery expression syntax error."
msgstr "Obnovení po chybě syntaxe výrazu."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Obnovení operací"
@@ -14535,20 +14552,20 @@ msgstr "Vzdálený příkaz"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14557,10 +14574,10 @@ msgstr "Vzdálený příkaz"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14604,7 +14621,7 @@ msgstr "Vzdálený příkaz"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14687,14 +14704,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14707,8 +14724,8 @@ msgstr "Nahradit"
msgid "Replace dependencies"
msgstr "Nahradit závislosti"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14909,7 +14926,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Výsledek"
@@ -15444,7 +15461,7 @@ msgstr "Rozsah"
msgid "Script"
msgstr "Skript"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Skript \"%1$s\" již existuje."
@@ -15510,6 +15527,15 @@ msgstr "Vyhledávací vzor je prázdný"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Sekundární POC buňka"
@@ -15588,7 +15614,7 @@ msgstr "Vyber prvek"
msgid "Selected"
msgstr "Vybrané"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "OznaÄené akce smazané"
@@ -15830,6 +15856,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16283,7 +16310,7 @@ msgstr "Španělsky (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Specifikovaný skript neexistuje nebo nemáte práva na jeho vykonání."
@@ -16318,8 +16345,8 @@ msgstr "Standardní položky"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16327,7 +16354,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "ZaÄátek v"
@@ -16406,7 +16433,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16510,7 +16537,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Krok s jménem \"%1$s\" již existuje."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16564,12 +16591,12 @@ msgstr "Přímý"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16590,10 +16617,10 @@ msgstr "Podfiltr"
msgid "Subject"
msgstr "Předmět"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Subjekt"
@@ -16787,7 +16814,7 @@ msgstr "Hodnota znaÄky"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16803,13 +16830,13 @@ msgstr "Hodnota znaÄky"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16826,7 +16853,7 @@ msgstr "Hodnota znaÄky"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16836,7 +16863,7 @@ msgstr "Hodnota znaÄky"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16872,14 +16899,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Å ablona"
@@ -16923,7 +16948,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Šablona byla smazána"
@@ -16935,11 +16960,11 @@ msgstr "Skupina Å¡ablon"
msgid "Template linkage"
msgstr "Propojení šablon"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Makra Å¡ablon"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Jméno šablony"
@@ -16974,13 +16999,12 @@ msgstr "Šablona se stejným viditelným jménem \"%1$s\" již existuje."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16989,10 +17013,12 @@ msgstr "Šablona se stejným viditelným jménem \"%1$s\" již existuje."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -17003,7 +17029,7 @@ msgstr "Å ablony"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Šablony \"%1$s\" odpojené od hostů \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr "Šablony aktualizovány"
@@ -17219,7 +17245,7 @@ msgstr "Téma"
msgid "This day last week"
msgstr "Tento den v minulém týdnu"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17257,7 +17283,7 @@ msgstr "Tento rok"
msgid "This year so far"
msgstr "Prozatím tento rok"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Prahová hodnota"
@@ -17290,15 +17316,15 @@ msgstr ""
msgid "Till"
msgstr "Do"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17335,13 +17361,13 @@ msgstr ""
msgid "Time period"
msgstr "Časové období"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -18037,9 +18063,9 @@ msgstr "Jednotky"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Neznámý"
@@ -18057,7 +18083,7 @@ msgid "Unknown error"
msgstr "Neznáma chyba"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Zadaná položka ve vybraném hostiteli neexistuje"
@@ -18089,16 +18115,16 @@ msgstr "Neznámý typ hodnoty"
msgid "Unlimited"
msgstr "Neomezený"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Odpojit"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Odpojit a proÄistit"
@@ -18195,10 +18221,10 @@ msgstr "Dostupný"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18207,16 +18233,16 @@ msgstr "Dostupný"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18245,7 +18271,7 @@ msgstr "Aktualizovat existující"
msgid "Update interval"
msgstr "Interval aktualizací"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "Aktualizace Äinností"
@@ -18272,7 +18298,7 @@ msgstr "Nahrát"
msgid "Upper level maps"
msgstr "Mapa nejvyšší úrovně"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18461,7 +18487,7 @@ msgstr[2] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18599,15 +18625,15 @@ msgid "User/Recipient"
msgstr "Uživatel/Příjemce"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Uživatelské jméno"
@@ -18921,11 +18947,11 @@ msgstr "Validace"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18999,14 +19025,14 @@ msgstr "Mapa hodnot \"%1$s\" již existuje."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Mapování hodnot"
@@ -19049,7 +19075,7 @@ msgstr "Hodnota: bez údajů"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19149,7 +19175,7 @@ msgstr "Virtuální velikost prostoru v bytech nebo v procentech z celkového po
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Zobrazované jméno"
@@ -19175,7 +19201,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Upozornění"
@@ -19285,6 +19311,10 @@ msgstr "St"
msgid "Wednesday"
msgstr "Středa"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19557,7 +19587,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Rok"
@@ -19617,7 +19648,7 @@ msgstr "Jste přihlášeni jako \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Nemůžete si vybrat některé jazyky protože locales pro ně nejsou nainstalované na web serveru."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Nejste přihlášen"
@@ -19858,11 +19889,11 @@ msgstr "oÄekává se Äasový rozsah"
msgid "a time unit is expected"
msgstr "je oÄekávána Äasová jednotka"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19957,7 +19988,7 @@ msgstr "je oÄekáván sudý poÄet hexadecimálních znaků"
msgid "an explicit time is expected"
msgstr "pÅ™esný Äas je oÄekáván"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -20001,11 +20032,11 @@ msgstr "jako Červená"
msgid "ascending"
msgstr "vzestupný"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -20019,11 +20050,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr "minimálně jedna možnost přepsání musí být specifikována"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -20045,39 +20076,47 @@ msgstr ""
msgid "avg"
msgstr "průměr"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - Průměrná hodnota periody T"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -20092,7 +20131,7 @@ msgstr "blikající"
msgid "both username and password should be either present or empty"
msgstr "uživatelské jméno a heslo by mÄ›ly být buÄ přítomné, nebo prázdné"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20134,7 +20173,7 @@ msgstr "nemůže být změněno"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20222,23 +20261,23 @@ msgstr "nelze vykonat požadavek Scroll API, data mohou být poškozena"
msgid "cannot update property for templated discovery rule"
msgstr "nelze aktualizovat soubor pro šablonu pravidla nálezu"
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - Rozdíl mezi poslední a předchozí hodnotou"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20265,7 +20304,7 @@ msgstr ""
msgid "comma-separated list"
msgstr "seznam oddÄ›lený Äárkami"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20280,15 +20319,15 @@ msgstr "konfigurace"
msgid "contains"
msgstr "obsahuje"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20296,11 +20335,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - PoÄet úspěšnÄ› pÅ™ijatých hodnot V (za které ruÄí operátor O) v periodÄ› T"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20313,15 +20352,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - Aktuální datum"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - Den měsíce"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - Den týdne"
@@ -20339,7 +20378,7 @@ msgstr "dní"
msgid "default"
msgstr "výchozí"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20416,7 +20455,7 @@ msgstr ""
msgid "does not match"
msgstr "nesouhlasí"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20439,11 +20478,11 @@ msgstr "chybová zpráva"
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20459,7 +20498,7 @@ msgstr "chyba v analýze JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20473,15 +20512,15 @@ msgstr "první"
msgid "first parameter is expected"
msgstr "první parametr je oÄekávaný"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - PÅ™edpovÄ›Ä pro následující t sekund založená na periodÄ› T"
@@ -20489,7 +20528,7 @@ msgstr "forecast() - PÅ™edpovÄ›Ä pro následující t sekund založená na peri
msgid "fourth"
msgstr "Ätvrtý"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime() - Rozdíl mezi hodnotou položky (Äasovou znaÄkou) a Äasovou znaÄkou Zabbix serveru je menší nebo rovná T vteÅ™inám (1 ano, 0 - ne)"
@@ -20563,7 +20602,7 @@ msgstr "v"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20572,11 +20611,11 @@ msgstr ""
msgid "including subgroups"
msgstr "vÄetnÄ› podskupin"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20595,7 +20634,7 @@ msgstr "neplatný poÄet prvků"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20613,7 +20652,7 @@ msgstr "nesprávná syntaxe u \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20673,7 +20712,7 @@ msgstr "neplatný název skupiny"
msgid "invalid host name"
msgstr "neplatné jméno hosta"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20695,6 +20734,16 @@ msgstr "neplatný regulérní výraz"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20736,7 +20785,7 @@ msgstr "vzorec položky"
msgid "key is empty"
msgstr "klÃ­Ä je prázdný"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20752,7 +20801,7 @@ msgctxt "week of month"
msgid "last"
msgstr "poslední"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - Poslední (aktuální) T hodnota"
@@ -20760,11 +20809,11 @@ msgstr "last() - Poslední (aktuální) T hodnota"
msgid "left"
msgstr "levá"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20772,23 +20821,23 @@ msgstr ""
msgid "list of characters"
msgstr "list znaků"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20796,7 +20845,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "základní pravidlo nálezu"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20828,11 +20877,11 @@ msgstr "makro je prázdné"
msgid "macro(s)"
msgstr "makro(a)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20868,7 +20917,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - Maximální hodnota pro periodu T"
@@ -20882,7 +20931,7 @@ msgstr "maximální poÄet závislých položek dosažen"
msgid "maximum number of dependency levels reached"
msgstr "maximální poÄet úrovní závislostí dosažen"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20899,7 +20948,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min() - Minimální hodnota pro periodu T"
@@ -20914,15 +20963,15 @@ msgstr "minimální délka je %1$s znaků"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -21004,7 +21053,7 @@ msgstr "název"
msgid "new"
msgstr "nový"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "nový"
@@ -21038,7 +21087,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -21059,7 +21108,7 @@ msgstr "mimo"
msgid "not selected"
msgstr "nevybráno"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now() - PoÄet sekund od Období"
@@ -21146,15 +21195,15 @@ msgstr ""
msgid "pattern"
msgstr "vzorec"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile() - Percentil P pro periodu T"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21162,15 +21211,15 @@ msgstr ""
msgid "problem pattern"
msgstr "vzorec problému"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21219,11 +21268,11 @@ msgstr ""
msgid "regular expression"
msgstr "regulární výraz"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21247,15 +21296,15 @@ msgstr ""
msgid "right"
msgstr "pravý"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21346,23 +21395,23 @@ msgstr "zobrazit mapování ikon"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21370,11 +21419,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21382,11 +21431,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum() - Souhrn hodnot za periodu T"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21414,7 +21463,7 @@ msgstr "zadaná pověření nejsou jedineÄná"
msgid "tag"
msgstr "znaÄka"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21448,7 +21497,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21495,31 +21544,35 @@ msgstr ""
msgid "time shift"
msgstr "Äasový posun"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - Aktuální Äas"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - Odhad Äas pro dosažení limitu je založen na periodÄ› T"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21545,11 +21598,11 @@ msgstr "prototyp spouÅ¡tÄ›Äe nelze pÅ™esunout do jiné Å¡ablony nebo hosta"
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "spouštěc s vazbami nelze přesunout do jiné šablony nebo hosta"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21606,7 +21659,7 @@ msgstr "neoÄekávaný konec makra"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21649,7 +21702,7 @@ msgstr "neoÄekávaná hodnota \"%1$s\""
msgid "unknown"
msgstr "neznámý"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21850,11 +21903,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/de/LC_MESSAGES/frontend.po b/ui/locale/de/LC_MESSAGES/frontend.po
index c2d3b73a8f0..a6d93c6c72f 100644
--- a/ui/locale/de/LC_MESSAGES/frontend.po
+++ b/ui/locale/de/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2021-10-01 11:19+0300\n"
"Last-Translator: Joachim <joachim.schwender@web.de>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -302,10 +302,10 @@ msgstr "(0 - Standard-Aktion verwenden)"
msgid "(Only super admins can create groups)"
msgstr "(Nur Super-Admins können Gruppen erstellen)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(kein Proxy)"
@@ -456,7 +456,7 @@ msgstr "API Token aktualisiert"
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr "Abszisse"
@@ -525,7 +525,7 @@ msgstr "RESOLVED Ereignisse bestätigen"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -544,11 +544,11 @@ msgstr "RESOLVED Ereignisse bestätigen"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -560,24 +560,24 @@ msgstr "RESOLVED Ereignisse bestätigen"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -595,7 +595,7 @@ msgstr "RESOLVED Ereignisse bestätigen"
msgid "Action"
msgstr "Aktion"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Aktion \"%1$s\" existiert bereits."
@@ -605,7 +605,7 @@ msgstr "Aktion \"%1$s\" existiert bereits."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr "Aktion \"%2$s\" ist für die Benutzerrolle \"%1$s\" nicht verfügbar."
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Aktion hinzugefügt"
@@ -614,17 +614,17 @@ msgstr "Aktion hinzugefügt"
msgid "Action class %1$s must extend %2$s class."
msgstr "Aktionsklasse %1$s muss die Klasse %2$s erweitern."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Aktion gelöscht"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Aktion deaktiviert"
msgstr[1] "Aktionen deaktiviert"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Aktion aktiviert"
@@ -643,7 +643,7 @@ msgstr "Aktionsprotokoll"
msgid "Action operation"
msgstr "Aktion Vorgang"
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Aktion geändert"
@@ -690,7 +690,7 @@ msgid "Active till"
msgstr "Aktiv bis"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -749,14 +749,14 @@ msgstr "Aktiv bis"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -772,10 +772,10 @@ msgstr "Aktiv bis"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -787,9 +787,9 @@ msgstr "Aktiv bis"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -807,7 +807,7 @@ msgstr "Aktiv bis"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -852,7 +852,7 @@ msgstr "Untergeordnetes Element hinzufügen"
msgid "Add child service"
msgstr "Untergeordneten Dienst hinzugefügt"
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr "Untergeordneten Dienste hinzugefügt"
@@ -877,8 +877,8 @@ msgstr "Füge mehrere Karten hinzu"
msgid "Add new data set"
msgstr "Neuen Datensatz hinzufügen"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr "Neue Schnittstelle hinufügen"
@@ -891,7 +891,7 @@ msgstr "Neue Vorrangregel hinzufügen"
msgid "Add page"
msgstr "Seite hinzugefügt"
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr "Übergeordnete Dienste hinzufügen"
@@ -1025,7 +1025,7 @@ msgstr ""
msgid "Aggregate"
msgstr "Zusammenfassung"
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr "Zusammenfassende Funktionen"
@@ -1041,6 +1041,10 @@ msgstr "Zusammenfassungsintervall"
msgid "Alert message"
msgstr "Alarmmeldung"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1359,7 +1363,7 @@ msgstr "Mindestens eine der Datenbanken MySQL, PostgreSQL oder Oracle sollte unt
msgid "At least one operation must be selected."
msgstr "Mindestens eine Operation muss ausgewählt sein."
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "Mindestens eine Operation muss existieren."
@@ -1439,9 +1443,9 @@ msgstr "AuthN-Anfragen"
msgid "Authentication"
msgstr "Authentifizierung"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Authentifizierungs-Algorithmus"
@@ -1502,12 +1506,12 @@ msgstr "Automatisches An-und Abmelden kann nicht gleichzeitig aktiviert werden."
msgid "Auto-logout"
msgstr "Automatisches Abmelden"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automatisch"
@@ -1622,12 +1626,12 @@ msgstr "Bind-DN"
msgid "Bind password"
msgstr "Bind-Passwort"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr "Bits zu verschieben"
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr "Bitweise Funktionen"
@@ -1834,7 +1838,7 @@ msgstr "Kann nicht-numerischen Datenpunkt \"%1$s\" nicht zu Diagramm \"%2$s\" hi
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Kann nicht-numerischen Datenpunkt \"%1$s\" nicht zu Diagrammprototyp \"%2$s\" hinzufügen."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Kann Aktion nicht hinzufügen"
@@ -2133,7 +2137,7 @@ msgstr[1] "API-Token können nicht gelöscht werden"
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Kann Zabbix-internen Benutzer \"%1$s\" nicht löschen. Alternativ könnte er deaktiviert werden."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Kann Aktion nicht löschen"
@@ -2297,12 +2301,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Kann Skript nicht löschen"
msgstr[1] "Kann Skript nicht löschen"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Kann Skript nicht löschen. Aktionsoperation \"%2$s\" verwendet Skript \"%1$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Kann ausgewählte Aktionen nicht löschen"
@@ -2318,7 +2322,7 @@ msgstr[1] "Kann Dienst nicht löschen"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr "Der Dienst \"%1$s\" kann nicht gelöscht werden: %2$s."
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Kann Vorlage nicht löschen"
@@ -2405,7 +2409,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] "Kann API Token nicht deaktivieren"
msgstr[1] "Kann API Token nicht deaktivieren"
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Kann Aktion nicht deaktivieren"
@@ -2483,7 +2487,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] "Kann API Token nicht aktivieren"
msgstr[1] "Kann API Token nicht aktivieren"
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Kann Aktion nicht aktivieren"
@@ -2712,7 +2716,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "Kann Vorlage nicht importieren \"%1$s\", verknüpfte Vorlage \"%2$s\" existiert nicht."
msgstr[1] "Kann Vorlage nicht importieren \"%1$s\", verknüpfte Vorlagen \"%2$s\" existieren nicht."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Kann Auslöser Ausdruck nicht einfügen"
@@ -2891,7 +2895,7 @@ msgstr "Kann Vorlage nicht trennen."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr "Der Auslöser \"%1$s\" kann nicht entkoppelt werden, da er Elemente aus der Vorlage enthält, die noch mit dem Host verknüpft ist."
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "\"%1$s\" nicht aktualisierbar für Aktion \"%2$s\"."
@@ -2957,7 +2961,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Vorlagebasiertes Web-Szenario \"%1$s\": %2$s nicht aktualisierbar."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Kann Aktion nicht ändern"
@@ -3017,7 +3021,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Kann Gruppen für per Suchlauf entdeckten Host \"%1$s\" nicht aktualisieren."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Kann Host nicht ändern"
@@ -3120,9 +3124,9 @@ msgstr "Geplanter Bericht kann nicht aktualisiert werden"
msgid "Cannot update script"
msgstr "Kann Skript nicht ändern"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr "Skriptbereich kann nicht aktualisiert werden. Skript \"%1$s\" wird in Aktion \"%2$s\" verwendet."
@@ -3149,7 +3153,7 @@ msgstr "Schritt für vorlagebasiertes Web-Szenario \"%1$s\": %2$s nicht aktualis
msgid "Cannot update template"
msgstr "Kann Vorlage nicht ändern"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr "Kann Vorlagen nicht aktualisieren"
@@ -3235,14 +3239,14 @@ msgstr "Erfasst alle SNMP-Traps welche nicht durch snmptrap[] Datenpunkte erfass
msgid "Center"
msgstr "Mittig"
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Zertifkat"
@@ -3260,10 +3264,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Ändern"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr "PSK Ändern"
@@ -3303,9 +3307,9 @@ msgstr "Zeichenfolge enthalten"
msgid "Character string not included"
msgstr "Zeichenfolge nicht enthalten"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr "Zeichen"
@@ -3321,7 +3325,7 @@ msgstr "Gehäuse Information. Liefert Zeichefolge"
msgid "Check already exists."
msgstr "Prüfung existiert bereits."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Prüfen Sie den Teil des Ausdrucks der bei \"%1$s\" beginnt."
@@ -3443,8 +3447,8 @@ msgstr "Verlauf löschen"
msgid "Clear history and trends"
msgstr "Verlauf und Trends leeren"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Leeren, wenn getrennt wird"
@@ -3471,16 +3475,16 @@ msgstr "Uhr"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3609,7 +3613,7 @@ msgstr "Kompression"
msgid "Concurrent sessions"
msgstr "Aktuelle Sitzungen"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3892,13 +3896,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr "Die Verbindung wird nicht verschlüsselt, da sie eine Socket-Datei (unter Unix) oder Shared Memory (Windows) verwendet."
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Verbindungen"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Verbindungen vom Host"
@@ -3906,9 +3910,9 @@ msgstr "Verbindungen vom Host"
msgid "Connections from proxy"
msgstr "Verbindungen vom Proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Verbindungen zu Host"
@@ -4076,10 +4080,10 @@ msgid "Correlation updated"
msgstr "Korrelation aktualisiert"
# Zähler?
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Gesamt"
@@ -4169,7 +4173,7 @@ msgid "Create discovery rule (select template first)"
msgstr "Suchlaufregel erzeugen (über Vorlage)"
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4372,7 +4376,7 @@ msgid "Current value"
msgstr "Aktueller Wert"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Benutzerdefiniert"
@@ -4617,7 +4621,7 @@ msgid "Database TLS key file"
msgstr "Datenbank-TLS-Schlüsseldatei"
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4690,11 +4694,11 @@ msgstr "Ende der HW-Wartung"
msgid "Date HW purchased"
msgstr "HW-Anschaffungsdatum"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr "Funktionen für Datum und Uhrzeit"
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Tag"
@@ -4735,8 +4739,8 @@ msgstr "Dez"
msgid "December"
msgstr "Dezember"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr "Dezimalstellen"
@@ -4746,7 +4750,7 @@ msgstr "Verringern um"
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4877,7 +4881,7 @@ msgstr "Löschen"
msgid "Delete all elements that are not present in the import file?"
msgstr "Alle Elemente löschen, die nicht in der Importdatei enthalten sind?"
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Löschen und leeren"
@@ -4886,11 +4890,11 @@ msgstr "Löschen und leeren"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Ausgewählte Vorlagen löschen und leeren? (Warnung: leert Daten aller verbundenen Hosts!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Vorlage löschen und leeren? (Achtung: Alle verbundenen Hosts werden geleert!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Aktuelle Aktion löschen?"
@@ -5023,7 +5027,7 @@ msgstr "Ausgewählte Gruppen löschen?"
msgid "Delete selected host groups?"
msgstr "Ausgewählte Hostgruppe löschen?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Ausgewählten Host-Prototyp löschen?"
@@ -5131,7 +5135,7 @@ msgstr "Ausgewählte Benutzer löschen?"
msgid "Delete selected web scenarios?"
msgstr "Ausgewählte Web Szenarios löschen?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Vorlage löschen?"
@@ -5192,7 +5196,7 @@ msgstr "Ablehnungsliste"
msgid "Dependencies"
msgstr "Abhängigkeiten"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "ABHÄNGIGKEIT"
@@ -5200,7 +5204,7 @@ msgstr "ABHÄNGIGKEIT"
msgid "Dependent item"
msgstr "Abhängiger Datenpunkt"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5211,7 +5215,7 @@ msgid "Deployment status"
msgstr "Verteilungsstatus"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5226,16 +5230,16 @@ msgstr "Verteilungsstatus"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5247,10 +5251,10 @@ msgstr "Beschreibung"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Details"
@@ -5259,6 +5263,14 @@ msgstr "Details"
msgid "Details of web scenario"
msgstr "Details zu Web-Szenario"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Gerät"
@@ -5381,7 +5393,7 @@ msgstr "Ausgewählte Web Szenarios löschen?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5408,17 +5420,17 @@ msgstr "Ausgewählte Web Szenarios löschen?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Deaktiviert"
@@ -5443,7 +5455,7 @@ msgstr "Wert verwerfen"
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5658,7 +5670,7 @@ msgstr "Gestapeltes Diagramm angezeigt"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5675,7 +5687,7 @@ msgstr "Anzeigen %1$s bis %2$s von %3$s gefunden"
msgid "Displaying options"
msgstr "Anzeigeoptionen"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr "Divisionsnenner"
@@ -5757,7 +5769,7 @@ msgstr "Abbild herunterladen"
msgid "Download the configuration file"
msgstr "Konfigurationsdatei herunterladen"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5821,7 +5833,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Dauer"
@@ -5851,14 +5863,14 @@ msgstr "Jeder Datenpunkt"
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6117,7 +6129,7 @@ msgstr "Trapper einschalten"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6155,13 +6167,13 @@ msgstr "Trapper einschalten"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6177,11 +6189,11 @@ msgstr "Aktiviert"
msgid "Encrypt"
msgstr "Verschlüsseln"
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Verschlüsselung"
@@ -6257,6 +6269,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Fehler: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Ereignis"
@@ -6826,8 +6842,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Erste"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Angleichen"
@@ -6940,12 +6956,12 @@ msgstr "Voll"
# Das heißt nicht überall gleich.
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Vollständig klonen"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funktion"
@@ -6961,7 +6977,7 @@ msgstr "GSM-Modem"
msgid "GUI"
msgstr "Oberfläche"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Zugriff auf Oberfläche deaktiviert."
@@ -7310,7 +7326,7 @@ msgstr "Gruppenname"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Gruppen-Prototyp kann nicht auf einer per Suchlauf entdeckten Host-Gruppe \"%1$s\" basieren."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Gruppen-Prototypen"
@@ -7323,12 +7339,11 @@ msgid "Grouping by"
msgstr "Gruppiert nach"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Gruppen"
@@ -7550,7 +7565,7 @@ msgstr "Es dauert eine Weile, den Verlauf zu leeren. Fortfahren?"
msgid "History data selection"
msgstr "Historiedaten Selektion"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr "Historienfunktionen"
@@ -7581,7 +7596,7 @@ msgid "Horizontal align"
msgstr "Horizontale Ausrichtung"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7590,7 +7605,7 @@ msgstr "Horizontale Ausrichtung"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7601,7 +7616,7 @@ msgstr "Horizontale Ausrichtung"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7728,7 +7743,7 @@ msgid "Host group label type"
msgstr "Beschriftung Hostgruppe"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7747,8 +7762,8 @@ msgstr "Host-Gruppe mit ID \"%1$s\" ist nicht verfügbar."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7798,7 +7813,7 @@ msgstr "Ãœberblick Hostinventar"
msgid "Host label type"
msgstr "Beschriftung Host"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Makros"
@@ -7810,7 +7825,7 @@ msgstr "Systemmetadaten"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Name des Hosts"
@@ -7847,7 +7862,7 @@ msgstr "Der Host-Prototyp kann nicht mehr als eine Standardschnittstelle desselb
msgid "Host prototype deleted"
msgstr "Host-Prototyp gelöscht"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr "Host-Prototyp-Makros"
@@ -7870,7 +7885,7 @@ msgstr "Hostprototyp mit Anzeigename \"%1$s\" existiert bereits in Suchlauf \"%2
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Host-Prototypen"
@@ -7895,7 +7910,7 @@ msgstr "Systemzeit"
msgid "Host update failed."
msgstr "Änderung des Hosts fehlgeschlagen."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Host geändert"
@@ -7972,6 +7987,10 @@ msgstr "Hoststandort"
msgid "Hosts updated"
msgstr "Hosts geändert"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Stunden"
@@ -8041,15 +8060,15 @@ msgstr "IP-Bereich"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "IP-Bereich \"%1$s\" überschreitet \"%2$s\" Adressbereich"
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8281,7 +8300,7 @@ msgstr "Bilder"
msgid "Images for all maps will be updated!"
msgstr "Die Bilder für alle Karten werden geändert!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Zurzeit"
@@ -8363,7 +8382,7 @@ msgstr "Unerreichbarer Datenpunkt-Prototyp"
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8375,11 +8394,11 @@ msgstr "Unerreichbare Karte"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "Unerreichbare Vorlage"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "Unzugänglicher Auslöser"
@@ -8494,7 +8513,7 @@ msgstr "Falsches Vault-Token."
msgid "Incorrect action condition discovery check."
msgstr "Fehlerhafte Aktionsbedingung: Suchlaufprüfung."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Unzulässige Aktionsbedingung: Suchlaufprüfung. Suchlaufprüfung existiert nicht oder Sie haben keine Berechtigung dafür."
@@ -8502,7 +8521,7 @@ msgstr "Unzulässige Aktionsbedingung: Suchlaufprüfung. Suchlaufprüfung existi
msgid "Incorrect action condition discovery object."
msgstr "Unzulässige Aktionsbedingung Suchlaufobjekt."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Unzulässige Aktionsbedingung: Suchlaufregel. Suchlaufregel existiert nicht oder Sie haben keine Berechtigung dafür."
@@ -8514,15 +8533,15 @@ msgstr "Unzulässige Aktionsbedingung: Suchlaufstatus."
msgid "Incorrect action condition event type."
msgstr "Unzulässige Aktionsbedingung: Ereignistyp."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8531,11 +8550,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Unzulässige Aktionsbedingung: Port \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Unzulässige Aktionsbedingung: Proxy. Proxy existiert nicht oder Sie haben keine Berechtigung dafür."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8543,7 +8562,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Unzulässige Aktionsbedingung: Auslöserschweregrad."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Unzulässige Aktionsbedingung: Auslöser. Auslöser existiert nicht oder Sie haben keine Berechtigung dafür."
@@ -8553,11 +8572,11 @@ msgstr "Unzulässiger Typ der Aktionsbedingung."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Unzulässiger Eskalationsstufenwert in Aktionsoperation."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8566,11 +8585,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Falscher Aktions-Vorgangstyp \"%1$s\" für Ereignis Quelle \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8870,8 +8889,8 @@ msgstr "Falsche Schrittzahl in Web Szenario Vorlage."
msgid "Incorrect trigger expression"
msgstr "Falscher Auslöser-Ausdruck"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Ungültiger Auslöser-Ausdruck."
@@ -9269,7 +9288,7 @@ msgstr "Informationen über eine Datei. Gibt JSON zurück"
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Informationen über einen Dienst. Gibt integer mit param als state, startup; string - mit param als displayname, path, user; text - mit param als description; Speziell für state: 0 - läuft, 1 - pausiert, 2 - Start anstehend, 3 - Pause anstehend, 4 - Fortsetzung anstehend, 5 - Stop anstehend, 6 - gestoppt, 7 - unbekannt, 255 - kein solcher Dienst; Speziell für startup: 0 - automatisch, 1 - automatisch verzögert, 2 - manuell, 3 - deaktiviert, 4 - unbekannt"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr "Erben"
@@ -9278,11 +9297,11 @@ msgstr "Erben"
msgid "Inherited"
msgstr "Geerbt"
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Geerbte und Host-Makros"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr "Vererbte und Host-Prototyp-Makros"
@@ -9294,7 +9313,7 @@ msgstr "Vererbte und Element-Tags"
msgid "Inherited and scenario tags"
msgstr "Vererbte und Szenario-Tags"
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Vererbte und Vorlagen Makros"
@@ -9314,7 +9333,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Einfügen"
@@ -9373,8 +9392,8 @@ msgstr "DNS-Name darf nicht leer bleiben auf Schnittstelle mit IP-Adresse \"%1$s
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Es wurde kein DNS-Name angegeben für Schnittstelle mit IP-Adresse \"%1$s\"."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr "Schnittstellen"
@@ -9466,7 +9485,7 @@ msgstr "Ungültiger Inhalt der YAML-Datei"
msgid "Invalid action condition: %1$s."
msgstr "Ungültige Aktionsbedingung: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr "Ungültige Bedingung: %1$s."
@@ -9527,10 +9546,10 @@ msgstr "Ungültige Methoden-Parameter."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9593,8 +9612,8 @@ msgstr "Ungültige Methoden-Parameter."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9816,11 +9835,11 @@ msgstr "Ungültige Zeitspanne."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventar"
@@ -9834,7 +9853,7 @@ msgid "Inventory field"
msgstr "Invertarfeld "
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Inventarmodus"
@@ -9842,10 +9861,10 @@ msgstr "Inventarmodus"
msgid "Is online?"
msgstr "Online?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Aussteller"
@@ -9937,7 +9956,7 @@ msgstr[1] "Datenpunkte aktiviert"
msgid "Item in \"not supported\" state"
msgstr "Element im Zustand \"nicht unterstützt\""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Datenpunkt nicht ausgewählt"
@@ -10391,17 +10410,17 @@ msgstr "Diagramm des letzten Monats"
msgid "Last name"
msgstr "Nachname"
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Letzten"
@@ -10478,8 +10497,8 @@ msgstr "Beschnitt links"
msgid "Legend"
msgstr "Legende"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr "Länge"
@@ -10513,8 +10532,8 @@ msgstr "Linienart"
msgid "Line width"
msgstr "Strichstärke"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Verbindung"
@@ -10537,16 +10556,9 @@ msgstr "Das Feld \"selementid2\" des Links verweist auf eine nicht existierende
msgid "Link indicators"
msgstr "Indikatoren"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr "Neue Vorlagen verbinden"
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Vorlagen verknüpfen"
@@ -10562,13 +10574,6 @@ msgstr "Verbinden mit Vorlagen"
msgid "Linked map"
msgstr "Verknüpfte Karte"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10707,7 +10712,7 @@ msgstr "Nicht verarbeitbare SNMP-Traps protokollieren"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Anmelden"
@@ -10789,16 +10794,16 @@ msgstr "Makro \"%1$s\" existiert bereits auf \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Makro \"%1$s\" existiert bereits."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Makros"
@@ -10897,12 +10902,12 @@ msgstr "Verwalten von API-Tokens"
msgid "Manage scheduled reports"
msgstr "Verwalten von geplanten Berichten"
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manuell"
@@ -11046,16 +11051,16 @@ msgstr "Andere markieren"
msgid "Mark selected"
msgstr "Markieren"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Maske"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11088,11 +11093,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr "Stimmt mit dem regulären Ausdruck überein"
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr "Mathematische Funktionen"
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11324,7 +11329,7 @@ msgstr "Microsoft Edge"
msgid "Middle"
msgstr "Mitte"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11426,7 +11431,7 @@ msgstr "Fehlende Datenpunkte für Diagramm-Prototyp \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Schlüssel \"%1$s\" fehlt bei Host \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11508,9 +11513,9 @@ msgstr "Montag"
msgid "Monitored by"
msgstr "Ãœberwacht durch"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Ãœberwacht von Proxy"
@@ -11529,6 +11534,7 @@ msgstr "Ãœberwachung"
msgid "Monospace"
msgstr "Festschrittschrift"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Monat"
@@ -11641,8 +11647,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11712,11 +11718,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11744,8 +11750,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11766,7 +11772,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12056,15 +12062,15 @@ msgstr "Keine Suchlauf-IDs festgelegt."
msgid "No enabled modules found."
msgstr "Keine aktivierten Module gefunden."
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Keine Verschlüsselung"
@@ -12150,7 +12156,7 @@ msgstr "Keine Treffer gefunden"
msgid "No new modules discovered"
msgstr "Keine neuen Module entdeckt"
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12187,9 +12193,9 @@ msgstr "Keine Berechtigung zum Zugriff auf die Oberfläche."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12228,7 +12234,7 @@ msgstr "Keine Berechtigung zum Aufruf von \"%1$s.%2$s\"."
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12328,11 +12334,11 @@ msgstr "Keine Berechtigung zum Aufruf von \"%1$s.%2$s\"."
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12391,7 +12397,7 @@ msgid "No public key file specified."
msgstr "Keine Datei mit öffentlichem Schlüssel angegeben."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12412,7 +12418,7 @@ msgid "No target selected."
msgstr "Kein Ziel ausgewählt."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12563,6 +12569,10 @@ msgstr "Benachrichtigungs-Report"
msgid "Notifications"
msgstr "Benachrichtigungen"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12649,6 +12659,10 @@ msgstr "Anzahl der Prozessoren auf virtueller VMware-Maschine, <url>-VMware Dien
msgid "Number of rows"
msgstr "Zeilenzahl"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Anzahl der Statusänderungen"
@@ -12824,7 +12838,7 @@ msgid "Off"
msgstr "Aus"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12871,7 +12885,7 @@ msgstr "Einer"
msgid "One time only"
msgstr "Einmalig"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Einmalige Downtime"
@@ -12949,12 +12963,12 @@ msgstr "Informationen zum Betriebssystem. Rüchgabewert Zeichenfolge"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr "Operation \"%1$s\" existiert bereits."
@@ -12988,8 +13002,8 @@ msgstr "Operative Daten"
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operationen"
@@ -13024,7 +13038,7 @@ msgstr "Operationen"
msgid "Operator"
msgstr "Operator"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr "Operator-Funktionen"
@@ -13064,19 +13078,19 @@ msgstr "Oder"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13106,10 +13120,10 @@ msgstr "Oder"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13374,10 +13388,10 @@ msgstr "PROBLEM"
msgid "PROBLEM event generation mode"
msgstr "PROBLEM Ereignisgenerierungsmodus"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13390,19 +13404,19 @@ msgstr "PROBLEM Ereignisgenerierungsmodus"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "PSK-Identität"
@@ -13454,12 +13468,12 @@ msgid "Parameters"
msgstr "Parameter"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Ãœbergeordnete Suchlaufregeln"
@@ -13515,13 +13529,13 @@ msgid "Passive"
msgstr "Passiv"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13529,7 +13543,7 @@ msgstr "Passiv"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13582,12 +13596,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Ohne externe Links einfügen"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr "Muster"
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "Pausieren von Vorgängen bei unterdrückten Problemen"
@@ -13600,7 +13614,7 @@ msgstr "Höchstwert Speichernutzung: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr "Prozentsatz der Zeit, in der die virtuelle Maschine nicht ausgeführt werden kann, weil sie um den Zugriff auf die physische(n) CPU(s) kämpft, <url> - VMware-Service-URL, <uuid> - Hostname der virtuellen VMware-Maschine"
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Prozentsatz"
@@ -13624,10 +13638,11 @@ msgstr "Perzentilenstrich (rechts)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Führt eine DNS-Abfrage durch. Gibt eine Zeichenkette mit dem gewünschten Informationstyp zurück"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13635,7 +13650,9 @@ msgstr "Führt eine DNS-Abfrage durch. Gibt eine Zeichenkette mit dem gewünscht
msgid "Period"
msgstr "Zeitraum"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr "Periodenverschiebung"
@@ -13699,11 +13716,11 @@ msgstr "Geräusch abspielen"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Bitte überprüfen Sie die Konfigurationsparameter. Wenn alles korrekt ist, drücken Sie die Taste \"%1$s\" oder \"%2$s\", um die Konfigurationsparameter zu ändern."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr "Bitte bestätigen Sie, dass Sie alle Makros entfernen möchten."
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr "Bitte bestätigen Sie, dass Sie alle Wertezuordnungen entfernen möchten."
@@ -13789,7 +13806,7 @@ msgstr "Beitragstyp"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr "Stromverbrauch , <url> - VMware-Service-URL, <uuid> - VMware-Hypervisor-Hostname, <max> - Maximal zulässiger Stromverbrauch"
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr "Leistung"
@@ -13798,7 +13815,7 @@ msgstr "Leistung"
msgid "Pre-installation summary"
msgstr "Zusammenfassung vor Installation"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr "Vorhersagefunktionen"
@@ -13916,9 +13933,9 @@ msgid "Private key file"
msgstr "Datei mit privatem Schlüsel"
# Bezieht sich auf IPMI-Einstellungen
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Berechtigungsebene"
@@ -14325,7 +14342,7 @@ msgstr "Ausdruck der Wiederherstellung"
msgid "Recovery expression syntax error."
msgstr "Syntaxfehler des Wiederherstellungsausdrucks."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Wiederherstellungsmassnahmen"
@@ -14456,20 +14473,20 @@ msgstr "Befehl ausführen"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14478,10 +14495,10 @@ msgstr "Befehl ausführen"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14525,7 +14542,7 @@ msgstr "Befehl ausführen"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14608,14 +14625,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14628,8 +14645,8 @@ msgstr "Ersetzen"
msgid "Replace dependencies"
msgstr "Abhängigkeiten ersetzen"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14831,7 +14848,7 @@ msgstr "Antworttyp: Zeichenkette"
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Ergebnis"
@@ -15365,7 +15382,7 @@ msgstr "Umfang"
msgid "Script"
msgstr "Skript"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Das Skript \"%1$s\" existiert bereits."
@@ -15430,6 +15447,15 @@ msgstr "Suchmuster ist leer"
msgid "Search type"
msgstr "Suchtyp"
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Zweitkontakt Mobil"
@@ -15508,7 +15534,7 @@ msgstr "Widget auswählen"
msgid "Selected"
msgstr "Ausgewählte"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Ausgewählte Aktionen gelöscht"
@@ -15748,6 +15774,7 @@ msgid "Services updated"
msgstr "Dienste aktualisiert"
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr "Fehler bei der Sitzungsinitialisierung."
@@ -16203,7 +16230,7 @@ msgstr "Spanisch (es_ES)"
msgid "Specified role was not found."
msgstr "Angegebene Rolle wurde nicht gefunden."
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Das angegebene Skript existiert nicht oder Sie haben nicht die notwendigen Berechtigungen."
@@ -16238,8 +16265,8 @@ msgstr "Standard-Element"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr "Start"
@@ -16248,7 +16275,7 @@ msgid "Start date"
msgstr "Anfangsdatum"
# Spaltenüberschrift für Startzeitpunkt einer Operationsschritts
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Start bei"
@@ -16327,7 +16354,7 @@ msgstr "Statistik und Verfügbarkeit des Zabbix-Schreibcache. Cache - einer der
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16431,7 +16458,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Schritt namens \"%1$s\" existiert bereits."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16486,12 +16513,12 @@ msgstr "Straight"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr "Zeichenkette"
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16512,10 +16539,10 @@ msgstr ""
msgid "Subject"
msgstr "Betreff"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Subjekt"
@@ -16712,7 +16739,7 @@ msgstr "Maker-Wert"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16728,13 +16755,13 @@ msgstr "Maker-Wert"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16751,7 +16778,7 @@ msgstr "Maker-Wert"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16761,7 +16788,7 @@ msgstr "Maker-Wert"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16797,14 +16824,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Vorlage"
@@ -16848,7 +16873,7 @@ msgstr "Vorlage Ãœbersichtsseite"
msgid "Template dashboards"
msgstr "Vorlage Ãœbersichtsseiten"
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Vorlage gelöscht"
@@ -16860,11 +16885,11 @@ msgstr "Vorlagen-Gruppe"
msgid "Template linkage"
msgstr "Vorlagenverlinkung"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Makrovorlagen"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Vorlagenname"
@@ -16899,13 +16924,12 @@ msgstr "Vorlage mit demselben sichtbaren Namen \"%1$s\" existiert bereits."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16914,10 +16938,12 @@ msgstr "Vorlage mit demselben sichtbaren Namen \"%1$s\" existiert bereits."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16928,7 +16954,7 @@ msgstr "Vorlagen"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Vorlage \"%1$s\" getrennt von Host \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr "Vorlagen aktualisiert"
@@ -17142,7 +17168,7 @@ msgstr "Thema"
msgid "This day last week"
msgstr "Heute vor einer Woche"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr "Dieses Feld wird automatisch gefüllt vom Datenpunkt \"%1$s\"."
@@ -17180,7 +17206,7 @@ msgstr "Dieses Jahr"
msgid "This year so far"
msgstr "Dieses Jahr bis jetzt"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Schwellenwert"
@@ -17213,15 +17239,15 @@ msgstr ""
msgid "Till"
msgstr "Bis"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17258,13 +17284,13 @@ msgstr "Zeitpunkt des letzten Zugriffs auf den Proxy. Name - Name des Proxys. GÃ
msgid "Time period"
msgstr "Zeitspanne"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17956,9 +17982,9 @@ msgstr "Einheit"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Unbekannt"
@@ -17976,7 +18002,7 @@ msgid "Unknown error"
msgstr "Unbekannter Fehler"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Ausgewählter Host enthält keinen solchen Datenpunkt"
@@ -18008,16 +18034,16 @@ msgstr "Unbekannter Werttyp"
msgid "Unlimited"
msgstr "Unbegrenzt"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Trennen"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Trennen und reinigen"
@@ -18114,10 +18140,10 @@ msgstr "Erreichbar"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18126,16 +18152,16 @@ msgstr "Erreichbar"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18164,7 +18190,7 @@ msgstr "Ändere existierende"
msgid "Update interval"
msgstr "Aktualisierungsintervall"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "Vorgänge aktualisieren"
@@ -18191,7 +18217,7 @@ msgstr "Hochladen"
msgid "Upper level maps"
msgstr "Ãœbergeordnete Karten"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18377,7 +18403,7 @@ msgstr[1] "Benutzergruppen aktualisiert"
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18513,15 +18539,15 @@ msgid "User/Recipient"
msgstr "Benutzer/Empfänger"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Benutzername"
@@ -18835,11 +18861,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18913,14 +18939,14 @@ msgstr "Wertzuordnung \"%1$s\" exitstiert bereits."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Wertezuordnung"
@@ -18963,7 +18989,7 @@ msgstr "Wert: Keine Daten"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19063,7 +19089,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Sichtbarer Name"
@@ -19089,7 +19115,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Warnung"
@@ -19198,6 +19224,10 @@ msgstr "Mi"
msgid "Wednesday"
msgstr "Mittwoch"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19470,7 +19500,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "JJJJ-MM-TThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Jahr"
@@ -19530,7 +19561,7 @@ msgstr "Sie sind angemeldet als \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Sie können einige der Sprachen nicht auswählen, weil die nötige Locale nicht auf dem Web-Server installiert ist."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Du bist nicht eingeloggt"
@@ -19771,11 +19802,11 @@ msgstr "es wird ein Zeitraum erwartet"
msgid "a time unit is expected"
msgstr "Zeiteinheit erwartet"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr "abs() - Absolutwert"
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19870,7 +19901,7 @@ msgstr "eine gerade Anzahl von hexadezimalen Zeichen wird erwartet"
msgid "an explicit time is expected"
msgstr "eine explizite Zeit ist erwartet"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19914,11 +19945,11 @@ msgstr "als Rot"
msgid "ascending"
msgstr "A-Z"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19932,11 +19963,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19958,39 +19989,47 @@ msgstr ""
msgid "avg"
msgstr "durchschnitt"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr "bitrshift() - Bitweises Verschieben nach rechts"
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr "bitxor() - Bitweises exklusives ODER"
@@ -20005,7 +20044,7 @@ msgstr "Blinkt"
msgid "both username and password should be either present or empty"
msgstr "sowohl Benutzername als auch Passwort sollten entweder vorhanden oder leer sein"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr "bytelength() - Gibt die Länge in Bytes zurück"
@@ -20047,7 +20086,7 @@ msgstr "nicht änderbar"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20135,23 +20174,23 @@ msgstr "keine Scroll-API-Anfrage durchführen kann, könnten die Daten abgeschni
msgid "cannot update property for templated discovery rule"
msgstr "Kann Eigenschaften für eine vorlagengestützte Suchlaufregel nicht aktualisieren"
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr "cbrt() - kubische Wurzel"
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr "ceil() - Rundet auf die nächsthöhere ganze Zahl"
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - Differenz zwischen dem letzten und dem vorherigen Wert"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr "char() - Gibt das Zeichen zurück, das den angegebenen ASCII-Code darstellt"
@@ -20178,7 +20217,7 @@ msgstr "Farbe"
msgid "comma-separated list"
msgstr "Kommagetrennte Liste"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20193,15 +20232,15 @@ msgstr "konfigurieren"
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20209,11 +20248,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - Anzahl der erfolgreich abgerufenen Werte V (die den Operator O erfüllen) für den Zeitraum T"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr "countunique() - Die Anzahl der einmaligen Werte"
@@ -20226,15 +20265,15 @@ msgstr "T"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - Aktuelles Datum"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - Tag des Monats"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - Wochentag"
@@ -20252,7 +20291,7 @@ msgstr "Tage"
msgid "default"
msgstr "Standard"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr "degrees() - Konvertiert einen Wert von Radiant in Grad"
@@ -20329,7 +20368,7 @@ msgstr "existiert nicht"
msgid "does not match"
msgstr "passt nicht"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20352,11 +20391,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20372,7 +20411,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20386,15 +20425,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr "erster Parameter erwartet"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr "first() - Der älteste Wert im angegebenen Zeitintervall"
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr "floor() - Rundet auf die nächstkleinere ganze Zahl ab"
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - Vorhersage für die nächsten t Sekunden auf der Grundlage des Zeitraums T"
@@ -20402,7 +20441,7 @@ msgstr "forecast() - Vorhersage für die nächsten t Sekunden auf der Grundlage
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime() - Die Differenz zwischen dem Elementwert (als Zeitstempel) und dem Zeitstempel des Zabbix-Servers ist kleiner oder gleich T Sekunden (1 - wahr, 0 - falsch)"
@@ -20476,7 +20515,7 @@ msgstr "in"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20485,11 +20524,11 @@ msgstr ""
msgid "including subgroups"
msgstr "einschließlich Untergruppen"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20508,7 +20547,7 @@ msgstr "falsche Elementanzahl"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20526,7 +20565,7 @@ msgstr "falsche Syntax bei \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20586,7 +20625,7 @@ msgstr ""
msgid "invalid host name"
msgstr "ungültiger Hostname"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20608,6 +20647,16 @@ msgstr "Ungültiger regulärer Ausdruck"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20649,7 +20698,7 @@ msgstr ""
msgid "key is empty"
msgstr "Schlüssel ist leer"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr "kurtosis() - Misst die \"Schwanzlosigkeit\" der Wahrscheinlichkeitsverteilung"
@@ -20665,7 +20714,7 @@ msgctxt "week of month"
msgid "last"
msgstr "letzte"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20673,11 +20722,11 @@ msgstr ""
msgid "left"
msgstr "links"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20685,23 +20734,23 @@ msgstr ""
msgid "list of characters"
msgstr "Liste der Zeichen"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr "log10() - Dezimaler Logarithmus"
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr "logeventid() - Ereignis-ID des letzten Protokolleintrags, der dem regulären Ausdruck V für den Zeitraum T entspricht (1 - Übereinstimmung, 0 - keine Übereinstimmung)"
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr "logseverity() - Schweregrad des letzten Protokolleintrags für den Zeitraum T"
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr "logsource() - Quelle des letzten Protokolleintrags, der dem Parameter V im Zeitraum T entspricht (1 - Ãœbereinstimmung, 0 - keine Ãœbereinstimmung)"
@@ -20709,7 +20758,7 @@ msgstr "logsource() - Quelle des letzten Protokolleintrags, der dem Parameter V
msgid "low-level discovery rule"
msgstr "Suchlaufregel"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20741,11 +20790,11 @@ msgstr "Makro ist leer"
msgid "macro(s)"
msgstr "Makro(s)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr "In der Funktion \"%1$s\" fehlt ein obligatorischer Parameter."
@@ -20781,7 +20830,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr "Maximaler Zeitraum ist kleiner als der Standardzeitraum des Zeitfilters"
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - Höchstwert für den Zeitraum T"
@@ -20795,7 +20844,7 @@ msgstr "maximale Anzahl abhängiger Datenpunkte erreicht"
msgid "maximum number of dependency levels reached"
msgstr "maximale Anzahl von Abhängigkeitsebenen erreicht"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20812,7 +20861,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20827,15 +20876,15 @@ msgstr "die Mindestlänge beträgt %1$s Zeichen"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20917,7 +20966,7 @@ msgstr "Name"
msgid "new"
msgstr "neu"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "neu"
@@ -20951,7 +21000,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20972,7 +21021,7 @@ msgstr "nicht in"
msgid "not selected"
msgstr "nicht ausgewählt"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21060,15 +21109,15 @@ msgstr ""
msgid "pattern"
msgstr "Muster"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21076,15 +21125,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21133,11 +21182,11 @@ msgstr ""
msgid "regular expression"
msgstr "Regulärer Ausdruck"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21161,15 +21210,15 @@ msgstr ""
msgid "right"
msgstr "rechts"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21260,23 +21309,23 @@ msgstr "Zeige Symbolzuordnung"
msgid "sign in as guest"
msgstr "als Gast anmelden"
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21284,11 +21333,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21296,11 +21345,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21328,7 +21377,7 @@ msgstr ""
msgid "tag"
msgstr "Marker"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21362,7 +21411,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21409,31 +21458,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21459,11 +21512,11 @@ msgstr "Auslöser-Prototyp nicht zu einer anderen Vorlage oder anderem Host vers
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21520,7 +21573,7 @@ msgstr "unerwartetes Ende des Makros"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21563,7 +21616,7 @@ msgstr "unerwarteter Wert \"%1$s\""
msgid "unknown"
msgstr "unbekannt"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21762,11 +21815,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/el/LC_MESSAGES/frontend.po b/ui/locale/el/LC_MESSAGES/frontend.po
index 01f2820cfb9..a610e924edb 100644
--- a/ui/locale/el/LC_MESSAGES/frontend.po
+++ b/ui/locale/el/LC_MESSAGES/frontend.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2014-10-03 08:43+0300\n"
"Last-Translator: ΓΙΑÎÎΗΣ <yannis@computerstudio.gr>\n"
"Language-Team: none\n"
@@ -306,10 +306,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr "(Μόνο υπεÏδιαχειÏιστές δημιουÏγοÏν ομάδες)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(χωÏίς διαμεσολαβητή)"
@@ -460,7 +460,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -529,7 +529,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -548,11 +548,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -564,24 +564,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -599,7 +599,7 @@ msgstr ""
msgid "Action"
msgstr "ΕνέÏγεια"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "ΕνέÏγεια \"%1$s\" υπάÏχει ήδη."
@@ -609,7 +609,7 @@ msgstr "ΕνέÏγεια \"%1$s\" υπάÏχει ήδη."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Η ενέÏγεια Ï€Ïοστέθηκε"
@@ -618,17 +618,17 @@ msgstr "Η ενέÏγεια Ï€Ïοστέθηκε"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Η ενέÏγεια διεγÏάφη"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "ΕνέÏγεια απενεÏγοποιημένη"
msgstr[1] "ΕνέÏγειες απενεÏγοποιημένες"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "ΕνέÏγεια ενεÏγοποιημένη"
@@ -647,7 +647,7 @@ msgstr "ΕνέÏγεια καταγÏαφής"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Η ΕνέÏγεια ενημεÏώθηκε"
@@ -694,7 +694,7 @@ msgid "Active till"
msgstr "ΕνεÏγό έως"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -753,14 +753,14 @@ msgstr "ΕνεÏγό έως"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -776,10 +776,10 @@ msgstr "ΕνεÏγό έως"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -791,9 +791,9 @@ msgstr "ΕνεÏγό έως"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -811,7 +811,7 @@ msgstr "ΕνεÏγό έως"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -856,7 +856,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -881,8 +881,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -895,7 +895,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1029,7 +1029,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1045,6 +1045,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Ψευδώνυμο"
@@ -1359,7 +1363,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1439,9 +1443,9 @@ msgstr ""
msgid "Authentication"
msgstr "Ταυτοποίηση"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "ΑλγόÏιθμος ταυτοποίησης"
@@ -1502,12 +1506,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Αυτόματο"
@@ -1622,12 +1626,12 @@ msgstr "Συσχέτιση DN"
msgid "Bind password"
msgstr "Συσχέτιση συνθηματικοÏ"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1833,7 +1837,7 @@ msgstr "ΑδÏνατη η Ï€Ïοσθήκη μη αÏÎ¹Î¸Î¼Î·Ï„Î¹ÎºÎ¿Ï ÏƒÏ…Î»Î»Î
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "ΑδÏνατη η Ï€Ïοσθήκη μη αÏÎ¹Î¸Î¼Î·Ï„Î¹ÎºÎ¿Ï ÏƒÏ…Î»Î»Î­ÎºÏ„Î· \"%1$s\" στο Ï€Ïωτότυπο γÏάφημα \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "ΑδÏνατη η Ï€Ïοσθήκη ενέÏγειας"
@@ -2131,7 +2135,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "ΑδÏνατη η διαγÏαφή Zabbix εσωτεÏÎ¹ÎºÎ¿Ï Ï‡Ïήστη \"%1$s\", απενεÏγοποιήστε το χÏήστη."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "ΑδÏνατη η διαγÏαφή ενέÏγειας"
@@ -2299,12 +2303,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "ΑδÏνατη η διαγÏαφή δέσμης ενεÏγειών"
msgstr[1] "ΑδÏνατη η διαγÏαφή δέσμης ενεÏγειών"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "ΑδÏνατη η διαγÏαφή δεσμών ενεÏγειών. Η Δέσμη ενεÏγειών \"%1$s\" χÏησιμοποιείτε στην εÏγασία ενέÏγειας \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "ΑδÏνατη η διαγÏαφή επιλεγμένων ενεÏγειών"
@@ -2321,7 +2325,7 @@ msgstr[1] "ΑδÏνατη η διαγÏαφή υπηÏεσίας"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "ΑδÏνατη η διαγÏαφή σχεδιότυπου"
@@ -2408,7 +2412,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "ΑδÏνατη η απενεÏγοποίηση ενέÏγειας"
@@ -2486,7 +2490,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "ΑδÏνατη η ενεÏγοποίηση ενέÏγειας"
@@ -2715,7 +2719,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "Δεν μποÏÏŽ να εισάγω σχεδιότυπο \"%1$s\", συνδεδεμένο σχεδιότυπο \"%2$s\" ανÏπαÏκτο."
msgstr[1] "Δεν μποÏÏŽ να εισάγω σχεδιότυπο \"%1$s\", συνδεδεμένα σχεδιότυπα \"%2$s\" ανÏπαÏκτα."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "ΑδÏνατη η εισαγωγή έκφÏασης εναÏσματος"
@@ -2894,7 +2898,7 @@ msgstr "ΑδÏνατη η αποσÏνδεση σχεδιότυπου."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "ΑδÏνατη η ενημέÏωση \"%1$s\" για ενέÏγεια \"%2$s\"."
@@ -2960,7 +2964,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "ΑδÏνατη η ενημέÏωση ενέÏγειας"
@@ -3020,7 +3024,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "ΑδÏνατη η ενημέÏωση ομάδων εντοπισμένων ξενιστών \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "ΑδÏνατη η ενημέÏωση ξενιστή"
@@ -3125,9 +3129,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "ΑδÏνατη η ενημέÏωση δέσμης ενεÏγειών"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3154,7 +3158,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "ΑδÏνατη η ενημέÏωση σχεδιότυπου"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3241,14 +3245,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3266,10 +3270,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3309,9 +3313,9 @@ msgstr "ΠεÏιλαμβάνεται στοιχειοσειÏά χαÏακτήÏ
msgid "Character string not included"
msgstr "Δεν πεÏιλαμβάνεται στοιχειοσειÏά χαÏακτήÏων"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3327,7 +3331,7 @@ msgstr ""
msgid "Check already exists."
msgstr "Ο Έλεγχος υπάÏχει ήδη."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Ελέγξτε το τμήμα έκφÏασης που ξεκινά απο \"%1$s\"."
@@ -3449,8 +3453,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr "ΕκκαθάÏιση ιστοÏÎ¹ÎºÎ¿Ï ÎºÎ±Î¹ τάσεων"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "ΕκκαθάÏιση όταν αποσυνδέεται"
@@ -3477,16 +3481,16 @@ msgstr "Ρολόι"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3615,7 +3619,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3887,13 +3891,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3901,9 +3905,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4070,10 +4074,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "ΑπαÏίθμηση"
@@ -4163,7 +4167,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4365,7 +4369,7 @@ msgid "Current value"
msgstr "ΤÏέχουσα τιμή"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4608,7 +4612,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4681,11 +4685,11 @@ msgstr "ΗμεÏομηνία λήξης συντήÏησης HW"
msgid "Date HW purchased"
msgstr "ΗμεÏομηνία αγοÏάς HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "ΗμέÏα"
@@ -4726,8 +4730,8 @@ msgstr "Δεκ"
msgid "December"
msgstr "ΔεκέμβÏιος"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4737,7 +4741,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4868,7 +4872,7 @@ msgstr "ΔιαγÏαφή"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "ΔιαγÏαφή και καθαÏισμός"
@@ -4877,11 +4881,11 @@ msgstr "ΔιαγÏαφή και καθαÏισμός"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "ΔιαγÏαφή και καθαÏισμός επιλεγμένων σχεδιότυπων; (ΠÏοσοχή: όλοι οι συνδεδεμένοι ξενιστές θα καθαÏιστοÏν!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "ΔιαγÏαφή και καθαÏισμός σχεδιότυπου; (ΠÏοσοχή: όλοι οι συνδεδεμένοι ξενιστές θα καθαÏιστοÏν!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "ΔιαγÏαφή Ï„Ïέχουσας ενέÏγειας;"
@@ -5014,7 +5018,7 @@ msgstr "ΔιαγÏαφή επιλεγμένων ομάδων;"
msgid "Delete selected host groups?"
msgstr "ΔιαγÏαφή επιλεγμένων ομάδων ξενιστών;"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "ΔιαγÏαφή επιλεγμένου Ï€Ïωτότυπου ξενιστή;"
@@ -5122,7 +5126,7 @@ msgstr "ΔιαγÏαφή επιλεγμένων χÏηστών;"
msgid "Delete selected web scenarios?"
msgstr "ΔιαγÏαφή επιλεγμένων σεναÏίων ΙΣΤΟΥ;"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "ΔιαγÏαφή σχεδιότυπου;"
@@ -5183,7 +5187,7 @@ msgstr ""
msgid "Dependencies"
msgstr "ΕξαÏτήσεις"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "ΕξαÏτημένο"
@@ -5191,7 +5195,7 @@ msgstr "ΕξαÏτημένο"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5202,7 +5206,7 @@ msgid "Deployment status"
msgstr "Κατάσταση υλοποίησης"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5217,16 +5221,16 @@ msgstr "Κατάσταση υλοποίησης"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5238,10 +5242,10 @@ msgstr "ΠεÏιγÏαφή"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "ΛεπτομέÏειες"
@@ -5250,6 +5254,14 @@ msgstr "ΛεπτομέÏειες"
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Συσκευή"
@@ -5372,7 +5384,7 @@ msgstr "ΑπενεÏγοποίηση επιλεγμένων σεναÏίων ιÏ
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5399,17 +5411,17 @@ msgstr "ΑπενεÏγοποίηση επιλεγμένων σεναÏίων ιÏ
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "ΑπενεÏγοποιημένο"
@@ -5434,7 +5446,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5648,7 +5660,7 @@ msgstr "Εμφάνιση στοιβαγμένου γÏαφήματος"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5665,7 +5677,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5747,7 +5759,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5811,7 +5823,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "ΔιάÏκεια"
@@ -5841,14 +5853,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6104,7 +6116,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6142,13 +6154,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6164,11 +6176,11 @@ msgstr "ΕνεÏγοποιημένο"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6244,6 +6256,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Σφάλμα: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Συμβάν"
@@ -6813,8 +6829,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "ΠÏώτο"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6926,12 +6942,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "ΠλήÏης κλώνος"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "ΣυνάÏτηση"
@@ -6947,7 +6963,7 @@ msgstr "GSM μόντεμ"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "ΑπενεÏγοποιημένη Ï€Ïόσβαση GUI."
@@ -7296,7 +7312,7 @@ msgstr "Όνομα ομάδος"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "ΠÏωτότυπη ομάδα δεν μποÏεί να βασίζεται σε εντοπισμένη ομάδα ξενιστή \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "ΠÏωτότυπες ομάδες"
@@ -7309,12 +7325,11 @@ msgid "Grouping by"
msgstr "Ομαδοποίηση με"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Ομάδες"
@@ -7533,7 +7548,7 @@ msgstr "Η εκκαθάÏιση ιστοÏÎ¹ÎºÎ¿Ï Î¼Ï€Î¿Ïεί να πάÏει
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7564,7 +7579,7 @@ msgid "Horizontal align"
msgstr "ΟÏιζόντια ευθυγÏάμμιση"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7573,7 +7588,7 @@ msgstr "ΟÏιζόντια ευθυγÏάμμιση"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7584,7 +7599,7 @@ msgstr "ΟÏιζόντια ευθυγÏάμμιση"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7710,7 +7725,7 @@ msgid "Host group label type"
msgstr "ΤÏπος ετικέτας ομάδος ξενιστών"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7729,8 +7744,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7780,7 +7795,7 @@ msgstr "Επισκόπηση απογÏαφής ξενιστή"
msgid "Host label type"
msgstr "ΤÏπος ετικέτας ξενιστή"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7792,7 +7807,7 @@ msgstr "Μετα-δεδομένα ξενιστή"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Όνομα ξενιστή"
@@ -7829,7 +7844,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "ΠÏωτότυπος ξενιστής διεγÏάφη"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7853,7 +7868,7 @@ msgstr "ΠÏωτότυπος ξενιστής με οÏατό όνομα \"%1$s\
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "ΠÏωτότυποι ξενιστές"
@@ -7878,7 +7893,7 @@ msgstr "ΧÏόνος ξενιστή"
msgid "Host update failed."
msgstr "Αποτυχία ενημέÏωσης ξενιστή."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Ξενιστής ενημεÏώθηκε"
@@ -7955,6 +7970,10 @@ msgstr "Τοποθεσία ξενιστών"
msgid "Hosts updated"
msgstr "Ξενιστές ενημεÏώθηκαν"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "ÎÏες"
@@ -8024,15 +8043,15 @@ msgstr "ΠεÏιοχή IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8264,7 +8283,7 @@ msgstr "Εικόνες"
msgid "Images for all maps will be updated!"
msgstr "Οι εικόνες όλων των χαÏτών θα ενημεÏωθοÏν!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Άμεσα"
@@ -8346,7 +8365,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8358,11 +8377,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8477,7 +8496,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Λανθασμένη συνθήκη ενέÏγειας ελέγχου εντοπισμοÏ."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Λανθασμένη συνθήκη ενέÏγειας ελέγχου εντοπισμοÏ. ÎŒ έλεγχος δεν υπάÏχει ή δεν έχετε Ï€Ïόσβαση."
@@ -8485,7 +8504,7 @@ msgstr "Λανθασμένη συνθήκη ενέÏγειας ελέγχου ε
msgid "Incorrect action condition discovery object."
msgstr "Λανθασμένη συνθήκη ενέÏγειας αντικειμένου εντοπισμοÏ."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Λανθασμένη συνθήκη ενέÏγειας κανόνα εντοπισμοÏ. ÎŒ κανόνας δεν υπάÏχει ή δεν έχετε Ï€Ïόσβαση."
@@ -8497,15 +8516,15 @@ msgstr "Λανθασμένη συνθήκη ενέÏγειας κατάστασÎ
msgid "Incorrect action condition event type."
msgstr "Λανθασμένη συνθήκη ενέÏγειας είδους συμβάντος."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8514,11 +8533,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Λανθασμένη συνθήκη ενέÏγειας θÏÏας \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Λανθασμένος διαμεσολαβητής στη συνθήκη ενέÏγειας. Ο διαμεσολαβητής δεν υπάÏχει ή δεν έχετε Ï€Ïόσβαση σε αυτόν."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8526,7 +8545,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Λανθασμένη συνθήκη ενέÏγειας βαÏÏτητας εναÏσματος."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Λανθασμένο έναυσμα στη συνθήκη ενέÏγειας. Έναυσμα δεν υπάÏχει ή δεν έχετε Ï€Ïόσβαση."
@@ -8536,11 +8555,11 @@ msgstr "Λανθασμένος Ï„Ïπος στη συνθήκη ενέÏγεια
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Λανθασμένες βηματικές τιμές κλιμάκωσης εÏγασίας ενέÏγειας."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8549,11 +8568,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8853,8 +8872,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr "Λανθασμένη έκφÏαση εναÏσματος"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Λανθασμένη έκφÏαση εναÏσματος."
@@ -9252,7 +9271,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9261,11 +9280,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9277,7 +9296,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9297,7 +9316,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Εισαγωγή"
@@ -9356,8 +9375,8 @@ msgstr "Η διεπαφή με IP \"%1$s\" δεν μποÏεί να έχει κÎ
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Η διεπαφή με IP \"%1$s\" δεν μποÏεί να έχει κενό όνομα DNS."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9449,7 +9468,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9510,10 +9529,10 @@ msgstr "ΆκυÏες παÏάμετÏοι μεθόδου."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9576,8 +9595,8 @@ msgstr "ΆκυÏες παÏάμετÏοι μεθόδου."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9799,11 +9818,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "ΑπογÏαφή"
@@ -9817,7 +9836,7 @@ msgid "Inventory field"
msgstr "Πεδίο απογÏαφής"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "ΤÏόπος απογÏαφής"
@@ -9825,10 +9844,10 @@ msgstr "ΤÏόπος απογÏαφής"
msgid "Is online?"
msgstr "Είναι συνδεδεμένος;"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9920,7 +9939,7 @@ msgstr[1] "Συλλέκτες ενεÏγοποιημένοι"
msgid "Item in \"not supported\" state"
msgstr "Συλλέκτης σε \"ανυποστήÏικτη\" κατάσταση"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Συλλέκτης μή επιλεγμένος"
@@ -10374,17 +10393,17 @@ msgstr "ΓÏάφημα τελευταίου μήνα"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Τελευταίο απο"
@@ -10461,8 +10480,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10496,8 +10515,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "ΣÏνδεσμος"
@@ -10520,16 +10539,9 @@ msgstr ""
msgid "Link indicators"
msgstr "ΣÏνδεση δεικτών"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "ΣÏνδεση σχεδιότυπων"
@@ -10545,13 +10557,6 @@ msgstr "ΣÏνδεση με σχεδιότυπα"
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10690,7 +10695,7 @@ msgstr "ΚαταγÏαφή αταίÏιαστων SNMP traps"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "ΣÏνδεση"
@@ -10772,16 +10777,16 @@ msgstr "Η μακÏοεντολή \"%1$s\" υπάÏχει ήδη σε \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Η μακÏοεντολή \"%1$s\" υπάÏχει ήδη."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "ΜακÏοεντολές"
@@ -10880,12 +10885,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "ΧειÏοκίνητα"
@@ -11028,16 +11033,16 @@ msgstr "Σημειώστε άλλα"
msgid "Mark selected"
msgstr "Σημάδι επιλέχθηκε"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Μάσκα"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11070,11 +11075,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11307,7 +11312,7 @@ msgstr ""
msgid "Middle"
msgstr "Ενδιάμεσο"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11409,7 +11414,7 @@ msgstr "Απόντες συλλέκτες Ï€Ïωτότυπου γÏαφήματÎ
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Απουσία ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï \"%1$s\" ξενιστή \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11491,9 +11496,9 @@ msgstr "ΔευτέÏα"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Εποπτευόμενο μέσω διαμεσολαβητή"
@@ -11512,6 +11517,7 @@ msgstr "Εποπτεία"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Μήνας"
@@ -11624,8 +11630,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11695,11 +11701,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11727,8 +11733,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11749,7 +11755,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12039,15 +12045,15 @@ msgstr "Δεν δόθηκαν IDs κανόνα εντοπισμοÏ."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12133,7 +12139,7 @@ msgstr "Δεν βÏέθηκαν ταιÏιάσματα"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12170,9 +12176,9 @@ msgstr "ΧωÏίς δικαιώματα για Ï€Ïόσβαση συστήματ
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12211,7 +12217,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12311,11 +12317,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12374,7 +12380,7 @@ msgid "No public key file specified."
msgstr "Δεν καθοÏίστηκε αÏχείο δημοσίου κλειδιοÏ."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12395,7 +12401,7 @@ msgid "No target selected."
msgstr "Δεν επιλέχθηκε στόχος."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12544,6 +12550,10 @@ msgstr "ΑναφοÏά ειδοποίησης"
msgid "Notifications"
msgstr "Ειδοποιήσεις"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12630,6 +12640,10 @@ msgstr "ΑÏιθμός επεξεÏγαστών σε VMware εικονική μÎ
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "ΑÏιθμός αλλαγών κατάστασης"
@@ -12805,7 +12819,7 @@ msgid "Off"
msgstr "Εκτός"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12852,7 +12866,7 @@ msgstr ""
msgid "One time only"
msgstr "Μία φοÏά μόνο"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Μία φοÏά μή διαθέσιμο"
@@ -12929,12 +12943,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12968,8 +12982,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "ΛειτουÏγίες"
@@ -13004,7 +13018,7 @@ msgstr "ΛειτουÏγίες"
msgid "Operator"
msgstr "ΧειÏιστής"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13044,19 +13058,19 @@ msgstr "Ή"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13086,10 +13100,10 @@ msgstr "Ή"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13352,10 +13366,10 @@ msgstr "ΠΡΟΒΛΗΜΑ"
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13368,19 +13382,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13432,12 +13446,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Γονικοί κανόνες εντοπισμοÏ"
@@ -13492,13 +13506,13 @@ msgid "Passive"
msgstr "Παθητικός"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13506,7 +13520,7 @@ msgstr "Παθητικός"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13559,12 +13573,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13577,7 +13591,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13601,10 +13615,11 @@ msgstr "Εκατοστιαία γÏαμμή (δεξιά)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13612,7 +13627,9 @@ msgstr ""
msgid "Period"
msgstr "ΠεÏίοδος"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13676,11 +13693,11 @@ msgstr "Παίξε ήχο"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13766,7 +13783,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13775,7 +13792,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13893,9 +13910,9 @@ msgstr ""
msgid "Private key file"
msgstr "ΑÏχείο Î¹Î´Î¹Ï‰Ï„Î¹ÎºÎ¿Ï ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Επίπεδο δικαιωμάτων"
@@ -14303,7 +14320,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14434,20 +14451,20 @@ msgstr "ΑπομακÏυσμένη εντολή"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14456,10 +14473,10 @@ msgstr "ΑπομακÏυσμένη εντολή"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14503,7 +14520,7 @@ msgstr "ΑπομακÏυσμένη εντολή"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14586,14 +14603,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14606,8 +14623,8 @@ msgstr "Αντικατάσταση"
msgid "Replace dependencies"
msgstr "Αντικατάσταση εξαÏτήσεων"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14808,7 +14825,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Αποτέλεσμα"
@@ -15340,7 +15357,7 @@ msgstr ""
msgid "Script"
msgstr "Δέσμη ενεÏγειών"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Δέσμη ενεÏγειών \"%1$s\" υπάÏχει ήδη."
@@ -15406,6 +15423,15 @@ msgstr "Το σχέδιο αναζήτησης είναι άδειο"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Κινητό ΔεÏτεÏης Επαφής"
@@ -15484,7 +15510,7 @@ msgstr ""
msgid "Selected"
msgstr "Επιλεγμένο"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Επιλεγμένες ενέÏγειες διεγÏάφησαν"
@@ -15725,6 +15751,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16178,7 +16205,7 @@ msgstr "Ισπανικά (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Η καθοÏισμένη δέσμη ενεÏγειών δεν υπάÏχει ή δεν έχετε δικαιώματα σε αυτή για εντολή εÏγασίας ενέÏγειας."
@@ -16213,8 +16240,8 @@ msgstr "Τυπικοί συλλέκτες"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16222,7 +16249,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "ΈναÏξη σε"
@@ -16301,7 +16328,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16405,7 +16432,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Βήμα ονόματος \"%1$s\" υπάÏχει ήδη."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16459,12 +16486,12 @@ msgstr "Ευθεία"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16485,10 +16512,10 @@ msgstr ""
msgid "Subject"
msgstr "Θέμα"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16682,7 +16709,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16698,13 +16725,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16721,7 +16748,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16731,7 +16758,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16767,14 +16794,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Σχεδιότυπο"
@@ -16818,7 +16843,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Σχεδιότυπο διεγÏάφη"
@@ -16830,11 +16855,11 @@ msgstr "Ομάδα σχεδιότυπων"
msgid "Template linkage"
msgstr "Συσχέτιση σχεδιότυπου"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Όνομα σχεδιότυπου"
@@ -16869,13 +16894,12 @@ msgstr "Σχεδιότυπο με ίδιο οÏατό όνομα \"%1$s\" υπά
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16884,10 +16908,12 @@ msgstr "Σχεδιότυπο με ίδιο οÏατό όνομα \"%1$s\" υπά
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16898,7 +16924,7 @@ msgstr "Σχεδιότυπα"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Σχεδιότυπα \"%1$s\" αποσυνδεδεμένα απο ξενιστές \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17112,7 +17138,7 @@ msgstr "Θέμα"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17150,7 +17176,7 @@ msgstr "Αυτό το έτος"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17183,15 +17209,15 @@ msgstr ""
msgid "Till"
msgstr "Έως"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17228,13 +17254,13 @@ msgstr ""
msgid "Time period"
msgstr "ΧÏονική πεÏίοδος"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17927,9 +17953,9 @@ msgstr "Μονάδες"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Άγνωστο"
@@ -17947,7 +17973,7 @@ msgid "Unknown error"
msgstr "Άγνωστο σφάλμα"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Άγνωστος συλλέκτης ξενιστή, κανένας τέτοιος συλλέκτης σε επιλεγμένο ξενιστή"
@@ -17979,16 +18005,16 @@ msgstr "Άγνωστος Ï„Ïπος τιμής"
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "ΑποσÏνδεση"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "ΑποσÏνδεση και εκκαθάÏιση"
@@ -18084,10 +18110,10 @@ msgstr "Ανοικτά"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18096,16 +18122,16 @@ msgstr "Ανοικτά"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18134,7 +18160,7 @@ msgstr "ΕνημέÏωση υφιστάμενων"
msgid "Update interval"
msgstr "Διάστημα ενημέÏωσης"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18161,7 +18187,7 @@ msgstr "Ανεβάστε"
msgid "Upper level maps"
msgstr "ΧάÏτες Άνω επίπεδο"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18347,7 +18373,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18483,15 +18509,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Όνομα χÏήστη"
@@ -18805,11 +18831,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18883,14 +18909,14 @@ msgstr "Αντιστοιχία τιμής \"%1$s\" υπάÏχει ήδη."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Αντιστοίχιση τιμής"
@@ -18933,7 +18959,7 @@ msgstr "Τιμή: όχι δεδομένα"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19033,7 +19059,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "ΟÏατό όνομα"
@@ -19059,7 +19085,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "ΠÏοειδοποίηση"
@@ -19167,6 +19193,10 @@ msgstr "Τετ"
msgid "Wednesday"
msgstr "ΤετάÏτη"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19439,7 +19469,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Έτος"
@@ -19499,7 +19530,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Δεν μποÏείται να επιλέξετε κάποια από τις γλώσσες, επειδή οι τοπικές Ïυθμίσεις για αυτές δεν είναι εγκατεστημένες στον εξυπηÏετητή ιστοÏ."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19740,11 +19771,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19839,7 +19870,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19883,11 +19914,11 @@ msgstr "ως Κόκκινο"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19901,11 +19932,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19927,39 +19958,47 @@ msgstr ""
msgid "avg"
msgstr "μ.ο."
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19974,7 +20013,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20016,7 +20055,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20104,23 +20143,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20147,7 +20186,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20162,15 +20201,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20178,11 +20217,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20195,15 +20234,15 @@ msgstr "η"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20221,7 +20260,7 @@ msgstr "ημέÏες"
msgid "default"
msgstr "Ï€ÏοκαθοÏισμένο"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20298,7 +20337,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20321,11 +20360,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20341,7 +20380,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20355,15 +20394,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20371,7 +20410,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20446,7 +20485,7 @@ msgstr "εν"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20455,11 +20494,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20478,7 +20517,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20496,7 +20535,7 @@ msgstr "ανακÏιβής σÏνταξη πλησίον \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20556,7 +20595,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20578,6 +20617,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20619,7 +20668,7 @@ msgstr ""
msgid "key is empty"
msgstr "κενό κλειδί"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20635,7 +20684,7 @@ msgctxt "week of month"
msgid "last"
msgstr "τελευταίο"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20643,11 +20692,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20655,23 +20704,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20679,7 +20728,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "κανόνας ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï Ï‡Î±Î¼Î·Î»Î¿Ï ÎµÏ€Î¹Ï€Î­Î´Î¿Ï…"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20711,11 +20760,11 @@ msgstr ""
msgid "macro(s)"
msgstr "μακÏοεντολή(ες)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20751,7 +20800,7 @@ msgstr "μεγ."
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20765,7 +20814,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20782,7 +20831,7 @@ msgstr ""
msgid "min"
msgstr "ελάχ."
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20797,15 +20846,15 @@ msgstr ""
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20887,7 +20936,7 @@ msgstr ""
msgid "new"
msgstr "νέο"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "νέο"
@@ -20921,7 +20970,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20942,7 +20991,7 @@ msgstr "όχι σε"
msgid "not selected"
msgstr "δεν επιλέχθηκε"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21029,15 +21078,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21045,15 +21094,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21102,11 +21151,11 @@ msgstr ""
msgid "regular expression"
msgstr "κανονική έκφÏαση"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21130,15 +21179,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21229,23 +21278,23 @@ msgstr "εμφάνιση αντιστοιχίσεων εικονίδιου"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21253,11 +21302,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21265,11 +21314,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21297,7 +21346,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21331,7 +21380,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21378,31 +21427,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21428,11 +21481,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21489,7 +21542,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21532,7 +21585,7 @@ msgstr ""
msgid "unknown"
msgstr "άγνωστο"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21731,11 +21784,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/es/LC_MESSAGES/frontend.po b/ui/locale/es/LC_MESSAGES/frontend.po
index 4136afbb491..4807ba10b47 100644
--- a/ui/locale/es/LC_MESSAGES/frontend.po
+++ b/ui/locale/es/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2014-10-01 18:50+0300\n"
"Last-Translator: Saúl <saulortega.co@gmail.com>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -302,10 +302,10 @@ msgstr "(0 - usar acción por defecto)"
msgid "(Only super admins can create groups)"
msgstr "(Sólo los súper administradores pueden crear grupos)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(sin proxy)"
@@ -456,7 +456,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -525,7 +525,7 @@ msgstr "Aceptar eventos RESUELTOS"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -544,11 +544,11 @@ msgstr "Aceptar eventos RESUELTOS"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -560,24 +560,24 @@ msgstr "Aceptar eventos RESUELTOS"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -595,7 +595,7 @@ msgstr "Aceptar eventos RESUELTOS"
msgid "Action"
msgstr "Acción"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "La acción \"%1$s\" ya existe."
@@ -605,7 +605,7 @@ msgstr "La acción \"%1$s\" ya existe."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Acción agregada"
@@ -614,17 +614,17 @@ msgstr "Acción agregada"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Acción eliminada"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Acción deshabilitada"
msgstr[1] "Acciones deshabilitadas"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Acción habilitada"
@@ -643,7 +643,7 @@ msgstr "Registro de acciones"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Acción actualizada"
@@ -690,7 +690,7 @@ msgid "Active till"
msgstr "Activo hasta"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -749,14 +749,14 @@ msgstr "Activo hasta"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -772,10 +772,10 @@ msgstr "Activo hasta"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -787,9 +787,9 @@ msgstr "Activo hasta"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -807,7 +807,7 @@ msgstr "Activo hasta"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -852,7 +852,7 @@ msgstr "Agregar un elemento hijo"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -877,8 +877,8 @@ msgstr "Agregar varios mapas"
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -891,7 +891,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1025,7 +1025,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1041,6 +1041,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1355,7 +1359,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "Al menos debe existir una operación."
@@ -1435,9 +1439,9 @@ msgstr ""
msgid "Authentication"
msgstr "Autenticación"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Algoritmo de autenticación"
@@ -1498,12 +1502,12 @@ msgstr "Las opciones inicio y cierre de sesión automáticos no pueden ser habil
msgid "Auto-logout"
msgstr "Cierre de sesión automático"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automático"
@@ -1618,12 +1622,12 @@ msgstr "DN del enlace"
msgid "Bind password"
msgstr "Contraseña del enlace"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1829,7 +1833,7 @@ msgstr "No se puede agregar un ítem no numérico \"%1$s\" a la gráfica \"%2$s\
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "No se puede agregar un ítem no numérico \"%1$s\" al prototipo de gráfica \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "No se pudo agregar la acción"
@@ -2127,7 +2131,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "No se puede borrar el usuario \"%1$s\", prueba deshabilitandolo primero."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "No es posible eliminar la acción"
@@ -2293,12 +2297,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "No es posible eliminar el script"
msgstr[1] "No es posible eliminar el script"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "No es posible eliminar los scripts. script \"%1$s\" es usado en accioón \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "No es posible eliminar las acciones seleccionadas"
@@ -2315,7 +2319,7 @@ msgstr[1] "No es posible eliminar el servicio"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "No es posible eliminar las plantilla"
@@ -2402,7 +2406,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "No se pudo desactivar la acción"
@@ -2480,7 +2484,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "No se pudo habilitar la acción"
@@ -2709,7 +2713,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "No se pudo importar la plantilla \"%1$s\" porque la plantilla enlazada \"%2$s\" no existe."
msgstr[1] "No se pudo importar la plantilla \"%1$s\" porque las plantillas enlazadas \"%2$s\" no existen."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "No se pudo insertar la expresión del disparador"
@@ -2888,7 +2892,7 @@ msgstr "No se pudo desenlazar la plantilla."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "No se puede actualizar el \"%1$s\" de una acción \"%2$s\"."
@@ -2954,7 +2958,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "No es posible actualizar la acción"
@@ -3014,7 +3018,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "No se pudo actualizar los grupos del equipo descubierto \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "No es posible actualizar el equipo"
@@ -3119,9 +3123,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "No se pudo actualizar el script"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3148,7 +3152,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "No se pudo actualizar la plantilla"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3235,14 +3239,14 @@ msgstr "Captura todos los traps SNMP que no fueron capturados por ninguno de los
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Certificado"
@@ -3260,10 +3264,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Cambio"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3303,9 +3307,9 @@ msgstr "Cadena de caracteres incluida"
msgid "Character string not included"
msgstr "Cadena de caracteres no incluidos"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3321,7 +3325,7 @@ msgstr "Información del chasis. Devuelve una cadena"
msgid "Check already exists."
msgstr "Verifique si ya existe."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Verifique la parte de la expresión que inicia en \"%1$s\"."
@@ -3443,8 +3447,8 @@ msgstr "Limpiar histórico"
msgid "Clear history and trends"
msgstr "Limpiar historial y tendencias"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Limpiar cuando se deslinke"
@@ -3471,16 +3475,16 @@ msgstr "Reloj"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3609,7 +3613,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr "Sesiones simultáneas"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3881,13 +3885,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Conexiones"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Conexiones desde el host"
@@ -3895,9 +3899,9 @@ msgstr "Conexiones desde el host"
msgid "Connections from proxy"
msgstr "Conexiones desde el proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Conexiones al host"
@@ -4065,10 +4069,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Contador"
@@ -4158,7 +4162,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4360,7 +4364,7 @@ msgid "Current value"
msgstr "Valor actual"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "A medida"
@@ -4603,7 +4607,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4676,11 +4680,11 @@ msgstr "Fecha HW mantenimiento expira"
msgid "Date HW purchased"
msgstr "Fecha de adquisición del hardware"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Día"
@@ -4721,8 +4725,8 @@ msgstr "Dic"
msgid "December"
msgstr "Diciembre"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4732,7 +4736,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4863,7 +4867,7 @@ msgstr "Eliminar"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Eliminar y limpiar"
@@ -4872,11 +4876,11 @@ msgstr "Eliminar y limpiar"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "¿Desea eliminar y limpiar las plantillas seleccionadas? (Advertencia: Todos los equipos enlazados serán purgados)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "¿Desea eliminar y limpiar la plantilla? (Advertencia: Todos los equipos enlazados serán purgados)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "¿Desea eliminar la acción actual?"
@@ -5009,7 +5013,7 @@ msgstr "¿Desea eliminar los grupos seleccionados?"
msgid "Delete selected host groups?"
msgstr "¿Desea eliminar los grupos de equipos seleccionados?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "¿Desea eliminar el prototipo de equipo seleccionado?"
@@ -5117,7 +5121,7 @@ msgstr "¿Desea eliminar los usuarios seccionados?"
msgid "Delete selected web scenarios?"
msgstr "¿Desea eliminar los escenarios web seleccionados?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "¿Desea eliminar la plantilla?"
@@ -5178,7 +5182,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Dependencias"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Dependiente"
@@ -5186,7 +5190,7 @@ msgstr "Dependiente"
msgid "Dependent item"
msgstr "Elemento dependiente"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5197,7 +5201,7 @@ msgid "Deployment status"
msgstr "Estado de implementación"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5212,16 +5216,16 @@ msgstr "Estado de implementación"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5233,10 +5237,10 @@ msgstr "Descripción"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detalles"
@@ -5245,6 +5249,14 @@ msgstr "Detalles"
msgid "Details of web scenario"
msgstr "Detalles del escenario web"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Dispositivo"
@@ -5367,7 +5379,7 @@ msgstr "¿Desea desactivar los escenarios web seleccionados?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5394,17 +5406,17 @@ msgstr "¿Desea desactivar los escenarios web seleccionados?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Desactivado"
@@ -5429,7 +5441,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5644,7 +5656,7 @@ msgstr "Mostrar gráfico apilado"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5661,7 +5673,7 @@ msgstr "Mostrando %1$s a %2$s de %3$s encontrados"
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5743,7 +5755,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Descargar el archivo de configuración"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5807,7 +5819,7 @@ msgstr "Userid duplicado \"%1$s\" en usuarios para el mapa \"%2$s\"."
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Duración"
@@ -5837,14 +5849,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6100,7 +6112,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6138,13 +6150,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6160,11 +6172,11 @@ msgstr "Activado"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Cifrado"
@@ -6240,6 +6252,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Error: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Evento"
@@ -6809,8 +6825,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Primero"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Ajustar"
@@ -6922,12 +6938,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Clonación completa"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Función"
@@ -6943,7 +6959,7 @@ msgstr "Modem GSM"
msgid "GUI"
msgstr "Interfaz de usuario"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Acceso a la interfaz desactivada."
@@ -7292,7 +7308,7 @@ msgstr "Nombre del grupo"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7305,12 +7321,11 @@ msgid "Grouping by"
msgstr "Agrupar por"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Grupos"
@@ -7529,7 +7544,7 @@ msgstr "Eliminar el histórico puede llevarse tiempo. ¿Continuar?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7560,7 +7575,7 @@ msgid "Horizontal align"
msgstr "Alineación horizontal"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7569,7 +7584,7 @@ msgstr "Alineación horizontal"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7580,7 +7595,7 @@ msgstr "Alineación horizontal"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7707,7 +7722,7 @@ msgid "Host group label type"
msgstr ""
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7726,8 +7741,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7777,7 +7792,7 @@ msgstr "Vista general del inventario de equipos"
msgid "Host label type"
msgstr "Tipo de etiqueta de equipo"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7789,7 +7804,7 @@ msgstr "Metadatos de equipo"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Nombre de equipo"
@@ -7826,7 +7841,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Prototipo de equipo eliminado"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7850,7 +7865,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Prototipos de equipo"
@@ -7875,7 +7890,7 @@ msgstr "Hora del equipo"
msgid "Host update failed."
msgstr ""
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Equipo actualizado"
@@ -7952,6 +7967,10 @@ msgstr "Ubicación del equipo"
msgid "Hosts updated"
msgstr "Equipos actualizados"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Horas"
@@ -8021,15 +8040,15 @@ msgstr "Rango de IP's"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "El rango IP \"%1$s\" sobrepasa el límite de direccionamiento \"%2$s\""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8261,7 +8280,7 @@ msgstr "Imágenes"
msgid "Images for all maps will be updated!"
msgstr ""
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr ""
@@ -8343,7 +8362,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8355,11 +8374,11 @@ msgstr "Mapa inaccesible"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8474,7 +8493,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr ""
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr ""
@@ -8482,7 +8501,7 @@ msgstr ""
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr ""
@@ -8494,15 +8513,15 @@ msgstr ""
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8511,11 +8530,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8524,7 +8543,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Gravedad del iniciador de la acción de la condición incorrecta"
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr ""
@@ -8534,11 +8553,11 @@ msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr ""
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8547,11 +8566,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8852,8 +8871,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr ""
@@ -9251,7 +9270,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9260,11 +9279,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9276,7 +9295,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9296,7 +9315,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Insertar"
@@ -9355,8 +9374,8 @@ msgstr ""
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9448,7 +9467,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9509,10 +9528,10 @@ msgstr ""
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9575,8 +9594,8 @@ msgstr ""
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9798,11 +9817,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventario"
@@ -9816,7 +9835,7 @@ msgid "Inventory field"
msgstr "Campo de inventario"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr ""
@@ -9824,10 +9843,10 @@ msgstr ""
msgid "Is online?"
msgstr "¿Está conectado?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Emisor"
@@ -9919,7 +9938,7 @@ msgstr[1] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10372,17 +10391,17 @@ msgstr "Gráfico del último mes"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "El último de"
@@ -10459,8 +10478,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10494,8 +10513,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Vínculo"
@@ -10518,16 +10537,9 @@ msgstr ""
msgid "Link indicators"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr ""
@@ -10543,13 +10555,6 @@ msgstr ""
msgid "Linked map"
msgstr "Mapa enlazado"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10688,7 +10693,7 @@ msgstr "Registrar traps SNMP sin emparejar"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Iniciar sesión"
@@ -10770,16 +10775,16 @@ msgstr ""
msgid "Macro \"%1$s\" already exists."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Macros"
@@ -10878,12 +10883,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manual"
@@ -11026,16 +11031,16 @@ msgstr "Marcar otros"
msgid "Mark selected"
msgstr "Marcar seleccionados"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11068,11 +11073,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11304,7 +11309,7 @@ msgstr ""
msgid "Middle"
msgstr "Medio"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11406,7 +11411,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11488,9 +11493,9 @@ msgstr "Lunes"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr ""
@@ -11509,6 +11514,7 @@ msgstr "Monitorización"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Mes"
@@ -11621,8 +11627,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11692,11 +11698,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11724,8 +11730,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11746,7 +11752,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12036,15 +12042,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Sin cifrado"
@@ -12130,7 +12136,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12167,9 +12173,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12208,7 +12214,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12308,11 +12314,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12371,7 +12377,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12392,7 +12398,7 @@ msgid "No target selected."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12541,6 +12547,10 @@ msgstr "Informe de notificaciones"
msgid "Notifications"
msgstr "Notificaciones"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12627,6 +12637,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Número de cambios de estado"
@@ -12802,7 +12816,7 @@ msgid "Off"
msgstr "INACTIVO"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12849,7 +12863,7 @@ msgstr ""
msgid "One time only"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Una vez inoperativo"
@@ -12926,12 +12940,12 @@ msgstr "Información del sistema operativo. Devuelve una cadena"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12965,8 +12979,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operaciones"
@@ -13001,7 +13015,7 @@ msgstr "Operaciones"
msgid "Operator"
msgstr "Operador"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13041,19 +13055,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13083,10 +13097,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13349,10 +13363,10 @@ msgstr "PROBLEMA"
msgid "PROBLEM event generation mode"
msgstr "Modo de generador de eventos de PROBLEMA"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13365,19 +13379,19 @@ msgstr "Modo de generador de eventos de PROBLEMA"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "Identidad PSK"
@@ -13429,12 +13443,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13489,13 +13503,13 @@ msgid "Passive"
msgstr "Pasivo"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13503,7 +13517,7 @@ msgstr "Pasivo"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13556,12 +13570,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13574,7 +13588,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13598,10 +13612,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13609,7 +13624,9 @@ msgstr ""
msgid "Period"
msgstr "Período"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13673,11 +13690,11 @@ msgstr "Reproducir sonido"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13763,7 +13780,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13772,7 +13789,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13889,9 +13906,9 @@ msgstr "Privada"
msgid "Private key file"
msgstr "Archivo de clave privada"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Nivel de privilegio"
@@ -14298,7 +14315,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14429,20 +14446,20 @@ msgstr "Comando remoto"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14451,10 +14468,10 @@ msgstr "Comando remoto"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14498,7 +14515,7 @@ msgstr "Comando remoto"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14581,14 +14598,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14601,8 +14618,8 @@ msgstr "Reemplazar"
msgid "Replace dependencies"
msgstr "Reemplazar dependencias"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14803,7 +14820,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Resultado"
@@ -15335,7 +15352,7 @@ msgstr ""
msgid "Script"
msgstr "Script"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15400,6 +15417,15 @@ msgstr ""
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15478,7 +15504,7 @@ msgstr "Seleccione widget"
msgid "Selected"
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15719,6 +15745,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16172,7 +16199,7 @@ msgstr "Español (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "El script especificado no existe o usted no tiene permisos sobre él para la acción de la instrucción."
@@ -16207,8 +16234,8 @@ msgstr ""
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16216,7 +16243,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16295,7 +16322,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16399,7 +16426,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16453,12 +16480,12 @@ msgstr ""
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16479,10 +16506,10 @@ msgstr ""
msgid "Subject"
msgstr "Título"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Asunto"
@@ -16676,7 +16703,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16692,13 +16719,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16715,7 +16742,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16725,7 +16752,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16761,14 +16788,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Plantilla"
@@ -16812,7 +16837,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Plantilla borrada"
@@ -16824,11 +16849,11 @@ msgstr ""
msgid "Template linkage"
msgstr "Plantilla vinculada"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Nombre de plantilla"
@@ -16863,13 +16888,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16878,10 +16902,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16892,7 +16918,7 @@ msgstr "Plantillas"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17106,7 +17132,7 @@ msgstr "Tema"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17144,7 +17170,7 @@ msgstr "Este año"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17177,15 +17203,15 @@ msgstr ""
msgid "Till"
msgstr "Hasta"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17222,13 +17248,13 @@ msgstr ""
msgid "Time period"
msgstr "Período de tiempo"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17920,9 +17946,9 @@ msgstr "Unidad"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Desconocido"
@@ -17940,7 +17966,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr ""
@@ -17972,16 +17998,16 @@ msgstr ""
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Desvincular"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Desvincular y eliminar"
@@ -18077,10 +18103,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18089,16 +18115,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18127,7 +18153,7 @@ msgstr ""
msgid "Update interval"
msgstr "Intervalo de actualización"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18154,7 +18180,7 @@ msgstr "Subir"
msgid "Upper level maps"
msgstr "Mapas de nivel superior"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18340,7 +18366,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18476,15 +18502,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr ""
@@ -18798,11 +18824,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18876,14 +18902,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Asignación de valores"
@@ -18926,7 +18952,7 @@ msgstr "Valores: sin datos"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19026,7 +19052,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Nombre visible"
@@ -19052,7 +19078,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Advertencia"
@@ -19160,6 +19186,10 @@ msgstr ""
msgid "Wednesday"
msgstr "Miércoles"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19432,7 +19462,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Año"
@@ -19492,7 +19523,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "No puede elegir algunos idiomas porque las «locales» para ellos no están instalados en el servidor web."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19733,11 +19764,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19832,7 +19863,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19876,11 +19907,11 @@ msgstr "como Rojo"
msgid "ascending"
msgstr "ascendente"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19894,11 +19925,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19920,39 +19951,47 @@ msgstr ""
msgid "avg"
msgstr "media"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19967,7 +20006,7 @@ msgstr "parpadeo"
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20009,7 +20048,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20097,23 +20136,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20140,7 +20179,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20155,15 +20194,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20171,11 +20210,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20188,15 +20227,15 @@ msgstr ""
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20214,7 +20253,7 @@ msgstr "días"
msgid "default"
msgstr "por defecto"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20291,7 +20330,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20314,11 +20353,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20334,7 +20373,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20348,15 +20387,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20364,7 +20403,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20438,7 +20477,7 @@ msgstr "contenido en"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20447,11 +20486,11 @@ msgstr ""
msgid "including subgroups"
msgstr "incluir subgrupos"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20470,7 +20509,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20488,7 +20527,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20548,7 +20587,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20570,6 +20609,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20611,7 +20660,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20627,7 +20676,7 @@ msgctxt "week of month"
msgid "last"
msgstr "último"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20635,11 +20684,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20647,23 +20696,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20671,7 +20720,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20703,11 +20752,11 @@ msgstr ""
msgid "macro(s)"
msgstr "macro(s)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20743,7 +20792,7 @@ msgstr "máximo"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20757,7 +20806,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20774,7 +20823,7 @@ msgstr ""
msgid "min"
msgstr "mínimo"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20789,15 +20838,15 @@ msgstr ""
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20879,7 +20928,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20913,7 +20962,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20934,7 +20983,7 @@ msgstr "no contenido en"
msgid "not selected"
msgstr "no seleccionada"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21021,15 +21070,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21037,15 +21086,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21094,11 +21143,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21122,15 +21171,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21221,23 +21270,23 @@ msgstr "mostrar asignaciones de icono"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21245,11 +21294,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21257,11 +21306,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21289,7 +21338,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21323,7 +21372,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21370,31 +21419,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21420,11 +21473,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21481,7 +21534,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21524,7 +21577,7 @@ msgstr ""
msgid "unknown"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21723,11 +21776,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/fa/LC_MESSAGES/frontend.po b/ui/locale/fa/LC_MESSAGES/frontend.po
index d8eaa8e250f..b6a0de8cf63 100644
--- a/ui/locale/fa/LC_MESSAGES/frontend.po
+++ b/ui/locale/fa/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-10-10 08:30+0300\n"
"Last-Translator: richlv <richlv@nakts.net>\n"
"Language-Team: none\n"
@@ -284,10 +284,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(بدون پروکسی)"
@@ -435,7 +435,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -504,7 +504,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -523,11 +523,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -539,24 +539,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -574,7 +574,7 @@ msgstr ""
msgid "Action"
msgstr "Ùعالیت ها"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr ""
@@ -584,7 +584,7 @@ msgstr ""
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Ùعالیت اضاÙÙ‡ شد"
@@ -593,16 +593,16 @@ msgstr "Ùعالیت اضاÙÙ‡ شد"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Ùعالیت حذ٠شد"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] ""
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] ""
@@ -620,7 +620,7 @@ msgstr ""
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Ùعالیت بروز شد"
@@ -667,7 +667,7 @@ msgid "Active till"
msgstr "Ùعال تا"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -726,14 +726,14 @@ msgstr "Ùعال تا"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -749,10 +749,10 @@ msgstr "Ùعال تا"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -764,9 +764,9 @@ msgstr "Ùعال تا"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -784,7 +784,7 @@ msgstr "Ùعال تا"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -829,7 +829,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -854,8 +854,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -868,7 +868,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1002,7 +1002,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1018,6 +1018,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "نام مستعار"
@@ -1332,7 +1336,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1412,9 +1416,9 @@ msgstr ""
msgid "Authentication"
msgstr "تصدیق هویت"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "الگوریتم تصدیق هویت"
@@ -1475,12 +1479,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "خودکار"
@@ -1595,12 +1599,12 @@ msgstr ""
msgid "Bind password"
msgstr "مقید به کلمه عبور"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1806,7 +1810,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Ùعالیت نمی تواند اضاÙÙ‡ شود"
@@ -2099,7 +2103,7 @@ msgstr[0] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Ùعالیت نمی‌تواند حذ٠شود"
@@ -2253,12 +2257,12 @@ msgid "Cannot delete script"
msgid_plural "Cannot delete scripts"
msgstr[0] "اسکریپت نمی تواند حذ٠شود"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "اسکریپت ها نمی توانند حذ٠شوند.اسکریپت \"%1$s\" در عملکرد Ùعالیت \"%2$s\" استÙاده شده است.اسکریپت ها نمی توانند حذ٠شوند.اسکریپت \"%1$s\" در عملکرد Ùعالیت \"%2$s\" استÙاده شده است.اسکریپت ها نمی توانند حذ٠شوند.اسکریپت \"%1$s\" در عملکرد Ùعالیت \"%2$s\" استÙاده شده است.اسکریپت ها نمی توانند حذ٠شوند.اسکریپت \"%1$s\" در عملکرد Ùعالیت \"%2$s\" استÙاده شده است.اسکریپت ها نمی توانند حذ٠شوند.اسکریپت \"%1$s\" در عملکرد Ùعالیت \"%2$s\" استÙاده شده است."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Ùعالیت های انتخاب شده نمی‌توانند حذ٠شوند"
@@ -2274,7 +2278,7 @@ msgstr[0] "سرویس نمی‌تواند حذ٠شود"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "قالب نمی تواند حذ٠شود"
@@ -2357,7 +2361,7 @@ msgid "Cannot disable API token"
msgid_plural "Cannot disable API tokens"
msgstr[0] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] ""
@@ -2425,7 +2429,7 @@ msgid "Cannot enable API token"
msgid_plural "Cannot enable API tokens"
msgstr[0] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2644,7 +2648,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
msgstr[0] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2821,7 +2825,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -2887,7 +2891,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Ùعالیت نمی‌تواند بروز شود"
@@ -2946,7 +2950,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "هاست نمی‌تواند بروز شود"
@@ -3047,9 +3051,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "اسکریپت نمی تواند بروز شود"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3076,7 +3080,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "قالب نمی تواند بروز شود"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3160,14 +3164,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3185,10 +3189,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3228,9 +3232,9 @@ msgstr "در بر داشتن رشته کاراکتری"
msgid "Character string not included"
msgstr "در بر نداشتن رشته کاراکتری"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3246,7 +3250,7 @@ msgstr ""
msgid "Check already exists."
msgstr "بررسی از قبل وجود دارد"
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "بخش عبارت بررسی از \"%1$s\" شروع می‌شود."
@@ -3368,8 +3372,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr "پاک کردن تاریخچه و روند ها"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "پاک کردن وقتی جدا شد"
@@ -3396,16 +3400,16 @@ msgstr "ساعت"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3534,7 +3538,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3806,13 +3810,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3820,9 +3824,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -3986,10 +3990,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "تعداد"
@@ -4079,7 +4083,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4281,7 +4285,7 @@ msgid "Current value"
msgstr "مقدار Ùعلی"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4523,7 +4527,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4596,11 +4600,11 @@ msgstr "تاریخ منقضی شدن تعمیر سخت اÙزار"
msgid "Date HW purchased"
msgstr "تاریخ خرید سخت اÙزار"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "روز"
@@ -4641,8 +4645,8 @@ msgstr ""
msgid "December"
msgstr "دسامبر"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4652,7 +4656,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4783,7 +4787,7 @@ msgstr "حذÙ"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "حذ٠و پاک کردن"
@@ -4792,11 +4796,11 @@ msgstr "حذ٠و پاک کردن"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr ""
@@ -4929,7 +4933,7 @@ msgstr ""
msgid "Delete selected host groups?"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5037,7 +5041,7 @@ msgstr ""
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr ""
@@ -5098,7 +5102,7 @@ msgstr ""
msgid "Dependencies"
msgstr "وابستگی‌ها"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "وابسته"
@@ -5106,7 +5110,7 @@ msgstr "وابسته"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5117,7 +5121,7 @@ msgid "Deployment status"
msgstr "وضعیت گسترش"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5132,16 +5136,16 @@ msgstr "وضعیت گسترش"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5153,10 +5157,10 @@ msgstr "توصیÙ"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "جزئیات"
@@ -5165,6 +5169,14 @@ msgstr "جزئیات"
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr ""
@@ -5287,7 +5299,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5314,17 +5326,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "غیرÙعال‌شده"
@@ -5349,7 +5361,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5559,7 +5571,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5576,7 +5588,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5658,7 +5670,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5722,7 +5734,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "مدت"
@@ -5752,14 +5764,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6015,7 +6027,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6053,13 +6065,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6075,11 +6087,11 @@ msgstr "Ùعال‌شده"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6155,6 +6167,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "رویداد"
@@ -6723,8 +6739,8 @@ msgctxt "page navigation"
msgid "First"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6836,12 +6852,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "کپی کامل"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "تابع"
@@ -6857,7 +6873,7 @@ msgstr "مودم GSM"
msgid "GUI"
msgstr "واسط گراÙیکی کاربران"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "دسترسی واسط گراÙیکی غیرÙعال شده است."
@@ -7204,7 +7220,7 @@ msgstr "نام گروه"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7217,12 +7233,11 @@ msgid "Grouping by"
msgstr "گروه کردن بر اساس"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "گروهها"
@@ -7441,7 +7456,7 @@ msgstr ""
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7472,7 +7487,7 @@ msgid "Horizontal align"
msgstr "ردی٠کردن اÙÙ‚ÛŒ"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7481,7 +7496,7 @@ msgstr "ردی٠کردن اÙÙ‚ÛŒ"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7492,7 +7507,7 @@ msgstr "ردی٠کردن اÙÙ‚ÛŒ"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7616,7 +7631,7 @@ msgid "Host group label type"
msgstr "نوع برچسب گروه هاست"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7635,8 +7650,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7686,7 +7701,7 @@ msgstr "نمای Ú©Ù„ÛŒ Ùهرست هاست"
msgid "Host label type"
msgstr "نوع برچسب هاست"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7698,7 +7713,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "نام هاست"
@@ -7735,7 +7750,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7757,7 +7772,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7782,7 +7797,7 @@ msgstr "زمان هاست"
msgid "Host update failed."
msgstr ""
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr ""
@@ -7859,6 +7874,10 @@ msgstr "مکان هاست ها"
msgid "Hosts updated"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "ساعت"
@@ -7928,15 +7947,15 @@ msgstr "محدوده IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr ""
@@ -8166,7 +8185,7 @@ msgstr "تصاویر"
msgid "Images for all maps will be updated!"
msgstr ""
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Ùوری"
@@ -8248,7 +8267,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8260,11 +8279,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8379,7 +8398,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr ""
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr ""
@@ -8387,7 +8406,7 @@ msgstr ""
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr ""
@@ -8399,15 +8418,15 @@ msgstr ""
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8416,11 +8435,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8428,7 +8447,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr ""
@@ -8438,11 +8457,11 @@ msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr ""
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8451,11 +8470,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8755,8 +8774,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr ""
@@ -9154,7 +9173,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9163,11 +9182,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9179,7 +9198,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9199,7 +9218,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "درج"
@@ -9258,8 +9277,8 @@ msgstr ""
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9351,7 +9370,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9412,10 +9431,10 @@ msgstr ""
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9478,8 +9497,8 @@ msgstr ""
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9701,11 +9720,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Ùهرست"
@@ -9719,7 +9738,7 @@ msgid "Inventory field"
msgstr ""
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr ""
@@ -9727,10 +9746,10 @@ msgstr ""
msgid "Is online?"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9819,7 +9838,7 @@ msgstr[0] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10265,17 +10284,17 @@ msgstr "نمودار ماه گذشته"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "آخرین از"
@@ -10352,8 +10371,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10387,8 +10406,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "پیوند"
@@ -10411,16 +10430,9 @@ msgstr ""
msgid "Link indicators"
msgstr "شاخص پیوند"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr ""
@@ -10436,13 +10448,6 @@ msgstr "پیوند به قالب ها"
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10581,7 +10586,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "ورود"
@@ -10663,16 +10668,16 @@ msgstr ""
msgid "Macro \"%1$s\" already exists."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "ماکروها"
@@ -10771,12 +10776,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "دستی"
@@ -10919,16 +10924,16 @@ msgstr "انتخاب دیگران"
msgid "Mark selected"
msgstr "انتخاب موارد"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -10961,11 +10966,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11193,7 +11198,7 @@ msgstr ""
msgid "Middle"
msgstr "وسط"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11294,7 +11299,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11372,9 +11377,9 @@ msgstr "دوشنبه"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "مانیتور شده با پروکسی"
@@ -11393,6 +11398,7 @@ msgstr "مانیتورینگ"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "ماه"
@@ -11505,8 +11511,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11576,11 +11582,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11608,8 +11614,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11630,7 +11636,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -11920,15 +11926,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12014,7 +12020,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12051,9 +12057,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12092,7 +12098,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12192,11 +12198,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12255,7 +12261,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12276,7 +12282,7 @@ msgid "No target selected."
msgstr "هد٠انتخاب نشده"
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12425,6 +12431,10 @@ msgstr "گزارش آگاه سازی"
msgid "Notifications"
msgstr "اخطارها"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12511,6 +12521,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "تعداد حالت‌های تغییر یاÙته"
@@ -12686,7 +12700,7 @@ msgid "Off"
msgstr "خاموش"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12733,7 +12747,7 @@ msgstr ""
msgid "One time only"
msgstr "Ùقط یکبار"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "یکبار پایین آمده"
@@ -12809,12 +12823,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12848,8 +12862,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "عملکردها"
@@ -12884,7 +12898,7 @@ msgstr "عملکردها"
msgid "Operator"
msgstr "عملگر"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -12924,19 +12938,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -12966,10 +12980,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13232,10 +13246,10 @@ msgstr "مشکل"
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13248,19 +13262,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13312,12 +13326,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13372,13 +13386,13 @@ msgid "Passive"
msgstr "منÙعل"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13386,7 +13400,7 @@ msgstr "منÙعل"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13439,12 +13453,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13457,7 +13471,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13481,10 +13495,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13492,7 +13507,9 @@ msgstr ""
msgid "Period"
msgstr "دوره"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13556,11 +13573,11 @@ msgstr "پخش صدا"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13646,7 +13663,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13655,7 +13672,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13772,9 +13789,9 @@ msgstr ""
msgid "Private key file"
msgstr "Ùابل کلید اختصاصی"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "سطح ویژه"
@@ -14180,7 +14197,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14310,20 +14327,20 @@ msgstr "Ùرمان راه دور"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14332,10 +14349,10 @@ msgstr "Ùرمان راه دور"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14379,7 +14396,7 @@ msgstr "Ùرمان راه دور"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14462,14 +14479,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14482,8 +14499,8 @@ msgstr "جایگزینی"
msgid "Replace dependencies"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14684,7 +14701,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "نتیجه"
@@ -15213,7 +15230,7 @@ msgstr ""
msgid "Script"
msgstr "اسکریپت"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15277,6 +15294,15 @@ msgstr ""
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15355,7 +15381,7 @@ msgstr ""
msgid "Selected"
msgstr "انتخاب شده"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15594,6 +15620,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16047,7 +16074,7 @@ msgstr ""
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr ""
@@ -16082,8 +16109,8 @@ msgstr "آیتم های استاندارد"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16091,7 +16118,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16170,7 +16197,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16274,7 +16301,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16328,12 +16355,12 @@ msgstr "مستقیم"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16354,10 +16381,10 @@ msgstr ""
msgid "Subject"
msgstr "موضوع"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16551,7 +16578,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16567,13 +16594,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16590,7 +16617,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16600,7 +16627,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16636,14 +16663,12 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "قالب"
@@ -16687,7 +16712,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr ""
@@ -16699,11 +16724,11 @@ msgstr "گروه قالب"
msgid "Template linkage"
msgstr "پیوند قالب"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "نام قالب"
@@ -16738,13 +16763,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16753,10 +16777,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16767,7 +16793,7 @@ msgstr "قالب ها"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -16979,7 +17005,7 @@ msgstr "پوسته"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17017,7 +17043,7 @@ msgstr "امسال"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17050,15 +17076,15 @@ msgstr ""
msgid "Till"
msgstr "تا"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17095,13 +17121,13 @@ msgstr ""
msgid "Time period"
msgstr "دوره زمانی"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17789,9 +17815,9 @@ msgstr "واحدها"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "ناشناخته"
@@ -17809,7 +17835,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr ""
@@ -17841,16 +17867,16 @@ msgstr ""
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "حذ٠پیوند"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "حذ٠پیوند و پاک کردن"
@@ -17945,10 +17971,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -17957,16 +17983,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -17995,7 +18021,7 @@ msgstr "بروزرسانی در حال حاضر"
msgid "Update interval"
msgstr " Ùاصله به‌روزرسانی"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18022,7 +18048,7 @@ msgstr "بارگذاری"
msgid "Upper level maps"
msgstr "نقشه های سطح بالاتر"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18205,7 +18231,7 @@ msgstr[0] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18339,15 +18365,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "نام کاربری"
@@ -18661,11 +18687,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18739,14 +18765,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "نگاشت مقدار"
@@ -18789,7 +18815,7 @@ msgstr ""
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -18889,7 +18915,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "نام قابل رؤیت"
@@ -18915,7 +18941,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "اخطار"
@@ -19021,6 +19047,10 @@ msgstr "چهارشنبه"
msgid "Wednesday"
msgstr "چهارشنبه"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19293,7 +19323,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "سال"
@@ -19353,7 +19384,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr ""
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19594,11 +19625,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19693,7 +19724,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19737,11 +19768,11 @@ msgstr "به عنوان قرمز"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19755,11 +19786,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19781,39 +19812,47 @@ msgstr ""
msgid "avg"
msgstr "میانگین"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19828,7 +19867,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19870,7 +19909,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -19958,23 +19997,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20001,7 +20040,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20016,15 +20055,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20032,11 +20071,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20049,15 +20088,15 @@ msgstr ""
msgid "d.M"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20075,7 +20114,7 @@ msgstr "روز"
msgid "default"
msgstr "پیش‌Ùرض"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20152,7 +20191,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20175,11 +20214,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20195,7 +20234,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20209,15 +20248,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20225,7 +20264,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20299,7 +20338,7 @@ msgstr "در"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20308,11 +20347,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20331,7 +20370,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20349,7 +20388,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20409,7 +20448,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20431,6 +20470,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20472,7 +20521,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20488,7 +20537,7 @@ msgctxt "week of month"
msgid "last"
msgstr "آخرین"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20496,11 +20545,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20508,23 +20557,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20532,7 +20581,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20564,11 +20613,11 @@ msgstr ""
msgid "macro(s)"
msgstr "ماکرو(ها)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20604,7 +20653,7 @@ msgstr "بیشترین"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20618,7 +20667,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20635,7 +20684,7 @@ msgstr ""
msgid "min"
msgstr "کمترین"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20650,15 +20699,15 @@ msgstr ""
msgid "mm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20740,7 +20789,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20774,7 +20823,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20795,7 +20844,7 @@ msgstr "نیست در"
msgid "not selected"
msgstr "انتخاب نشده"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -20882,15 +20931,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -20898,15 +20947,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -20955,11 +21004,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -20983,15 +21032,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21082,23 +21131,23 @@ msgstr "نمایش نشان های نگاشت شده"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21106,11 +21155,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21118,11 +21167,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21150,7 +21199,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21184,7 +21233,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21231,31 +21280,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21281,11 +21334,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21342,7 +21395,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21385,7 +21438,7 @@ msgstr ""
msgid "unknown"
msgstr "ناشناخته"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21582,11 +21635,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/fi/LC_MESSAGES/frontend.po b/ui/locale/fi/LC_MESSAGES/frontend.po
index 5ba2503e021..3f8a199d565 100644
--- a/ui/locale/fi/LC_MESSAGES/frontend.po
+++ b/ui/locale/fi/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-10-10 08:23+0300\n"
"Last-Translator: richlv <richlv@nakts.net>\n"
"Language-Team: none\n"
@@ -301,10 +301,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr "(Vain järjestelmäylläpitäjät voivat luoda ryhmiä)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(ei välityspalvelinta)"
@@ -457,7 +457,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -526,7 +526,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -545,11 +545,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -561,24 +561,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -596,7 +596,7 @@ msgstr ""
msgid "Action"
msgstr "Toiminto"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Toiminto \"%1$s\" on jo olemassa."
@@ -606,7 +606,7 @@ msgstr "Toiminto \"%1$s\" on jo olemassa."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Toiminto lisätty"
@@ -615,17 +615,17 @@ msgstr "Toiminto lisätty"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Toiminto poistettu"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Toiminto poistettu käytöstä. "
msgstr[1] "Toiminnot poistettu käytöstä. "
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Toiminto otettu käyttöön."
@@ -644,7 +644,7 @@ msgstr "Toimintoloki "
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Toiminto päivitetty"
@@ -691,7 +691,7 @@ msgid "Active till"
msgstr "Aktiivinen asti"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -750,14 +750,14 @@ msgstr "Aktiivinen asti"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -773,10 +773,10 @@ msgstr "Aktiivinen asti"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -788,9 +788,9 @@ msgstr "Aktiivinen asti"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -808,7 +808,7 @@ msgstr "Aktiivinen asti"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -853,7 +853,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -878,8 +878,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -892,7 +892,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1027,7 +1027,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1043,6 +1043,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1357,7 +1361,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1437,9 +1441,9 @@ msgstr ""
msgid "Authentication"
msgstr "Tunnistautuminen"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Tunnistautumisalgoritmi"
@@ -1500,12 +1504,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automaattinen"
@@ -1620,12 +1624,12 @@ msgstr "Sidonta-DN"
msgid "Bind password"
msgstr "Sidonnan salasana"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1831,7 +1835,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr ""
@@ -2129,7 +2133,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr ""
@@ -2293,12 +2297,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] ""
msgstr[1] ""
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr ""
@@ -2314,7 +2318,7 @@ msgstr[1] ""
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr ""
@@ -2401,7 +2405,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] ""
@@ -2479,7 +2483,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2708,7 +2712,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] ""
msgstr[1] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2887,7 +2891,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -2953,7 +2957,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr ""
@@ -3013,7 +3017,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr ""
@@ -3116,9 +3120,9 @@ msgstr ""
msgid "Cannot update script"
msgstr ""
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3145,7 +3149,7 @@ msgstr ""
msgid "Cannot update template"
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3231,14 +3235,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3256,10 +3260,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3299,9 +3303,9 @@ msgstr ""
msgid "Character string not included"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3317,7 +3321,7 @@ msgstr ""
msgid "Check already exists."
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr ""
@@ -3439,8 +3443,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr ""
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr ""
@@ -3467,16 +3471,16 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3605,7 +3609,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3877,13 +3881,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3891,9 +3895,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4060,10 +4064,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr ""
@@ -4153,7 +4157,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4355,7 +4359,7 @@ msgid "Current value"
msgstr ""
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4598,7 +4602,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4671,11 +4675,11 @@ msgstr ""
msgid "Date HW purchased"
msgstr ""
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr ""
@@ -4716,8 +4720,8 @@ msgstr ""
msgid "December"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4727,7 +4731,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4858,7 +4862,7 @@ msgstr ""
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr ""
@@ -4867,11 +4871,11 @@ msgstr ""
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr ""
@@ -5004,7 +5008,7 @@ msgstr ""
msgid "Delete selected host groups?"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5112,7 +5116,7 @@ msgstr ""
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr ""
@@ -5173,7 +5177,7 @@ msgstr ""
msgid "Dependencies"
msgstr ""
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr ""
@@ -5181,7 +5185,7 @@ msgstr ""
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5192,7 +5196,7 @@ msgid "Deployment status"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5207,16 +5211,16 @@ msgstr ""
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5228,10 +5232,10 @@ msgstr ""
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr ""
@@ -5240,6 +5244,14 @@ msgstr ""
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr ""
@@ -5362,7 +5374,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5389,17 +5401,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr ""
@@ -5424,7 +5436,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5637,7 +5649,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5654,7 +5666,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5736,7 +5748,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5800,7 +5812,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr ""
@@ -5830,14 +5842,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6093,7 +6105,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6131,13 +6143,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6153,11 +6165,11 @@ msgstr ""
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6233,6 +6245,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr ""
@@ -6801,8 +6817,8 @@ msgctxt "page navigation"
msgid "First"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6914,12 +6930,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr ""
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr ""
@@ -6935,7 +6951,7 @@ msgstr ""
msgid "GUI"
msgstr ""
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr ""
@@ -7284,7 +7300,7 @@ msgstr ""
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7297,12 +7313,11 @@ msgid "Grouping by"
msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr ""
@@ -7521,7 +7536,7 @@ msgstr ""
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7552,7 +7567,7 @@ msgid "Horizontal align"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7561,7 +7576,7 @@ msgstr ""
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7572,7 +7587,7 @@ msgstr ""
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7698,7 +7713,7 @@ msgid "Host group label type"
msgstr ""
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7717,8 +7732,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7768,7 +7783,7 @@ msgstr ""
msgid "Host label type"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7780,7 +7795,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr ""
@@ -7817,7 +7832,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7840,7 +7855,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7865,7 +7880,7 @@ msgstr ""
msgid "Host update failed."
msgstr ""
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr ""
@@ -7942,6 +7957,10 @@ msgstr ""
msgid "Hosts updated"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr ""
@@ -8011,15 +8030,15 @@ msgstr ""
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr ""
@@ -8251,7 +8270,7 @@ msgstr ""
msgid "Images for all maps will be updated!"
msgstr ""
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr ""
@@ -8333,7 +8352,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8345,11 +8364,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8464,7 +8483,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr ""
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr ""
@@ -8472,7 +8491,7 @@ msgstr ""
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr ""
@@ -8484,15 +8503,15 @@ msgstr ""
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8501,11 +8520,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8513,7 +8532,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr ""
@@ -8523,11 +8542,11 @@ msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr ""
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8536,11 +8555,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8840,8 +8859,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr ""
@@ -9239,7 +9258,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9248,11 +9267,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9264,7 +9283,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9284,7 +9303,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr ""
@@ -9343,8 +9362,8 @@ msgstr ""
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9436,7 +9455,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9497,10 +9516,10 @@ msgstr ""
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9563,8 +9582,8 @@ msgstr ""
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9786,11 +9805,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr ""
@@ -9804,7 +9823,7 @@ msgid "Inventory field"
msgstr ""
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr ""
@@ -9812,10 +9831,10 @@ msgstr ""
msgid "Is online?"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9907,7 +9926,7 @@ msgstr[1] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10360,17 +10379,17 @@ msgstr ""
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr ""
@@ -10447,8 +10466,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10482,8 +10501,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr ""
@@ -10506,16 +10525,9 @@ msgstr ""
msgid "Link indicators"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr ""
@@ -10531,13 +10543,6 @@ msgstr ""
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10676,7 +10681,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr ""
@@ -10758,16 +10763,16 @@ msgstr ""
msgid "Macro \"%1$s\" already exists."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr ""
@@ -10866,12 +10871,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr ""
@@ -11014,16 +11019,16 @@ msgstr ""
msgid "Mark selected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11056,11 +11061,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11292,7 +11297,7 @@ msgstr ""
msgid "Middle"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11394,7 +11399,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11476,9 +11481,9 @@ msgstr ""
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr ""
@@ -11497,6 +11502,7 @@ msgstr ""
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr ""
@@ -11609,8 +11615,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11680,11 +11686,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11712,8 +11718,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11734,7 +11740,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12024,15 +12030,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12118,7 +12124,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12155,9 +12161,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12196,7 +12202,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12296,11 +12302,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12359,7 +12365,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12380,7 +12386,7 @@ msgid "No target selected."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12529,6 +12535,10 @@ msgstr ""
msgid "Notifications"
msgstr ""
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12615,6 +12625,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr ""
@@ -12790,7 +12804,7 @@ msgid "Off"
msgstr ""
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12837,7 +12851,7 @@ msgstr ""
msgid "One time only"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr ""
@@ -12914,12 +12928,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12953,8 +12967,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr ""
@@ -12989,7 +13003,7 @@ msgstr ""
msgid "Operator"
msgstr ""
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13029,19 +13043,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13071,10 +13085,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13337,10 +13351,10 @@ msgstr ""
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13353,19 +13367,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13417,12 +13431,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13477,13 +13491,13 @@ msgid "Passive"
msgstr ""
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13491,7 +13505,7 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13544,12 +13558,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13562,7 +13576,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13586,10 +13600,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13597,7 +13612,9 @@ msgstr ""
msgid "Period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13661,11 +13678,11 @@ msgstr ""
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13751,7 +13768,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13760,7 +13777,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13877,9 +13894,9 @@ msgstr ""
msgid "Private key file"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr ""
@@ -14286,7 +14303,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14417,20 +14434,20 @@ msgstr ""
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14439,10 +14456,10 @@ msgstr ""
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14486,7 +14503,7 @@ msgstr ""
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14569,14 +14586,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14589,8 +14606,8 @@ msgstr ""
msgid "Replace dependencies"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14791,7 +14808,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr ""
@@ -15323,7 +15340,7 @@ msgstr ""
msgid "Script"
msgstr ""
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15388,6 +15405,15 @@ msgstr ""
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15466,7 +15492,7 @@ msgstr ""
msgid "Selected"
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15706,6 +15732,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16159,7 +16186,7 @@ msgstr ""
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr ""
@@ -16194,8 +16221,8 @@ msgstr ""
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16203,7 +16230,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16282,7 +16309,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16386,7 +16413,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16440,12 +16467,12 @@ msgstr ""
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16466,10 +16493,10 @@ msgstr ""
msgid "Subject"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16663,7 +16690,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16679,13 +16706,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16702,7 +16729,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16712,7 +16739,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16748,14 +16775,12 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr ""
@@ -16799,7 +16824,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr ""
@@ -16811,11 +16836,11 @@ msgstr ""
msgid "Template linkage"
msgstr ""
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr ""
@@ -16850,13 +16875,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16865,10 +16889,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16879,7 +16905,7 @@ msgstr ""
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17093,7 +17119,7 @@ msgstr ""
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17131,7 +17157,7 @@ msgstr ""
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17164,15 +17190,15 @@ msgstr ""
msgid "Till"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17209,13 +17235,13 @@ msgstr ""
msgid "Time period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17907,9 +17933,9 @@ msgstr ""
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr ""
@@ -17927,7 +17953,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr ""
@@ -17959,16 +17985,16 @@ msgstr ""
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr ""
@@ -18064,10 +18090,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18076,16 +18102,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18114,7 +18140,7 @@ msgstr ""
msgid "Update interval"
msgstr ""
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18141,7 +18167,7 @@ msgstr ""
msgid "Upper level maps"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18327,7 +18353,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18463,15 +18489,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr ""
@@ -18785,11 +18811,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18863,14 +18889,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr ""
@@ -18913,7 +18939,7 @@ msgstr ""
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19013,7 +19039,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr ""
@@ -19039,7 +19065,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr ""
@@ -19147,6 +19173,10 @@ msgstr ""
msgid "Wednesday"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19419,7 +19449,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr ""
@@ -19479,7 +19510,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr ""
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19720,11 +19751,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19819,7 +19850,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19863,11 +19894,11 @@ msgstr ""
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19881,11 +19912,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19907,39 +19938,47 @@ msgstr ""
msgid "avg"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19954,7 +19993,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19996,7 +20035,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20084,23 +20123,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20127,7 +20166,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20142,15 +20181,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20158,11 +20197,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20175,15 +20214,15 @@ msgstr ""
msgid "d.M"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20201,7 +20240,7 @@ msgstr ""
msgid "default"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20278,7 +20317,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20301,11 +20340,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20321,7 +20360,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20335,15 +20374,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20351,7 +20390,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20425,7 +20464,7 @@ msgstr ""
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20434,11 +20473,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20457,7 +20496,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20475,7 +20514,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20535,7 +20574,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20557,6 +20596,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20598,7 +20647,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20614,7 +20663,7 @@ msgctxt "week of month"
msgid "last"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20622,11 +20671,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20634,23 +20683,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20658,7 +20707,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20690,11 +20739,11 @@ msgstr ""
msgid "macro(s)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20730,7 +20779,7 @@ msgstr ""
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20744,7 +20793,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20761,7 +20810,7 @@ msgstr ""
msgid "min"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20776,15 +20825,15 @@ msgstr ""
msgid "mm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20866,7 +20915,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20900,7 +20949,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20921,7 +20970,7 @@ msgstr ""
msgid "not selected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21008,15 +21057,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21024,15 +21073,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21081,11 +21130,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21109,15 +21158,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21208,23 +21257,23 @@ msgstr "näytä ikoni"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21232,11 +21281,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21244,11 +21293,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21276,7 +21325,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21310,7 +21359,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21357,31 +21406,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21407,11 +21460,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21468,7 +21521,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21511,7 +21564,7 @@ msgstr ""
msgid "unknown"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21710,11 +21763,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/fr/LC_MESSAGES/frontend.po b/ui/locale/fr/LC_MESSAGES/frontend.po
index 14f1982797a..7abcd5d492f 100644
--- a/ui/locale/fr/LC_MESSAGES/frontend.po
+++ b/ui/locale/fr/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2018-01-15 09:21+0300\n"
"Last-Translator: Christophe <ctr@pmspos.fr>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -302,10 +302,10 @@ msgstr "(0 - utiliser les paramètres par défaut de l'action)"
msgid "(Only super admins can create groups)"
msgstr "(Seuls les super administrateurs peuvent créer des groupes)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(pas de proxy)"
@@ -456,7 +456,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -525,7 +525,7 @@ msgstr "Événements RÉSOLUS acquittés"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -544,11 +544,11 @@ msgstr "Événements RÉSOLUS acquittés"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -560,24 +560,24 @@ msgstr "Événements RÉSOLUS acquittés"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -595,7 +595,7 @@ msgstr "Événements RÉSOLUS acquittés"
msgid "Action"
msgstr "Action"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Action \"%1$s\" déjà existante."
@@ -605,7 +605,7 @@ msgstr "Action \"%1$s\" déjà existante."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Action ajoutée"
@@ -614,17 +614,17 @@ msgstr "Action ajoutée"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Action supprimée"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Action désactivée"
msgstr[1] "Actions désactivées"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Action activée"
@@ -643,7 +643,7 @@ msgstr "Journal des actions"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Action mise à jour"
@@ -690,7 +690,7 @@ msgid "Active till"
msgstr "Actif jusqu'à"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -749,14 +749,14 @@ msgstr "Actif jusqu'à"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -772,10 +772,10 @@ msgstr "Actif jusqu'à"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -787,9 +787,9 @@ msgstr "Actif jusqu'à"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -807,7 +807,7 @@ msgstr "Actif jusqu'à"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -852,7 +852,7 @@ msgstr "Ajouter un élément enfant"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -877,8 +877,8 @@ msgstr "Ajouter plusieurs cartes"
msgid "Add new data set"
msgstr "Ajouter un nouvel ensemble de données"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -891,7 +891,7 @@ msgstr "Ajouter une nouvelle surcharge"
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1025,7 +1025,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1041,6 +1041,10 @@ msgstr ""
msgid "Alert message"
msgstr "Message d'alerte"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1357,7 +1361,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "Au moins une opération doit exister."
@@ -1437,9 +1441,9 @@ msgstr ""
msgid "Authentication"
msgstr "Authentification"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Algorithme d'authentification"
@@ -1500,12 +1504,12 @@ msgstr "Les options d'auto-connexion et d'auto-déconnexion ne peuvent pas être
msgid "Auto-logout"
msgstr "Auto-déconnexion"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automatique"
@@ -1620,12 +1624,12 @@ msgstr "DN de lien"
msgid "Bind password"
msgstr "Mot de passe de lien"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1831,7 +1835,7 @@ msgstr "Impossible d'ajouter un élément non-numérique \"%1$s\" au graphique \
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Impossible d'ajouter un élément non numérique \"%1$s\" au prototype de graphique \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Impossible d'ajouter l'action"
@@ -2129,7 +2133,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Impossible de supprimer l'utilisateur interne Zabbix \"%1$s\", essayez de désactiver cet utilisateur."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Impossible de supprimer l'action"
@@ -2295,12 +2299,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Impossible de supprimer le script"
msgstr[1] "Impossible de supprimer les scripts"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Impossible de supprimer les scripts. Le script \"%1$s\" est utilisé dans l'opération de l'action \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Impossible de supprimer les actions sélectionnées"
@@ -2317,7 +2321,7 @@ msgstr[1] "Impossible de supprimer le service"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Impossible de supprimer le modèle"
@@ -2404,7 +2408,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Impossible de désactiver l'action"
@@ -2482,7 +2486,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Impossible d'activer l'action"
@@ -2711,7 +2715,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "Impossible d'importer le modèle \"%1$s\", le modèle lié \"%2$s\" n'existe pas."
msgstr[1] "Impossible d'importer le modèle \"%1$s\", les modèles liés \"%2$s\" n'existent pas."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Impossible d'insérer l'expression de déclencheur"
@@ -2890,7 +2894,7 @@ msgstr "Impossible de délier le modèle."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Impossible de mettre à jour \"%1$s\" pour l'action \"%2$s\"."
@@ -2956,7 +2960,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Impossible de mettre à jour un scénario web de modèle \"%1$s\": %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Impossible de mettre à jour l'action"
@@ -3016,7 +3020,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Impossible de mettre à jour les groupes pour l'hôte découvert \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Impossible de mettre à jour l'hôte"
@@ -3119,9 +3123,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Impossible de mettre à jour le script"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3148,7 +3152,7 @@ msgstr "Impossible de mettre à jour une étape pour un scénario web de modèle
msgid "Cannot update template"
msgstr "Impossible de mettre à jour le modèle"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr "Impossible de mettre à jour les modèles"
@@ -3234,14 +3238,14 @@ msgstr "Reçoit tous les traps SNMP qui n'ont été reçus par aucun élément s
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Certificat"
@@ -3259,10 +3263,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Changer"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3302,9 +3306,9 @@ msgstr "Chaîne de caractères inclue"
msgid "Character string not included"
msgstr "Chaîne de caractères non inclue"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3320,7 +3324,7 @@ msgstr "Informations du chaÅsis. Retourne une chaîne"
msgid "Check already exists."
msgstr "La vérification existe déjà."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Vérifiez la partie d'expression à partir de \"%1$s\"."
@@ -3442,8 +3446,8 @@ msgstr "Effacer l'historique"
msgid "Clear history and trends"
msgstr "Effacer l'historique et les tendances"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Effacer en déliant"
@@ -3470,16 +3474,16 @@ msgstr "Horloge"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3608,7 +3612,7 @@ msgstr "Compression"
msgid "Concurrent sessions"
msgstr "Sessions concurrentes"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3880,13 +3884,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Connexions"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Connexion de l'hôte"
@@ -3894,9 +3898,9 @@ msgstr "Connexion de l'hôte"
msgid "Connections from proxy"
msgstr "Connexions du proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Connexion à l'hôte"
@@ -4064,10 +4068,10 @@ msgstr "Règle de corrélation"
msgid "Correlation updated"
msgstr "Corrélation mise à jour"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Compte"
@@ -4157,7 +4161,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4359,7 +4363,7 @@ msgid "Current value"
msgstr "Valeur actuelle"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Personnalisé"
@@ -4602,7 +4606,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4675,11 +4679,11 @@ msgstr "Matériel - Date de fin de maintenance"
msgid "Date HW purchased"
msgstr "Matériel - Date d'achat"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Jour"
@@ -4720,8 +4724,8 @@ msgstr "Déc"
msgid "December"
msgstr "Décembre"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4731,7 +4735,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4862,7 +4866,7 @@ msgstr "Supprimer"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Supprimer et effacer"
@@ -4871,11 +4875,11 @@ msgstr "Supprimer et effacer"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Supprimer et nettoyer les modèles sélectionnés ? (Attention : tous les hôtes liés seront nettoyés !)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Supprimer et nettoyer le modèle ? (Attention : tous les hôtes liés seront nettoyés !)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Effacer l'action actuelle ?"
@@ -5008,7 +5012,7 @@ msgstr "Supprimer les groupes sélectionnés ?"
msgid "Delete selected host groups?"
msgstr "Supprimer les groupes d'hôtes sélectionnés ?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Supprimer le prototype d'hôte sélectionné ?"
@@ -5116,7 +5120,7 @@ msgstr "Supprimer les utilisateurs sélectionnés ?"
msgid "Delete selected web scenarios?"
msgstr "Supprimer les scénarios web sélectionnés ?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Supprimer le modèle ?"
@@ -5177,7 +5181,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Dépendances"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Dépendant"
@@ -5185,7 +5189,7 @@ msgstr "Dépendant"
msgid "Dependent item"
msgstr "Élément dépendant"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5196,7 +5200,7 @@ msgid "Deployment status"
msgstr "État du déploiement"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5211,16 +5215,16 @@ msgstr "État du déploiement"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5232,10 +5236,10 @@ msgstr "Description"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Détails"
@@ -5244,6 +5248,14 @@ msgstr "Détails"
msgid "Details of web scenario"
msgstr "Détails du scénario web"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Équipement"
@@ -5366,7 +5378,7 @@ msgstr "Désactiver les scénarios web sélectionnés ?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5393,17 +5405,17 @@ msgstr "Désactiver les scénarios web sélectionnés ?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Désactivé"
@@ -5428,7 +5440,7 @@ msgstr "Ignorer la valeur"
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5642,7 +5654,7 @@ msgstr "Afficher le graphique empilé"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5659,7 +5671,7 @@ msgstr "Affichage de %1$s à %2$s parmi %3$s trouvés"
msgid "Displaying options"
msgstr "Options d'affichage"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5741,7 +5753,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Télécharger le fichier de configuration"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5805,7 +5817,7 @@ msgstr "Identifiant d'utilisateur \"%1$s\" en doublon dans les utilisateurs pour
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Durée"
@@ -5835,14 +5847,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6098,7 +6110,7 @@ msgstr "Activer les trap"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6136,13 +6148,13 @@ msgstr "Activer les trap"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6158,11 +6170,11 @@ msgstr "Activé"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Chiffrement"
@@ -6238,6 +6250,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Erreur : %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Événement"
@@ -6806,8 +6822,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Premier"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Ajuster"
@@ -6919,12 +6935,12 @@ msgid "Full"
msgstr "Tout"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Clone complet"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Fonction"
@@ -6940,7 +6956,7 @@ msgstr "Modem GSM"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Accès GUI désactivé."
@@ -7289,7 +7305,7 @@ msgstr "Nom du groupe"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Le prototype de groupe ne peut pas être basé sur un groupe d'hôte \"%1$s\" découvert."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Prototypes de groupes"
@@ -7302,12 +7318,11 @@ msgid "Grouping by"
msgstr "Groupement par"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Groupes"
@@ -7526,7 +7541,7 @@ msgstr "Le nettoyage de l'historique prend du temps. Continuer ?"
msgid "History data selection"
msgstr "Sélection des données d'historique"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7557,7 +7572,7 @@ msgid "Horizontal align"
msgstr "Alignement horizontal"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7566,7 +7581,7 @@ msgstr "Alignement horizontal"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7577,7 +7592,7 @@ msgstr "Alignement horizontal"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7703,7 +7718,7 @@ msgid "Host group label type"
msgstr "Type d'étiquette du groupe d'hôtes"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7722,8 +7737,8 @@ msgstr "Le groupe d'hôtes avec l'ID \"%1$s\" n'est pas disponible."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7773,7 +7788,7 @@ msgstr "Aperçu d'inventaire d'hôtes"
msgid "Host label type"
msgstr "Type d'étiquette d'hôte"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Macros d'hôte"
@@ -7785,7 +7800,7 @@ msgstr "Métadonnées de l'hôte"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Nom de l'hôte"
@@ -7822,7 +7837,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Prototype d'hôte supprimé"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7845,7 +7860,7 @@ msgstr "Un prototype d'hôte avec le nom visible \"%1$s\" existe déjà dans la
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Prototypes d'hôtes"
@@ -7870,7 +7885,7 @@ msgstr "Temps de l'hôte"
msgid "Host update failed."
msgstr "Échec de la mise à jour de l'hôte."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Hôte mis à jour"
@@ -7947,6 +7962,10 @@ msgstr "Localisation des hôtes"
msgid "Hosts updated"
msgstr "Hôtes mis à jour"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Heures"
@@ -8016,15 +8035,15 @@ msgstr "Plage d'adresses IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "La plage d'IP \"%1$s\" dépasse la limite d'adresses \"%2$s\""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8256,7 +8275,7 @@ msgstr "Images"
msgid "Images for all maps will be updated!"
msgstr "Les images de toutes les cartes seront mises à jour !"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Immédiatement"
@@ -8338,7 +8357,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "Maintenance inaccessible"
@@ -8350,11 +8369,11 @@ msgstr "Carte inaccessible"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "Modèle inaccessible"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "Déclencheur inaccessible"
@@ -8469,7 +8488,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Test de découverte associé à la condition d'action incorrect."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Test de découverte associé à la condition d'action incorrect. Le test de découverte n'existe pas ou vous n'y avez pas accès."
@@ -8477,7 +8496,7 @@ msgstr "Test de découverte associé à la condition d'action incorrect. Le test
msgid "Incorrect action condition discovery object."
msgstr "Test de découverte associé à la condition d'action incorrect."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Règle de découverte associée à la condition d'action incorrecte. La règle de découverte n'existe pas ou vous n'y avez pas accès."
@@ -8489,15 +8508,15 @@ msgstr "État de découverte associé à la condition d'action incorrect."
msgid "Incorrect action condition event type."
msgstr "Type d'événement associé à la condition d'action incorrect."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8506,11 +8525,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Port de condition d'action \"%1$s\" incorrect."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Proxy associé à la condition d'action incorrect. Le proxy n'existe pas ou vous n'y avez pas accès."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8518,7 +8537,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Sévérité de déclencheur de condition d'action incorrecte."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Déclencheur associé à la condition d'action incorrect. Le déclencheur n'existe pas ou vous n'y avez pas accès."
@@ -8528,11 +8547,11 @@ msgstr "Type associé à la condition d'action incorrect."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Valeurs de pas d'escalade associées à la condition d'action incorrectes."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8541,11 +8560,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Type d'opération d'action \"%1$s\" incorrect pour la source d'événement \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8845,8 +8864,8 @@ msgstr "Compte d'étapes de scénario web de template incorrect."
msgid "Incorrect trigger expression"
msgstr "Expression de déclencheur incorrecte"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Expression du déclencheur incorrecte."
@@ -9244,7 +9263,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Informations à propos d'un service. Retourne un entier avec param state, startup ; une chaîne avec param displayname, path, user ; du texte avec param description ; Pour state : 0 - en fonctionnement, 1 - en pause, 2 - démarrage en attente, 3 - pause en attente, 4 - continue en attente, 5 - arrêt en attente, 6 - arrêté, 7 - inconnu, 255 - service introuvable ; Pour startup : 0 - automatique, 1 - automatique avec délai, 2 - manuel, 3 - désactivé, 4 - inconnu"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9253,11 +9272,11 @@ msgstr ""
msgid "Inherited"
msgstr "Hérité"
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Macros héritées et d'hôtes"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9269,7 +9288,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Macros héritées et de modèle"
@@ -9289,7 +9308,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Insertion"
@@ -9348,8 +9367,8 @@ msgstr "L'interface avec l'IP \"%1$s\" ne peut pas avoir de nom DNS vide avec la
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "L'interface avec l'IP \"%1$s\" ne peut pas avoir de nom DNS vide."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9441,7 +9460,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "Condition d'action invalide: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9502,10 +9521,10 @@ msgstr "Paramètres de la méthode invalides."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9568,8 +9587,8 @@ msgstr "Paramètres de la méthode invalides."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9791,11 +9810,11 @@ msgstr "Période de temps invalide."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventaire"
@@ -9809,7 +9828,7 @@ msgid "Inventory field"
msgstr "Champ d'inventaire"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Mode d'inventaire"
@@ -9817,10 +9836,10 @@ msgstr "Mode d'inventaire"
msgid "Is online?"
msgstr "Est connecté ?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Délivré par"
@@ -9912,7 +9931,7 @@ msgstr[1] "Éléments activés"
msgid "Item in \"not supported\" state"
msgstr "Élément dans l'état \"non supporté\""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Élément non sélectionné"
@@ -10365,17 +10384,17 @@ msgstr "Graphique du dernier mois"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Dernier"
@@ -10452,8 +10471,8 @@ msgstr "Rogner à gauche"
msgid "Legend"
msgstr "Légende"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10487,8 +10506,8 @@ msgstr "Type de ligne"
msgid "Line width"
msgstr "Largeur de ligne"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Lien"
@@ -10511,16 +10530,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Indicateurs de lien"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Lier les modèles"
@@ -10536,13 +10548,6 @@ msgstr "Lier aux modèles"
msgid "Linked map"
msgstr "Carte liée"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10681,7 +10686,7 @@ msgstr "Enregistrer les traps SNMP non appariés"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Connexion"
@@ -10763,16 +10768,16 @@ msgstr "La macro \"%1$s\" existe déjà sur \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "La macro \"%1$s\" existe déjà."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Macros"
@@ -10871,12 +10876,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manuel"
@@ -11019,16 +11024,16 @@ msgstr "Marquer les autres"
msgid "Mark selected"
msgstr "Marquer les éléments sélectionnés"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Masque"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11061,11 +11066,11 @@ msgstr "Élément maître"
msgid "Matches regular expression"
msgstr "Correspond à l'expression régulière"
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11297,7 +11302,7 @@ msgstr ""
msgid "Middle"
msgstr "Milieu"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11399,7 +11404,7 @@ msgstr "Éléments manquants pour le prototype de graphique \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Clé \"%1$s\" manquante pour l'hôte \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11481,9 +11486,9 @@ msgstr "Lundi"
msgid "Monitored by"
msgstr "Surveillé par"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Surveillé via le proxy"
@@ -11502,6 +11507,7 @@ msgstr "Surveillance"
msgid "Monospace"
msgstr "Chasse fixe"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Mois"
@@ -11614,8 +11620,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11685,11 +11691,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11717,8 +11723,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11739,7 +11745,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12029,15 +12035,15 @@ msgstr "Aucun identifiant de règle de découverte fourni."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Pas de chiffrement"
@@ -12123,7 +12129,7 @@ msgstr "Aucune correspondance trouvée"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12160,9 +12166,9 @@ msgstr "Aucune permission pour l'accès au système."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12201,7 +12207,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12301,11 +12307,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12364,7 +12370,7 @@ msgid "No public key file specified."
msgstr "Aucun fichier de clé publique spécifié."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12385,7 +12391,7 @@ msgid "No target selected."
msgstr "Aucune cible sélectionnée."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12534,6 +12540,10 @@ msgstr "Rapport de notification"
msgid "Notifications"
msgstr "Notifications"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12620,6 +12630,10 @@ msgstr "Nombre de processeurs sur un hyperviseur VMware, <url> - URL du service
msgid "Number of rows"
msgstr "Nombre de lignes"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Nombre de changements d'états"
@@ -12795,7 +12809,7 @@ msgid "Off"
msgstr "Inactif"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12842,7 +12856,7 @@ msgstr "Un"
msgid "One time only"
msgstr "Une fois uniquement"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Temps d'arrêt unique"
@@ -12919,12 +12933,12 @@ msgstr "Informations du système d'exploitation. Retourne une chaîne"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12958,8 +12972,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Opérations"
@@ -12994,7 +13008,7 @@ msgstr "Opérations"
msgid "Operator"
msgstr "Opérateur"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13034,19 +13048,19 @@ msgstr "Ou"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13076,10 +13090,10 @@ msgstr "Ou"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13342,10 +13356,10 @@ msgstr "PROBLÈME"
msgid "PROBLEM event generation mode"
msgstr "Mode de génération des événements PROBLÈME"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13358,19 +13372,19 @@ msgstr "Mode de génération des événements PROBLÈME"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "Identité PSK"
@@ -13422,12 +13436,12 @@ msgid "Parameters"
msgstr "Paramètres"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Règles de découverte parentes"
@@ -13482,13 +13496,13 @@ msgid "Passive"
msgstr "Passif"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13496,7 +13510,7 @@ msgstr "Passif"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13549,12 +13563,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Coller sans les liens externes"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "Suspendre les opérations des problèmes supprimés"
@@ -13567,7 +13581,7 @@ msgstr "Pic d'utilisation de la mémoire : %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Pourcentage"
@@ -13591,10 +13605,11 @@ msgstr "Ligne de centile (droite)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Réalise une requête DNS. Retourne une chaîne de caractères avec le type d'information requis"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13602,7 +13617,9 @@ msgstr "Réalise une requête DNS. Retourne une chaîne de caractères avec le t
msgid "Period"
msgstr "Période"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13666,11 +13683,11 @@ msgstr "Jouer un son"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Veuillez vérifier les paramètres de configuration. Si tout est correct, appuyez sur le bouton \"%1$s\" ; sinon, le bouton \"%2$s\" pour changer les paramètres."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13756,7 +13773,7 @@ msgstr "Type POST"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13765,7 +13782,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Résumé pré-installation"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13882,9 +13899,9 @@ msgstr "Privé"
msgid "Private key file"
msgstr "Fichier de clé privée"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Niveau de privilège"
@@ -14291,7 +14308,7 @@ msgstr "Expression de récupération"
msgid "Recovery expression syntax error."
msgstr "Erreur de syntaxe dans l'expression de récupération."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Opérations de récupération"
@@ -14422,20 +14439,20 @@ msgstr "Commande à distance"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14444,10 +14461,10 @@ msgstr "Commande à distance"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14491,7 +14508,7 @@ msgstr "Commande à distance"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14574,14 +14591,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14594,8 +14611,8 @@ msgstr "Remplacer"
msgid "Replace dependencies"
msgstr "Remplacer les dépendances"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14796,7 +14813,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Résultat"
@@ -15328,7 +15345,7 @@ msgstr "Étendue"
msgid "Script"
msgstr "Script"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Le script \"%1$s\" existe déjà."
@@ -15393,6 +15410,15 @@ msgstr "Expression de recherche vide"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Contact Secondaire - Mobile"
@@ -15471,7 +15497,7 @@ msgstr "Sélectionnez un widget"
msgid "Selected"
msgstr "Sélectionné"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Actions sélectionnées supprimées"
@@ -15712,6 +15738,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16165,7 +16192,7 @@ msgstr "Espagnol (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Le script spécifié n'existe pas ou vous n'avez pas les droits dessis pour une commande d'opération d'action."
@@ -16200,8 +16227,8 @@ msgstr "Éléments standards"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16209,7 +16236,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Démarrer dans"
@@ -16288,7 +16315,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16392,7 +16419,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "L'étape nommée \"%1$s\" existe déjà."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16446,12 +16473,12 @@ msgstr "Littéral"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16472,10 +16499,10 @@ msgstr "Sous-filtre"
msgid "Subject"
msgstr "Sujet"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Sujet"
@@ -16669,7 +16696,7 @@ msgstr "Valeur du tag"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16685,13 +16712,13 @@ msgstr "Valeur du tag"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16708,7 +16735,7 @@ msgstr "Valeur du tag"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16718,7 +16745,7 @@ msgstr "Valeur du tag"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16754,14 +16781,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Modèle"
@@ -16805,7 +16830,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Modèle supprimé"
@@ -16817,11 +16842,11 @@ msgstr "Groupe de modèles"
msgid "Template linkage"
msgstr "Lien entre modèles"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Macros du modèle"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Nom du modèle"
@@ -16856,13 +16881,12 @@ msgstr "Un modèle avec le même nom visible \"%1$s\" existe déjà."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16871,10 +16895,12 @@ msgstr "Un modèle avec le même nom visible \"%1$s\" existe déjà."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16885,7 +16911,7 @@ msgstr "Modèles"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Les modèles \"%1$s\" sont déliés de l'hôte \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr "Modèles mis à jour"
@@ -17099,7 +17125,7 @@ msgstr "Thème"
msgid "This day last week"
msgstr "Ce jour la semaine dernière"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17137,7 +17163,7 @@ msgstr "Cette année"
msgid "This year so far"
msgstr "Cette année jusqu'à présent"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Seuil"
@@ -17170,15 +17196,15 @@ msgstr ""
msgid "Till"
msgstr "À"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17215,13 +17241,13 @@ msgstr ""
msgid "Time period"
msgstr "Période de temps"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17913,9 +17939,9 @@ msgstr "Unités"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Inconnu"
@@ -17933,7 +17959,7 @@ msgid "Unknown error"
msgstr "Erreur inconnue"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Élément inconnu, cet élément n'existe pas dans l'hôte sélectionné"
@@ -17965,16 +17991,16 @@ msgstr "Type de valeur inconnu"
msgid "Unlimited"
msgstr "Illimité"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Supprimer lien"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Supprimer lien et nettoyer"
@@ -18070,10 +18096,10 @@ msgstr "Fonctionne"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18082,16 +18108,16 @@ msgstr "Fonctionne"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18120,7 +18146,7 @@ msgstr "Actualiser l'existant"
msgid "Update interval"
msgstr "Intervalle d'actualisation"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "Opérations de mise à jour"
@@ -18147,7 +18173,7 @@ msgstr "Télécharger"
msgid "Upper level maps"
msgstr "Cartes de niveau supérieur"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18333,7 +18359,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18469,15 +18495,15 @@ msgid "User/Recipient"
msgstr "Utilisateur/Destinataire"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Nom d'utilisateur"
@@ -18791,11 +18817,11 @@ msgstr "Validation"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18869,14 +18895,14 @@ msgstr "La table de correspondance \"%1$s\" existe déjà."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Table de correspondance"
@@ -18919,7 +18945,7 @@ msgstr "Valeur : pas de donnée"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19019,7 +19045,7 @@ msgstr "Taille de l'espace virtuel en octets ou en pourcentage du toutal. Retour
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Nom visible"
@@ -19045,7 +19071,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Avertissement"
@@ -19153,6 +19179,10 @@ msgstr "Mer"
msgid "Wednesday"
msgstr "Mercredi"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19425,7 +19455,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Année"
@@ -19485,7 +19516,7 @@ msgstr "Vous êtes connecté en tant que \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Certaines langues ne peuvent pas être choisi, car elles ne sont pas toutes installées sur le serveur web."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Vous n'êtes pas connecté"
@@ -19726,11 +19757,11 @@ msgstr "une plage de temps est nécessaire"
msgid "a time unit is expected"
msgstr "une unité de temps est nécessaire"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19825,7 +19856,7 @@ msgstr "un nombre pair de caractères hexadécimaux est nécessaire"
msgid "an explicit time is expected"
msgstr "un temps explicite est attendu"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19869,11 +19900,11 @@ msgstr "en Rouge"
msgid "ascending"
msgstr "croissant"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19887,11 +19918,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr "au moins une option de substitution doit être spécifiée"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19913,39 +19944,47 @@ msgstr ""
msgid "avg"
msgstr "moy"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - Valeur moyenne d'une période T"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19960,7 +19999,7 @@ msgstr "clignotant"
msgid "both username and password should be either present or empty"
msgstr "le nom d'utilisateur et le mot de passe doivent être présents ou vides"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20002,7 +20041,7 @@ msgstr "ne peut pas être changé"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20090,23 +20129,23 @@ msgstr "ne peut pas exécuter la requête API de défilement, les données peuve
msgid "cannot update property for templated discovery rule"
msgstr "impossible de mettre à jour la propriété pour la règle de découverte basée sur un modèle"
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change () - Différence entre valeur précédente et précédente"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20133,7 +20172,7 @@ msgstr ""
msgid "comma-separated list"
msgstr "liste séparée par des virgules"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20148,15 +20187,15 @@ msgstr "configurer"
msgid "contains"
msgstr "contient"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20164,11 +20203,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count () - Nombre de valeurs récupérées avec succès V (qui remplissent l'opérateur O) pour la période T"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20181,15 +20220,15 @@ msgstr "j"
msgid "d.M"
msgstr "d M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date () - Date actuelle"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth () - Jour du mois"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek () - Jour de la semaine"
@@ -20207,7 +20246,7 @@ msgstr "jours"
msgid "default"
msgstr "défaut"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20284,7 +20323,7 @@ msgstr ""
msgid "does not match"
msgstr "ne correspond pas"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20307,11 +20346,11 @@ msgstr "message d'erreur"
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20327,7 +20366,7 @@ msgstr "impossible de parcourir le JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20341,15 +20380,15 @@ msgstr "premier"
msgid "first parameter is expected"
msgstr "le premier paramètre est nécessaire"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast () - Prévisions pour les prochaines t secondes sur la base de la période T"
@@ -20357,7 +20396,7 @@ msgstr "forecast () - Prévisions pour les prochaines t secondes sur la base de
msgid "fourth"
msgstr "Quatrième"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime() - La différence entre la valeur de l'horodatage de l'élément et l'horodatage du serveur Zabbix est inférieure ou égale à T secondes (1 - vrai, 0 - faux)"
@@ -20431,7 +20470,7 @@ msgstr "dans"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20440,11 +20479,11 @@ msgstr ""
msgid "including subgroups"
msgstr "sous-groupes inclus"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20463,7 +20502,7 @@ msgstr "compte d'éléments incorrect"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20481,7 +20520,7 @@ msgstr "syntaxe incorrecte à proximité de \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20541,7 +20580,7 @@ msgstr "nom de groupe d'hôte non valide"
msgid "invalid host name"
msgstr "nom d'hôte invalide"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20563,6 +20602,16 @@ msgstr "expression régulière invalide"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20604,7 +20653,7 @@ msgstr "modèle d'article"
msgid "key is empty"
msgstr "la clé est vide"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20620,7 +20669,7 @@ msgctxt "week of month"
msgid "last"
msgstr "dernier"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last () - Dernière valeur T la plus récente"
@@ -20628,11 +20677,11 @@ msgstr "last () - Dernière valeur T la plus récente"
msgid "left"
msgstr "gauche"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20640,23 +20689,23 @@ msgstr ""
msgid "list of characters"
msgstr "liste de caractères"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20664,7 +20713,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "règle de découverte bas niveau"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20696,11 +20745,11 @@ msgstr "la macro est vide"
msgid "macro(s)"
msgstr "macro(s)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20736,7 +20785,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max () - Valeur maximale pour la période T"
@@ -20750,7 +20799,7 @@ msgstr "nombre maximal d'éléments dépendants atteint"
msgid "maximum number of dependency levels reached"
msgstr "nombre maximal de niveaux de dépendance atteint"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20767,7 +20816,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min () - Valeur minimale pour la période T"
@@ -20782,15 +20831,15 @@ msgstr "la longueur minimale est de %1$s caractères"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20872,7 +20921,7 @@ msgstr "nom"
msgid "new"
msgstr "nouveau"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "nouveau"
@@ -20906,7 +20955,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20927,7 +20976,7 @@ msgstr "pas dans"
msgid "not selected"
msgstr "non sélectionné"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now () - Nombre de secondes écoulées depuis le temps Epoch"
@@ -21014,15 +21063,15 @@ msgstr ""
msgid "pattern"
msgstr "motif"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile () - Pourcentage P d'une période T"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21030,15 +21079,15 @@ msgstr ""
msgid "problem pattern"
msgstr "modèle de problème"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21087,11 +21136,11 @@ msgstr ""
msgid "regular expression"
msgstr "expression régulière"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21115,15 +21164,15 @@ msgstr ""
msgid "right"
msgstr "droite"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21214,23 +21263,23 @@ msgstr "afficher les correspondances d'icônes"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21238,11 +21287,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21250,11 +21299,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum () - Somme des valeurs d'une période T"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21282,7 +21331,7 @@ msgstr "les informations d'identification fournies ne sont pas uniques"
msgid "tag"
msgstr "tag"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21316,7 +21365,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21363,31 +21412,35 @@ msgstr ""
msgid "time shift"
msgstr "décalage horaire"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time () - Heure actuelle"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft () - Temps nécessaire pour atteindre le seuil estimé en fonction de la période T"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21413,11 +21466,11 @@ msgstr "un prototype de déclencheur ne peut pas être déplacé vers un autre m
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "un déclencheur avec liens ne peut pas être déplacé vers un autre modèle ou hôte"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21474,7 +21527,7 @@ msgstr "fin de macro inattendue"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21517,7 +21570,7 @@ msgstr "valeur \"%1$s\" inattendue"
msgid "unknown"
msgstr "inconnu"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21716,11 +21769,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/he/LC_MESSAGES/frontend.po b/ui/locale/he/LC_MESSAGES/frontend.po
index 7977100aaac..941a5e6e860 100644
--- a/ui/locale/he/LC_MESSAGES/frontend.po
+++ b/ui/locale/he/LC_MESSAGES/frontend.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
-"PO-Revision-Date: 2021-11-09 16:04+0300\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
+"PO-Revision-Date: 2021-11-21 09:37+0300\n"
"Last-Translator: Yaron <sh.yaron@gmail.com>\n"
"Language-Team: none\n"
"Language: he\n"
@@ -12,7 +12,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Pootle 2.5.1.3\n"
-"X-POOTLE-MTIME: 1636466694.000000\n"
+"X-POOTLE-MTIME: 1637480254.000000\n"
#: include/classes/db/MysqlDbBackend.php:70
#: include/classes/db/OracleDbBackend.php:142
@@ -301,10 +301,10 @@ msgstr "(0 - שימוש בבררת המחדל של המשימה)"
msgid "(Only super admins can create groups)"
msgstr "(רק מנהלי על ×™×›×•×œ×™× ×œ×™×¦×•×¨ קבוצות)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(×ין מתווך)"
@@ -455,7 +455,7 @@ msgstr "×סימון ×”Ö¾API עודכן"
msgid "API tokens"
msgstr "×סימוני API"
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr "×בסיסה"
@@ -524,7 +524,7 @@ msgstr "××™×¨×•×¢×™× ×ž×•×›×¨×™× ×©× ×¤×ª×¨×•"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -543,11 +543,11 @@ msgstr "××™×¨×•×¢×™× ×ž×•×›×¨×™× ×©× ×¤×ª×¨×•"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -559,24 +559,24 @@ msgstr "××™×¨×•×¢×™× ×ž×•×›×¨×™× ×©× ×¤×ª×¨×•"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -594,7 +594,7 @@ msgstr "××™×¨×•×¢×™× ×ž×•×›×¨×™× ×©× ×¤×ª×¨×•"
msgid "Action"
msgstr "משימה"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "המשימה „%1$s†כבר קיימת."
@@ -604,7 +604,7 @@ msgstr "המשימה „%1$s†כבר קיימת."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr "המשימה „%2$s†××™× ×” זמינה לתפקיד משתמש „%1$sâ€."
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "נוספה משימה"
@@ -613,17 +613,17 @@ msgstr "נוספה משימה"
msgid "Action class %1$s must extend %2$s class."
msgstr "מחלקת הפעולה %1$s חייבת להרחיב ×ת המחלקה %2$s."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "המשימה נמחקה"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "המשימה הושבתה"
msgstr[1] "המשימות הושבתו"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "המשימה הופעלה"
@@ -642,7 +642,7 @@ msgstr "×¨×™×©×•× ×ž×©×™×ž×•×ª"
msgid "Action operation"
msgstr "פעולת משימה"
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "המשימה עודכנה"
@@ -689,7 +689,7 @@ msgid "Active till"
msgstr "פעיל עד"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -748,14 +748,14 @@ msgstr "פעיל עד"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -771,10 +771,10 @@ msgstr "פעיל עד"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -786,9 +786,9 @@ msgstr "פעיל עד"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -806,7 +806,7 @@ msgstr "פעיל עד"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -851,7 +851,7 @@ msgstr "הוספת פריט צ×צ×"
msgid "Add child service"
msgstr "הוספת שירות צ×צ×"
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr "הוספת ×©×™×¨×•×ª×™× ×¦×צ××™×"
@@ -876,8 +876,8 @@ msgstr "הוספת מספר מפות"
msgid "Add new data set"
msgstr "הוספת ערכת × ×ª×•× ×™× ×—×“×©×”"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr "הוספת מנשק חדש"
@@ -890,7 +890,7 @@ msgstr "הוספת מעקף חדש"
msgid "Add page"
msgstr "הוספת עמוד"
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr "הוספת ×©×™×¨×•×ª×™× ×”×•×¨×™×"
@@ -1024,7 +1024,7 @@ msgstr "בדיקת הגוון סוכן. מחזירה 1 - לסוכן Zabbix,†2
msgid "Aggregate"
msgstr "צבירה"
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr "פונקציות צבירה"
@@ -1040,6 +1040,10 @@ msgstr "משך צבירה"
msgid "Alert message"
msgstr "הודעת ×זהרה"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr "×לגורית×"
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "כינוי"
@@ -1356,7 +1360,7 @@ msgstr "×מורה להיות תמיכה ב×חד לפחות מבין MySQL,â€
msgid "At least one operation must be selected."
msgstr "יש לבחור בפעילות ×חת לפחות."
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "חייבת להיות לפחות פעולה ×חת."
@@ -1436,9 +1440,9 @@ msgstr "בקשות AuthN"
msgid "Authentication"
msgstr "×ימות"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "××œ×’×•×¨×™×ª× ×ימות"
@@ -1499,12 +1503,12 @@ msgstr "×œ× × ×™×ª×Ÿ להפעיל ×ת ×”×פשרויות לכניסה וליצ
msgid "Auto-logout"
msgstr "יצי××” ×וטומטית"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "×וטומטי"
@@ -1619,12 +1623,12 @@ msgstr "DN ×יגוד"
msgid "Bind password"
msgstr "ססמת ×יגוד"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr "סיביות להזחה"
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr "פונקציות על סיביות"
@@ -1830,7 +1834,7 @@ msgstr "×œ× × ×™×ª×Ÿ להוסיף ×ת הפריט „%1$s†ש×ינו מספ×
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "×œ× × ×™×ª×Ÿ להוסיף ×ת הפריט „%1$s†ש×ינו מספרי ל×בטיפוס ×”×ª×¨×©×™× â€ž%2$sâ€."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "×œ× × ×™×ª×Ÿ להוסיף משימה"
@@ -2128,7 +2132,7 @@ msgstr[1] "×œ× × ×™×ª×Ÿ למחוק ×סימוני API"
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת המשתמש הפנימי של Zabbix ×‘×©× â€ž%1$sâ€, יש לנסות להשבית ×ת המשתמש ×”×–×”."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת המשימה"
@@ -2292,12 +2296,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "×œ× × ×™×ª×Ÿ למחוק סקריפט"
msgstr[1] "×œ× × ×™×ª×Ÿ למחוק סקריפטי×"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת הסקריפטי×. בסקריפט „%1$s†נעשה שימוש במשימת הפעולה „%2$sâ€."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת המשימות הנבחרות"
@@ -2313,7 +2317,7 @@ msgstr[1] "×œ× × ×™×ª×Ÿ למחוק שירותי×"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr "×œ× × ×™×ª×Ÿ למחוק ×ת השירות „%1$sâ€:†%2$s."
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "×œ× × ×™×ª×Ÿ למחוק תבנית"
@@ -2400,7 +2404,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] "×œ× × ×™×ª×Ÿ להשבית ×סימון API"
msgstr[1] "×œ× × ×™×ª×Ÿ להשבית ×סימוני API"
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "×œ× × ×™×ª×Ÿ להשבית משימה"
@@ -2478,7 +2482,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] "×œ× × ×™×ª×Ÿ להפעיל ×סימון API"
msgstr[1] "×œ× × ×™×ª×Ÿ להפעיל ×סימוני API"
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "×œ× × ×™×ª×Ÿ להפעיל משימה"
@@ -2707,7 +2711,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "×œ× × ×™×ª×Ÿ ×œ×™×™×‘× ×ת התבנית „%1$sâ€, התבנית המקושרת „%2$s†××™× ×” קיימת."
msgstr[1] "×œ× × ×™×ª×Ÿ ×œ×™×™×‘× ×ת התבנית „%1$sâ€, התבניות המקושרות „%2$s†×ינן קיימות."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "×œ× × ×™×ª×Ÿ להוסיף ביטוי הקפצה"
@@ -2886,7 +2890,7 @@ msgstr "×œ× × ×™×ª×Ÿ לנתק ולפנות תבנית."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr "×œ× × ×™×ª×Ÿ לנתק ×ת ההקפצה „%1$sâ€, יש לה ×¤×¨×™×˜×™× ×ž×ª×‘× ×™×ª שנותרה מקושרת למ×רח."
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "×œ× × ×™×ª×Ÿ לעדכן ×ת „%1$s†עבור המשימה „%2$sâ€."
@@ -2952,7 +2956,7 @@ msgstr "×œ× × ×™×ª×Ÿ לעדכן ×ת קבוצת המ××¨×—×™× ×©×”×ª×’×œ×ª×” â
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "×œ× × ×™×ª×Ÿ לעדכן תרחיש רשת בתבנית „%1$sâ€:†%2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "×œ× × ×™×ª×Ÿ לעדכן משימה"
@@ -3012,7 +3016,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "×œ× × ×™×ª×Ÿ לעדכן קבוצות עבור המ×רח שהתגלה „%1$sâ€."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "×œ× × ×™×ª×Ÿ לעדכן מ×רח"
@@ -3115,9 +3119,9 @@ msgstr "×œ× × ×™×ª×Ÿ לעדכן דוח מתוזמן"
msgid "Cannot update script"
msgstr "×œ× × ×™×ª×Ÿ לעדכן ×ת הסקריפט"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr "×œ× × ×™×ª×Ÿ לעדכן ×ת היקף הסקריפט. הסקריפט „%1$s†משמש ×ת הפעולה „%2$sâ€."
@@ -3144,7 +3148,7 @@ msgstr "×œ× × ×™×ª×Ÿ לעדכן ×ת הצעד עבור תרחיש הרשת שב
msgid "Cannot update template"
msgstr "×œ× × ×™×ª×Ÿ לעדכן ×ת התבנית"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr "×œ× × ×™×ª×Ÿ לעדכן תבניות"
@@ -3230,14 +3234,14 @@ msgstr "תופסת ×ת כל מלכודות ×”Ö¾SNMP ×©×œ× × ×ª×¤×¡×• על יד
msgid "Center"
msgstr "מרכז"
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "×ישור"
@@ -3255,10 +3259,10 @@ msgctxt "verb"
msgid "Change"
msgstr "שינוי"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr "החלפת PSK"
@@ -3298,9 +3302,9 @@ msgstr "מחרוזת ×ª×•×•×™× ×›×œ×•×œ×”"
msgid "Character string not included"
msgstr "מחרוזת ×ª×•×•×™× ××™× ×” כלולה"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr "תווי×"
@@ -3316,7 +3320,7 @@ msgstr "פרטי מ×רז. מחזירה מחרוזת"
msgid "Check already exists."
msgstr "הבדיקה כבר קיימת."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "בדיקת החלק של הביטוי שמתחיל ב־„%1$s“."
@@ -3438,8 +3442,8 @@ msgstr "פינוי ההיסטוריה"
msgid "Clear history and trends"
msgstr "פינוי היסטוריה ומגמות"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "פינוי בעת ניתוק"
@@ -3466,16 +3470,16 @@ msgstr "שעון"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3604,7 +3608,7 @@ msgstr "דחיסה"
msgid "Concurrent sessions"
msgstr "הפעלות בו־זמנית"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3887,13 +3891,13 @@ msgstr "החיבור לשרת ה־Zabbix נכשל. הגדרות שגויות."
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr "החיבור ×œ× ×™×•×¦×¤×Ÿ כיוון ×©×”×•× ×ž×©×ª×ž×© בקובץ שקע (ביוניקס) ×ו בזיכרון שיתופי (Windows)."
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "חיבורי×"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "התחברויות מהמ×רח"
@@ -3901,9 +3905,9 @@ msgstr "התחברויות מהמ×רח"
msgid "Connections from proxy"
msgstr "התחברויות מהמתווך"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "התחברויות ×ל המ×רח"
@@ -4070,10 +4074,10 @@ msgstr "כלל יחס"
msgid "Correlation updated"
msgstr "יחס עודכן"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "ספירה"
@@ -4163,7 +4167,7 @@ msgid "Create discovery rule (select template first)"
msgstr "יצירת כלל גילוי (יש לבחור תבנית תחילה)"
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4365,7 +4369,7 @@ msgid "Current value"
msgstr "ערך נוכחי"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "בהת×מה ×ישית"
@@ -4608,8 +4612,8 @@ msgid "Database TLS key file"
msgstr "קובץ מפתח TLS של מסד הנתוני×"
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
-msgstr "היסטוריית מסד ×”× ×ª×•× ×™× â€Ž$info_tables שודרגה"
+msgid "Database history tables upgraded"
+msgstr ""
#: app/partials/administration.system.info.php:129
msgid "Database history tables use primary key"
@@ -4681,11 +4685,11 @@ msgstr "הת×ריך בו ×”×חריות על החומרה פגה"
msgid "Date HW purchased"
msgstr "הת×ריך בו החומרה נרכשה"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr "פונקציות ת×ריך ושעה"
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "יו×"
@@ -4726,8 +4730,8 @@ msgstr "דצמ׳"
msgid "December"
msgstr "דצמבר"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr "מקומות עשרוניי×"
@@ -4737,7 +4741,7 @@ msgstr "הקטנה בשיעור"
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4868,7 +4872,7 @@ msgstr "מחיקה"
msgid "Delete all elements that are not present in the import file?"
msgstr "למחוק ×ת כל ×”×¨×›×™×‘×™× ×©××™× × ×ž×•×¤×™×¢×™× ×‘×§×•×‘×¥ הייבו×?"
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "מחיקה ופינוי"
@@ -4877,11 +4881,11 @@ msgstr "מחיקה ופינוי"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "למחוק ולפנות ×ת התבניות הנבחרות? (×זהרה: כל המ××¨×—×™× ×”×§×©×•×¨×™× ×™×ª×¤× ×• ×’× ×”×!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "למחוק ולפנות ×ת התבנית? (×זהרה: כל המ××¨×—×™× ×”×ž×§×•×©×¨×™× ×™×¤×•× ×• ×’× ×”×!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "למחוק ×ת המשימה הנוכחית?"
@@ -5014,7 +5018,7 @@ msgstr "למחוק ×ת הקבוצות הנבחרות?"
msgid "Delete selected host groups?"
msgstr "למחוק ×ת קבוצות המ××¨×—×™× ×”× ×‘×—×¨×•×ª?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "למחוק ×ת ×”×בטיפוס של המ×רח הנבחר?"
@@ -5122,7 +5126,7 @@ msgstr "למחוק ×ת ×”×ž×©×ª×ž×©×™× ×”× ×‘×—×¨×™×?"
msgid "Delete selected web scenarios?"
msgstr "למחוק ×ת תרחישי הרשת הנבחרי×?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "למחוק תבנית?"
@@ -5183,7 +5187,7 @@ msgstr "רשימת דחייה"
msgid "Dependencies"
msgstr "תלויות"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "תלוי"
@@ -5191,7 +5195,7 @@ msgstr "תלוי"
msgid "Dependent item"
msgstr "פריט תלוי"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5202,7 +5206,7 @@ msgid "Deployment status"
msgstr "מצב הטמעה"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5217,16 +5221,16 @@ msgstr "מצב הטמעה"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5238,10 +5242,10 @@ msgstr "תי×ור"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "פרטי×"
@@ -5250,6 +5254,14 @@ msgstr "פרטי×"
msgid "Details of web scenario"
msgstr "פרטי תרחיש רשת"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr "תקופת זיהוי"
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr "סטיות"
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "התקן"
@@ -5372,7 +5384,7 @@ msgstr "להשבית ×ת תרחישי הרשת הנבחרי×?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5399,17 +5411,17 @@ msgstr "להשבית ×ת תרחישי הרשת הנבחרי×?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "מושבת"
@@ -5434,7 +5446,7 @@ msgstr "התעלמות מערך"
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5647,7 +5659,7 @@ msgstr "הצגת ×ª×¨×©×™× ×ž×•×¢×¨×"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5664,7 +5676,7 @@ msgstr "×ž×•×¦×’×™× %1$s עד %2$s מתוך %3$s ×¤×¨×™×˜×™× ×©× ×ž×¦×ו"
msgid "Displaying options"
msgstr "×פשרויות הצגה"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr "מכנה החילוק"
@@ -5746,7 +5758,7 @@ msgstr "הורדת תמונה"
msgid "Download the configuration file"
msgstr "הורדת קובץ ההגדרות"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5810,7 +5822,7 @@ msgstr "userid משוכפל „%1$sâ€ ×‘×ž×©×ª×ž×©×™× ×¢×‘×•×¨ המפה „%2$
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "משך"
@@ -5840,14 +5852,14 @@ msgstr "כל פריט"
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6103,7 +6115,7 @@ msgstr "הפעלת לכידה"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6141,13 +6153,13 @@ msgstr "הפעלת לכידה"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6163,11 +6175,11 @@ msgstr "פעיל"
msgid "Encrypt"
msgstr "הצפנה"
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "הצפנה"
@@ -6243,6 +6255,10 @@ msgstr "שגי××”! ×œ× × ×™×ª×Ÿ להפעיל ×ת שרת ×”Ö¾Zabbix עקב ×’×
msgid "Error: %1$s"
msgstr "שגי××”: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr "תקופת הערכה"
+
#: include/events.inc.php:180
msgid "Event"
msgstr "×ירוע"
@@ -6811,8 +6827,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "ר×שון"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "הת×מה"
@@ -6924,12 +6940,12 @@ msgid "Full"
msgstr "מל×"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "שכפול מל×"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "פונקציה"
@@ -6945,7 +6961,7 @@ msgstr "×ž×•×“× GSM"
msgid "GUI"
msgstr "מנשק משתמש"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "הגישה למנשק המשתמש מושבתת."
@@ -7294,7 +7310,7 @@ msgstr "×©× ×§×‘×•×¦×”"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "××™ ×פשר לבסס ×ת ×בטיפוס הקבוצה על קבוצת מ××¨×—×™× ×©×”×ª×’×œ×ª×” „%1$sâ€."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "×בות טיפוס קבוצה"
@@ -7307,12 +7323,11 @@ msgid "Grouping by"
msgstr "קיבוץ לפי"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "קבוצות"
@@ -7531,7 +7546,7 @@ msgstr "מחיקת ההיסטוריה עשויה ל×רוך זמן רב. להמ×
msgid "History data selection"
msgstr "בחירת × ×ª×•× ×™× ×”×™×¡×˜×•×¨×™×™×"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr "פונקציות היסטוריה"
@@ -7562,7 +7577,7 @@ msgid "Horizontal align"
msgstr "יישור ×ופקי"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7571,7 +7586,7 @@ msgstr "יישור ×ופקי"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7582,7 +7597,7 @@ msgstr "יישור ×ופקי"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7708,7 +7723,7 @@ msgid "Host group label type"
msgstr "סוג תווית קבוצת מ×רחי×"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7727,8 +7742,8 @@ msgstr "קבוצת מ××¨×—×™× ×¢× ×”×ž×–×”×” „%1$s†××™× ×” זמינה."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7778,7 +7793,7 @@ msgstr "סקירת מ×גר מ×רח"
msgid "Host label type"
msgstr "סוג תווית מ×רח"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "מ×קרו××™× ×©×œ המ×רח"
@@ -7790,7 +7805,7 @@ msgstr "נתוני על למ×רח"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "×©× ×ž×רח"
@@ -7827,7 +7842,7 @@ msgstr "ל×בטיפוס המ×רח ×œ× ×™×›×•×œ להיות יותר ממנשק
msgid "Host prototype deleted"
msgstr "נמחק ×בטיפוס מ×רח"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr "תסריטי מ×קרו ל×בות טיפוס של מ×רחי×"
@@ -7850,7 +7865,7 @@ msgstr "×בטיפוס מ×רח ×¢× ×©× ×”×ª×¦×•×’×” „%1$s†כבר קיי×
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "×בות טיפוס מ×רח"
@@ -7875,7 +7890,7 @@ msgstr "זמן מ×רח"
msgid "Host update failed."
msgstr "עדכון המ×רח נכשל."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "המ×רח עודכן"
@@ -7952,6 +7967,10 @@ msgstr "מיקומי מ×רחי×"
msgid "Hosts updated"
msgstr "המ××¨×—×™× ×¢×•×“×›× ×•"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "שעות"
@@ -8021,15 +8040,15 @@ msgstr "טווח כתובות IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "טווח ×”Ö¾IP†„%1$s†חורג ממגבלת הכתובות „%2$sâ€"
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8261,7 +8280,7 @@ msgstr "תמונות"
msgid "Images for all maps will be updated!"
msgstr "התמונות עבור כל המפות יעודכנו!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "מיידית"
@@ -8343,7 +8362,7 @@ msgstr "×בטיפוס פריט בלתי נגיש"
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "תחזוקה בלתי נגישה"
@@ -8355,11 +8374,11 @@ msgstr "מפה בלתי נגישה"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "תבנית בלתי נגישה"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "הקפצה בלתי נגישה"
@@ -8474,7 +8493,7 @@ msgstr "×סימון הכספת שגוי."
msgid "Incorrect action condition discovery check."
msgstr "בדיקת גילוי תנ××™ משימה שגויה."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "בדיקת גילוי תנ××™ משימה שגויה. בדיקת הגילוי ××™× ×” קיימת ×ו ש×ין לך גישה ×ליה."
@@ -8482,7 +8501,7 @@ msgstr "בדיקת גילוי תנ××™ משימה שגויה. בדיקת ×”×’×™×
msgid "Incorrect action condition discovery object."
msgstr "פריט גילוי תנ××™ משימה שגוי."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "כלל גילוי תנ××™ משימה שגוי. כלל הגילוי ×œ× ×§×™×™× ×ו ש×ין לך גישה ×ליו."
@@ -8494,36 +8513,36 @@ msgstr "מצב גילוי תנ××™ משימה שגוי."
msgid "Incorrect action condition event type."
msgstr "סוג ×ירוע תנ××™ משימה שגוי."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
-msgstr ""
+msgstr "תנ××™ משימה ×ו פעילות קבוצת מ××¨×—×™× ×©×’×•×™×™×. קבוצת המ××¨×—×™× ×œ× ×§×™×™×ž×ª ×ו ש×ין לך גישה ×ליה."
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
-msgstr ""
+msgstr "תנ××™ משימה ×ו פעילות מ×רח שגויי×. המ×רח ×œ× ×§×™×™× ×ו ש×ין לך גישה ×ליו."
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
-msgstr ""
+msgstr "תנ××™ משימה ×ו תבנית פעולה שגויי×. התבנית ×œ× ×§×™×™×ž×ª ×ו ש×ין לך גישה ×ליה."
#: include/classes/validators/CActionCondValidator.php:131
#, c-format
msgid "Incorrect action condition port \"%1$s\"."
msgstr "פתחת תנ××™ המשימה שגויה „%1$sâ€."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "מתווך תנ××™ משימה שגוי. המתווך ×œ× ×§×™×™× ×ו ש×ין לך גישה ×ליו."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
-msgstr ""
+msgstr "שירות תנ××™ משימה שגוי. השירות ×œ× ×§×™×™× ×ו ש×ין לך גישה ×ליו."
#: include/classes/validators/CActionCondValidator.php:155
msgid "Incorrect action condition trigger severity."
-msgstr "חומרת הקפצה תנ××™ משימה שגויה."
+msgstr "חומרת הקפצת תנ××™ משימה שגויה."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "הקפצת תנ××™ פעולה שגויה. ההקפצה ×œ× ×§×™×™×ž×ª ×ו ש×ין לך גישה ×ליה."
@@ -8533,26 +8552,26 @@ msgstr "סוג תנ××™ פעולה שגוי."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "ערכי דרגות הסלמת משימת הפעולה שגויי×."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
-msgstr ""
+msgstr "סוג מדיה תנ××™ משימה שגוי. סוג המדיה ×œ× ×§×™×™× ×ו ש×ין לך גישה ×ליו."
#: app/controllers/CControllerActionOperationValidate.php:63
#, c-format
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "סוג משימת הפעולה שגוי „%1$s†למקור ×”×ירוע „%2$sâ€."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
-msgstr ""
+msgstr "קבוצת משתמשי תנ××™ משימה שגוי. קבוצת ×”×ž×©×ª×ž×©×™× ×œ× ×§×™×™×ž×ª ×ו ש×ין לך גישה ×ליה."
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
-msgstr ""
+msgstr "משתמש תנ××™ משימה שגוי. המשתמש ×œ× ×§×™×™× ×ו ש×ין לך גישה ×ליו."
#: include/classes/api/services/CDRule.php:206
#: include/classes/api/services/CDRule.php:348
@@ -8850,8 +8869,8 @@ msgstr "ספירת ×¦×¢×“×™× ×œ×ª×¨×—×™×© רשת בתבנית שגויה."
msgid "Incorrect trigger expression"
msgstr "ביטוי הקפצה שגוי"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "ביטוי הקפצה שגוי."
@@ -9249,7 +9268,7 @@ msgstr "מידע על קובץ. מחזירה JSON"
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "מידע על שירות. מחזירה מספר ×©×œ× ×•×—×™×•×‘×™ ×¢× ×¤×¨×ž×˜×¨ בתור מצב, התחלה; מחרוזת - ×¢× ×¤×¨×ž×˜×¨ בתור ×©× ×ª×¦×•×’×”, path,†user; טקסט - ×¢× ×¤×¨×ž×˜×¨ בתור תי×ור; במיוחד עבור מצב: 0 - פעיל, 1 - מושהה, 2 - ההפעלה בהמתנה, 3 - השהיה בהמתנה, 4 - המשך בהמתנה, 5 - עצירה בהמתנה, 6 - נעצר, 7 - ×œ× ×™×“×•×¢, 255 - ×ין ×›×–×” שירות; במיוחד עבור התחלה: 0 - ×וטומטית, 1 - ×וטומטית ×¢× ×”×ž×ª× ×”, 2 - ידנית, 3 - מושבתת, 4 - ×œ× ×™×“×•×¢×”"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr "לרשת"
@@ -9258,11 +9277,11 @@ msgstr "לרשת"
msgid "Inherited"
msgstr "בירושה"
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "מ×קרו××™× ×©×”×ª×§×‘×œ×• בירושה ושל המ×רח"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr "מ×קרו××™× ×©×”×ª×§×‘×œ×• בירושה ו×בות טיפוס של המ×רח"
@@ -9274,7 +9293,7 @@ msgstr "תגיות פריט וכ×לו שהתקבלו בירושה"
msgid "Inherited and scenario tags"
msgstr "תגיות תרחיש וכ×לו שהתקבלו בירושה"
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "מ×קרו××™× ×©×”×ª×§×‘×œ×• בירושה ושל התבנית"
@@ -9294,7 +9313,7 @@ msgstr "תצוגה ר×שונית"
msgid "Initial view is ignored if the default view is set."
msgstr "תצוגה ר×שונית ×œ× ×ª×•×¦×’ ×× ×ž×•×’×“×¨×ª תצוגת בררת מחדל."
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "הוספה"
@@ -9353,8 +9372,8 @@ msgstr "למנשק ×¢× ×›×ª×•×‘×ª ×”Ö¾IP†„%1$sâ€ ×œ× ×™×›×•×œ להיות
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "למנשק ×¢× ×›×ª×•×‘×ª ×”Ö¾IP†„%1$sâ€ ×œ× ×™×›×•×œ להיות ×©× ×¨×™×§ בתור DNS."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr "מנשקי×"
@@ -9446,7 +9465,7 @@ msgstr "תכני קובץ ×”Ö¾YAML שגויי×"
msgid "Invalid action condition: %1$s."
msgstr "תנ××™ פעולה שגוי: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr "תנ××™ שגוי: %1$s."
@@ -9507,10 +9526,10 @@ msgstr "×”×¤×¨×ž×˜×¨×™× ×œ×©×™×˜×” שגויי×."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9573,8 +9592,8 @@ msgstr "×”×¤×¨×ž×˜×¨×™× ×œ×©×™×˜×” שגויי×."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9796,11 +9815,11 @@ msgstr "פרק הזמן שגוי."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr "משתנה תקריב „%1$s†שגוי: %2$s."
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "מ×גר"
@@ -9814,7 +9833,7 @@ msgid "Inventory field"
msgstr "שדה מ×גר"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "מצב מ×גר"
@@ -9822,10 +9841,10 @@ msgstr "מצב מ×גר"
msgid "Is online?"
msgstr "מחובר?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "מנפיק"
@@ -9917,7 +9936,7 @@ msgstr[1] "×¤×¨×™×˜×™× ×ž×•×¤×¢×œ×™×"
msgid "Item in \"not supported\" state"
msgstr "פריט במצב â€ž×œ× × ×ª×ž×šâ€"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "×œ× × ×‘×—×¨ פריט"
@@ -10370,17 +10389,17 @@ msgstr "×ª×¨×©×™× ×©×œ החודש שעבר"
msgid "Last name"
msgstr "×©× ×ž×©×¤×—×”"
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "×חרון מבין"
@@ -10457,8 +10476,8 @@ msgstr "×¦×ž×¦×•× ×ž×©×ž×ל"
msgid "Legend"
msgstr "מקר×"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr "×ורך"
@@ -10492,8 +10511,8 @@ msgstr "סוג קו"
msgid "Line width"
msgstr "עובי קו"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "קישור"
@@ -10516,16 +10535,9 @@ msgstr "הקישור בשדה „selementid2†מצביע למזהה selement ×
msgid "Link indicators"
msgstr "מחווני קישור"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr "קישור תבניות חדשות"
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "קישור תבניות"
@@ -10541,13 +10553,6 @@ msgstr "קישור לתבניות"
msgid "Linked map"
msgstr "מפה מקושרת"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10686,7 +10691,7 @@ msgstr "תיעוד מלכודות SNMP ש×ינן תו×מות"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "כניסה"
@@ -10768,16 +10773,16 @@ msgstr "המ×קרו „%1$s†כבר ×§×™×™× ×ª×—×ª „%2$sâ€."
msgid "Macro \"%1$s\" already exists."
msgstr "המ×קרו „%1$s†כבר קיי×."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "תבניות מ×קרו"
@@ -10876,12 +10881,12 @@ msgstr "ניהול ×סימוני API"
msgid "Manage scheduled reports"
msgstr "ניהול דוחות מתוזמני×"
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "ידני"
@@ -11024,16 +11029,16 @@ msgstr "סימון ×חרי×"
msgid "Mark selected"
msgstr "סימון הנבחרי×"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "מסכה"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11066,11 +11071,11 @@ msgstr "פריט ×ב"
msgid "Matches regular expression"
msgstr "תו×× ×œ×‘×™×˜×•×™ רגולרי"
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr "פונקציות מתמטיות"
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11302,7 +11307,7 @@ msgstr "Microsoft Edge"
msgid "Middle"
msgstr "×מצעי"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11404,7 +11409,7 @@ msgstr "×¤×¨×™×˜×™× ×—×¡×¨×™× ×œ×בטיפוס ×ª×¨×©×™× â€ž%1$sâ€."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "חסר מפתח „%1$s†למ×רח „%2$sâ€."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11486,9 +11491,9 @@ msgstr "×™×•× ×©× ×™"
msgid "Monitored by"
msgstr "מנוטר על ידי"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "מנוטר ע״י מתווך"
@@ -11507,6 +11512,7 @@ msgstr "מעקב"
msgid "Monospace"
msgstr "רוחב ×חיד"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "חודש"
@@ -11619,8 +11625,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11690,11 +11696,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11722,8 +11728,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11744,7 +11750,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12034,15 +12040,15 @@ msgstr "×œ× ×¡×•×¤×§ מזהה של כלל גילוי."
msgid "No enabled modules found."
msgstr "×œ× × ×ž×¦×ו ×ž×•×“×•×œ×™× ×©×”×•×¤×¢×œ×•."
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "×ין הצפנה"
@@ -12128,10 +12134,10 @@ msgstr "×œ× × ×ž×¦×ו הת×מות"
msgid "No new modules discovered"
msgstr "×œ× ×”×ª×’×œ×• ×ž×•×“×•×œ×™× ×—×“×©×™×"
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
-msgstr ""
+msgstr "×œ× ×”×•×’×“×¨×• פעילויות למשימה „%1$sâ€."
#: include/classes/api/services/CUser.php:1550
#: include/classes/api/services/CUser.php:2054
@@ -12165,9 +12171,9 @@ msgstr "×ין הרש×ות לגישה למערכת."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12206,7 +12212,7 @@ msgstr "×ין הרש×ות ×œ×§×¨×•× ×œÖ¾â€ž%1$s.%2$sâ€."
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12306,11 +12312,11 @@ msgstr "×ין הרש×ות ×œ×§×¨×•× ×œÖ¾â€ž%1$s.%2$sâ€."
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12369,9 +12375,9 @@ msgid "No public key file specified."
msgstr "×œ× ×¦×•×™×Ÿ מפתח ציבורי."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
-msgstr ""
+msgstr "×œ× ×¦×•×™× ×• × ×ž×¢× ×™× ×œ×”×•×“×¢×ª פעילות משימה."
#: include/classes/widgets/CWidgetConfig.php:286 jsLoader.php:165
msgid "No refresh"
@@ -12390,9 +12396,9 @@ msgid "No target selected."
msgstr "×œ× × ×‘×—×¨ יעד."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
-msgstr ""
+msgstr "×œ× ×¦×•×™× ×• ×™×¢×“×™× ×œ×¡×§×¨×™×¤×˜ גלובלי של פעילות משימה."
#: include/triggers.inc.php:91
#, c-format
@@ -12539,6 +12545,10 @@ msgstr "דוח התרעות"
msgid "Notifications"
msgstr "התרעות"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12625,6 +12635,10 @@ msgstr "מספר ×”×ž×¢×‘×“×™× ×‘×ž×›×•× ×” וירטו×לית של VMware,â€
msgid "Number of rows"
msgstr "מספר שורות"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "מספר שינויי המצב"
@@ -12800,7 +12814,7 @@ msgid "Off"
msgstr "כבוי"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12847,7 +12861,7 @@ msgstr "×חד"
msgid "One time only"
msgstr "×¤×¢× ×חת בלבד"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "חוסר פעילות חד־פעמית"
@@ -12924,12 +12938,12 @@ msgstr "×¤×¨×˜×™× ×¢×œ מערכת ההפעלה. מחזירה מחרוזת"
msgid "Operation"
msgstr "פעילות"
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr "הפעילות „%1$s†כבר קיימת למשימה „%2$sâ€."
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr "הפעילות „%1$s†כבר קיימת."
@@ -12963,8 +12977,8 @@ msgstr "× ×ª×•× ×™× ×ª×¤×¢×•×œ×™×™×"
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "פעולות"
@@ -12999,7 +13013,7 @@ msgstr "פעולות"
msgid "Operator"
msgstr "מפעיל"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr "פונקציות מפעיל"
@@ -13039,19 +13053,19 @@ msgstr "×ו"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13081,10 +13095,10 @@ msgstr "×ו"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13347,10 +13361,10 @@ msgstr "תקלה"
msgid "PROBLEM event generation mode"
msgstr "מצב יצירת ×ירוע תקלה"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13363,19 +13377,19 @@ msgstr "מצב יצירת ×ירוע תקלה"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "זהות PSK"
@@ -13427,12 +13441,12 @@ msgid "Parameters"
msgstr "פרמטרי×"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr "×ת ×”×ž×©×ª× ×™× â€žesc_step_from†ו־„esc_step_to†יש להגדיר ביחד."
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "כללי גילוי הורה"
@@ -13487,13 +13501,13 @@ msgid "Passive"
msgstr "פ×סיבי"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13501,7 +13515,7 @@ msgstr "פ×סיבי"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13554,12 +13568,12 @@ msgstr "הדבקת וידג׳ט"
msgid "Paste without external links"
msgstr "הדבקה ×œ×œ× ×§×™×©×•×¨×™× ×—×™×¦×•× ×™×™×"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr "תבנית"
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "השהיית פעולות לתקלות מוסתרות"
@@ -13572,7 +13586,7 @@ msgstr "השימוש המרבי בזיכרון: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr "×חוז הזמן שמכונה וירטו×לית ×œ× ×™×›×•×œ×” לרוץ ×›×™ ×”×™× ×ž×ª×—×¨×” על גישה ×œ×ž×¢×‘×“×™× ×¤×™×–×™×™×, <url> - כתובת שירות VMware,†<uuid> - ×©× ×ž×רח של מכונה וירטו×לית ב־VMware"
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "×חוז"
@@ -13596,10 +13610,11 @@ msgstr "קו ×חוזון (ימין)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "ביצוע ש×ילתת DNS. מחזירה מחרוזת ×ª×•×•×™× ×¢× ×¡×•×’ המידע הנדרש"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13607,7 +13622,9 @@ msgstr "ביצוע ש×ילתת DNS. מחזירה מחרוזת ×ª×•×•×™× ×¢× ×
msgid "Period"
msgstr "תקופה"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr "הזחת פרק זמן"
@@ -13671,11 +13688,11 @@ msgstr "ניגון צליל"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "× × ×œ×‘×“×•×§ ×ת משתני התצורה. ×× ×›×•×œ× × ×›×•× ×™×, יש ללחוץ על הכפתור „%1$s†×ו לחלופין על הכפתור „%2$s†כדי לשנות משתני תצורה."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr "× × ×œ×שר שברצונך להסיר ×ת כל תסריטי המ×קרו."
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr "× × ×œ×שר שברצונך להסיר ×ת כל מיפויי הערכי×."
@@ -13761,7 +13778,7 @@ msgstr "סוג Post"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr "ניצולת חשמל , <url> - כתובת שירות ×”Ö¾VMware,†<uuid> - ×©× ×”×ž×רח של ×”Ö¾VMware hypervisor,†<max> - ניצולת החשמל המרבית המותרת"
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr "ערך חזקה"
@@ -13770,7 +13787,7 @@ msgstr "ערך חזקה"
msgid "Pre-installation summary"
msgstr "תקציר ×˜×¨×•× ×”×ª×§× ×”"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr "פונקציות חיזוי"
@@ -13887,9 +13904,9 @@ msgstr "פרטי"
msgid "Private key file"
msgstr "קובץ מפתח פרטי"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "רמת ההרש×ות"
@@ -14296,7 +14313,7 @@ msgstr "ביטוי שחזור"
msgid "Recovery expression syntax error."
msgstr "שגי××” בתחביר ביטוי השחזור."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "פעולות שחזור"
@@ -14427,20 +14444,20 @@ msgstr "פקודה מרוחקת"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14449,10 +14466,10 @@ msgstr "פקודה מרוחקת"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14496,7 +14513,7 @@ msgstr "פקודה מרוחקת"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14579,14 +14596,14 @@ msgstr "לחזור ב־"
msgid "Repeats"
msgstr "חוזרת"
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14599,8 +14616,8 @@ msgstr "החלפה"
msgid "Replace dependencies"
msgstr "החלפת תלויות"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr "החלפה"
@@ -14801,7 +14818,7 @@ msgstr "סוג התגובה: מחרוזת"
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "תוצ××”"
@@ -15333,7 +15350,7 @@ msgstr "היקף"
msgid "Script"
msgstr "סקריפט"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "הסקריפט „%1$s“ כבר קיי×."
@@ -15398,6 +15415,15 @@ msgstr "תבנית החיפוש ריקה"
msgid "Search type"
msgstr "סוג חיפוש"
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr "עונה"
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr "חלון סטיית עונה"
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "סלולרי ×יש קשר משני"
@@ -15476,7 +15502,7 @@ msgstr "בחירת וידג׳ט"
msgid "Selected"
msgstr "נבחר"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "הפעולה הנבחרת נמחקה"
@@ -15716,6 +15742,7 @@ msgid "Services updated"
msgstr "×©×™×¨×•×ª×™× ×¢×•×“×›× ×•"
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr "שגי×ת ×תחול הפעלה."
@@ -16169,7 +16196,7 @@ msgstr "ספרדית (es_ES)"
msgid "Specified role was not found."
msgstr "התפקיד שצוין ×œ× × ×ž×¦×."
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "הסקריפט שצוין ×œ× ×§×™×™× ×ו ש×ין לך הרש×ות עליו לטובת פקודת משימת פעולה."
@@ -16204,8 +16231,8 @@ msgstr "×¤×¨×™×˜×™× ×¨×’×™×œ×™×"
msgid "Standby"
msgstr "המתנה"
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr "התחלה"
@@ -16213,7 +16240,7 @@ msgstr "התחלה"
msgid "Start date"
msgstr "ת×ריך התחלה"
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "התחלה בעוד"
@@ -16292,7 +16319,7 @@ msgstr "סטטיסטיקה וזמינות זיכרון מטמון הכתיבה ×
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16396,7 +16423,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "מהלך ×¢× ×”×©× â€ž%1$s†כבר קיי×."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16450,12 +16477,12 @@ msgstr "ישירה"
msgid "Strict"
msgstr "קפדני"
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr "מחרוזת"
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr "פונקציות מחרוזות"
@@ -16476,10 +16503,10 @@ msgstr "תת־מסנן"
msgid "Subject"
msgstr "נוש×"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "נוש×"
@@ -16673,7 +16700,7 @@ msgstr "ערך תגית"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16689,13 +16716,13 @@ msgstr "ערך תגית"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16712,7 +16739,7 @@ msgstr "ערך תגית"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16722,7 +16749,7 @@ msgstr "ערך תגית"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16758,14 +16785,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "תבנית"
@@ -16809,7 +16834,7 @@ msgstr "תבנית של לוח מחווני×"
msgid "Template dashboards"
msgstr "תבניות של לוחות מחווני×"
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "נמחקה תבנית"
@@ -16821,11 +16846,11 @@ msgstr "קבוצת תבניות"
msgid "Template linkage"
msgstr "קישור בין תבניות"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "מ×קרו××™× ×‘×ª×‘× ×™×ª"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "×©× ×”×ª×‘× ×™×ª"
@@ -16860,13 +16885,12 @@ msgstr "כבר קיימת תבנית ×¢× ×ותו ×©× ×”×ª×¦×•×’×” „%1$sâ€.
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16875,10 +16899,12 @@ msgstr "כבר קיימת תבנית ×¢× ×ותו ×©× ×”×ª×¦×•×’×” „%1$sâ€.
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16889,7 +16915,7 @@ msgstr "תבניות"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "התבניות „%1$s†נותקו מהמ××¨×—×™× â€ž%2$sâ€."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr "תבניות עודכנו"
@@ -17103,7 +17129,7 @@ msgstr "ערכת עיצוב"
msgid "This day last week"
msgstr "×”×™×•× ×”×–×” בשבוע שעבר"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr "השדה ×”×–×” ×ž×ª×ž×œ× ×וטומטית בפריט „%1$sâ€."
@@ -17141,7 +17167,7 @@ msgstr "השנה"
msgid "This year so far"
msgstr "השנה הזו עד כה"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "סף"
@@ -17174,15 +17200,15 @@ msgstr "נתוני יחוס ספק ×”××¨×™×—×™× ×ž×•×¤×™×¢×™× ×‘×ª×™×‘×ª טק
msgid "Till"
msgstr "עד"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17219,13 +17245,13 @@ msgstr "זמן הגישה ×”×חרונה למתווך. ×©× - ×©× ×”×ž×ª×•×•×š.
msgid "Time period"
msgstr "תקופת זמן"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17917,9 +17943,9 @@ msgstr "יחידות"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "×œ× ×™×“×•×¢"
@@ -17937,7 +17963,7 @@ msgid "Unknown error"
msgstr "שגי××” ×œ× ×™×“×•×¢×”"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "פריט מ×רח ×œ× ×™×“×•×¢, ×ין ×›×–×” פריט במ×רח הנבחר"
@@ -17969,16 +17995,16 @@ msgstr "סוג הערך ×œ× ×™×“×•×¢"
msgid "Unlimited"
msgstr "×œ×œ× ×”×’×‘×œ×”"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "הפרדה"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "הפרדה ומחיקה"
@@ -18074,10 +18100,10 @@ msgstr "פעיל"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18086,16 +18112,16 @@ msgstr "פעיל"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18124,7 +18150,7 @@ msgstr "עדכון קיימי×"
msgid "Update interval"
msgstr "תדירות עדכון"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "עדכון פעולות"
@@ -18151,7 +18177,7 @@ msgstr "העל××”"
msgid "Upper level maps"
msgstr "מפות ברמות עליונות"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18337,7 +18363,7 @@ msgstr[1] "קבוצות ×ž×©×ª×ž×©×™× ×¢×•×“×›× ×•"
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18473,15 +18499,15 @@ msgid "User/Recipient"
msgstr "משתמש/נמען"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "×©× ×ž×©×ª×ž×©"
@@ -18795,11 +18821,11 @@ msgstr "×ימות"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18873,14 +18899,14 @@ msgstr "מפת ×”×¢×¨×›×™× â€ž%1$s“ כבר קיימת."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "מיפוי ערכי×"
@@ -18923,7 +18949,7 @@ msgstr "ערך: ×ין נתוני×"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr "מפת ×¢×¨×›×™× ×¢× ×”×ž×–×”×” „%1$s†××™× ×” זמינה תחת „%2$sâ€."
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19023,7 +19049,7 @@ msgstr "גודל נפח וירטו×לי ב××—×•×–×™× ×ž×”×›×œ×œ. מחזירה
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "×©× ×ª×¦×•×’×”"
@@ -19049,7 +19075,7 @@ msgstr "×–"
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "×זהרה"
@@ -19157,6 +19183,10 @@ msgstr "ד׳"
msgid "Wednesday"
msgstr "×™×•× ×¨×‘×™×¢×™"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19429,7 +19459,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "שנה"
@@ -19489,7 +19520,7 @@ msgstr "נכנסת ×‘×©× â€ž%1$s“."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "×ין לך ×פשרות לבחור בחלק מהשפות כיוון שההגדרות עבורן ×ינן מותקנות בשרת."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "×œ× × ×›× ×¡×ª"
@@ -19733,11 +19764,11 @@ msgstr "×מור להיות טווח זמן"
msgid "a time unit is expected"
msgstr "×מור להיות יחידת זמן"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr "abs()‎ - ערך מוחלט"
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr "acos()‎ - הקוסינוס ההפוך של ערך כזווית, ×ž×‘×•×˜× ×‘×¨×“×™×× ×™×"
@@ -19832,7 +19863,7 @@ msgstr "×מור להיות מספר זוגי ×ו ×ª×•×•×™× ×”×§×¡×“×¦×™×ž×œ×™
msgid "an explicit time is expected"
msgstr "×מורה להיות שעה מפורשת"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr "×œ× ×”×•×’×“×¨ מזהה בנוסחה"
@@ -19876,11 +19907,11 @@ msgstr "×›×דו×"
msgid "ascending"
msgstr "עולה"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr "ascii()‎ - מחזירה ×ת קוד ×”Ö¾ASCII של התו השמ×לי הקיצוני של הערך"
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr "asin()‎ - הסינוס ההפוך של ערך כזווית, ×ž×‘×•×˜× ×‘×¨×“×™×× ×™×"
@@ -19894,11 +19925,11 @@ msgstr "יש לבחור לפחות ×™×•× ×חד בשבוע"
msgid "at least one override option must be specified"
msgstr "יש לציין ×פשרות שכתוב ×חת לפחות"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr "atan()‎ - הטנגנס ההפוך של ערך כזווית, ×ž×‘×•×˜× ×‘×¨×“×™×× ×™×"
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr "atan2()‎ - ×”×רקטנגנס של הנקודות ×‘×¦×™×¨×™× ×”×× ×›×™ וה×ופקי ×©×ž×™×•×¦×’×™× ×›×–×•×•×™×ª, ברדי×× ×™×"
@@ -19920,39 +19951,47 @@ msgstr "×¨×™×©×•× ×וטומטי"
msgid "avg"
msgstr "ממוצע"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg()‎ - ממוצע לטווח T"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr "between()‎ - בודקת ×× ×¢×¨×š שייך לטווח ×ž×¡×•×™× (1 - בטווח, 0 - מחוץ לטווח)"
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr "bitand()‎ - פעולת ×•×’× ×¢×œ סיביות"
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr "bitlength()‎ - מחזירה ×ת ×”×ורך בסיביות"
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr "bitlshift()‎ - ×”×–×–×” לוגית לשמ×ל של סיביות"
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr "bitnot()‎ - פעולה ×œ× ×¢×œ סיביות"
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr "bitor()‎ - פעולת ×ו על סיביות"
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr "bitrshift()‎ - הזזה לוגית לימין של סיביות"
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr "bitxor()‎ - פעולת ×ו ×ž×•×¦×™× (XOR) על סיביות"
@@ -19967,7 +20006,7 @@ msgstr "מהבהב"
msgid "both username and password should be either present or empty"
msgstr "×©× ×”×ž×©×ª×ž×© והססמה ×—×™×™×‘×™× ×œ×”×™×•×ª מל××™× ×ו ×¨×™×§×™× ×™×—×“×™×•"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr "bytelength()‎ - מחזירה ×ת ×”×ורך בבתי×"
@@ -19980,7 +20019,7 @@ msgstr "מחושב"
#: app/views/administration.geomaps.edit.php:52
msgid "can be used to add \"@2x\" to the URL to load retina tiles."
-msgstr ""
+msgstr "×פשר להשתמש כדי להוסיף „‎@2x†לכתובת כדי לטעון ×ריחי רשתית."
#: include/classes/api/services/CItemGeneral.php:229
msgid "cannot be changed"
@@ -20009,7 +20048,7 @@ msgstr "×œ× × ×™×ª×Ÿ לשנות"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20097,23 +20136,23 @@ msgstr "בקשת ×”Ö¾Scroll API ××™× ×” תקינה, יכול להיות שהנ×
msgid "cannot update property for templated discovery rule"
msgstr "×œ× × ×™×ª×Ÿ לעדכן מ×פיין של כלל גילוי מתבנית"
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr "cbrt()‎ - שורש קוביה"
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr "ceil()‎ - מעגלת למספר ×”×©×œ× ×”×’×“×•×œ הקרוב ביותר"
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change()‎ - שינוי בין הערך ×”×חרון לקודמו"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
-msgstr ""
+msgstr "changecount()‎ - מספר ×”×©×™× ×•×™×™× ×‘×™×Ÿ ×¢×¨×›×™× ×¡×ž×•×›×™× ×ž×¦×‘ (all - כל השינויי×, inc - רק תוספות, dec - רק גריעות)"
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr "char()‎ - מחזירה ×ת התו שמייצג ×ת קוד ×”Ö¾ASCII הנתון"
@@ -20140,7 +20179,7 @@ msgstr "צבע"
msgid "comma-separated list"
msgstr "רשימה מופרדת בפסיקי×"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr "concat()‎ - מחזירה מחרוזת ×©×”×™× ×ª×•×¦××” של ערך משורשר למחרוזת"
@@ -20155,15 +20194,15 @@ msgstr "הגדרה"
msgid "contains"
msgstr "מכיל"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr "cos()‎ - קוסינוס של ערך, ×›×שר הערך ×”×•× ×–×•×•×™×ª שמיוצגת ברדי×× ×™×"
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr "cosh()‎ - קוסינוס היפרבולי של ערך"
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr "cot()‎ - קוטנגנס של ערך, ×›×שר הערך ×”×™× ×–×•×•×™×ª שמבוט×ת ברדי×× ×™×"
@@ -20171,11 +20210,11 @@ msgstr "cot()‎ - קוטנגנס של ערך, ×›×שר הערך ×”×™× ×–×•×•×™
msgid "count"
msgstr "ספירה"
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count()‎ - מספר ערכי ×”Ö¾ V שהתקבלו בהצלחה (×•×ž×§×™×™×ž×™× ×ת המשתנה O) למשך T"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr "countunique()‎ - מספר ×”×¢×¨×›×™× ×”×™×—×•×“×™×™×"
@@ -20188,15 +20227,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date()‎ - ת×ריך נוכחי"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth()‎ - ×™×•× ×‘×—×•×“×©"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek()‎ - ×™×•× ×‘×©×‘×•×¢"
@@ -20214,7 +20253,7 @@ msgstr "ימי×"
msgid "default"
msgstr "בררת מחדל"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr "degrees()‎ - ממירה ערך מרדי×× ×™× ×œ×ž×¢×œ×•×ª"
@@ -20291,7 +20330,7 @@ msgstr "×œ× ×§×™×™×"
msgid "does not match"
msgstr "×œ× ×ª×•××"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr "e()‎ - מחזירה ×ת קבוע ×וילר"
@@ -20314,11 +20353,11 @@ msgstr "הודעת שגי××”"
msgid "exists"
msgstr "קיי×"
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr "exp()‎ - מספר ×וילר בחזקה של ערך"
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr "expm1()‎ - קבוע ×וילר בחזקת ערך פחות 1"
@@ -20334,7 +20373,7 @@ msgstr "פענוח ה־JSON נכשל"
msgid "file format is unsupported"
msgstr "סוג הקובץ ×ינו נתמך"
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr "find()‎ - בדיקת מופעי התבנית V (שמקיימת ×ת הסימן O) למשך T (1 - תו××, 0 - ×œ× ×ª×•××)"
@@ -20348,15 +20387,15 @@ msgstr "ר×שון"
msgid "first parameter is expected"
msgstr "×מור להיות הפרמטר הר×שון"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr "first()‎ - הערך הישן ביותר במשך זמן מסוי×"
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr "floor()‎ - מעגלת למטה למספר ×”×©×œ× ×”×§×¨×•×‘"
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast()‎ - תחזית למשך t השניות הב×ות לפי × ×ª×•× ×™× ×‘×ž×©×š T"
@@ -20364,7 +20403,7 @@ msgstr "forecast()‎ - תחזית למשך t השניות הב×ות לפי × ×
msgid "fourth"
msgstr "רביעי"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime()‎ - ההפרש בין ערך פריט (בתור חותמת זמן) וחותמת הזמן של שרת ×”Ö¾Zabbix קטנה ×ו שווה ל־T שניות (1 - ×מת, 0 - שקר)"
@@ -20438,7 +20477,7 @@ msgstr "בתוך"
msgid "in range"
msgstr "בטווח"
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr "in()‎ - בודקת ×× ×¢×¨×š שווה ל×חד ×ž×”×¢×¨×›×™× ×”×ž×•×’×“×¨×™× (1 - שווה, 0 - ×חרת)"
@@ -20447,11 +20486,11 @@ msgstr "in()‎ - בודקת ×× ×¢×¨×š שווה ל×חד ×ž×”×¢×¨×›×™× ×”×ž×•
msgid "including subgroups"
msgstr "כולל תת־קבוצות"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr "נוסחה שגויה לפריט מחושב"
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr "נוסחה שגויה לפריט מחושב מתחילה מ־„%1$sâ€"
@@ -20470,7 +20509,7 @@ msgstr "מניין ×¨×›×™×‘×™× ×©×’×•×™"
msgid "incorrect expression starting from \"%1$s\""
msgstr "ביטוי שגוי החל מ־„%1$sâ€"
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr "מספר התנ××™× ×©×’×•×™"
@@ -20488,7 +20527,7 @@ msgstr "שגי×ת תחביר ליד „%1$s“"
msgid "incorrect usage of function \"%1$s\""
msgstr "שימוש שגוי בפונקציה „%1$sâ€"
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr "insert()‎ - מוסיפה ×ª×•×•×™× ×ž×¡×•×™×ž×™× ×ו ×¨×•×•×—×™× ×œ×ž×—×¨×•×–×ª תווי×, בתחילת ×ž×™×§×•× ×ž×¡×•×™× ×‘×ž×—×¨×•×–×ª"
@@ -20548,7 +20587,7 @@ msgstr "×©× ×§×‘×•×¦×ª המ××¨×—×™× ×©×’×•×™×”"
msgid "invalid host name"
msgstr "×©× ×”×ž×רח שגוי"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20570,6 +20609,16 @@ msgstr "ביטוי רגולרי שגוי"
msgid "invalid second parameter in function \"%1$s\""
msgstr "משתנה שני שגוי בפונקציה „%1$sâ€"
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr "משתנה שביעי שגוי בפונקציה „%1$sâ€"
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr "משתנה שביעי שגוי בפונקציה „%1$sâ€"
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20611,7 +20660,7 @@ msgstr "תבנית פריט"
msgid "key is empty"
msgstr "המפתח ריק"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr "kurtosis()‎ - מודדת ×ת „ההזדנבות†של ההתפלגות"
@@ -20627,7 +20676,7 @@ msgctxt "week of month"
msgid "last"
msgstr "×חרון"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last()‎ - ערך ה־T (העדכני ביותר)"
@@ -20635,11 +20684,11 @@ msgstr "last()‎ - ערך ה־T (העדכני ביותר)"
msgid "left"
msgstr "שמ×ל"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr "left()‎ - מחזירה כמות ×›×–×ת של ×ª×•×•×™× ×ž×©×ž×ל"
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr "length()‎ - ×ורך ערך ×”Ö¾T ×”×חרון (העדכני ביותר) בתווי×"
@@ -20647,23 +20696,23 @@ msgstr "length()‎ - ×ורך ערך ×”Ö¾T ×”×חרון (העדכני ביות×
msgid "list of characters"
msgstr "רשימה של תווי×"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr "log()‎ - ×œ×•×’×¨×™×ª× ×˜×‘×¢×™"
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr "log10()‎ - ×œ×•×’×¨×™×ª× ×¢×©×¨×•× ×™"
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr "logeventid()‎ - מזהה ×”×ירוע של רשומת היומן ×”×חרונה שתו×מת לביטוי הרגולרי V למשך T (1 - תו××, 0 - ×œ× ×ª×•××)"
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr "logseverity()‎ - חומרת היומן של רשומת היומן ×”×חרונה בפרק זמן T"
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr "logsource()‎ - מקור היומן של רשומת היומן ×”×חרונה שתו×מת לביטוי הרגולרי V למשך T (1 - תו××, 0 - ×œ× ×ª×•××)"
@@ -20671,7 +20720,7 @@ msgstr "logsource()‎ - מקור היומן של רשומת היומן ×”×חר
msgid "low-level discovery rule"
msgstr "כלל גילוי ברמה נמוכה"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr "ltrim()‎ - מסירה ×ª×•×•×™× ×ž×¡×•×™×ž×™× ×ž×”×ª×—×œ×” של מחרוזת"
@@ -20703,11 +20752,11 @@ msgstr "המ×קרו ריק"
msgid "macro(s)"
msgstr "מ×קרו/×™×"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr "mad()‎ - ממוצע ערך מוחלט של סטיות"
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr "חסר משתנה חובה לפונקציה „%1$sâ€"
@@ -20743,7 +20792,7 @@ msgstr "מרבי"
msgid "max period is less than time filter default period"
msgstr "משך הזמן המרבי קטן ממשך הזמן של מסנן הזמן כבררת מחדל"
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max()‎ - ערך מרבי במשך T"
@@ -20757,7 +20806,7 @@ msgstr "כמות ×”×¤×¨×™×˜×™× ×”×ª×œ×•×™×™× ×”×ž×¨×‘×™×ª מול××”"
msgid "maximum number of dependency levels reached"
msgstr "כמות הרמות המרבית לתלויות מול××”"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr "mid()‎ - מחזירה תת־מחרוזת שמתחילה ×‘×ž×™×§×•× ×”×ª×• שצוין כהתחלה ב×ורך N תווי×"
@@ -20774,7 +20823,7 @@ msgstr "mid()‎ - מחזירה תת־מחרוזת שמתחילה ×‘×ž×™×§×•× ×
msgid "min"
msgstr "מזערי"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min()‎ - ערך מזערי במשך T"
@@ -20789,15 +20838,15 @@ msgstr "×”×ורך המזערי ×”×•× %1$s תווי×"
msgid "mm"
msgstr "ממ"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr "mod()‎ - ש×רית החילוק"
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr "monodec()‎ - בדיקת הקטנת ערך פריט ב×ופן רציף (1 - הנתון ×”×•× ×ž×•× ×•×˜×•× ×™, 0 - ×חרת), מצב (strict - דורש מונוטוניות קשיחה)"
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr "monoinc()‎ - בדיקת גדילת ערך פריט ב×ופן רציף (1 - הנתון ×”×•× ×ž×•× ×•×˜×•× ×™, 0 - ×חרת), מצב (strict - דורש מונוטוניות קשיחה)"
@@ -20879,7 +20928,7 @@ msgstr "ש×"
msgid "new"
msgstr "חדש"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "חדש"
@@ -20913,7 +20962,7 @@ msgstr "×ין הרש×ות ליצור ולערוך מפות"
msgid "no permissions to unacknowledge problems"
msgstr "×ין הרש×ות לבטל הכרה בתקלות"
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr "nodata()‎ - ×œ× ×”×ª×§×‘×œ×• × ×ª×•× ×™× ×‘×¤×¨×§ זמן T (1 - ×מת, 0 - שקר), מצב (קפדני - התעלמות מעיכוב בזמן מהמתווך בשליחת נתוני×)"
@@ -20934,7 +20983,7 @@ msgstr "×œ× ×‘×™×Ÿ"
msgid "not selected"
msgstr "×œ× × ×‘×—×¨"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now()‎ - מספר השניות מ××– ר×שית ספירת Epoch"
@@ -21021,15 +21070,15 @@ msgstr "נתיב/×ל/סוד:מפתח"
msgid "pattern"
msgstr "תבנית"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile()‎ - ×חוזון P במשך T"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr "pi()‎ - מחזירה ×ת הקבוע פ××™"
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr "power()‎ - ערך מעריך החזקה של הבסיס"
@@ -21037,15 +21086,15 @@ msgstr "power()‎ - ערך מעריך החזקה של הבסיס"
msgid "problem pattern"
msgstr "תבנית תקלה"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr "radians()‎ - ממירה ערך ממעלות לרדי×× ×™×"
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr "rand()‎ - ערך מספרי ×©×œ× ×קר××™"
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr "rate()‎ - מחזירה רמה ממוצעת לכל שנייה ×œ×ž×•× ×™× ×©×’×“×œ×™× ×‘×ופן ×חיד"
@@ -21094,11 +21143,11 @@ msgstr "ביטוי רגולרי"
msgid "regular expression"
msgstr "ביטוי רגולרי"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr "repeat()‎ - מחזירה מחרוזת שמורכבת מערך שחוזר מספר פעמי×"
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr "replace()‎ - חיפוש ×ž×•×¤×¢×™× ×©×œ תבנית בערך ×ž×¡×•×™× ×•×”×—×œ×¤×ª×"
@@ -21122,15 +21171,15 @@ msgstr "מייצג ×ת משתנה רמת התקריב בכתובת,"
msgid "right"
msgstr "ימינה"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr "right()‎ - מחזירה כמות ×›×–×ת של ×”×ª×•×•×™× ×”×™×ž× ×™×™× ×‘×™×•×ª×¨"
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr "round()‎ - מעגלת ערך ×œ×ž×™×§×•×ž×™× ×חרי הנקודה העשרונית"
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr "rtrim()‎ - מסירה ×ª×•×•×™× ×ž×¡×•×™×ž×™× ×ž×¡×•×£ המחרוזת"
@@ -21221,23 +21270,23 @@ msgstr "הצגת מיפוי סמלי×"
msgid "sign in as guest"
msgstr "כניסה ×›×ורח"
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr "signum()‎ - מחזירה ‎-1 ×× ×¢×¨×š ×”×•× ×©×œ×™×œ×™, 0 ×¢× ×”×¢×¨×š ×”×•× ×פס, 1 ×× ×¢×¨×š ×”×•× ×—×™×•×‘×™"
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr "sin()‎ - סינוס של ערך, ×›×שר הערך ×”×•× ×–×•×•×™×ª שמיוצגת ברדי×× ×™×"
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr "sinh()‎ - הסינוס ההיפרבולי של הערך"
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr "skewness()‎ - מודדת ×ת ×”×סימטריה של התפלגות ההסתברות"
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr "sqrt()‎ - שורש ריבועי של ערך"
@@ -21245,11 +21294,11 @@ msgstr "sqrt()‎ - שורש ריבועי של ערך"
msgid "standalone server"
msgstr "שרת עצמ××™"
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr "stddevpop()‎ - סטיית תקן של הקבוצה"
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr "stddevsamp()‎ - סטיית תקן של מדג×"
@@ -21257,11 +21306,11 @@ msgstr "stddevsamp()‎ - סטיית תקן של מדג×"
msgid "sum"
msgstr "סכו×"
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum()‎ - ×¡×›×•× ×”×¢×¨×›×™× ×‘×ž×©×š T"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr "sumofsquares()‎ - ×¡×›×•× ×¨×™×‘×•×¢×™×"
@@ -21289,7 +21338,7 @@ msgstr "פרטי הגישה שסופקו ××™× × ×™×—×•×“×™×™×"
msgid "tag"
msgstr "תגית"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr "tan()‎ - הטנגנס (משיק) של הערך"
@@ -21323,7 +21372,7 @@ msgstr "הזנת השורה החדשה ×”×חרונה חסרה"
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21370,31 +21419,35 @@ msgstr "משך הזמן כבררת המחדל של מסנן הזמן חורג מ
msgid "time shift"
msgstr "הפרש זמן"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time()‎ - השעה הנוכחית"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft()‎ - זמן להגיע לסף המוערך בהת×× ×œ×ž×©×š T"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr "trendavg()‎ - ערך ממוצע של משך זמן T ×¢× ×”×–×—×ª משך זמן מדויקת"
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr "trendcount()‎ - מספר ×”×¢×¨×›×™× ×©×”×ª×§×‘×œ×• בהצלחה בפרק הזמן T"
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr "trendmax()‎ - ערך מרבי לפרק זמן T ×¢× ×”×–×—×ª זמן מדויקת"
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr "trendmin()‎ - ערך מזערי לפרק זמן T ×¢× ×”×–×—×ª זמן מדויקת"
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr "trendstl()‎ - בדיקת חריגות לתקופה T"
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr "trendsum()‎ - סכו××” ×¢×¨×›×™× ×œ×¤×¨×§ זמן T ×¢× ×”×–×—×ª זמן מדויקת"
@@ -21420,11 +21473,11 @@ msgstr "×בטיפוס ההקפצה ×ינו ניתן להעברה לתבנית
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "הקפצות ×¢× ×§×™×©×•×¨×™×•×ª ×ינן ניתנות להעברה לתבנית ×ו למ×רח ×חרי×"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr "trim()‎ - הסרת ×ª×•×•×™× ×ž×¡×•×™×ž×™× ×ž×ª×—×™×œ×ª ×ו סוף מחרוזת"
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr "truncate()‎ - קוצץ ערך למקומות עשרוניי×"
@@ -21481,7 +21534,7 @@ msgstr "סוף המ×קרו בלתי צפוי"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21524,7 +21577,7 @@ msgstr "הערך „%1$s“ בלתי צפוי"
msgid "unknown"
msgstr "×œ× ×™×“×•×¢"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21723,11 +21776,11 @@ msgstr "ערך המשתנה השני ×רוך מדי"
msgid "value of third parameter must be one of %1$s"
msgstr "ערך המשתנה השלישי חייב להיות ×חת מתוך %1$s"
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr "varpop()‎ - שונות ×וכלוסיה"
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr "varsamp()‎ - סטיית דגימה"
diff --git a/ui/locale/hu/LC_MESSAGES/frontend.po b/ui/locale/hu/LC_MESSAGES/frontend.po
index 4364741f139..2cd3d330887 100644
--- a/ui/locale/hu/LC_MESSAGES/frontend.po
+++ b/ui/locale/hu/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-01-09 22:10+0300\n"
"Last-Translator: Robert <szenasy.robert@gmail.com>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -302,10 +302,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(nincs proxy)"
@@ -456,7 +456,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -525,7 +525,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -544,11 +544,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -560,24 +560,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -595,7 +595,7 @@ msgstr ""
msgid "Action"
msgstr "Eljárás"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr ""
@@ -605,7 +605,7 @@ msgstr ""
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Eljárás hozzáadva"
@@ -614,17 +614,17 @@ msgstr "Eljárás hozzáadva"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Eljárás törölve"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] ""
@@ -643,7 +643,7 @@ msgstr ""
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Eljárás frissítve"
@@ -690,7 +690,7 @@ msgid "Active till"
msgstr "Aktív eddig"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -749,14 +749,14 @@ msgstr "Aktív eddig"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -772,10 +772,10 @@ msgstr "Aktív eddig"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -787,9 +787,9 @@ msgstr "Aktív eddig"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -807,7 +807,7 @@ msgstr "Aktív eddig"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -852,7 +852,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -877,8 +877,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -891,7 +891,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1025,7 +1025,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1041,6 +1041,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Másodlagos név"
@@ -1355,7 +1359,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1435,9 +1439,9 @@ msgstr ""
msgid "Authentication"
msgstr "Authentikáció"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Autentikációs algoritmus"
@@ -1498,12 +1502,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automatikus"
@@ -1618,12 +1622,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1829,7 +1833,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Az eljárást nem lehet felvenni"
@@ -2127,7 +2131,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Az eljárást nem lehet törölni"
@@ -2294,12 +2298,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Script törlése sikertelen"
msgstr[1] "Script törlése sikertelen"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr ""
@@ -2316,7 +2320,7 @@ msgstr[1] "Szolgáltatás törlése sikertelen"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Minta nem törölhető"
@@ -2403,7 +2407,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] ""
@@ -2481,7 +2485,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2710,7 +2714,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] ""
msgstr[1] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2889,7 +2893,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -2955,7 +2959,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Az eljárást nem lehet frissíteni"
@@ -3015,7 +3019,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Hoszt frissítése sikertelen"
@@ -3118,9 +3122,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Script frissítése sikertelen"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3147,7 +3151,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "Minta frissítése sikertelen"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3233,14 +3237,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3258,10 +3262,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3301,9 +3305,9 @@ msgstr "Tartalmazza a következő szót"
msgid "Character string not included"
msgstr "Nem tartalmazza a következő szót"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3319,7 +3323,7 @@ msgstr ""
msgid "Check already exists."
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr ""
@@ -3441,8 +3445,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr ""
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr ""
@@ -3469,16 +3473,16 @@ msgstr "Óra"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3607,7 +3611,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3879,13 +3883,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3893,9 +3897,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4062,10 +4066,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Számol"
@@ -4155,7 +4159,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4357,7 +4361,7 @@ msgid "Current value"
msgstr ""
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4600,7 +4604,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4673,11 +4677,11 @@ msgstr ""
msgid "Date HW purchased"
msgstr ""
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Nap"
@@ -4718,8 +4722,8 @@ msgstr ""
msgid "December"
msgstr "December"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4729,7 +4733,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4860,7 +4864,7 @@ msgstr "Törlés"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Törlés ÉS kiürítés"
@@ -4869,11 +4873,11 @@ msgstr "Törlés ÉS kiürítés"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Figyelmeztetés: Ez a művelet törli a kijelölt mintákat és eltávolítja az érintett elemeket az összes csatolt hosztról"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr ""
@@ -5006,7 +5010,7 @@ msgstr "Törli a kiválasztott csoportokat?"
msgid "Delete selected host groups?"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5114,7 +5118,7 @@ msgstr "Törli a kiválasztott felhasználókat?"
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr ""
@@ -5175,7 +5179,7 @@ msgstr ""
msgid "Dependencies"
msgstr ""
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Függő"
@@ -5183,7 +5187,7 @@ msgstr "Függő"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5194,7 +5198,7 @@ msgid "Deployment status"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5209,16 +5213,16 @@ msgstr ""
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5230,10 +5234,10 @@ msgstr "Leírás"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Részletek"
@@ -5242,6 +5246,14 @@ msgstr "Részletek"
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Eszköz"
@@ -5364,7 +5376,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5391,17 +5403,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Letiltva"
@@ -5426,7 +5438,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5640,7 +5652,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5657,7 +5669,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5739,7 +5751,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5803,7 +5815,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Időtartam"
@@ -5833,14 +5845,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6096,7 +6108,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6134,13 +6146,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6156,11 +6168,11 @@ msgstr "Engedélyezve"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6236,6 +6248,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Esemény"
@@ -6805,8 +6821,8 @@ msgctxt "page navigation"
msgid "First"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6918,12 +6934,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Teljes klón"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funkció"
@@ -6939,7 +6955,7 @@ msgstr "GSM modem"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr ""
@@ -7289,7 +7305,7 @@ msgstr "Csoport név"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7302,12 +7318,11 @@ msgid "Grouping by"
msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Csoportok"
@@ -7526,7 +7541,7 @@ msgstr "Az előzmények törlése hosszabb időt vehet igénybe. Folytatja?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7557,7 +7572,7 @@ msgid "Horizontal align"
msgstr "Vízszintes igazítás"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7566,7 +7581,7 @@ msgstr "Vízszintes igazítás"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7577,7 +7592,7 @@ msgstr "Vízszintes igazítás"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7703,7 +7718,7 @@ msgid "Host group label type"
msgstr ""
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7722,8 +7737,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7773,7 +7788,7 @@ msgstr ""
msgid "Host label type"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7785,7 +7800,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Hoszt név"
@@ -7822,7 +7837,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7845,7 +7860,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7870,7 +7885,7 @@ msgstr ""
msgid "Host update failed."
msgstr ""
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Hoszt frissítve"
@@ -7947,6 +7962,10 @@ msgstr "Hosztok elhelyezkedése"
msgid "Hosts updated"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Órák"
@@ -8016,15 +8035,15 @@ msgstr "IP tartomány"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr ""
@@ -8256,7 +8275,7 @@ msgstr "Képek"
msgid "Images for all maps will be updated!"
msgstr ""
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Azonnal"
@@ -8338,7 +8357,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8350,11 +8369,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8469,7 +8488,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr ""
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr ""
@@ -8477,7 +8496,7 @@ msgstr ""
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr ""
@@ -8489,15 +8508,15 @@ msgstr ""
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8506,11 +8525,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8518,7 +8537,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr ""
@@ -8528,11 +8547,11 @@ msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr ""
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8541,11 +8560,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8845,8 +8864,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr "Hibás trigger kifejezés"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr ""
@@ -9244,7 +9263,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9253,11 +9272,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9269,7 +9288,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9289,7 +9308,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Beszúrás"
@@ -9348,8 +9367,8 @@ msgstr ""
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9441,7 +9460,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9502,10 +9521,10 @@ msgstr ""
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9568,8 +9587,8 @@ msgstr ""
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9791,11 +9810,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Leltár"
@@ -9809,7 +9828,7 @@ msgid "Inventory field"
msgstr ""
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr ""
@@ -9817,10 +9836,10 @@ msgstr ""
msgid "Is online?"
msgstr "Bejelentkezve?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9912,7 +9931,7 @@ msgstr[1] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10365,17 +10384,17 @@ msgstr "Utolsó hónap grafikonja"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Utolsó"
@@ -10452,8 +10471,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10487,8 +10506,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Kapcsolat"
@@ -10511,16 +10530,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Kapcsolatjelzők"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr ""
@@ -10536,13 +10548,6 @@ msgstr ""
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10681,7 +10686,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Belépés"
@@ -10763,16 +10768,16 @@ msgstr ""
msgid "Macro \"%1$s\" already exists."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Makrók"
@@ -10871,12 +10876,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr ""
@@ -11019,16 +11024,16 @@ msgstr "Inverz megjelölése"
msgid "Mark selected"
msgstr "Válaszott megjelölése"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11061,11 +11066,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11297,7 +11302,7 @@ msgstr ""
msgid "Middle"
msgstr "Középre"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11399,7 +11404,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11481,9 +11486,9 @@ msgstr "Hétfő"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Proxin keresztül monitorozva"
@@ -11502,6 +11507,7 @@ msgstr "Felügyelet"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Hónap"
@@ -11614,8 +11620,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11685,11 +11691,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11717,8 +11723,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11739,7 +11745,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12029,15 +12035,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12123,7 +12129,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12160,9 +12166,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12201,7 +12207,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12301,11 +12307,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12364,7 +12370,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12385,7 +12391,7 @@ msgid "No target selected."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12534,6 +12540,10 @@ msgstr "Értesítési riportok"
msgid "Notifications"
msgstr "Értesítések"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12620,6 +12630,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Ãllapotváltozások száma"
@@ -12795,7 +12809,7 @@ msgid "Off"
msgstr "KIKAPCSOL"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12842,7 +12856,7 @@ msgstr ""
msgid "One time only"
msgstr "Egy alkalommal"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Egyszeri kiesés"
@@ -12919,12 +12933,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12958,8 +12972,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Műveletek"
@@ -12994,7 +13008,7 @@ msgstr "Műveletek"
msgid "Operator"
msgstr "Operátor"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13034,19 +13048,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13076,10 +13090,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13342,10 +13356,10 @@ msgstr "HIBA"
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13358,19 +13372,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13422,12 +13436,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13482,13 +13496,13 @@ msgid "Passive"
msgstr ""
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13496,7 +13510,7 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13549,12 +13563,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13567,7 +13581,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13591,10 +13605,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13602,7 +13617,9 @@ msgstr ""
msgid "Period"
msgstr "Időszak"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13666,11 +13683,11 @@ msgstr ""
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13756,7 +13773,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13765,7 +13782,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13882,9 +13899,9 @@ msgstr ""
msgid "Private key file"
msgstr "Privát kulcsfájl"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr ""
@@ -14291,7 +14308,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14423,20 +14440,20 @@ msgstr "Távoli parancs"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14445,10 +14462,10 @@ msgstr "Távoli parancs"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14492,7 +14509,7 @@ msgstr "Távoli parancs"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14575,14 +14592,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14595,8 +14612,8 @@ msgstr "Csere"
msgid "Replace dependencies"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14797,7 +14814,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Eredmény"
@@ -15329,7 +15346,7 @@ msgstr ""
msgid "Script"
msgstr "Script"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15394,6 +15411,15 @@ msgstr "A keresési feltétel üres"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15472,7 +15498,7 @@ msgstr ""
msgid "Selected"
msgstr "Kijelölt"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15713,6 +15739,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16166,7 +16193,7 @@ msgstr "Spanyol (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr ""
@@ -16201,8 +16228,8 @@ msgstr ""
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16210,7 +16237,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16289,7 +16316,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16393,7 +16420,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16447,12 +16474,12 @@ msgstr "Straight"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16473,10 +16500,10 @@ msgstr ""
msgid "Subject"
msgstr "Tárgy"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16670,7 +16697,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16686,13 +16713,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16709,7 +16736,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16719,7 +16746,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16755,14 +16782,12 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Minta"
@@ -16806,7 +16831,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Minta törölve"
@@ -16818,11 +16843,11 @@ msgstr ""
msgid "Template linkage"
msgstr "Minta csatolások"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr ""
@@ -16857,13 +16882,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16872,10 +16896,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16886,7 +16912,7 @@ msgstr "Minták"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17100,7 +17126,7 @@ msgstr "Téma"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17138,7 +17164,7 @@ msgstr "Ebben az évben"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17171,15 +17197,15 @@ msgstr ""
msgid "Till"
msgstr "-ig"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17216,13 +17242,13 @@ msgstr ""
msgid "Time period"
msgstr "Idő periódus"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17914,9 +17940,9 @@ msgstr "Egységek"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Ismeretlen"
@@ -17934,7 +17960,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr ""
@@ -17966,16 +17992,16 @@ msgstr "Ismeretlen érték típus"
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Leválasztás"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Leválasztás és kiürítés"
@@ -18071,10 +18097,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18083,16 +18109,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18121,7 +18147,7 @@ msgstr ""
msgid "Update interval"
msgstr "Frissítési gyakoriság"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18148,7 +18174,7 @@ msgstr "Feltöltés"
msgid "Upper level maps"
msgstr "Felsőbb szintű térképek"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18334,7 +18360,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18470,15 +18496,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr ""
@@ -18792,11 +18818,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18870,14 +18896,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Érték-hozzárendelés"
@@ -18920,7 +18946,7 @@ msgstr ""
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19020,7 +19046,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr ""
@@ -19046,7 +19072,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Figyelmezetés"
@@ -19154,6 +19180,10 @@ msgstr ""
msgid "Wednesday"
msgstr "Szerda"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19426,7 +19456,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Év"
@@ -19486,7 +19517,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr ""
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19727,11 +19758,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19826,7 +19857,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19870,11 +19901,11 @@ msgstr "Piros"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19888,11 +19919,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19914,39 +19945,47 @@ msgstr ""
msgid "avg"
msgstr "átl"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19961,7 +20000,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20003,7 +20042,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20091,23 +20130,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20134,7 +20173,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20149,15 +20188,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20165,11 +20204,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20182,15 +20221,15 @@ msgstr ""
msgid "d.M"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20208,7 +20247,7 @@ msgstr "napok"
msgid "default"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20285,7 +20324,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20308,11 +20347,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20328,7 +20367,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20342,15 +20381,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20358,7 +20397,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20432,7 +20471,7 @@ msgstr "ban / ben"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20441,11 +20480,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20464,7 +20503,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20482,7 +20521,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20542,7 +20581,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20564,6 +20603,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20605,7 +20654,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20621,7 +20670,7 @@ msgctxt "week of month"
msgid "last"
msgstr "utolsó"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20629,11 +20678,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20641,23 +20690,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20665,7 +20714,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20697,11 +20746,11 @@ msgstr ""
msgid "macro(s)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20737,7 +20786,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20751,7 +20800,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20768,7 +20817,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20783,15 +20832,15 @@ msgstr ""
msgid "mm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20873,7 +20922,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20907,7 +20956,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20928,7 +20977,7 @@ msgstr "nem ban / ben"
msgid "not selected"
msgstr "nincs kiválasztva"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21015,15 +21064,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21031,15 +21080,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21088,11 +21137,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21116,15 +21165,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21215,23 +21264,23 @@ msgstr ""
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21239,11 +21288,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21251,11 +21300,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21283,7 +21332,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21317,7 +21366,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21364,31 +21413,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21414,11 +21467,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21475,7 +21528,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21518,7 +21571,7 @@ msgstr ""
msgid "unknown"
msgstr "ismeretlen"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21717,11 +21770,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/id/LC_MESSAGES/frontend.po b/ui/locale/id/LC_MESSAGES/frontend.po
index cd970ba3f62..dbee920fb27 100644
--- a/ui/locale/id/LC_MESSAGES/frontend.po
+++ b/ui/locale/id/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-10-10 08:26+0300\n"
"Last-Translator: richlv <richlv@nakts.net>\n"
"Language-Team: none\n"
@@ -284,10 +284,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(tanpa proxy)"
@@ -435,7 +435,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -504,7 +504,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -523,11 +523,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -539,24 +539,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -574,7 +574,7 @@ msgstr ""
msgid "Action"
msgstr "Tindakan"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr ""
@@ -584,7 +584,7 @@ msgstr ""
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Aksi ditambahkan"
@@ -593,16 +593,16 @@ msgstr "Aksi ditambahkan"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Aksi dihapus"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] ""
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] ""
@@ -620,7 +620,7 @@ msgstr ""
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Aksi diperbarui"
@@ -667,7 +667,7 @@ msgid "Active till"
msgstr "Aktif sampai"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -726,14 +726,14 @@ msgstr "Aktif sampai"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -749,10 +749,10 @@ msgstr "Aktif sampai"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -764,9 +764,9 @@ msgstr "Aktif sampai"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -784,7 +784,7 @@ msgstr "Aktif sampai"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -829,7 +829,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -854,8 +854,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -868,7 +868,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1002,7 +1002,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1018,6 +1018,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "alias"
@@ -1332,7 +1336,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1412,9 +1416,9 @@ msgstr ""
msgid "Authentication"
msgstr "Otentikasi"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Algoritma otentikasi"
@@ -1475,12 +1479,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Otomatis"
@@ -1595,12 +1599,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind password"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1806,7 +1810,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Tidak dapat menambah aksi"
@@ -2099,7 +2103,7 @@ msgstr[0] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Tidak dapat menghapus user Zabbix internal \"%1$s\", coba non-aktifkan user tersebut."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Tidak dapat menghapus aksi"
@@ -2253,12 +2257,12 @@ msgid "Cannot delete script"
msgid_plural "Cannot delete scripts"
msgstr[0] "Tidak dapat menghapus script"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Tidak dapat menghapus script. Script %1$s\" sedang digunakan pada operasi aksi \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Tidak dapat menghapus aksi yang dipilih"
@@ -2274,7 +2278,7 @@ msgstr[0] "Tidak dapat menghapus service"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Tidak dapat mengahapus template"
@@ -2357,7 +2361,7 @@ msgid "Cannot disable API token"
msgid_plural "Cannot disable API tokens"
msgstr[0] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] ""
@@ -2425,7 +2429,7 @@ msgid "Cannot enable API token"
msgid_plural "Cannot enable API tokens"
msgstr[0] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2644,7 +2648,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
msgstr[0] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2821,7 +2825,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -2887,7 +2891,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Tidak dapat perbarui aksi"
@@ -2946,7 +2950,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Tidak dapat perbarui host"
@@ -3047,9 +3051,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Tidak dapat perbarui script"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3076,7 +3080,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "Tidak dapat perbarui template"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3160,14 +3164,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3185,10 +3189,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3228,9 +3232,9 @@ msgstr "Termasuk string karakter"
msgid "Character string not included"
msgstr "Tidak termasuk string karakter"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3246,7 +3250,7 @@ msgstr ""
msgid "Check already exists."
msgstr "Pemeriksaan sudah ada."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Pemeriksaan bagian ekspresi dimulai dari \"%1$s\"."
@@ -3368,8 +3372,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr "Bersihkan riwayat dan tren"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Bersihkan ketika membatalkan penautan"
@@ -3396,16 +3400,16 @@ msgstr "Jam"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3534,7 +3538,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3806,13 +3810,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3820,9 +3824,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -3986,10 +3990,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Hitung"
@@ -4079,7 +4083,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4281,7 +4285,7 @@ msgid "Current value"
msgstr "Nilai saat ini"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4523,7 +4527,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4596,11 +4600,11 @@ msgstr "Tanggal HW pemeliharaan habis"
msgid "Date HW purchased"
msgstr "Tanggal HW dibeli"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Hari"
@@ -4641,8 +4645,8 @@ msgstr "Des"
msgid "December"
msgstr "Desember"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4652,7 +4656,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4783,7 +4787,7 @@ msgstr "Hapus"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Hapus dan bersihkan"
@@ -4792,11 +4796,11 @@ msgstr "Hapus dan bersihkan"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Hapus dan bersihkan template yang dipilih? (Peringatan: semua host yang terhubung akan dibersihkan!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Hapus dan bersihkan template? (Peringatan: semua host yang terhubung akan dibersihkan!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Hapus aksi yang berlaku?"
@@ -4929,7 +4933,7 @@ msgstr "Hapus grup yang dipilih?"
msgid "Delete selected host groups?"
msgstr "Hapus grup host yang dipilih?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5037,7 +5041,7 @@ msgstr "Hapus user yang dipilih?"
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Hapus template?"
@@ -5098,7 +5102,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Dependensi"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Tergantung"
@@ -5106,7 +5110,7 @@ msgstr "Tergantung"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5117,7 +5121,7 @@ msgid "Deployment status"
msgstr "Status deployment"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5132,16 +5136,16 @@ msgstr "Status deployment"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5153,10 +5157,10 @@ msgstr "Deskripsi"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detail"
@@ -5165,6 +5169,14 @@ msgstr "Detail"
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Perangkat"
@@ -5287,7 +5299,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5314,17 +5326,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Non-aktifkan"
@@ -5349,7 +5361,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5560,7 +5572,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5577,7 +5589,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5659,7 +5671,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5723,7 +5735,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Durasi"
@@ -5753,14 +5765,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6016,7 +6028,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6054,13 +6066,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6076,11 +6088,11 @@ msgstr "Aktif"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6156,6 +6168,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Error: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Event"
@@ -6724,8 +6740,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Pertama"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6837,12 +6853,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Full clone"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Fungsi"
@@ -6858,7 +6874,7 @@ msgstr "Modem GSM"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Akses GUI non-aktif."
@@ -7206,7 +7222,7 @@ msgstr "Nama grup"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7219,12 +7235,11 @@ msgid "Grouping by"
msgstr "Grup berdasarkan"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Grup"
@@ -7443,7 +7458,7 @@ msgstr "Pembersihan riwayat akan memakan waktu lama. Lanjutkan?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7474,7 +7489,7 @@ msgid "Horizontal align"
msgstr "Luruskan horisontal"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7483,7 +7498,7 @@ msgstr "Luruskan horisontal"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7494,7 +7509,7 @@ msgstr "Luruskan horisontal"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7617,7 +7632,7 @@ msgid "Host group label type"
msgstr "Tipe label grup host"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7636,8 +7651,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7687,7 +7702,7 @@ msgstr "Rangkuman inventaris Host"
msgid "Host label type"
msgstr "Tipe label host"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7699,7 +7714,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Nama host"
@@ -7736,7 +7751,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7758,7 +7773,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7783,7 +7798,7 @@ msgstr "Waktu host"
msgid "Host update failed."
msgstr "Perbarui host gagal."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Host diperbarui"
@@ -7860,6 +7875,10 @@ msgstr "Lokasi host"
msgid "Hosts updated"
msgstr "Host diperbarui"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Jam"
@@ -7929,15 +7948,15 @@ msgstr "Jarak IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8167,7 +8186,7 @@ msgstr "Gambar"
msgid "Images for all maps will be updated!"
msgstr "Gambar untuk semua peta akan diperbarui!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Segera"
@@ -8249,7 +8268,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8261,11 +8280,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8380,7 +8399,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Aksi kondisi pemeriksa penemuan salah."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Aksi kondisi pemeriksa penemuan salah. Pemeriksa penemuan tidak ada atau Anda tidak memiliki akses untuk itu."
@@ -8388,7 +8407,7 @@ msgstr "Aksi kondisi pemeriksa penemuan salah. Pemeriksa penemuan tidak ada atau
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Aksi kondisi aturan penemuan salah. Aturan penemuan tidak ada atau Anda tidak memiliki akses untuk itu."
@@ -8400,15 +8419,15 @@ msgstr "Aksi kondisi status penemuan salah."
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8417,11 +8436,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Aksi kondisi proxy salah. Proxy tidak ada atau Anda tidak memiliki akses untuk itu."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8429,7 +8448,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Aksi kondisi trigger salah. Trigger tidak ada atau Anda tidak memiliki akses untuk itu."
@@ -8439,11 +8458,11 @@ msgstr "Aksi kondisi tipe salah."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Kesalahan aksi operasi nilai langkah eskalasi."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8452,11 +8471,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8756,8 +8775,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr "Kesalahan ekspresi trigger"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Kesalahan ekspresi trigger."
@@ -9155,7 +9174,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9164,11 +9183,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9180,7 +9199,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9200,7 +9219,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Sisipkan"
@@ -9259,8 +9278,8 @@ msgstr "Interface dengan IP \"%1$s\" tidak boleh mengosongkan nama DNS ketika me
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Interface dengan IP \"%1$s\" nama DNS tidak boleh kosong."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9352,7 +9371,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9413,10 +9432,10 @@ msgstr "Metode parameter tidak sah."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9479,8 +9498,8 @@ msgstr "Metode parameter tidak sah."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9702,11 +9721,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventaris"
@@ -9720,7 +9739,7 @@ msgid "Inventory field"
msgstr "Field inventaris"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Mode inventaris"
@@ -9728,10 +9747,10 @@ msgstr "Mode inventaris"
msgid "Is online?"
msgstr "Apakah online?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9820,7 +9839,7 @@ msgstr[0] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10266,17 +10285,17 @@ msgstr "Grafik bulan terakhir"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Terakhir dari"
@@ -10353,8 +10372,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10388,8 +10407,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Tautan"
@@ -10412,16 +10431,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Indikator tautan"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Template tautan"
@@ -10437,13 +10449,6 @@ msgstr "Tautan ke template"
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10582,7 +10587,7 @@ msgstr "Log jebakan SNMP yang tidak sama"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Login"
@@ -10664,16 +10669,16 @@ msgstr "Makro \"%1$s\" sudah ada pada \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Makro \"%1$s\" sudah ada."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Makro"
@@ -10772,12 +10777,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manual"
@@ -10920,16 +10925,16 @@ msgstr "Tandai lainnya"
msgid "Mark selected"
msgstr "Tandai yang dipilih"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -10962,11 +10967,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11196,7 +11201,7 @@ msgstr ""
msgid "Middle"
msgstr "Tengah"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11297,7 +11302,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Hilangnya kunci \"%1$s\" untuk host \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11375,9 +11380,9 @@ msgstr "Senin"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Terpantau oleh proxy"
@@ -11396,6 +11401,7 @@ msgstr "Pemantauan"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Bulan"
@@ -11508,8 +11514,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11579,11 +11585,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11611,8 +11617,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11633,7 +11639,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -11923,15 +11929,15 @@ msgstr "Tidak ada aturan ID yang diberikan pada discovery."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12017,7 +12023,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12054,9 +12060,9 @@ msgstr "Tidak ada izin untuk akses sistem."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12095,7 +12101,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12195,11 +12201,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12258,7 +12264,7 @@ msgid "No public key file specified."
msgstr "Tidak file kunci publik yang dispesifikasikan."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12279,7 +12285,7 @@ msgid "No target selected."
msgstr "Tidak ada sasaran yang dipilih."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12428,6 +12434,10 @@ msgstr "Laporan notifikasi"
msgid "Notifications"
msgstr "Notifikasi"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12514,6 +12524,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Jumlah status yang berubah"
@@ -12689,7 +12703,7 @@ msgid "Off"
msgstr "Mati"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12736,7 +12750,7 @@ msgstr ""
msgid "One time only"
msgstr "Satu kali saja"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Satu-kali downtime"
@@ -12812,12 +12826,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12851,8 +12865,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operasi"
@@ -12887,7 +12901,7 @@ msgstr "Operasi"
msgid "Operator"
msgstr "Operator"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -12927,19 +12941,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -12969,10 +12983,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13235,10 +13249,10 @@ msgstr "MASALAH"
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13251,19 +13265,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13315,12 +13329,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Aturan discovery induk"
@@ -13375,13 +13389,13 @@ msgid "Passive"
msgstr "Pasif"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13389,7 +13403,7 @@ msgstr "Pasif"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13442,12 +13456,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13460,7 +13474,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13484,10 +13498,11 @@ msgstr "Baris persentil (kanan)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13495,7 +13510,9 @@ msgstr ""
msgid "Period"
msgstr "Periode"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13559,11 +13576,11 @@ msgstr "Mainkan suara"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13649,7 +13666,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13658,7 +13675,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13775,9 +13792,9 @@ msgstr ""
msgid "Private key file"
msgstr "File kunci pribadi"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Tingkatan hak"
@@ -14183,7 +14200,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14313,20 +14330,20 @@ msgstr "Perintah jarak jauh"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14335,10 +14352,10 @@ msgstr "Perintah jarak jauh"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14382,7 +14399,7 @@ msgstr "Perintah jarak jauh"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14465,14 +14482,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14485,8 +14502,8 @@ msgstr "Gantikan"
msgid "Replace dependencies"
msgstr "Gantikan dependensi"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14687,7 +14704,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Hasil "
@@ -15216,7 +15233,7 @@ msgstr ""
msgid "Script"
msgstr "Skrip"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15280,6 +15297,15 @@ msgstr "Pola pencarian kosong"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Sel POC kedua"
@@ -15358,7 +15384,7 @@ msgstr ""
msgid "Selected"
msgstr "Dipilih"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Aksi yang dipilih dihapus"
@@ -15598,6 +15624,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16051,7 +16078,7 @@ msgstr "Spanish (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Skrip yang dispesifikasikan tidak ada atau Anda tidak memiliki hak atasnya untuk perintah aksi operasi."
@@ -16086,8 +16113,8 @@ msgstr "Item standar"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16095,7 +16122,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Memulai"
@@ -16174,7 +16201,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16278,7 +16305,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16332,12 +16359,12 @@ msgstr "Lurus"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16358,10 +16385,10 @@ msgstr ""
msgid "Subject"
msgstr "Subyek"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16555,7 +16582,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16571,13 +16598,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16594,7 +16621,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16604,7 +16631,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16640,14 +16667,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Template"
@@ -16691,7 +16716,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Template telah dihapus"
@@ -16703,11 +16728,11 @@ msgstr "Template grup"
msgid "Template linkage"
msgstr "Template linkage"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Nama template"
@@ -16742,13 +16767,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16757,10 +16781,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16771,7 +16797,7 @@ msgstr "Template"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Template \"%1$s\" tidak dihubungkan dari host \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -16983,7 +17009,7 @@ msgstr "Theme"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17021,7 +17047,7 @@ msgstr "Tahun ini"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17054,15 +17080,15 @@ msgstr ""
msgid "Till"
msgstr "Hingga"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17099,13 +17125,13 @@ msgstr ""
msgid "Time period"
msgstr "Periode waktu"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17793,9 +17819,9 @@ msgstr "Unit"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Tidak dikenal"
@@ -17813,7 +17839,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Item host yang tidak dikenal, tidak ada item tersebut dalam host yang terpilih"
@@ -17845,16 +17871,16 @@ msgstr "Tipe nilai tidak dikenal"
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Putuskan"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Putuskan dan bersihkan"
@@ -17949,10 +17975,10 @@ msgstr "Nyala"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -17961,16 +17987,16 @@ msgstr "Nyala"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -17999,7 +18025,7 @@ msgstr "Perbaru yang ada"
msgid "Update interval"
msgstr "Perbaru interval"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18026,7 +18052,7 @@ msgstr "Unggah"
msgid "Upper level maps"
msgstr "Tingkat peta lebih atas"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18209,7 +18235,7 @@ msgstr[0] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18343,15 +18369,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Username"
@@ -18665,11 +18691,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18743,14 +18769,14 @@ msgstr "Peta nilai \"%1$s\" sudah ada."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Pemetaan nilai"
@@ -18793,7 +18819,7 @@ msgstr "Nilai: tidak ada data"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -18893,7 +18919,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Nama terlihat"
@@ -18919,7 +18945,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Peringatan"
@@ -19025,6 +19051,10 @@ msgstr "Rab"
msgid "Wednesday"
msgstr "Rabu"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19297,7 +19327,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Tahun"
@@ -19357,7 +19388,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Anda tidak dapat memilih beberapa bahasa, karena locale untuk mereka tidak terinstall pada web server."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19598,11 +19629,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19697,7 +19728,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19741,11 +19772,11 @@ msgstr "sebagai Merah"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19759,11 +19790,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19785,39 +19816,47 @@ msgstr ""
msgid "avg"
msgstr "avg"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19832,7 +19871,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19874,7 +19913,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -19962,23 +20001,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20005,7 +20044,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20020,15 +20059,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20036,11 +20075,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20053,15 +20092,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20079,7 +20118,7 @@ msgstr "hari"
msgid "default"
msgstr "standar"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20156,7 +20195,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20179,11 +20218,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20199,7 +20238,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20213,15 +20252,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20229,7 +20268,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20303,7 +20342,7 @@ msgstr "dalam"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20312,11 +20351,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20335,7 +20374,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20353,7 +20392,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20413,7 +20452,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20435,6 +20474,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20476,7 +20525,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20492,7 +20541,7 @@ msgctxt "week of month"
msgid "last"
msgstr "terakhir"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20500,11 +20549,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20512,23 +20561,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20536,7 +20585,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20568,11 +20617,11 @@ msgstr ""
msgid "macro(s)"
msgstr "makro"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20608,7 +20657,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20622,7 +20671,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20639,7 +20688,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20654,15 +20703,15 @@ msgstr ""
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20744,7 +20793,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20778,7 +20827,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20799,7 +20848,7 @@ msgstr "tidak didalam"
msgid "not selected"
msgstr "tidak dipilih"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -20886,15 +20935,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -20902,15 +20951,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -20959,11 +21008,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -20987,15 +21036,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21086,23 +21135,23 @@ msgstr "tampilkan pemetaan ikon"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21110,11 +21159,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21122,11 +21171,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21154,7 +21203,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21188,7 +21237,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21235,31 +21284,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21285,11 +21338,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21346,7 +21399,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21389,7 +21442,7 @@ msgstr ""
msgid "unknown"
msgstr "tidak diketahui"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21586,11 +21639,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/it/LC_MESSAGES/frontend.po b/ui/locale/it/LC_MESSAGES/frontend.po
index e14571aed49..8595c921ee9 100644
--- a/ui/locale/it/LC_MESSAGES/frontend.po
+++ b/ui/locale/it/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2016-04-20 12:06+0300\n"
"Last-Translator: quadrata <dimitri.bellini@quadrata.it>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -302,10 +302,10 @@ msgstr "(0 - usa azione di default)"
msgid "(Only super admins can create groups)"
msgstr "(Solo i super amministratori possono creare gruppi)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(nessun proxy)"
@@ -456,7 +456,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -525,7 +525,7 @@ msgstr "Acknowledged RESOLVED events"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -544,11 +544,11 @@ msgstr "Acknowledged RESOLVED events"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -560,24 +560,24 @@ msgstr "Acknowledged RESOLVED events"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -595,7 +595,7 @@ msgstr "Acknowledged RESOLVED events"
msgid "Action"
msgstr "Azione"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "L'azione \"%1$s\" esiste già."
@@ -605,7 +605,7 @@ msgstr "L'azione \"%1$s\" esiste già."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Azione aggiunta"
@@ -614,17 +614,17 @@ msgstr "Azione aggiunta"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Azione rimossa"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Azione disabilitata"
msgstr[1] "Azioni disabilitate"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Azione abilitata"
@@ -643,7 +643,7 @@ msgstr "Action log"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Azione aggiornata"
@@ -690,7 +690,7 @@ msgid "Active till"
msgstr "Attivo fino a"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -749,14 +749,14 @@ msgstr "Attivo fino a"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -772,10 +772,10 @@ msgstr "Attivo fino a"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -787,9 +787,9 @@ msgstr "Attivo fino a"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -807,7 +807,7 @@ msgstr "Attivo fino a"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -852,7 +852,7 @@ msgstr "Aggiungi elemento child"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -877,8 +877,8 @@ msgstr "Aggiungi mappe multiple"
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -891,7 +891,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1025,7 +1025,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1041,6 +1041,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1355,7 +1359,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1435,9 +1439,9 @@ msgstr ""
msgid "Authentication"
msgstr "Autenticazione"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Algoritmo di autenticazione"
@@ -1498,12 +1502,12 @@ msgstr "Le opzioni Auto-login e auto-logout non possono essere abilitate insieme
msgid "Auto-logout"
msgstr "Auto-logout"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automatico"
@@ -1618,12 +1622,12 @@ msgstr "Associa DN"
msgid "Bind password"
msgstr "Associa password"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1829,7 +1833,7 @@ msgstr "Impossibile aggiungere un item non-numerico \"%1$s\" al grafico \"%2$s\"
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Impossibile aggiungere un item non-numerico \"%1$s\" al prototipo di grafico \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Impossibile aggiungere l'azione"
@@ -2127,7 +2131,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Impossibile rimuovere utente interno Zabbix \"%1$s\", prova a disabilitare quell'utente."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Impossibile cancellare l'azione"
@@ -2293,12 +2297,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Impossibile rimuovere lo script"
msgstr[1] "Impossibile rimuovere lo script"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Impossibile rimuovere gli script. Lo script \"%1$s\" e' utilizzato nell'operazione \"%2$s\" dell'azione."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Impossibile rimuovere azioni selezionate."
@@ -2315,7 +2319,7 @@ msgstr[1] "Impossibile rimuovere il servizio"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Impossibile rimuovere il template"
@@ -2402,7 +2406,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Impossibile disabilitare azione"
@@ -2480,7 +2484,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Impossibile abilitare l'azione"
@@ -2709,7 +2713,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "Non e' possibile importare il template \"%1$s\", template collegato \"%2$s\" inesistente."
msgstr[1] "Non e' possibile importare il template \"%1$s\", template collegati \"%2$s\" inesistenti."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Impossibile inserire espressione trigger"
@@ -2888,7 +2892,7 @@ msgstr "Impossibile scollegare template."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Impossibile aggiornate \"%1$s\" per l'azione \"%2$s\"."
@@ -2954,7 +2958,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Impossibile aggiornare uno scenario web di tipo template \"%1$s\": %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Impossibile aggiornare l'azione"
@@ -3014,7 +3018,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Impossibile aggiornare gruppi per l'host discoverato \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Impossibile aggiornare l'host"
@@ -3117,9 +3121,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Impossibile aggiornare lo script"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3146,7 +3150,7 @@ msgstr "Impossibile aggiornare lo step per uno scenario web di tipo template \"%
msgid "Cannot update template"
msgstr "Impossibile aggiornare il template"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3232,14 +3236,14 @@ msgstr "Cattura tutte le trap SNMP che non sono state catturate da item di tipo
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Certificato"
@@ -3257,10 +3261,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Cambiare"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3300,9 +3304,9 @@ msgstr "Stringa di caratteri inclusa"
msgid "Character string not included"
msgstr "Stringa di caratteri non inclusa"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3318,7 +3322,7 @@ msgstr "Informazioni chassis. Restituisce stringa"
msgid "Check already exists."
msgstr "Il controllo esiste già."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Controlla la porzione di espressione che parte da \"%1$s\"."
@@ -3440,8 +3444,8 @@ msgstr "Cancella storico"
msgid "Clear history and trends"
msgstr "Pulisci storico e trend"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Pulisci duranto lo scollegamento"
@@ -3468,16 +3472,16 @@ msgstr "Orologio"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3606,7 +3610,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr "Sessioni concorrenti"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3878,13 +3882,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Connessioni"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Connessioni dall'host"
@@ -3892,9 +3896,9 @@ msgstr "Connessioni dall'host"
msgid "Connections from proxy"
msgstr "Connessioni dal proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Connessioni verso l'host"
@@ -4062,10 +4066,10 @@ msgstr "Regola di Correlazione"
msgid "Correlation updated"
msgstr "Correlazione aggiornata"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Conteggio"
@@ -4155,7 +4159,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4357,7 +4361,7 @@ msgid "Current value"
msgstr "Valore corrente"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Personalizzato"
@@ -4600,7 +4604,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4673,11 +4677,11 @@ msgstr "Data di scadenza manutenzione HW"
msgid "Date HW purchased"
msgstr "Data di acquisto HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Giorno"
@@ -4718,8 +4722,8 @@ msgstr "Dic"
msgid "December"
msgstr "Dicembre"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4729,7 +4733,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4860,7 +4864,7 @@ msgstr "Rimuovi"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Rimuovi e pulisci"
@@ -4869,11 +4873,11 @@ msgstr "Rimuovi e pulisci"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Rimuovere e pulire template selezionati? (Attenzione: tutti gli host collegati saranno puliti!)Rimuovere e pulire template selezionati? (Attenzione: tutti gli host collegati saranno puliti!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Rimuovere e pulire il template? (Attenzione: tutti gli host collegati saranno puliti!)Rimuovere e pulire il template? (Attenzione: tutti gli host collegati saranno puliti!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Rimuovere azione corrente?"
@@ -5006,7 +5010,7 @@ msgstr "Rimuovere gruppi selezionati?"
msgid "Delete selected host groups?"
msgstr "Rimuovere gruppi di host selezionati?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Rimuovere prototipi host selezionati?"
@@ -5114,7 +5118,7 @@ msgstr "Rimuovere utenti selezionati?"
msgid "Delete selected web scenarios?"
msgstr "Cancella scenario web selezionato?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Rimuovere template?"
@@ -5175,7 +5179,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Dipendenze"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Subordinato"
@@ -5183,7 +5187,7 @@ msgstr "Subordinato"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5194,7 +5198,7 @@ msgid "Deployment status"
msgstr "Stato di deploy"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5209,16 +5213,16 @@ msgstr "Stato di deploy"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5230,10 +5234,10 @@ msgstr "Descrizione"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Dettagli"
@@ -5242,6 +5246,14 @@ msgstr "Dettagli"
msgid "Details of web scenario"
msgstr "Dettagli scenario web"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Dispositivo"
@@ -5364,7 +5376,7 @@ msgstr "Disabilitare scenario web selezionato?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5391,17 +5403,17 @@ msgstr "Disabilitare scenario web selezionato?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Disabilitato"
@@ -5426,7 +5438,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5640,7 +5652,7 @@ msgstr "Mostra grafico stacked"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5657,7 +5669,7 @@ msgstr "Visualizzati %1$s a %2$s di %3$s trovati"
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5739,7 +5751,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Scarica il file di configurazione"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5803,7 +5815,7 @@ msgstr "Userid duplicato \"%1$s\" sugli utenti per la mappa \"%2$s\"."
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Durata"
@@ -5833,14 +5845,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6096,7 +6108,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6134,13 +6146,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6156,11 +6168,11 @@ msgstr "Abilitato"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Encryption"
@@ -6236,6 +6248,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Errore: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Evento"
@@ -6805,8 +6821,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Primo"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Adatta"
@@ -6918,12 +6934,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Clona tutto"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funzione"
@@ -6939,7 +6955,7 @@ msgstr "Modem GSM"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Accesso GUI disabilitato."
@@ -7288,7 +7304,7 @@ msgstr "Nome del gruppo"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Il prototipo gruppo non può esser basato su un gruppo host discoverato \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Prototipi gruppo"
@@ -7301,12 +7317,11 @@ msgid "Grouping by"
msgstr "Raggruppamento per"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Gruppi"
@@ -7525,7 +7540,7 @@ msgstr "La pulizia dello storico può durare a lungo. Continuare?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7556,7 +7571,7 @@ msgid "Horizontal align"
msgstr "Allinea in orizzontale"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7565,7 +7580,7 @@ msgstr "Allinea in orizzontale"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7576,7 +7591,7 @@ msgstr "Allinea in orizzontale"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7702,7 +7717,7 @@ msgid "Host group label type"
msgstr "Tipo etichetta gruppo host"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7721,8 +7736,8 @@ msgstr "Host group con ID \"%1$s\" non è disponibile."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7772,7 +7787,7 @@ msgstr "Panoramica inventario host"
msgid "Host label type"
msgstr "Tipo etichetta host"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Host macro"
@@ -7784,7 +7799,7 @@ msgstr "Metadati host"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Nome host"
@@ -7821,7 +7836,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Prototipo host rimosso"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7844,7 +7859,7 @@ msgstr "Il prototipo host con nome visibile \"%1$s\" esiste già nella regola di
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Prototipo host"
@@ -7869,7 +7884,7 @@ msgstr "Ora dell'host"
msgid "Host update failed."
msgstr "Aggiornamento host fallito."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Host aggiornato"
@@ -7946,6 +7961,10 @@ msgstr "Posizione host"
msgid "Hosts updated"
msgstr "Host aggiornati"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Ore"
@@ -8015,15 +8034,15 @@ msgstr "Intervallo IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "La gamma IP \"%1$s\" supera il limite di indirizzo \"%2$s\""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8255,7 +8274,7 @@ msgstr "Immagini"
msgid "Images for all maps will be updated!"
msgstr "Le immagini di tutte le mappe verranno aggiornate!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Immediatamente"
@@ -8337,7 +8356,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8349,11 +8368,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8468,7 +8487,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Controllo discovery errato per la condizione dell'azione."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Controllo discovery errato per la condizione dell'azione. Il controllo discovery non esiste o non hai accesso ad esso.Controllo discovery errato per la condizione dell'azione. Il controllo discovery non esiste o non hai accesso ad esso."
@@ -8476,7 +8495,7 @@ msgstr "Controllo discovery errato per la condizione dell'azione. Il controllo d
msgid "Incorrect action condition discovery object."
msgstr "Oggetto discovery della condizione azione errato."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Regola di discovery errata per la condizione dell'azione. La regola di discovery non esiste o non hai accesso ad essa.Regola di discovery errata per la condizione dell'azione. La regola di discovery non esiste o non hai accesso ad essa."
@@ -8488,15 +8507,15 @@ msgstr "Stato discovery errato per la condizione dell'azione."
msgid "Incorrect action condition event type."
msgstr "Tipo evento errato per la condizione dell'azione."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8505,11 +8524,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Porta della condizione azione \"%1$s\" errata."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Proxy errato per la condizione dell'azione. Il proxy non esiste o non hai accesso ad esso.Proxy errato per la condizione dell'azione. Il proxy non esiste o non hai accesso ad esso."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8517,7 +8536,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Severity del trigger nella condizione azione errata."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Trigger errato per la condizione dell'azione. Il trigger non esiste o non hai accesso ad esso.Trigger errato per la condizione dell'azione. Il trigger non esiste o non hai accesso ad esso."
@@ -8527,11 +8546,11 @@ msgstr "Tipo errato per la condizione dell'azione."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Valori dei passi di escalation errati per l'operazione dell'azione."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8540,11 +8559,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Non corretta azione tipo operazione \"%1$s\" per origine evento \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8844,8 +8863,8 @@ msgstr "Errato conteggio \"step\" sul web scenario proveniente dal template."
msgid "Incorrect trigger expression"
msgstr "Espressione trigger errata"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Espressione trigger errata."
@@ -9243,7 +9262,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Informazioni su un servizio. Restituisce intero con param come stato, di avvio; stringa - con param come displayname, percorso, utente; testo - con parametro come descrizione; In particolare per lo stato: 0 - in esecuzione, 1 - in pausa, 2 - attesa avvio, 3 - attesa pausa, 4 - continua attesa, 5 - attesa stop, 6 - fermato, 7 - sconosciuto, 255 - nessun servizio; In particolare per l'avvio: 0 - automatico, 1 - automatico ritardato, 2 - manuale, 3 - disabilitato, 4 - sconosciuto"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9252,11 +9271,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Eredita host macro"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9268,7 +9287,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Ereditato e macro template"
@@ -9288,7 +9307,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Inserisci"
@@ -9347,8 +9366,8 @@ msgstr "L'interfaccia con IP \"%1$s\" non può avere nome DNS vuoto avendo la pr
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "L'interfaccia con IP \"%1$s\" non può avere nome DNS vuoto."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9440,7 +9459,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "Action condition non valido: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9501,10 +9520,10 @@ msgstr "Parametri del metodo non validi."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9567,8 +9586,8 @@ msgstr "Parametri del metodo non validi."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9790,11 +9809,11 @@ msgstr "Periodo di tempo non valido."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventario"
@@ -9808,7 +9827,7 @@ msgid "Inventory field"
msgstr "Campo inventario"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Modalità inventario"
@@ -9816,10 +9835,10 @@ msgstr "Modalità inventario"
msgid "Is online?"
msgstr "È online?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Emittente"
@@ -9911,7 +9930,7 @@ msgstr[1] "Item disabilitato"
msgid "Item in \"not supported\" state"
msgstr "Item in stato \"non supportato\""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Item non selezionato"
@@ -10364,17 +10383,17 @@ msgstr "Grafico ultimo mese"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Ultimo di"
@@ -10451,8 +10470,8 @@ msgstr "Trim sinistro"
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10486,8 +10505,8 @@ msgstr "Tipo linea"
msgid "Line width"
msgstr "Spessore linea"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Collegamento"
@@ -10510,16 +10529,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Indicatori collegamento"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Template di collegamento"
@@ -10535,13 +10547,6 @@ msgstr "Collega ai template"
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10680,7 +10685,7 @@ msgstr "Registrare trap SNMP sconosciute"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Accesso"
@@ -10762,16 +10767,16 @@ msgstr "La macro \"%1$s\" esiste già su \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "La macro \"%1$s\" esiste già."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Macro"
@@ -10870,12 +10875,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manuale"
@@ -11018,16 +11023,16 @@ msgstr "Evidenzia altri"
msgid "Mark selected"
msgstr "Evidenzia selezionati"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Maschera"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11060,11 +11065,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11296,7 +11301,7 @@ msgstr ""
msgid "Middle"
msgstr "Centro"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11398,7 +11403,7 @@ msgstr "Item mancanti per il prototipo grafico \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Chiave \"%1$s\" mancante per l'host \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11480,9 +11485,9 @@ msgstr "Lunedì"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Monitorato dal proxy"
@@ -11501,6 +11506,7 @@ msgstr "Monitoraggio"
msgid "Monospace"
msgstr "Monospace"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Mese"
@@ -11613,8 +11619,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11684,11 +11690,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11716,8 +11722,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11738,7 +11744,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12028,15 +12034,15 @@ msgstr "Nessun ID regola di discovery fornito."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Nessuna encryption"
@@ -12122,7 +12128,7 @@ msgstr "Nessuna corrispondenza trovata"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12159,9 +12165,9 @@ msgstr "Nessun permesso per l'accesso al sistema."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12200,7 +12206,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12300,11 +12306,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12363,7 +12369,7 @@ msgid "No public key file specified."
msgstr "Nessun file di chiave pubblica specificato."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12384,7 +12390,7 @@ msgid "No target selected."
msgstr "Nessun target selezionato."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12533,6 +12539,10 @@ msgstr "Report notifiche"
msgid "Notifications"
msgstr "Notifiche"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12619,6 +12629,10 @@ msgstr "Numero di processori sulla macchina virtuale VMware, <url> - URL servizi
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Numero di cambiamenti di stato"
@@ -12795,7 +12809,7 @@ msgid "Off"
msgstr "Off"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12842,7 +12856,7 @@ msgstr "Uno"
msgid "One time only"
msgstr "Solo una volta"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Inattività una-volta"
@@ -12919,12 +12933,12 @@ msgstr "Informazioni Sistema Operativo. Restituisce stringa"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12958,8 +12972,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operazioni"
@@ -12994,7 +13008,7 @@ msgstr "Operazioni"
msgid "Operator"
msgstr "Operatore"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13034,19 +13048,19 @@ msgstr "Or"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13076,10 +13090,10 @@ msgstr "Or"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13342,10 +13356,10 @@ msgstr "PROBLEMA"
msgid "PROBLEM event generation mode"
msgstr "modalità di generazione eventi PROBLEM"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13358,19 +13372,19 @@ msgstr "modalità di generazione eventi PROBLEM"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "PSK identity"
@@ -13422,12 +13436,12 @@ msgid "Parameters"
msgstr "Parametri"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Regole di discovery primarie"
@@ -13482,13 +13496,13 @@ msgid "Passive"
msgstr "Passivo"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13496,7 +13510,7 @@ msgstr "Passivo"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13549,12 +13563,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Incolla senza link esterni"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13567,7 +13581,7 @@ msgstr "Picco memoria usata: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Percentuale"
@@ -13591,10 +13605,11 @@ msgstr "Linea di percentile (destra)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Esegue una query DNS. Restituisce una stringa di caratteri con le informazioni richieste"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13602,7 +13617,9 @@ msgstr "Esegue una query DNS. Restituisce una stringa di caratteri con le inform
msgid "Period"
msgstr "Periodo"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13666,11 +13683,11 @@ msgstr "Riproduci suono"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Si prega di controllare i parametri di configurazione. Se tutto è corretto, premere il pulsante \"%1$s\", o il pulsante \"%2$s\" per modificare i parametri di configurazione."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13756,7 +13773,7 @@ msgstr "Tipo POST"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13765,7 +13782,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Sommario pre-installazione"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13882,9 +13899,9 @@ msgstr "Privato"
msgid "Private key file"
msgstr "File chiave privata"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Livello privilegi"
@@ -14291,7 +14308,7 @@ msgstr "Espressione di recovery"
msgid "Recovery expression syntax error."
msgstr "Errore di sintassi sull'espressione di recovery."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Operazioni di recovery"
@@ -14422,20 +14439,20 @@ msgstr "Comando remoto"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14444,10 +14461,10 @@ msgstr "Comando remoto"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14491,7 +14508,7 @@ msgstr "Comando remoto"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14574,14 +14591,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14594,8 +14611,8 @@ msgstr "Sostituisci"
msgid "Replace dependencies"
msgstr "Sostituisci dipendenze"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14796,7 +14813,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Risultato"
@@ -15328,7 +15345,7 @@ msgstr ""
msgid "Script"
msgstr "Script"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Lo script \"%s\" esiste già."
@@ -15393,6 +15410,15 @@ msgstr "Il pattern di ricerca è vuoto"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Cella POC secondaria"
@@ -15471,7 +15497,7 @@ msgstr ""
msgid "Selected"
msgstr "Selezionati"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Azioni selezionate eliminate"
@@ -15712,6 +15738,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16165,7 +16192,7 @@ msgstr "Spagnolo (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Lo script specificato non esiste o non hai i diritti su esso per il comando dell'operazione azione.Lo script specificato non esiste o non hai i diritti su esso per il comando dell'operazione azione."
@@ -16200,8 +16227,8 @@ msgstr "Item standard"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16209,7 +16236,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Inizia in"
@@ -16288,7 +16315,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16392,7 +16419,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Il passo con nome \"%1$s\" esiste già."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16446,12 +16473,12 @@ msgstr "Dritto"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16472,10 +16499,10 @@ msgstr "Sottofiltro"
msgid "Subject"
msgstr "Soggetto"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Oggetto"
@@ -16669,7 +16696,7 @@ msgstr "Valore tag"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16685,13 +16712,13 @@ msgstr "Valore tag"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16708,7 +16735,7 @@ msgstr "Valore tag"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16718,7 +16745,7 @@ msgstr "Valore tag"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16754,14 +16781,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Template"
@@ -16805,7 +16830,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Template rimosso"
@@ -16817,11 +16842,11 @@ msgstr "Gruppo template"
msgid "Template linkage"
msgstr "Collegamento template"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Template macro"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Nome template"
@@ -16856,13 +16881,12 @@ msgstr "Template con stesso nome visibile \"%1$s\" gia' presente."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16871,10 +16895,12 @@ msgstr "Template con stesso nome visibile \"%1$s\" gia' presente."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16885,7 +16911,7 @@ msgstr "Template"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Template \"%1$s\" scollegati dagli host \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17099,7 +17125,7 @@ msgstr "Tema"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17137,7 +17163,7 @@ msgstr "Quest'anno"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Soglia"
@@ -17170,15 +17196,15 @@ msgstr ""
msgid "Till"
msgstr "Fino a"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17215,13 +17241,13 @@ msgstr ""
msgid "Time period"
msgstr "Periodo di tempo"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17913,9 +17939,9 @@ msgstr "Unità"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Sconosciuto"
@@ -17933,7 +17959,7 @@ msgid "Unknown error"
msgstr "Errore sconosciuto"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Item host sconosciuto, nessun item di questo tipo nell'host selezionato"
@@ -17965,16 +17991,16 @@ msgstr "Tipo valore sconosciuto"
msgid "Unlimited"
msgstr "Illimitato"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Scollega"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Scollega e pulisci"
@@ -18070,10 +18096,10 @@ msgstr "Su"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18082,16 +18108,16 @@ msgstr "Su"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18120,7 +18146,7 @@ msgstr "Aggiorna esistenti"
msgid "Update interval"
msgstr "Intervallo di aggiornamento"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18147,7 +18173,7 @@ msgstr "Carica"
msgid "Upper level maps"
msgstr "Mappe al livello superiore"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18333,7 +18359,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18469,15 +18495,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Nome utente"
@@ -18791,11 +18817,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18869,14 +18895,14 @@ msgstr "Mappa valori \"%1$s\" esiste già."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Mappatura valori"
@@ -18919,7 +18945,7 @@ msgstr "Valore: nessun dato"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19019,7 +19045,7 @@ msgstr "Dimensione dello spazio virtuale in byte o in percentuale dal totale. Re
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Nome visibile"
@@ -19045,7 +19071,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Bassa"
@@ -19153,6 +19179,10 @@ msgstr "Mer"
msgid "Wednesday"
msgstr "Mercoledì"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19425,7 +19455,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Anno"
@@ -19485,7 +19516,7 @@ msgstr "Sei loggato come \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Impossibile scegliere alcune delle lingue, in quanto i loro locale non sono installati sul server web.Impossibile scegliere alcune delle lingue, in quanto i loro locale non sono installati sul server web."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Non sei loggato"
@@ -19726,11 +19757,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr "è prevista un'unità di tempo"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19825,7 +19856,7 @@ msgstr "E' previsto un numero pari di caratteri esadecimali"
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19869,11 +19900,11 @@ msgstr "come Rosso"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19887,11 +19918,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19913,39 +19944,47 @@ msgstr ""
msgid "avg"
msgstr "avg"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19960,7 +19999,7 @@ msgstr "lampeggiante"
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20002,7 +20041,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20090,23 +20129,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20133,7 +20172,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20148,15 +20187,15 @@ msgstr "configura"
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20164,11 +20203,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20181,15 +20220,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20207,7 +20246,7 @@ msgstr "giorni"
msgid "default"
msgstr "predefinito"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20284,7 +20323,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20307,11 +20346,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20327,7 +20366,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20341,15 +20380,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr "è previsto il primo parametro"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20357,7 +20396,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20431,7 +20470,7 @@ msgstr "in"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20440,11 +20479,11 @@ msgstr ""
msgid "including subgroups"
msgstr "inclusione sottogruppi"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20463,7 +20502,7 @@ msgstr "Conteggio elemento errato"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20481,7 +20520,7 @@ msgstr "Sintassi non corretta in \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20541,7 +20580,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20563,6 +20602,16 @@ msgstr "regular expression non valida"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20604,7 +20653,7 @@ msgstr ""
msgid "key is empty"
msgstr "Key non definita"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20620,7 +20669,7 @@ msgctxt "week of month"
msgid "last"
msgstr "ultimi"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20628,11 +20677,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20640,23 +20689,23 @@ msgstr ""
msgid "list of characters"
msgstr "lista dei caratteri"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20664,7 +20713,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "regola discovery di basso-livello"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20696,11 +20745,11 @@ msgstr "macro vuota"
msgid "macro(s)"
msgstr "macro"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20736,7 +20785,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20750,7 +20799,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20767,7 +20816,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20782,15 +20831,15 @@ msgstr "lunghezza carattari minima è %1$s"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20872,7 +20921,7 @@ msgstr "nome"
msgid "new"
msgstr "nuovo"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "nuovo"
@@ -20906,7 +20955,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20927,7 +20976,7 @@ msgstr "non in"
msgid "not selected"
msgstr "non selezionato"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21014,15 +21063,15 @@ msgstr ""
msgid "pattern"
msgstr "pattern"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21030,15 +21079,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21087,11 +21136,11 @@ msgstr ""
msgid "regular expression"
msgstr "regular expression"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21115,15 +21164,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21214,23 +21263,23 @@ msgstr "mostra mappature icone"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21238,11 +21287,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21250,11 +21299,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21282,7 +21331,7 @@ msgstr ""
msgid "tag"
msgstr "tag"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21316,7 +21365,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21363,31 +21412,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21413,11 +21466,11 @@ msgstr "trigger prototipo non può essere spostato in un altro template o host"
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "trigger con collegamenti non può essere spostato ad un altro template o host"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21474,7 +21527,7 @@ msgstr "Fine della macro non valida"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21517,7 +21570,7 @@ msgstr "Valore non previsto \"%1$s\""
msgid "unknown"
msgstr "sconosciuto"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21716,11 +21769,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/ja/LC_MESSAGES/frontend.po b/ui/locale/ja/LC_MESSAGES/frontend.po
index 1cfda44be69..89d47b6628a 100644
--- a/ui/locale/ja/LC_MESSAGES/frontend.po
+++ b/ui/locale/ja/LC_MESSAGES/frontend.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
-"PO-Revision-Date: 2021-11-08 13:50+0300\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
+"PO-Revision-Date: 2021-11-23 05:18+0300\n"
"Last-Translator: Atsushi <a.tanaka77@gmail.com>\n"
"Language-Team: Zabbix\n"
"Language: ja\n"
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Pootle 2.5.1.3\n"
"X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1636372253.000000\n"
+"X-POOTLE-MTIME: 1637637501.000000\n"
#: include/classes/db/MysqlDbBackend.php:70
#: include/classes/db/OracleDbBackend.php:142
@@ -285,10 +285,10 @@ msgstr "(0 - アクションã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚’使用)"
msgid "(Only super admins can create groups)"
msgstr "(特権管ç†è€…ã®ã¿ãŒã‚°ãƒ«ãƒ¼ãƒ—を作æˆã§ãã¾ã™)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(プロキシãªã—)"
@@ -363,7 +363,7 @@ msgstr "<サブメニュー/サブメニュー/...>"
#: jsLoader.php:183
msgctxt "abbreviation of severity level"
msgid "A"
-msgstr ""
+msgstr "軽"
#: include/classes/widgets/CWidgetHelper.php:797
msgid "ADD OVERRIDE"
@@ -436,7 +436,7 @@ msgstr "APIトークンを更新ã—ã¾ã—ãŸ"
msgid "API tokens"
msgstr "APIトークン"
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr "横座標"
@@ -505,7 +505,7 @@ msgstr "確èªæ¸ˆã®è§£æ±ºæ¸ˆã‚¤ãƒ™ãƒ³ãƒˆ"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -524,11 +524,11 @@ msgstr "確èªæ¸ˆã®è§£æ±ºæ¸ˆã‚¤ãƒ™ãƒ³ãƒˆ"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -540,24 +540,24 @@ msgstr "確èªæ¸ˆã®è§£æ±ºæ¸ˆã‚¤ãƒ™ãƒ³ãƒˆ"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -575,7 +575,7 @@ msgstr "確èªæ¸ˆã®è§£æ±ºæ¸ˆã‚¤ãƒ™ãƒ³ãƒˆ"
msgid "Action"
msgstr "アクション"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "アクション\"%1$s\"ã¯ã™ã§ã«å­˜åœ¨ã—ã¦ã„ã¾ã™ã€‚"
@@ -585,7 +585,7 @@ msgstr "アクション\"%1$s\"ã¯ã™ã§ã«å­˜åœ¨ã—ã¦ã„ã¾ã™ã€‚"
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr "アクション\"%2$s\"ã¯ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®å½¹å‰²\"%1$s\"ã«ä½¿ç”¨ã¦ãã¾ã›ã‚“。"
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "アクションを追加ã—ã¾ã—ãŸ"
@@ -594,16 +594,16 @@ msgstr "アクションを追加ã—ã¾ã—ãŸ"
msgid "Action class %1$s must extend %2$s class."
msgstr "アクションクラス%1$sã¯%2$sクラスを拡張ã—ã¦ãã ã•ã„。"
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "アクションを削除ã—ã¾ã—ãŸ"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "アクションを無効ã«ã—ã¾ã—ãŸ"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "アクションを有効ã«ã—ã¾ã—ãŸ"
@@ -621,7 +621,7 @@ msgstr "アクションログ"
msgid "Action operation"
msgstr "アクション処ç†"
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "アクションを更新ã—ã¾ã—ãŸ"
@@ -668,7 +668,7 @@ msgid "Active till"
msgstr "設定有効期間ã®çµ‚了日時"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -727,14 +727,14 @@ msgstr "設定有効期間ã®çµ‚了日時"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -750,10 +750,10 @@ msgstr "設定有効期間ã®çµ‚了日時"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -765,9 +765,9 @@ msgstr "設定有効期間ã®çµ‚了日時"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -785,7 +785,7 @@ msgstr "設定有効期間ã®çµ‚了日時"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -830,7 +830,7 @@ msgstr "å­ã®è¦ç´ ã‚’追加"
msgid "Add child service"
msgstr "å­ã‚µãƒ¼ãƒ“スã®è¿½åŠ "
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr "å­ã‚µãƒ¼ãƒ“スã®è¿½åŠ "
@@ -855,8 +855,8 @@ msgstr "複数ã®ãƒžãƒƒãƒ—を追加"
msgid "Add new data set"
msgstr "æ–°ã—ã„データセットã®è¿½åŠ "
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr "æ–°ã—ã„インターフェースã®è¿½åŠ "
@@ -869,7 +869,7 @@ msgstr "æ–°ã—ã„オーãƒãƒ¼ãƒ©ã‚¤ãƒ‰ã®è¿½åŠ "
msgid "Add page"
msgstr "ページã®è¿½åŠ "
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr "親サービスã®è¿½åŠ "
@@ -1003,7 +1003,7 @@ msgstr "エージェント種別ãƒã‚§ãƒƒã‚¯ã€‚è¿”å´å€¤ã¯1 - Zabbixエージã‚
msgid "Aggregate"
msgstr "アグリゲート"
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr "集計関数"
@@ -1019,6 +1019,10 @@ msgstr "アグリゲーション間隔"
msgid "Alert message"
msgstr "通知メッセージ"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr "アルゴリズム"
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "エイリアス"
@@ -1333,7 +1337,7 @@ msgstr "å°‘ãªãã¨ã‚‚MySQLã€PostgreSQLã€Oracleã®ã†ã¡1ã¤ä»¥ä¸Šã‚’サãƒãƒ
msgid "At least one operation must be selected."
msgstr "å°‘ãªãã¨ã‚‚1ã¤ä»¥ä¸Šã®å®Ÿè¡Œå†…容ãŒé¸æŠžã•ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "å°‘ãªãã¨ã‚‚1ã¤ä»¥ä¸Šã®å®Ÿè¡Œå†…容ãŒè¨­å®šã•ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
@@ -1365,7 +1369,7 @@ msgstr "試行回数"
#: app/views/administration.geomaps.edit.php:88
msgid "Attribution"
-msgstr ""
+msgstr "帰属表示"
#: app/views/administration.housekeeping.edit.php:178
#: include/classes/helpers/CMenuHelper.php:119
@@ -1413,9 +1417,9 @@ msgstr "AuthNリクエスト"
msgid "Authentication"
msgstr "èªè¨¼"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "èªè¨¼ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ "
@@ -1476,12 +1480,12 @@ msgstr "自動ログインã¨è‡ªå‹•ãƒ­ã‚°ã‚¢ã‚¦ãƒˆã‚’åŒæ™‚ã«æœ‰åŠ¹ã«ã™ã‚‹ã“
msgid "Auto-logout"
msgstr "自動ログアウト"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "自動"
@@ -1596,12 +1600,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind password"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr "シフトã™ã‚‹ãƒ“ット数"
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr "ビットå˜ä½é–¢æ•°"
@@ -1807,7 +1811,7 @@ msgstr "数値型ã§ã¯ãªã„アイテム\"%1$s\"ã¯ã‚°ãƒ©ãƒ•\"%2$s\"ã«è¿½åŠ ã
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "数値型ã§ã¯ãªã„アイテム\"%1$s\"ã¯ã‚°ãƒ©ãƒ•ã®ãƒ—ロトタイプ\"%2$s\"ã«è¿½åŠ ã§ãã¾ã›ã‚“。"
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "アクションを追加ã§ãã¾ã›ã‚“"
@@ -2100,7 +2104,7 @@ msgstr[0] "APIトークンを削除ã§ãã¾ã›ã‚“"
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Zabbixユーザー\"%1$s\"を削除ã§ãã¾ã›ã‚“。ユーザーを無効ã«è¨­å®šã—ã¦ãã ã•ã„。"
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "アクションを削除ã§ãã¾ã›ã‚“"
@@ -2252,12 +2256,12 @@ msgid "Cannot delete script"
msgid_plural "Cannot delete scripts"
msgstr[0] "スクリプトを削除ã§ãã¾ã›ã‚“"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "スクリプトを削除ã§ãã¾ã›ã‚“。スクリプト\"%1$s\"ã¯å®Ÿè¡Œã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³\"%2$s\"ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "é¸æŠžã—ãŸã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’削除ã§ãã¾ã›ã‚“。"
@@ -2272,7 +2276,7 @@ msgstr[0] "サービスを削除ã§ãã¾ã›ã‚“"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr "サービス\"%1$s\"ã®å‰Šé™¤ãŒã§ãã¾ã›ã‚“:%2$s。"
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "テンプレートを削除ã§ãã¾ã›ã‚“"
@@ -2355,7 +2359,7 @@ msgid "Cannot disable API token"
msgid_plural "Cannot disable API tokens"
msgstr[0] "APIトークンを無効ã«ã§ãã¾ã›ã‚“"
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "アクションを無効ã«ã§ãã¾ã›ã‚“"
@@ -2422,7 +2426,7 @@ msgid "Cannot enable API token"
msgid_plural "Cannot enable API tokens"
msgstr[0] "APIトークンを有効ã«ã§ãã¾ã›ã‚“"
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "アクションを有効ã«ã§ãã¾ã›ã‚“"
@@ -2640,7 +2644,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
msgstr[0] "テンプレート\"%1$s\"をインãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“。リンクã•ã‚Œã¦ã„るテンプレート\"%2$s\"ãŒå­˜åœ¨ã—ã¾ã›ã‚“。"
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "トリガーæ¡ä»¶å¼ã‚’追加ã§ãã¾ã›ã‚“"
@@ -2817,7 +2821,7 @@ msgstr "テンプレートã®ãƒªãƒ³ã‚¯ã‚’削除ã§ãã¾ã›ã‚“。"
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr "トリガー\"%1$s\"ã®ãƒªãƒ³ã‚¯ã‚’削除ã§ãã¾ã›ã‚“。ホストã«ãƒªãƒ³ã‚¯ã•ã‚ŒãŸãƒ†ãƒ³ãƒ—レートã®ã‚¢ã‚¤ãƒ†ãƒ ã‚’使用ã—ã¦ã„ã¾ã™ã€‚"
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "アクション\"%2$s\"ã®\"%1$s\"ã‚’æ›´æ–°ã§ãã¾ã›ã‚“。"
@@ -2883,7 +2887,7 @@ msgstr "ディスカãƒãƒªã•ã‚ŒãŸãƒ›ã‚¹ãƒˆã‚°ãƒ«ãƒ¼ãƒ—\"%1$s\"ã‚’æ›´æ–°ã§ãã
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "テンプレート化ã•ã‚ŒãŸWebシナリオ\"%1$s\"ãŒæ›´æ–°ã§ãã¾ã›ã‚“:%2$s。"
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "アクションを更新ã§ãã¾ã›ã‚“"
@@ -2942,7 +2946,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "ディスカãƒãƒªã•ã‚ŒãŸãƒ›ã‚¹ãƒˆ\"%1$s\"ã®ã‚°ãƒ«ãƒ¼ãƒ—ã‚’æ›´æ–°ã§ãã¾ã›ã‚“。"
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "ホストを更新ã§ãã¾ã›ã‚“"
@@ -3043,9 +3047,9 @@ msgstr "定期レãƒãƒ¼ãƒˆã‚’æ›´æ–°ã§ãã¾ã›ã‚“"
msgid "Cannot update script"
msgstr "スクリプトを更新ã§ãã¾ã›ã‚“"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr "スクリプトã®ç¯„囲を更新ã§ãã¾ã›ã‚“。\"%1$s\"ã¯ã‚¢ã‚¯ã‚·ãƒ§ãƒ³\"%2$s\"ã§ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚"
@@ -3072,7 +3076,7 @@ msgstr "テンプレート化ã•ã‚ŒãŸWebシナリオ\"%1$s\"ã®ã‚¹ãƒ†ãƒƒãƒ—ãŒæ
msgid "Cannot update template"
msgstr "テンプレートを更新ã§ãã¾ã›ã‚“"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr "テンプレートを更新ã§ãã¾ã›ã‚“"
@@ -3156,14 +3160,14 @@ msgstr "snmptrap[]アイテムã§ã‚­ãƒ£ãƒƒãƒã•ã‚Œã¦ã„ãªã„ã™ã¹ã¦ã®SNMPã
msgid "Center"
msgstr "中央"
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "証明書"
@@ -3181,10 +3185,10 @@ msgctxt "verb"
msgid "Change"
msgstr "変更"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr "PSK変更"
@@ -3224,9 +3228,9 @@ msgstr "文字列ãŒå«ã¾ã‚Œã‚‹"
msgid "Character string not included"
msgstr "文字列ãŒå«ã¾ã‚Œãªã„"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr "文字"
@@ -3242,7 +3246,7 @@ msgstr "シャーシ情報。文字列値を返ã™ã€‚"
msgid "Check already exists."
msgstr "ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚"
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "æ¡ä»¶å¼ã®\"%1$s\"ã‹ã‚‰å§‹ã¾ã‚‹éƒ¨åˆ†ã‚’確èªã—ã¦ãã ã•ã„。"
@@ -3364,8 +3368,8 @@ msgstr "ヒストリを削除"
msgid "Clear history and trends"
msgstr "ヒストリã¨ãƒˆãƒ¬ãƒ³ãƒ‰ã‚’削除"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "リンク削除時ã«ã‚¯ãƒªã‚¢"
@@ -3392,16 +3396,16 @@ msgstr "時刻"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3483,7 +3487,7 @@ msgstr "最終çµæžœ"
#: include/classes/widgets/forms/CWidgetFormGeoMap.php:77
msgid "Comma separated center coordinates to display when the widget is initially loaded."
-msgstr ""
+msgstr "ウィジェットãŒæœ€åˆã«èª­ã¿è¾¼ã¾ã‚ŒãŸæ™‚ã«è¡¨ç¤ºã™ã‚‹ãŸã‚ã®ã‚«ãƒ³ãƒžåŒºåˆ‡ã‚Šã®ä¸­å¿ƒåº§æ¨™ã€‚"
#: app/views/administration.script.edit.php:173 include/actions.inc.php:1943
#: include/views/administration.auditacts.list.php:103
@@ -3530,7 +3534,7 @@ msgstr "圧縮"
msgid "Concurrent sessions"
msgstr "並列実行数"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3807,19 +3811,19 @@ msgstr ""
#: include/classes/server/CZabbixServer.php:590
msgid "Connection to Zabbix server failed. Incorrect configuration."
-msgstr ""
+msgstr "Zabbixサーãƒãƒ¼ã¸ã®æŽ¥ç¶šã«å¤±æ•—ã—ã¾ã—ãŸã€‚設定ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
#: include/classes/setup/CSetupWizard.php:538
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr "ソケットファイル(UNIXç³»OS上)や共有メモリ(Windows上)ãŒä½¿ç”¨ã•ã‚Œã‚‹ã®ã§æŽ¥ç¶šã¯æš—å·åŒ–ã•ã‚Œã¾ã›ã‚“。"
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "接続"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "ホストã‹ã‚‰ã®æŽ¥ç¶š"
@@ -3827,9 +3831,9 @@ msgstr "ホストã‹ã‚‰ã®æŽ¥ç¶š"
msgid "Connections from proxy"
msgstr "プロキシã‹ã‚‰ã®æŽ¥ç¶š"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "ホストã¸ã®æŽ¥ç¶š"
@@ -3993,10 +3997,10 @@ msgstr "相関関係ルール"
msgid "Correlation updated"
msgstr "相関関係を更新ã—ã¾ã—ãŸ"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "カウント"
@@ -4086,7 +4090,7 @@ msgid "Create discovery rule (select template first)"
msgstr "ディスカãƒãƒªãƒ«ãƒ¼ãƒ«ã®ä½œæˆ(å…ˆã«ãƒ†ãƒ³ãƒ—レートをé¸æŠž)"
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4288,7 +4292,7 @@ msgid "Current value"
msgstr "ç¾åœ¨ã®å€¤"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "カスタム"
@@ -4359,7 +4363,7 @@ msgstr "ãƒã‚§ã‚³èªž (cs_CZ)"
#: jsLoader.php:181
msgctxt "abbreviation of severity level"
msgid "D"
-msgstr ""
+msgstr "致"
#: include/classes/import/validators/C10XmlValidator.php:321
msgctxt "XML date format"
@@ -4530,12 +4534,12 @@ msgid "Database TLS key file"
msgstr "データベースã®TLSキーファイル"
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
-msgstr "データベースã®ãƒ’ストリ $info_tables ã®ã‚¢ãƒƒãƒ—グレード"
+msgid "Database history tables upgraded"
+msgstr ""
#: app/partials/administration.system.info.php:129
msgid "Database history tables use primary key"
-msgstr ""
+msgstr "データベースã®ãƒ’ストリテーブルãŒä¸»ã‚­ãƒ¼ã‚’使用"
#: include/classes/setup/CSetupWizard.php:472
msgid "Database host"
@@ -4603,11 +4607,11 @@ msgstr "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãƒ¡ãƒ³ãƒ†ãƒŠãƒ³ã‚¹çµ‚了日"
msgid "Date HW purchased"
msgstr "ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢è³¼å…¥æ—¥"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr "日付ã¨æ™‚刻関数"
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "æ—¥"
@@ -4648,8 +4652,8 @@ msgstr "12月"
msgid "December"
msgstr "12月"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr "å°æ•°ç‚¹ä»¥ä¸‹æ¡æ•°"
@@ -4659,7 +4663,7 @@ msgstr "深刻度を減らã™"
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4790,7 +4794,7 @@ msgstr "削除"
msgid "Delete all elements that are not present in the import file?"
msgstr "インãƒãƒ¼ãƒˆã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«å†…ã«å­˜åœ¨ã—ãªã„ã™ã¹ã¦ã®è¦ç´ ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ"
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "削除ã¨ã‚¯ãƒªã‚¢"
@@ -4799,11 +4803,11 @@ msgstr "削除ã¨ã‚¯ãƒªã‚¢"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "é¸æŠžã—ãŸãƒ†ãƒ³ãƒ—レートã¨ãƒ‡ãƒ¼ã‚¿ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ(警告: リンクã—ã¦ã„ã‚‹ã™ã¹ã¦ã®ãƒ›ã‚¹ãƒˆã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ï¼)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "テンプレートã¨ãƒ‡ãƒ¼ã‚¿ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ(警告: リンクã—ã¦ã„ã‚‹ã™ã¹ã¦ã®ãƒ›ã‚¹ãƒˆã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ãŒå‰Šé™¤ã•ã‚Œã¾ã™ï¼)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "ç¾åœ¨ã®ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ"
@@ -4936,7 +4940,7 @@ msgstr "é¸æŠžã—ãŸã‚°ãƒ«ãƒ¼ãƒ—を削除ã—ã¾ã™ã‹ï¼Ÿ"
msgid "Delete selected host groups?"
msgstr "é¸æŠžã—ãŸãƒ›ã‚¹ãƒˆã‚°ãƒ«ãƒ¼ãƒ—を削除ã—ã¾ã™ã‹ï¼Ÿ"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "é¸æŠžã—ãŸãƒ›ã‚¹ãƒˆã®ãƒ—ロトタイプを削除ã—ã¾ã™ã‹ï¼Ÿ"
@@ -5044,7 +5048,7 @@ msgstr "é¸æŠžã—ãŸãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’削除ã—ã¾ã™ã‹ï¼Ÿ"
msgid "Delete selected web scenarios?"
msgstr "é¸æŠžã—ãŸWebシナリオを削除ã—ã¾ã™ã‹ï¼Ÿ"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "テンプレートを削除ã—ã¾ã™ã‹ï¼Ÿ"
@@ -5105,7 +5109,7 @@ msgstr "æ‹’å¦ãƒªã‚¹ãƒˆ"
msgid "Dependencies"
msgstr "ä¾å­˜é–¢ä¿‚"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "ä¾å­˜å…ˆ"
@@ -5113,7 +5117,7 @@ msgstr "ä¾å­˜å…ˆ"
msgid "Dependent item"
msgstr "ä¾å­˜ã‚¢ã‚¤ãƒ†ãƒ "
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5124,7 +5128,7 @@ msgid "Deployment status"
msgstr "é…布ステータス"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5139,16 +5143,16 @@ msgstr "é…布ステータス"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5160,10 +5164,10 @@ msgstr "説明"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "詳細"
@@ -5172,6 +5176,14 @@ msgstr "詳細"
msgid "Details of web scenario"
msgstr "Webシナリオã®è©³ç´°"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr "検出期間"
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr "åå·®"
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "デãƒã‚¤ã‚¹"
@@ -5294,7 +5306,7 @@ msgstr "é¸æŠžã—ãŸWebシナリオを無効ã«ã—ã¾ã™ã‹ï¼Ÿ"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5321,17 +5333,17 @@ msgstr "é¸æŠžã—ãŸWebシナリオを無効ã«ã—ã¾ã™ã‹ï¼Ÿ"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "無効"
@@ -5356,7 +5368,7 @@ msgstr "値を破棄"
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5566,7 +5578,7 @@ msgstr "ç©ç®—グラフ表示"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5583,7 +5595,7 @@ msgstr "%3$s件ã®ã†ã¡%1$sã‹ã‚‰%2$s件ã¾ã§ã‚’表示ã—ã¦ã„ã¾ã™"
msgid "Displaying options"
msgstr "表示オプション"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr "除算分æ¯"
@@ -5665,7 +5677,7 @@ msgstr "イメージã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰"
msgid "Download the configuration file"
msgstr "設定ファイルã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5729,7 +5741,7 @@ msgstr "マップ\"%2$s\"ã®ãŸã‚ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å†…ã®userid \"%1$s\"ãŒé‡è¤‡ã
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "継続期間"
@@ -5759,14 +5771,14 @@ msgstr "アイテムã”ã¨"
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6022,7 +6034,7 @@ msgstr "トラッピングã®æœ‰åŠ¹åŒ–"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6060,13 +6072,13 @@ msgstr "トラッピングã®æœ‰åŠ¹åŒ–"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6082,11 +6094,11 @@ msgstr "有効"
msgid "Encrypt"
msgstr "æš—å·åŒ–"
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "æš—å·åŒ–"
@@ -6162,6 +6174,10 @@ msgstr "エラーï¼ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ãªã„データベースã®ãƒãƒ¼ã‚¸
msgid "Error: %1$s"
msgstr "エラー: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr "評価期間"
+
#: include/events.inc.php:180
msgid "Event"
msgstr "イベント"
@@ -6244,7 +6260,7 @@ msgstr "ç¹°è¿”ã—é–“éš”(週)"
#: app/views/administration.geomaps.edit.php:33
msgid "Example"
-msgstr ""
+msgstr "例"
#: app/views/administration.miscconfig.edit.php:36
msgid "Example: https://localhost/zabbix/ui/"
@@ -6729,8 +6745,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "最åˆ"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "近似関数"
@@ -6842,12 +6858,12 @@ msgid "Full"
msgstr "ã™ã¹ã¦"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "ã™ã¹ã¦è¤‡è£½"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "関数"
@@ -6863,7 +6879,7 @@ msgstr "GSMモデム"
msgid "GUI"
msgstr "表示設定"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "GUIアクセスを無効ã«ã—ã¾ã—ãŸ"
@@ -6887,11 +6903,11 @@ msgstr "Generated in %1$s sec"
#: app/views/administration.geomaps.edit.php:127
#: include/classes/helpers/CMenuHelper.php:244 include/html.inc.php:895
msgid "Geographical maps"
-msgstr ""
+msgstr "地ç†ãƒžãƒƒãƒ—"
#: include/classes/widgets/CWidgetConfig.php:51
msgid "Geomap"
-msgstr ""
+msgstr "地ç†ãƒžãƒƒãƒ—"
#: include/locales.inc.php:55
msgid "Georgian (ka_GE)"
@@ -7210,7 +7226,7 @@ msgstr "グループå"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "グループã®ãƒ—ロトタイプã«ãƒ‡ã‚£ã‚¹ã‚«ãƒãƒªã•ã‚ŒãŸãƒ›ã‚¹ãƒˆç”¨ã®ã‚°ãƒ«ãƒ¼ãƒ—\"%1$s\"を使用ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。"
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "グループã®ãƒ—ロトタイプ"
@@ -7223,12 +7239,11 @@ msgid "Grouping by"
msgstr "次ã«ã‚ˆã‚‹ã‚°ãƒ«ãƒ¼ãƒ”ング"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "グループ"
@@ -7239,7 +7254,7 @@ msgstr "Guestユーザー"
#: jsLoader.php:182
msgctxt "abbreviation of severity level"
msgid "H"
-msgstr ""
+msgstr "é‡"
#: include/translateDefines.inc.php:35
msgid "H:i"
@@ -7447,7 +7462,7 @@ msgstr "ヒストリã®å‰Šé™¤ã«ã¯æ™‚é–“ã‚’è¦ã—ã¾ã™ã€‚実行ã—ã¾ã™ã‹ï¼Ÿ
msgid "History data selection"
msgstr "履歴データã®é¸æŠž"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr "履歴関数"
@@ -7478,7 +7493,7 @@ msgid "Horizontal align"
msgstr "横ä½ç½®"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7487,7 +7502,7 @@ msgstr "横ä½ç½®"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7498,7 +7513,7 @@ msgstr "横ä½ç½®"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7621,7 +7636,7 @@ msgid "Host group label type"
msgstr "ホストグループã®ãƒ©ãƒ™ãƒ«ã‚¿ã‚¤ãƒ—"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7640,8 +7655,8 @@ msgstr "ID \"%1$s\"ã®ãƒ›ã‚¹ãƒˆã‚°ãƒ«ãƒ¼ãƒ—ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。"
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7691,7 +7706,7 @@ msgstr "ホストインベントリã®æ¦‚è¦"
msgid "Host label type"
msgstr "ホストã®ãƒ©ãƒ™ãƒ«ã‚¿ã‚¤ãƒ—"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "ホストマクロ"
@@ -7703,7 +7718,7 @@ msgstr "ホストメタデータ"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "ホストå"
@@ -7740,7 +7755,7 @@ msgstr "ホストã®ãƒ—ロトタイプã«ã¯åŒã˜ã‚¿ã‚¤ãƒ—ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚¤
msgid "Host prototype deleted"
msgstr "ホストã®ãƒ—ロトタイプを削除ã—ã¾ã—ãŸ"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr "ホストã®ãƒ—ロトタイプã®ãƒžã‚¯ãƒ­"
@@ -7762,7 +7777,7 @@ msgstr "ホストã®è¡¨ç¤ºå\"%1$s\"ã‚’æŒã¤ãƒ›ã‚¹ãƒˆã®ãƒ—ロトタイプã¯ã
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "ホストã®ãƒ—ロトタイプ"
@@ -7787,7 +7802,7 @@ msgstr "ホスト時間"
msgid "Host update failed."
msgstr "ホストã®æ›´æ–°ã«å¤±æ•—ã—ã¾ã—ãŸ"
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "ホストを更新ã—ã¾ã—ãŸ"
@@ -7864,6 +7879,10 @@ msgstr "ホストã®ä½ç½®"
msgid "Hosts updated"
msgstr "ホストを更新ã—ã¾ã—ãŸ"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "時間"
@@ -7882,7 +7901,7 @@ msgstr "ãƒãƒ³ã‚¬ãƒªãƒ¼èªž (hu_HU)"
#: jsLoader.php:185
msgctxt "abbreviation of severity level"
msgid "I"
-msgstr ""
+msgstr "情"
#: app/partials/massupdate.macros.tab.php:111
msgid "I confirm to remove all macros"
@@ -7933,15 +7952,15 @@ msgstr "IPアドレスã®ç¯„囲"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "IPアドレスã®ç¯„囲\"%1$s\"ãŒã‚¢ãƒ‰ãƒ¬ã‚¹ã®åˆ¶é™\"%2$s\"を超ãˆã¦ã„ã¾ã™ã€‚"
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8171,7 +8190,7 @@ msgstr "イメージ"
msgid "Images for all maps will be updated!"
msgstr "ã™ã¹ã¦ã®ãƒžãƒƒãƒ—ã®ã‚¤ãƒ¡ãƒ¼ã‚¸ãŒã‚¢ãƒƒãƒ—デートã•ã‚Œã¾ã™ï¼"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "ã™ãã«"
@@ -8253,7 +8272,7 @@ msgstr "アクセスã§ããªã„アイテムã®ãƒ—ロトタイプ"
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "アクセスã§ããªã„メンテナンス"
@@ -8265,11 +8284,11 @@ msgstr "アクセスã§ããªã„マップ"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "アクセスã§ããªã„テンプレート"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "アクセスã§ããªã„トリガー"
@@ -8384,7 +8403,7 @@ msgstr "Vaultã®ãƒˆãƒ¼ã‚¯ãƒ³ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
msgid "Incorrect action condition discovery check."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒ‡ã‚£ã‚¹ã‚«ãƒãƒªãƒã‚§ãƒƒã‚¯ã®å€¤ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒ‡ã‚£ã‚¹ã‚«ãƒãƒªãƒã‚§ãƒƒã‚¯ã®å€¤ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。ディスカãƒãƒªãƒã‚§ãƒƒã‚¯ãŒå­˜åœ¨ã—ãªã„ã‹ã€æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。"
@@ -8392,7 +8411,7 @@ msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒ‡ã‚£ã‚¹ã‚«ãƒãƒªãƒã‚§ãƒƒã‚¯ã®å€¤ãŒ
msgid "Incorrect action condition discovery object."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒ‡ã‚£ã‚¹ã‚«ãƒãƒªã‚ªãƒ–ジェクトãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒ‡ã‚£ã‚¹ã‚«ãƒãƒªãƒ«ãƒ¼ãƒ«ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。ディスカãƒãƒªãƒ«ãƒ¼ãƒ«ãŒå­˜åœ¨ã—ãªã„ã‹ã€æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“"
@@ -8404,36 +8423,36 @@ msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒ‡ã‚£ã‚¹ã‚«ãƒãƒªã®ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ã®
msgid "Incorrect action condition event type."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ã‚¤ãƒ™ãƒ³ãƒˆã‚¿ã‚¤ãƒ—ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
-msgstr ""
+msgstr "アクションã®æ¡ä»¶ã‹æ“作ã™ã‚‹ãƒ›ã‚¹ãƒˆã‚°ãƒ«ãƒ¼ãƒ—ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。ホストグループãŒå­˜åœ¨ã—ãªã„ã‹ã€ã‚ãªãŸã¯ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
-msgstr ""
+msgstr "アクションã®æ¡ä»¶ã‹æ“作ã™ã‚‹ãƒ›ã‚¹ãƒˆãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。ホストãŒå­˜åœ¨ã—ãªã„ã‹ã€ã‚ãªãŸã¯ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
-msgstr ""
+msgstr "アクションã®æ¡ä»¶ã‹æ“作ã™ã‚‹ãƒ†ãƒ³ãƒ—レートãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。テンプレートãŒå­˜åœ¨ã—ãªã„ã‹ã€ã‚ãªãŸã¯ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。"
#: include/classes/validators/CActionCondValidator.php:131
#, c-format
msgid "Incorrect action condition port \"%1$s\"."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒãƒ¼ãƒˆ\"%1$s\"ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒ—ロキシ設定ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。プロキシãŒå­˜åœ¨ã—ãªã„ã‹ã€ã‚¢ã‚¯ã‚»ã‚¹æ¨©ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
-msgstr ""
+msgstr "æ¡ä»¶ã«è¨­å®šã—ãŸã‚µãƒ¼ãƒ“スãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。サービスãŒå­˜åœ¨ã—ãªã„ã‹ã€ã‚ãªãŸã¯ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。"
#: include/classes/validators/CActionCondValidator.php:155
msgid "Incorrect action condition trigger severity."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒˆãƒªã‚¬ãƒ¼ã®æ·±åˆ»åº¦ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ãƒˆãƒªã‚¬ãƒ¼ã®å€¤ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。トリガーãŒå­˜åœ¨ã—ãªã„ã‹ã€ã‚¢ã‚¯ã‚»ã‚¹æ¨©ãŒã‚ã‚Šã¾ã›ã‚“。"
@@ -8443,26 +8462,26 @@ msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ã®ã‚¿ã‚¤ãƒ—ã®å€¤ãŒæ­£ã—ãã‚ã‚Šã¾ã›
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "実行ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã®ã‚¨ã‚¹ã‚«ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã‚¹ãƒ†ãƒƒãƒ—ã®å€¤ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
-msgstr ""
+msgstr "æ“作ã™ã‚‹ãƒ¡ãƒ‡ã‚£ã‚¢ã‚¿ã‚¤ãƒ—ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。メディアタイプãŒå­˜åœ¨ã—ãªã„ã‹ã€ã‚ãªãŸã¯ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。"
#: app/controllers/CControllerActionOperationValidate.php:63
#, c-format
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "イベントã®ã‚½ãƒ¼ã‚¹\"%2$s\"ã®ãŸã‚ã«å®Ÿè¡Œã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã®ã‚¿ã‚¤ãƒ—\"%1$s\"ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
-msgstr ""
+msgstr "æ“作ã™ã‚‹ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚°ãƒ«ãƒ¼ãƒ—ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。ユーザーグループãŒå­˜åœ¨ã—ãªã„ã‹ã€ã‚ãªãŸã¯ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
-msgstr ""
+msgstr "æ“作ã™ã‚‹ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。ユーザーãŒå­˜åœ¨ã—ãªã„ã‹ã€ã‚ãªãŸã¯ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。"
#: include/classes/api/services/CDRule.php:206
#: include/classes/api/services/CDRule.php:348
@@ -8760,8 +8779,8 @@ msgstr "テンプレートã®Webシナリオã®ã‚¹ãƒ†ãƒƒãƒ—æ•°ãŒæ­£ã—ãã‚ã‚Š
msgid "Incorrect trigger expression"
msgstr "é–“é•ã£ãŸãƒˆãƒªã‚¬ãƒ¼ã®æ¡ä»¶å¼"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "トリガーæ¡ä»¶å¼ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
@@ -9159,7 +9178,7 @@ msgstr "ファイルã®æƒ…報。JSONã§è¿”ã™"
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "サービス情報ã®å–得。引数ãŒstateã‚„startupãªã‚‰æ•´æ•°å€¤ã‚’è¿”ã™ã€‚引数ãŒdisplaynameã€pathã€userãªã‚‰æ–‡å­—列値を返ã™ã€‚引数ãŒdescriptionãªã‚‰ãƒ†ã‚­ã‚¹ãƒˆå€¤ã‚’è¿”ã™ã€‚具体的ã«ã¯å¼•æ•°ãŒstateã§çŠ¶æ…‹ãŒé–‹å§‹ãªã‚‰ã€Œ0ã€ã€ä¸€æ™‚åœæ­¢ãªã‚‰ã€Œï¼‘ã€ã€é–‹å§‹ä¸­ãªã‚‰ã€Œ2ã€ã€ä¸€æ™‚åœæ­¢ä¸­ãªã‚‰ã€Œ3ã€ã€å†é–‹ä¸­ãªã‚‰ã€Œ4ã€ã€åœæ­¢ä¸­ãªã‚‰ã€Œ5ã€ã€åœæ­¢ãªã‚‰ã€Œ6ã€ã€ä¸æ˜Žãªã‚‰ã€Œ7ã€ã€è©²å½“サービスãªã—ãªã‚‰ã€Œ255ã€ã‚’è¿”ã™ã€‚ã¾ãŸã€å¼•æ•°ãŒstartupã§ã‚¹ã‚¿ãƒ¼ãƒˆã‚¢ãƒƒãƒ—ã®ç¨®é¡žãŒè‡ªå‹•ãªã‚‰ã€Œ0ã€ã€è‡ªå‹•(é…延開始)ãªã‚‰ã€Œ1ã€ã€æ‰‹å‹•ãªã‚‰ã€Œ2ã€ã€ç„¡åŠ¹ãªã‚‰ã€Œ3ã€ã€ä¸æ˜Žãªã‚‰ã€Œ4ã€ã‚’è¿”ã™ã€‚"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr "継承"
@@ -9168,11 +9187,11 @@ msgstr "継承"
msgid "Inherited"
msgstr "継承ã—ãŸã‚‚ã®"
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "継承ã—ãŸãƒžã‚¯ãƒ­ã¨ãƒ›ã‚¹ãƒˆãƒžã‚¯ãƒ­"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr "継承ã—ãŸãƒžã‚¯ãƒ­ã¨ãƒ›ã‚¹ãƒˆã®ãƒ—ロトタイプã®ãƒžã‚¯ãƒ­"
@@ -9184,7 +9203,7 @@ msgstr "継承ã—ãŸã‚¿ã‚°ã¨ã‚¢ã‚¤ãƒ†ãƒ ã‚¿ã‚°"
msgid "Inherited and scenario tags"
msgstr "継承ã—ãŸã‚¿ã‚°ã¨ã‚·ãƒŠãƒªã‚ªã‚¿ã‚°"
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "継承ã—ãŸãƒžã‚¯ãƒ­ã¨ãƒ†ãƒ³ãƒ—レートマクロ"
@@ -9198,13 +9217,13 @@ msgstr "継承ã—ãŸã‚¢ã‚¤ãƒ†ãƒ "
#: include/classes/widgets/forms/CWidgetFormGeoMap.php:75
msgid "Initial view"
-msgstr ""
+msgstr "åˆæœŸè¡¨ç¤ºä½ç½®"
#: include/classes/widgets/forms/CWidgetFormGeoMap.php:79
msgid "Initial view is ignored if the default view is set."
-msgstr ""
+msgstr "デフォルト表示ãŒè¨­å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã¯ã€åˆæœŸè¡¨ç¤ºè¨­å®šã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚"
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "挿入"
@@ -9263,8 +9282,8 @@ msgstr "\"%2$s\"ã®\"DNSを使用\"ã«ãƒã‚§ãƒƒã‚¯ãŒå…¥ã£ã¦ã„ã‚‹å ´åˆã€IPã
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "IPアドレス\"%1$s\"ãŒè¨­å®šã•ã‚ŒãŸã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã«DNSåを設定ã—ã¦ãã ã•ã„。"
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr "インターフェース"
@@ -9356,7 +9375,7 @@ msgstr "YAMLファイルã®å†…容ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
msgid "Invalid action condition: %1$s."
msgstr "アクションã®å®Ÿè¡Œæ¡ä»¶ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“:%1$s。"
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr "æ¡ä»¶ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“: %1$s。"
@@ -9417,10 +9436,10 @@ msgstr "メソッドã®ãƒ‘ラメータãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9483,8 +9502,8 @@ msgstr "メソッドã®ãƒ‘ラメータãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9704,13 +9723,13 @@ msgstr "期間ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。"
#: include/classes/validators/CApiInputValidator.php:2814
#, c-format
msgid "Invalid zoomparameter \"%1$s\": %2$s."
-msgstr ""
+msgstr "ズームパラメーター\"%1$s\"ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“:%2$s。"
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "インベントリ"
@@ -9724,7 +9743,7 @@ msgid "Inventory field"
msgstr "インベントリフィールド"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "インベントリモード"
@@ -9732,10 +9751,10 @@ msgstr "インベントリモード"
msgid "Is online?"
msgstr "ログイン状態"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "発行者"
@@ -9824,7 +9843,7 @@ msgstr[0] "アイテムを有効ã«ã—ã¾ã—ãŸ"
msgid "Item in \"not supported\" state"
msgstr "アイテムãŒ\"å–å¾—ä¸å¯\"ã®çŠ¶æ…‹"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "アイテムãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -10270,17 +10289,17 @@ msgstr "最新1ヶ月ã®ã‚°ãƒ©ãƒ•"
msgid "Last name"
msgstr "姓"
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "最新ã®"
@@ -10357,8 +10376,8 @@ msgstr "先頭文字列削除"
msgid "Legend"
msgstr "凡例"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr "é•·ã•"
@@ -10392,8 +10411,8 @@ msgstr "線タイプ"
msgid "Line width"
msgstr "ç·šå¹…"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "リンク"
@@ -10416,16 +10435,9 @@ msgstr "マップ\"%2$s\"ã®ãƒªãƒ³ã‚¯\"selementid2\"フィールドãŒå­˜åœ¨ã—ã
msgid "Link indicators"
msgstr "障害発生時ã®æ¡ä»¶è¨­å®š"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr "æ–°è¦ãƒ†ãƒ³ãƒ—レートをリンク"
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "テンプレートをリンク"
@@ -10441,13 +10453,6 @@ msgstr "テンプレートã¨ãƒªãƒ³ã‚¯"
msgid "Linked map"
msgstr "リンクã•ã‚ŒãŸãƒžãƒƒãƒ—"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10476,7 +10481,7 @@ msgstr "検出ã•ã‚ŒãŸCPUコアã®ãƒªã‚¹ãƒˆã€‚JSONã§è¿”ã™"
#: include/classes/data/CItemData.php:1164
msgid "List of directory entries, recursively. Returns JSON"
-msgstr ""
+msgstr "å†å¸°çš„ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚¨ãƒ³ãƒˆãƒªã®ãƒªã‚¹ãƒˆã€‚JSONã§è¿”ã™"
#: include/classes/data/CItemData.php:1216
msgid "List of mounted filesystems and their types. Returns JSON"
@@ -10586,7 +10591,7 @@ msgstr "マッãƒã—ãªã„SNMPトラップをログã«è¨˜éŒ²"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "ログイン"
@@ -10668,16 +10673,16 @@ msgstr "マクロ\"%1$s\"ã¯\"%2$s\"ã«ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚"
msgid "Macro \"%1$s\" already exists."
msgstr "マクロ\"%1$s\"ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚"
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "マクロ"
@@ -10776,12 +10781,12 @@ msgstr "APIトークンã®ç®¡ç†"
msgid "Manage scheduled reports"
msgstr "定期レãƒãƒ¼ãƒˆã®ç®¡ç†"
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "マニュアル"
@@ -10924,16 +10929,16 @@ msgstr "ãã®ä»–をマーク"
msgid "Mark selected"
msgstr "é¸æŠžã‚’マーク"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "マスク"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -10966,11 +10971,11 @@ msgstr "マスターアイテム"
msgid "Matches regular expression"
msgstr "æ­£è¦è¡¨ç¾ã¨ä¸€è‡´ã™ã‚‹"
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr "数学関数"
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -10998,7 +11003,7 @@ msgstr "タイムセレクターã®æœ€å¤§æœŸé–“"
#: app/views/administration.geomaps.edit.php:98
msgid "Max zoom level"
-msgstr ""
+msgstr "最大ズームレベル"
#: include/classes/data/CItemData.php:896
msgid "Maximum number of opened files supported by OS. Returns integer"
@@ -11029,7 +11034,7 @@ msgstr "ID \"%1$s\"ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚¿ã‚¤ãƒ—ã®ãƒ¡ãƒ¼ãƒ«ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒæœ€å¤§é•·ã
#: app/views/administration.geomaps.edit.php:61
msgid "Maximum zoom level of the map."
-msgstr ""
+msgstr "マップã®æœ€å¤§ã‚ºãƒ¼ãƒ ãƒ¬ãƒ™ãƒ«"
#: include/func.inc.php:104 include/func.inc.php:241 jsLoader.php:235
msgid "May"
@@ -11198,7 +11203,7 @@ msgstr "Microsoft Edge"
msgid "Middle"
msgstr "中央"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11299,7 +11304,7 @@ msgstr "グラフã®ãƒ—ロトタイプ\"%1$s\"ã®ã‚¢ã‚¤ãƒ†ãƒ ãŒå­˜åœ¨ã—ã¾ã›ã
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "ホスト\"%2$s\"ã«ã¯ã‚­ãƒ¼\"%1$s\"ãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11377,9 +11382,9 @@ msgstr "月曜"
msgid "Monitored by"
msgstr "監視ã™ã‚‹ã‚‚ã®"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "プロキシã«ã‚ˆã‚‹ç›£è¦–"
@@ -11398,6 +11403,7 @@ msgstr "監視データ"
msgid "Monospace"
msgstr "Monospace"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "月"
@@ -11466,7 +11472,7 @@ msgstr "N"
#: jsLoader.php:186
msgctxt "abbreviation of severity level"
msgid "N"
-msgstr ""
+msgstr "未"
#: include/classes/helpers/CServiceHelper.php:42
#: include/classes/helpers/CServiceHelper.php:52
@@ -11510,8 +11516,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11581,11 +11587,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11613,8 +11619,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11635,7 +11641,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -11678,11 +11684,11 @@ msgstr "ãƒãƒ¼ãƒ ã‚¹ãƒšãƒ¼ã‚¹"
#: jsLoader.php:187
msgid "Navigate to default view"
-msgstr ""
+msgstr "デフォルト表示ã¸"
#: jsLoader.php:188
msgid "Navigate to initial view"
-msgstr ""
+msgstr "åˆæœŸè¡¨ç¤ºã¸"
#: app/views/administration.housekeeping.edit.php:76
msgid "Network discovery data storage period"
@@ -11925,15 +11931,15 @@ msgstr "ディスカãƒãƒªãƒ«ãƒ¼ãƒ«IDãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
msgid "No enabled modules found."
msgstr "有効ãªãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚ã‚Šã¾ã›ã‚“。"
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "æš—å·ãªã—"
@@ -12019,10 +12025,10 @@ msgstr "æ¡ä»¶ã«ä¸€è‡´ã™ã‚‹ãƒ‡ãƒ¼ã‚¿ã¯ã‚ã‚Šã¾ã›ã‚“"
msgid "No new modules discovered"
msgstr "æ–°ã—ã„モジュールã¯è¦‹ã¤ã‹ã‚Šã¾ã›ã‚“ã§ã—ãŸ"
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
-msgstr ""
+msgstr "アクション\"%1$s\"ã«å‡¦ç†ãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: include/classes/api/services/CUser.php:1550
#: include/classes/api/services/CUser.php:2054
@@ -12056,9 +12062,9 @@ msgstr "システムã¸ã®ã‚¢ã‚¯ã‚»ã‚¹æ¨©ãŒã‚ã‚Šã¾ã›ã‚“。"
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12097,7 +12103,7 @@ msgstr "\"%1$s.%2$s\"を呼ã³å‡ºã™æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。"
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12197,11 +12203,11 @@ msgstr "\"%1$s.%2$s\"を呼ã³å‡ºã™æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。"
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12249,7 +12255,7 @@ msgstr "秘密éµãƒ•ã‚¡ã‚¤ãƒ«ãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: jsLoader.php:173
msgid "No problems"
-msgstr ""
+msgstr "障害ãªã—"
#: app/views/configuration.discovery.edit.php:54
msgid "No proxy"
@@ -12260,9 +12266,9 @@ msgid "No public key file specified."
msgstr "公開éµãƒ•ã‚¡ã‚¤ãƒ«ãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
-msgstr ""
+msgstr "アクションメッセージã®å—信者ãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: include/classes/widgets/CWidgetConfig.php:286 jsLoader.php:165
msgid "No refresh"
@@ -12281,9 +12287,9 @@ msgid "No target selected."
msgstr "何もé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
-msgstr ""
+msgstr "アクション処ç†ã®ã‚°ãƒ­ãƒ¼ãƒãƒ«ã‚¹ã‚¯ãƒªãƒ—トã®ã‚¿ãƒ¼ã‚²ãƒƒãƒˆãŒæŒ‡å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。"
#: include/triggers.inc.php:91
#, c-format
@@ -12430,6 +12436,10 @@ msgstr "通知レãƒãƒ¼ãƒˆ"
msgid "Notifications"
msgstr "通知レãƒãƒ¼ãƒˆ"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12516,6 +12526,10 @@ msgstr "VMware仮想マシン上ã®ãƒ—ロセッサ数ã€<url> - VMwareサービã
msgid "Number of rows"
msgstr "行数"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "ステータス変更ã®å›žæ•°"
@@ -12691,7 +12705,7 @@ msgid "Off"
msgstr "OFF"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12738,7 +12752,7 @@ msgstr "1ã¤"
msgid "One time only"
msgstr "一度é™ã‚Š"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "一時的ãªãƒ€ã‚¦ãƒ³ã‚¿ã‚¤ãƒ "
@@ -12814,12 +12828,12 @@ msgstr "OS情報。文字列値を返ã™ã€‚"
msgid "Operation"
msgstr "処ç†å†…容"
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
-msgstr ""
+msgstr "アクション\"%2$s\"内ã«å‡¦ç†\"%1$s\"ãŒã™ã§ã«å­˜åœ¨ã—ã¦ã„ã¾ã™ã€‚"
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr "実行ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³\"%1$s\"ã¯ã™ã§ã«å­˜åœ¨ã—ã¦ã„ã¾ã™ã€‚"
@@ -12853,8 +12867,8 @@ msgstr "é‹ç”¨ãƒ‡ãƒ¼ã‚¿"
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "実行内容"
@@ -12889,7 +12903,7 @@ msgstr "実行内容"
msgid "Operator"
msgstr "オペレータ"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr "演算å­é–¢æ•°"
@@ -12929,19 +12943,19 @@ msgstr "Or"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -12971,10 +12985,10 @@ msgstr "Or"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13237,10 +13251,10 @@ msgstr "障害"
msgid "PROBLEM event generation mode"
msgstr "障害イベント生æˆãƒ¢ãƒ¼ãƒ‰"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13253,19 +13267,19 @@ msgstr "障害イベント生æˆãƒ¢ãƒ¼ãƒ‰"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "PSKアイデンティティ"
@@ -13317,12 +13331,12 @@ msgid "Parameters"
msgstr "パラメータ"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
-msgstr ""
+msgstr "パラメーター\"esc_step_from\"ã¨\"esc_step_to\"ã¯ä¸€ç·’ã«è¨­å®šã—ã¦ãã ã•ã„。"
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "親ディスカãƒãƒªãƒ«ãƒ¼ãƒ«"
@@ -13377,13 +13391,13 @@ msgid "Passive"
msgstr "パッシブ"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13391,7 +13405,7 @@ msgstr "パッシブ"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13444,12 +13458,12 @@ msgstr "ウィジェットã®è²¼ã‚Šä»˜ã‘"
msgid "Paste without external links"
msgstr "リンクãªã—ã§è²¼ã‚Šä»˜ã‘"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr "パターン"
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "メンテナンス中ã®å ´åˆã«å®Ÿè¡Œã‚’ä¿ç•™"
@@ -13462,7 +13476,7 @@ msgstr "ピーク時ã®ãƒ¡ãƒ¢ãƒªä½¿ç”¨é‡: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr "物ç†CPUã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ãŒç«¶åˆã—ã¦ä»®æƒ³ãƒžã‚·ãƒ³ãŒå®Ÿè¡Œã§ããªã„時間ã®å‰²åˆã€<url> - VMwareサービスURLã€<uuid> - VMware仮想マシンã®ãƒ›ã‚¹ãƒˆå"
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "パーセンテージ"
@@ -13486,10 +13500,11 @@ msgstr "パーセンタイルライン (å³)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "DNSクエリã®å®Ÿè¡Œã€‚è¦æ±‚ã—ãŸæƒ…å ±ã®ã‚¿ã‚¤ãƒ—ã®æ–‡å­—列を返ã™ã€‚"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13497,7 +13512,9 @@ msgstr "DNSクエリã®å®Ÿè¡Œã€‚è¦æ±‚ã—ãŸæƒ…å ±ã®ã‚¿ã‚¤ãƒ—ã®æ–‡å­—列を返
msgid "Period"
msgstr "期間"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr "期間ã®ã‚·ãƒ•ãƒˆ"
@@ -13561,11 +13578,11 @@ msgstr "サウンドå†ç”Ÿ"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "設定値を確èªã—ã¦ãã ã•ã„。正ã—ã‘ã‚Œã°\"%1$s\"ボタンを押ã—ã¦ãã ã•ã„。もã—ãã¯ã€\"%2$s\"ボタンを押ã—ã¦è¨­å®šå€¤ã‚’修正ã—ã¦ãã ã•ã„。"
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr "ã™ã¹ã¦ã®ãƒžã‚¯ãƒ­ã‚’削除ã—ã¦ã‚ˆã„ã‹ç¢ºèªã—ã¦ãã ã•ã„。"
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr "ã™ã¹ã¦ã®å€¤ã®ãƒžãƒƒãƒ”ングを削除ã—ã¦ã‚ˆã„ã‹ç¢ºèªã—ã¦ãã ã•ã„。"
@@ -13651,7 +13668,7 @@ msgstr "POSTデータã®å½¢å¼"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr "電力使用é‡ã€<url> - VMwareサービスURLã€<uuid> - VMwareãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã®ãƒ›ã‚¹ãƒˆåã€<max> - 許容ã•ã‚Œã‚‹é›»åŠ›ä½¿ç”¨é‡ã®æœ€å¤§"
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr "指数"
@@ -13660,7 +13677,7 @@ msgstr "指数"
msgid "Pre-installation summary"
msgstr "インストール事å‰æº–備概è¦"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr "予測関数"
@@ -13777,9 +13794,9 @@ msgstr "éžå…¬é–‹"
msgid "Private key file"
msgstr "秘密éµãƒ•ã‚¡ã‚¤ãƒ«"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "特権レベル"
@@ -14185,7 +14202,7 @@ msgstr "復旧æ¡ä»¶å¼"
msgid "Recovery expression syntax error."
msgstr "復旧æ¡ä»¶å¼ã®æ§‹æ–‡ã‚¨ãƒ©ãƒ¼ã€‚"
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "復旧時ã®å®Ÿè¡Œå†…容"
@@ -14315,20 +14332,20 @@ msgstr "リモートコマンド"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14337,10 +14354,10 @@ msgstr "リモートコマンド"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14384,7 +14401,7 @@ msgstr "リモートコマンド"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14467,14 +14484,14 @@ msgstr "ç¹°ã‚Šè¿”ã™æ›œæ—¥"
msgid "Repeats"
msgstr "ç¹°ã‚Šè¿”ã—"
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14487,8 +14504,8 @@ msgstr "ç½®æ›"
msgid "Replace dependencies"
msgstr "ä¾å­˜é–¢ä¿‚ã‚’ç½®æ›"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr "指定文字列"
@@ -14621,7 +14638,7 @@ msgstr "デフォルトã«ãƒªã‚»ãƒƒãƒˆ"
#: jsLoader.php:172
msgid "Reset to initial view"
-msgstr ""
+msgstr "åˆæœŸè¡¨ç¤ºã«ãƒªã‚»ãƒƒãƒˆ"
#: jsLoader.php:291
msgid "Resolved"
@@ -14689,7 +14706,7 @@ msgstr "レスãƒãƒ³ã‚¹ã‚¿ã‚¤ãƒ—: 文字列"
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "çµæžœ"
@@ -15218,7 +15235,7 @@ msgstr "範囲"
msgid "Script"
msgstr "スクリプト"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "スクリプト\"%1$s\"ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚"
@@ -15282,6 +15299,15 @@ msgstr "検索パターンãŒç©ºç™½ã§ã™"
msgid "Search type"
msgstr "検索タイプ"
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr "季節性"
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr "季節性å差期間"
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "セカンダリPOCセル"
@@ -15360,7 +15386,7 @@ msgstr "ウィジェットã®é¸æŠž"
msgid "Selected"
msgstr "é¸æŠž"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "é¸æŠžã—ãŸã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’削除ã—ã¾ã—ãŸ"
@@ -15599,6 +15625,7 @@ msgid "Services updated"
msgstr "サービスを更新ã—ã¾ã—ãŸ"
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr "セッションåˆæœŸåŒ–エラー。"
@@ -15642,7 +15669,7 @@ msgstr "ステータスを正常ã«è¨­å®š"
#: jsLoader.php:171
msgid "Set this view as default"
-msgstr ""
+msgstr "ã“ã®è¡¨ç¤ºã‚’デフォルトã«ã‚»ãƒƒãƒˆ"
#: app/views/js/popup.itemtestedit.view.js.php:365 include/forms.inc.php:1416
#: include/views/js/item.preprocessing.js.php:67
@@ -15715,7 +15742,7 @@ msgstr "深刻度を下ã’ã¾ã—ãŸ"
#: jsLoader.php:152
msgid "Severity filter"
-msgstr ""
+msgstr "深刻度フィルター"
#: include/actions.inc.php:1780
msgctxt "screen reader"
@@ -16052,7 +16079,7 @@ msgstr "スペイン語(es_ES)"
msgid "Specified role was not found."
msgstr "指定ã•ã‚ŒãŸå½¹å‰²ãŒå­˜åœ¨ã—ã¾ã›ã‚“。"
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "実行ã™ã‚‹ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã®ã‚³ãƒžãƒ³ãƒ‰ã§æŒ‡å®šã•ã‚ŒãŸã‚¹ã‚¯ãƒªãƒ—トãŒå­˜åœ¨ã—ãªã„ã‹ã€æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“。"
@@ -16087,8 +16114,8 @@ msgstr "標準ã®ã‚¢ã‚¤ãƒ†ãƒ "
msgid "Standby"
msgstr "スタンãƒã‚¤"
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr "開始ä½ç½®"
@@ -16096,7 +16123,7 @@ msgstr "開始ä½ç½®"
msgid "Start date"
msgstr "開始日付"
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "開始時刻"
@@ -16175,7 +16202,7 @@ msgstr "Zabbixã®æ›¸ãè¾¼ã¿ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã®çµ±è¨ˆã€‚cacheãŒvaluesãªã‚‰mode
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16279,7 +16306,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "\"%1$s\"ã®åå‰ã‚’æŒã¤ã‚¹ãƒ†ãƒƒãƒ—ãŒã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚"
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16333,12 +16360,12 @@ msgstr "Straight"
msgid "Strict"
msgstr "é™å®š"
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr "文字列"
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr "文字列関数"
@@ -16359,10 +16386,10 @@ msgstr "サブフィルター"
msgid "Subject"
msgstr "件å"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "サブジェクト"
@@ -16556,7 +16583,7 @@ msgstr "ã‚¿ã‚°ã®å€¤"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16572,13 +16599,13 @@ msgstr "ã‚¿ã‚°ã®å€¤"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16595,7 +16622,7 @@ msgstr "ã‚¿ã‚°ã®å€¤"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16605,7 +16632,7 @@ msgstr "ã‚¿ã‚°ã®å€¤"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16641,14 +16668,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "テンプレート"
@@ -16692,7 +16717,7 @@ msgstr "テンプレートã®ãƒ€ãƒƒã‚·ãƒ¥ãƒœãƒ¼ãƒ‰"
msgid "Template dashboards"
msgstr "テンプレートã®ãƒ€ãƒƒã‚·ãƒ¥ãƒœãƒ¼ãƒ‰"
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "テンプレートを削除ã—ã¾ã—ãŸ"
@@ -16704,11 +16729,11 @@ msgstr "テンプレートグループ"
msgid "Template linkage"
msgstr "テンプレートã®ãƒªãƒ³ã‚¯"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "テンプレートã®ãƒžã‚¯ãƒ­"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "テンプレートå"
@@ -16743,13 +16768,12 @@ msgstr "åŒã˜è¡¨ç¤ºå\"%1$s\"ã‚’æŒã¤ãƒ†ãƒ³ãƒ—レートãŒã™ã§ã«å­˜åœ¨ã—ã
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16758,10 +16782,12 @@ msgstr "åŒã˜è¡¨ç¤ºå\"%1$s\"ã‚’æŒã¤ãƒ†ãƒ³ãƒ—レートãŒã™ã§ã«å­˜åœ¨ã—ã
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16772,7 +16798,7 @@ msgstr "テンプレート"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "テンプレート\"%1$s\"ã¨ãƒ›ã‚¹ãƒˆ\"%2$s\"ã®ãƒªãƒ³ã‚¯ã‚’削除ã—ã¾ã—ãŸã€‚"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr "テンプレートを更新ã—ã¾ã—ãŸ"
@@ -16866,7 +16892,7 @@ msgstr "メソッド\"%1$s.%2$s\"ã¯\"auth\"パラメータãªã—ã§å‘¼ã³å‡ºã—
#: app/views/administration.geomaps.edit.php:30
msgid "The URL template is used to load and display the tile layer on geographical maps."
-msgstr ""
+msgstr "URLテンプレートã¯ã€åœ°ç†ãƒžãƒƒãƒ—上ã«ã‚¿ã‚¤ãƒ«ãƒ¬ã‚¤ãƒ¤ãƒ¼ã‚’読ã¿è¾¼ã‚“ã§è¡¨ç¤ºã™ã‚‹ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã¾ã™ã€‚"
#: include/classes/db/DbBackend.php:130
#, c-format
@@ -16895,7 +16921,7 @@ msgstr "クローンã—ãŸãƒ†ãƒ³ãƒ—レートã¯\"éš ã—テキスト\"タイプã
#: app/views/administration.geomaps.edit.php:36
msgid "The following placeholders are supported:"
-msgstr ""
+msgstr "次ã®ãƒ—レースホルダーãŒã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã™:"
#: include/html.inc.php:688
#, c-format
@@ -16984,7 +17010,7 @@ msgstr "テーマ"
msgid "This day last week"
msgstr "先週ã®ä»Šæ—¥"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr "ã“ã®ãƒ•ã‚£ãƒ¼ãƒ«ãƒ‰ã¯ã‚¢ã‚¤ãƒ†ãƒ \"%1$s\"ã«ã‚ˆã£ã¦è‡ªå‹•çš„ã«è¨­å®šã•ã‚Œã¾ã™ã€‚"
@@ -17022,7 +17048,7 @@ msgstr "今年"
msgid "This year so far"
msgstr "今年(ç¾åœ¨ã¾ã§)"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "閾値"
@@ -17040,30 +17066,30 @@ msgstr "木曜"
#: app/views/administration.geomaps.edit.php:77
msgid "Tile URL"
-msgstr ""
+msgstr "タイルURL"
#: app/views/administration.geomaps.edit.php:65
msgid "Tile provider"
-msgstr ""
+msgstr "タイルプロãƒã‚¤ãƒ€ãƒ¼"
#: app/views/administration.geomaps.edit.php:58
msgid "Tile provider attribution data displayed in a small text box on the map."
-msgstr ""
+msgstr "タイルプロãƒã‚¤ãƒ€ãƒ¼ã®å¸°å±žæƒ…å ±ã¯ãƒžãƒƒãƒ—上ã®å°ã•ãªãƒ†ã‚­ã‚¹ãƒˆãƒœãƒƒã‚¯ã‚¹ã«è¡¨ç¤ºã•ã‚Œã¾ã™ã€‚"
#: app/views/popup.service.time.edit.php:90
#: app/views/popup.service.time.edit.php:141 report4.php:191
msgid "Till"
msgstr "終了"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17100,13 +17126,13 @@ msgstr "最後ã«ãƒ—ロキシã«ã‚¢ã‚¯ã‚»ã‚¹ã—ãŸæ™‚間。name - プロキシã
msgid "Time period"
msgstr "期間"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17794,9 +17820,9 @@ msgstr "å˜ä½"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "ä¸æ˜Ž"
@@ -17814,7 +17840,7 @@ msgid "Unknown error"
msgstr "ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "ä¸æ˜Žãªã‚¢ã‚¤ãƒ†ãƒ ã€‚é¸æŠžã—ãŸãƒ›ã‚¹ãƒˆã«ãã®ã‚ˆã†ãªã‚¢ã‚¤ãƒ†ãƒ ã¯å­˜åœ¨ã—ã¾ã›ã‚“"
@@ -17846,16 +17872,16 @@ msgstr "ä¸æ˜Žãªå€¤ã®ã‚¿ã‚¤ãƒ—"
msgid "Unlimited"
msgstr "無制é™"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "リンクを削除"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "リンクã¨ä¿å­˜ãƒ‡ãƒ¼ã‚¿ã‚’削除"
@@ -17950,10 +17976,10 @@ msgstr "Up"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -17962,16 +17988,16 @@ msgstr "Up"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18000,7 +18026,7 @@ msgstr "既存ã®è¨­å®šã‚’上書"
msgid "Update interval"
msgstr "監視間隔"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "更新時ã®å®Ÿè¡Œå†…容"
@@ -18027,7 +18053,7 @@ msgstr "アップロード"
msgid "Upper level maps"
msgstr "上ä½ãƒ¬ãƒ™ãƒ«ã®ãƒžãƒƒãƒ—"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18210,7 +18236,7 @@ msgstr[0] "ユーザーグループを更新ã—ã¾ã—ãŸ"
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18344,15 +18370,15 @@ msgid "User/Recipient"
msgstr "ユーザー/é€ä¿¡å…ˆ"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "ユーザーå"
@@ -18666,11 +18692,11 @@ msgstr "ãƒãƒªãƒ‡ãƒ¼ã‚·ãƒ§ãƒ³"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18744,14 +18770,14 @@ msgstr "値ã®ãƒžãƒƒãƒ”ング\"%1$s\"ã¯ã™ã§ã«å­˜åœ¨ã—ã¾ã™ã€‚"
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "値ã®ãƒžãƒƒãƒ”ング"
@@ -18794,7 +18820,7 @@ msgstr "値: データãªã—"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr "IDãŒ\"%1$s\"ã®å€¤ã®ãƒžãƒƒãƒ”ングã¯\"%2$s\"ã«ã¯ã‚ã‚Šã¾ã›ã‚“。"
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -18894,7 +18920,7 @@ msgstr "ãƒã‚¤ãƒˆå˜ä½ã‚‚ã—ãã¯ãƒˆãƒ¼ã‚¿ãƒ«ã‹ã‚‰ã®ãƒ‘ーセンテージã§
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "表示å"
@@ -18916,11 +18942,11 @@ msgstr "W"
#: jsLoader.php:184
msgctxt "abbreviation of severity level"
msgid "W"
-msgstr ""
+msgstr "è­¦"
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "警告"
@@ -19026,6 +19052,10 @@ msgstr "æ°´"
msgid "Wednesday"
msgstr "水曜"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19298,7 +19328,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "å¹´"
@@ -19358,7 +19389,7 @@ msgstr "\"%1$s\"ã¨ã—ã¦ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã™ã€‚"
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Webサーãƒãƒ¼ã«ãƒ­ã‚±ãƒ¼ãƒ«ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ãªã„ãŸã‚ã€ã„ãã¤ã‹ã®è¨€èªžã¯åˆ©ç”¨ã§ãã¾ã›ã‚“。"
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "ã‚ãªãŸã¯ãƒ­ã‚°ã‚¤ãƒ³ã—ã¦ã„ã¾ã›ã‚“"
@@ -19602,11 +19633,11 @@ msgstr "時間範囲を指定ã—ã¦ãã ã•ã„"
msgid "a time unit is expected"
msgstr "時間ã®å˜ä½ã‚’指定ã—ã¦ãã ã•ã„"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr "abs() - 絶対値"
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr "acos() - 角度ã®å€¤ã®ã‚¢ãƒ¼ã‚¯ã‚³ã‚µã‚¤ãƒ³ã€ãƒ©ã‚¸ã‚¢ãƒ³ã§ç¤ºã™"
@@ -19701,7 +19732,7 @@ msgstr "16進文字列ã§æŒ‡å®šã—ã¦ãã ã•ã„"
msgid "an explicit time is expected"
msgstr "具体的ãªæ™‚間を指定ã—ã¦ãã ã•ã„"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr "識別å­ã¯å¼ã§å®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“"
@@ -19720,7 +19751,7 @@ msgstr "英字ã®å¤§æ–‡å­—ã¨å°æ–‡å­—"
#: app/views/administration.geomaps.edit.php:47
msgid "and"
-msgstr ""
+msgstr "ã¨"
#: include/views/monitoring.history.php:186
msgid "as Blue"
@@ -19745,11 +19776,11 @@ msgstr "赤"
msgid "ascending"
msgstr "昇順"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr "ascii() - 値ã®å·¦ç«¯ã®æ–‡å­—ã®ASCIIコードを返ã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr "asin() - 角度ã®å€¤ã®ã‚¢ãƒ¼ã‚¯ã‚µã‚¤ãƒ³ã€ãƒ©ã‚¸ã‚¢ãƒ³ã§ç¤ºã™"
@@ -19763,11 +19794,11 @@ msgstr "å°‘ãªãã¨ã‚‚1ã¤ã®æ›œæ—¥ã‚’é¸æŠžã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
msgid "at least one override option must be specified"
msgstr "å°‘ãªãã¨ã‚‚1ã¤ã®ã‚ªãƒ¼ãƒãƒ¼ãƒ©ã‚¤ãƒ‰ã‚ªãƒ—ションを指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr "atan() - 角度ã®å€¤ã®ã‚¢ãƒ¼ã‚¯ã‚¿ãƒ³ã‚¸ã‚§ãƒ³ãƒˆã€ãƒ©ã‚¸ã‚¢ãƒ³ã§ç¤ºã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr "atan2() - ラジアンã§è¡¨ã•ã‚ŒãŸè§’度ã¨ã—ã¦æŒ‡å®šã•ã‚ŒãŸç¸¦åº§æ¨™(exprue)ã¨æ¨ªåº§æ¨™ã®ã‚¢ãƒ¼ã‚¯ã‚¿ãƒ³ã‚¸ã‚§ãƒ³ãƒˆ"
@@ -19789,39 +19820,47 @@ msgstr "自動登録"
msgid "avg"
msgstr "å¹³å‡"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - 期間Tã®å€¤ã®å¹³å‡å€¤"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr "between() - 値ãŒæŒ‡å®šã•ã‚ŒãŸç¯„囲内ã§ã‚ã‚‹ã‹ãƒã‚§ãƒƒã‚¯ (1 - 範囲内, 0 - ãã®ä»–)"
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr "bitand() - ビットAND演算"
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr "bitlength() - ビット長を返ã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr "bitlshift() - ビット左シフト"
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr "bitnot() - ビットNOT演算"
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr "bitor() - ビットOR演算"
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr "bitrshift() - ビットå³ã‚·ãƒ•ãƒˆ"
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr "bitxor() - ビットXOR演算"
@@ -19836,7 +19875,7 @@ msgstr "点滅"
msgid "both username and password should be either present or empty"
msgstr "ユーザーåã¨ãƒ‘スワードã®ä¸¡æ–¹ã‚’指定ã™ã‚‹ã‹ç©ºã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr "bytelength() - ãƒã‚¤ãƒˆé•·ã‚’è¿”ã™"
@@ -19849,7 +19888,7 @@ msgstr "計算"
#: app/views/administration.geomaps.edit.php:52
msgid "can be used to add \"@2x\" to the URL to load retina tiles."
-msgstr ""
+msgstr "高精細タイルを読ã¿è¾¼ã‚€ãŸã‚ã«URLã«\"@2x\"を追加ã§ãる。"
#: include/classes/api/services/CItemGeneral.php:229
msgid "cannot be changed"
@@ -19878,7 +19917,7 @@ msgstr "変更ã§ãã¾ã›ã‚“"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -19966,23 +20005,23 @@ msgstr "スクロールAPIリクエストを実行ã§ãã¾ã›ã‚“。データã¯
msgid "cannot update property for templated discovery rule"
msgstr "テンプレートã®ãƒ‡ã‚£ã‚¹ã‚«ãƒãƒªãƒ«ãƒ¼ãƒ«ã®ãƒ—ロパティを更新ã§ãã¾ã›ã‚“"
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr "cbrt() - 立方根"
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr "ceil() - 一番近ãã¦å¤§ãã„æ•´æ•°ã«åˆ‡ã‚Šä¸Šã’ã‚‹"
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - 最新値ã¨å‰å›žå€¤ã¨ã®å·®åˆ†"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
-msgstr ""
+msgstr "changecount() - 隣接ã™ã‚‹å€¤ã®é–“ã®å¤‰æ›´ã®æ•°ã€mode (all - ã™ã¹ã¦ã®å¤‰åŒ–ã€inc - 増加ã®ã¿ã€dec - 減少ã®ã¿)"
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr "char() - 指定ã•ã‚ŒãŸASCIIコードã®æ–‡å­—ã‚’è¿”ã™"
@@ -20009,7 +20048,7 @@ msgstr "色"
msgid "comma-separated list"
msgstr "カンマ区切りã®ãƒªã‚¹ãƒˆ"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr "concat() - 値を文字列ã«é€£çµã—ãŸçµæžœã®æ–‡å­—列を返ã™"
@@ -20024,15 +20063,15 @@ msgstr "グローãƒãƒ«ãƒžã‚¯ãƒ­è¨­å®š"
msgid "contains"
msgstr "å«ã‚€"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr "cos() - 値ã®ã‚³ã‚µã‚¤ãƒ³ã€ãƒ©ã‚¸ã‚¢ãƒ³ã§ç¤ºã•ã‚ŒãŸè§’度ã®å€¤"
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr "cosh() - 値ã®ãƒã‚¤ãƒ‘ボリックコサイン"
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr "cot() - 値ã®ã‚³ã‚¿ãƒ³ã‚¸ã‚§ãƒ³ãƒˆã€ãƒ©ã‚¸ã‚¢ãƒ³ã§ç¤ºã•ã‚ŒãŸè§’度ã®å€¤"
@@ -20040,11 +20079,11 @@ msgstr "cot() - 値ã®ã‚³ã‚¿ãƒ³ã‚¸ã‚§ãƒ³ãƒˆã€ãƒ©ã‚¸ã‚¢ãƒ³ã§ç¤ºã•ã‚ŒãŸè§’度ã
msgid "count"
msgstr "個数"
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - 期間Tã§åŽé›†ã•ã‚ŒãŸå€¤V(オペレータOを満ãŸã™)ã®æ•°"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr "countunique() - ユニークãªå€¤ã®æ•°"
@@ -20057,15 +20096,15 @@ msgstr "d"
msgid "d.M"
msgstr "m/d"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - ç¾åœ¨ã®æ—¥ä»˜"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - 月内ã®æ—¥ä»˜"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - 曜日(月曜 - 1ã€æ—¥æ›œ - 7)"
@@ -20083,7 +20122,7 @@ msgstr "æ—¥"
msgid "default"
msgstr "デフォルト"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr "degrees() - 値をラジアンã‹ã‚‰è§’度ã«å¤‰æ›"
@@ -20160,7 +20199,7 @@ msgstr "存在ã—ãªã„"
msgid "does not match"
msgstr "一致ã—ãªã„"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr "e() - オイラー数を返ã™"
@@ -20183,11 +20222,11 @@ msgstr "エラーメッセージ"
msgid "exists"
msgstr "存在ã™ã‚‹"
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr "exp() - オイラー数ã®ç´¯ä¹—値"
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr "expm1() - オイラー数ã®ç´¯ä¹—値マイナス1"
@@ -20203,7 +20242,7 @@ msgstr "JSONã®è§£æžã«å¤±æ•—ã—ã¾ã—ãŸ"
msgid "file format is unsupported"
msgstr "ファイル形å¼ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr "find() - 期間Tã§ã®ãƒ‘ターンV(演算å­0を満ãŸã™)ã®ç™ºç”Ÿãƒã‚§ãƒƒã‚¯(1 - åˆè‡´ã™ã‚‹ã€0 - åˆè‡´ã—ãªã„)"
@@ -20217,15 +20256,15 @@ msgstr "第1"
msgid "first parameter is expected"
msgstr "最åˆã®ãƒ‘ラメータを指定ã—ã¦ãã ã•ã„"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr "first() - 指定ã•ã‚ŒãŸæ™‚é–“é–“éš”ã§æœ€ã‚‚å¤ã„値"
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr "floor() - 最も近ãã¦å°ã•ãªæ•´æ•°ã«åˆ‡ã‚Šæ¨ã¦ã‚‹"
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - 期間Tã«åŸºã¥ã次ã®t秒ã®äºˆæ¸¬å€¤"
@@ -20233,13 +20272,13 @@ msgstr "forecast() - 期間Tã«åŸºã¥ã次ã®t秒ã®äºˆæ¸¬å€¤"
msgid "fourth"
msgstr "第4"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime() - アイテムã®å€¤(タイムスタンプã¨ã—ã¦)ã¨Zabbixサーãƒãƒ¼ã®ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—ã¨ã®å·®ãŒT秒以下㋠(1 - T秒以下ã€0 - ãれ以外)"
#: include/classes/validators/CApiInputValidator.php:2807
msgid "geographical coordinates (values of comma separated latitude and longitude) are expected"
-msgstr ""
+msgstr "地ç†åº§æ¨™(コンマã§åŒºåˆ‡ã‚‰ã‚ŒãŸç·¯åº¦ã¨çµŒåº¦ã®å€¤)を指定ã—ã¦ãã ã•ã„"
#: include/views/configuration.item.edit.php:803
#: include/views/configuration.item.edit.php:808
@@ -20307,7 +20346,7 @@ msgstr "期間中"
msgid "in range"
msgstr "範囲"
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr "in() - 値ãŒãƒªã‚¹ãƒˆã‚¢ãƒƒãƒ—ã•ã‚ŒãŸå€¤ã¨åŒã˜ã‹ãƒã‚§ãƒƒã‚¯ (1 - åŒã˜ã€0 - ãã®ä»–)"
@@ -20316,11 +20355,11 @@ msgstr "in() - 値ãŒãƒªã‚¹ãƒˆã‚¢ãƒƒãƒ—ã•ã‚ŒãŸå€¤ã¨åŒã˜ã‹ãƒã‚§ãƒƒã‚¯ (1 -
msgid "including subgroups"
msgstr "サブグループをå«ã‚€"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr "計算アイテムã®è¨ˆç®—å¼ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr "\"%1$s\"ã‹ã‚‰å§‹ã¾ã‚‹è¨ˆç®—アイテムã®è¨ˆç®—å¼ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
@@ -20339,7 +20378,7 @@ msgstr "è¦ç´ ã®æ•°ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
msgid "incorrect expression starting from \"%1$s\""
msgstr "\"%1$s\"ã‹ã‚‰å§‹ã¾ã‚‹æ¡ä»¶å¼ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr "æ¡ä»¶ã®æ•°ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
@@ -20357,7 +20396,7 @@ msgstr "é–“é•ã£ãŸæ›¸å¼ãŒ\"%1$s\"付近ã«è¦‹ã¤ã‹ã‚Šã¾ã—ãŸ"
msgid "incorrect usage of function \"%1$s\""
msgstr "関数\"%1$s\"ã®ä½¿ã„æ–¹ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr "insert() - 文字列内ã®æŒ‡å®šã—ãŸé–‹å§‹ä½ç½®ã‹ã‚‰æŒ‡å®šã—ãŸæ–‡å­—列ã‹ã‚¹ãƒšãƒ¼ã‚¹ã‚’挿入ã™ã‚‹"
@@ -20417,7 +20456,7 @@ msgstr "ホストグループåãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
msgid "invalid host name"
msgstr "ホストåãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20439,6 +20478,16 @@ msgstr "æ­£è¦è¡¨ç¾ãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
msgid "invalid second parameter in function \"%1$s\""
msgstr "関数\"%1$s\"内ã®2番目ã®ãƒ‘ラメーターãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr "関数\"%1$s\"内ã®7番目ã®ãƒ‘ラメーターãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr "関数\"%1$s\"内ã®6番目ã®ãƒ‘ラメーターãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“"
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20480,7 +20529,7 @@ msgstr "アイテムパターン"
msgid "key is empty"
msgstr "キーãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr "kurtosis() - 確率分布ã®\"tailedness\"を測定ã™ã‚‹"
@@ -20496,7 +20545,7 @@ msgctxt "week of month"
msgid "last"
msgstr "最終"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - 最新値"
@@ -20504,11 +20553,11 @@ msgstr "last() - 最新値"
msgid "left"
msgstr "å·¦"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr "left() - 左端ã®æ–‡å­—をカウント"
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr "length() - 文字列内ã®æœ€å¾Œ(最新)ã®T値ã®é•·ã•"
@@ -20516,23 +20565,23 @@ msgstr "length() - 文字列内ã®æœ€å¾Œ(最新)ã®T値ã®é•·ã•"
msgid "list of characters"
msgstr "文字列ã®ãƒªã‚¹ãƒˆ"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr "log() - 自然対数"
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr "log10() - 常用対数"
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr "logeventid() - 期間T内ã®æœ€çµ‚ログエントリã®ã‚¤ãƒ™ãƒ³ãƒˆIDãŒæ­£è¦è¡¨ç¾Vã«ä¸€è‡´ã™ã‚‹ã‹ (1 - 一致ã™ã‚‹, 0 - 一致ã—ãªã„)"
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr "logseverity() - 期間T内ã®æœ€çµ‚ログエントリã®æ·±åˆ»åº¦"
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr "logsource() - 期間T内ã®æœ€çµ‚ログエントリã®ã‚½ãƒ¼ã‚¹ãŒå¼•æ•°Vã«ä¸€è‡´ã™ã‚‹ã‹ (1 - 一致ã™ã‚‹, 0 - 一致ã—ãªã„)"
@@ -20540,7 +20589,7 @@ msgstr "logsource() - 期間T内ã®æœ€çµ‚ログエントリã®ã‚½ãƒ¼ã‚¹ãŒå¼•æ•°
msgid "low-level discovery rule"
msgstr "ローレベルディスカãƒãƒªãƒ«ãƒ¼ãƒ«"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr "ltrim() - 文字列ã®å…ˆé ­ã‹ã‚‰æŒ‡å®šã—ãŸæ–‡å­—列を削除"
@@ -20572,11 +20621,11 @@ msgstr "マクロãŒè¨­å®šã•ã‚Œã¦ã„ã¾ã›ã‚“"
msgid "macro(s)"
msgstr "マクロ"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr "mad() - 中央絶対åå·®"
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr "関数\"%1$s\"ã«å¿…須パラメーターãŒã‚ã‚Šã¾ã›ã‚“"
@@ -20612,7 +20661,7 @@ msgstr "最大"
msgid "max period is less than time filter default period"
msgstr "最大期間ãŒãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã®ãƒ•ã‚£ãƒ«ã‚¿æœŸé–“よりもå°ã•ã„ã§ã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - 期間Tã§ã®æœ€å¤§å€¤"
@@ -20626,7 +20675,7 @@ msgstr "ä¾å­˜ã‚¢ã‚¤ãƒ†ãƒ ã®æ•°ãŒæœ€å¤§æ•°ã«é”ã—ã¾ã—ãŸ"
msgid "maximum number of dependency levels reached"
msgstr "ä¾å­˜ãƒ¬ãƒ™ãƒ«ã®æ•°ãŒæœ€å¤§æ•°ã«é”ã—ã¾ã—ãŸ\""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr "mid() - 開始ä½ç½®ã‹ã‚‰N文字ã®éƒ¨åˆ†æ–‡å­—列を返ã™"
@@ -20643,7 +20692,7 @@ msgstr "mid() - 開始ä½ç½®ã‹ã‚‰N文字ã®éƒ¨åˆ†æ–‡å­—列を返ã™"
msgid "min"
msgstr "最å°"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min() - 期間Tã§ã®æœ€å°å€¤"
@@ -20658,15 +20707,15 @@ msgstr "%1$s文字以上ã§æŒ‡å®šã—ã¦ãã ã•ã„"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr "mod() - 割り算ã®ä½™ã‚Š"
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr "monodec() - アイテムã®å€¤ãŒæ¸›å°‘ã—続ã‘ã¦ã„ã‚‹ã‹ãƒã‚§ãƒƒã‚¯ (1 - å˜èª¿ã€0 - ãã®ä»–)ã€ãƒ¢ãƒ¼ãƒ‰ (strict - 厳密ãªå˜èª¿æ€§)"
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr "monoinc() - アイテムã®å€¤ãŒå¢—加ã—続ã‘ã¦ã„ã‚‹ã‹ãƒã‚§ãƒƒã‚¯ (1 - å˜èª¿ã€0 - ãã®ä»–)ã€ãƒ¢ãƒ¼ãƒ‰ (strict - 厳密ãªå˜èª¿æ€§)"
@@ -20748,7 +20797,7 @@ msgstr "åå‰"
msgid "new"
msgstr "æ–°è¦"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "æ–°è¦"
@@ -20782,7 +20831,7 @@ msgstr "マップã®ä½œæˆã¨å¤‰æ›´ã®æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“"
msgid "no permissions to unacknowledge problems"
msgstr "障害を未確èªã«ã™ã‚‹æ¨©é™ãŒã‚ã‚Šã¾ã›ã‚“"
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr "nodata() - 期間Tã®é–“å–得データãªã— (1 - å–得データãªã—ã€0 - ãれ以外)ã€Mode (strict - é€ã‚‰ã‚Œã¦ããŸãƒ‡ãƒ¼ã‚¿å†…ã®ãƒ—ロキシã§ã®é…延を無視)"
@@ -20803,7 +20852,7 @@ msgstr "期間外"
msgid "not selected"
msgstr "é¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now() - エãƒãƒƒã‚¯ã‚’基準ã¨ã—ãŸçµŒéŽç§’æ•°"
@@ -20890,15 +20939,15 @@ msgstr "path/to/secret:key"
msgid "pattern"
msgstr "パターン"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile() - 期間Tã§ã®ãƒ‘ーセンタイルP"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr "pi() - 円周率を返ã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr "power() - ベースã®å€¤ã«æŒ‡æ•°ã‚’指定ã—ãŸã¹ã乗値"
@@ -20906,15 +20955,15 @@ msgstr "power() - ベースã®å€¤ã«æŒ‡æ•°ã‚’指定ã—ãŸã¹ã乗値"
msgid "problem pattern"
msgstr "障害パターン"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr "radians() - 値を角度ã‹ã‚‰ãƒ©ã‚¸ã‚¢ãƒ³ã«å¤‰æ›"
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr "rand() - ランダムãªæ•´æ•°å€¤"
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr "rate() - å˜èª¿ã«å¢—加ã™ã‚‹ã‚«ã‚¦ãƒ³ã‚¿ãƒ¼ã®1秒ã‚ãŸã‚Šã®å¹³å‡ãƒ¬ãƒ¼ãƒˆã‚’è¿”ã™"
@@ -20963,11 +21012,11 @@ msgstr "æ­£è¦è¡¨ç¾"
msgid "regular expression"
msgstr "æ­£è¦è¡¨ç¾"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr "repeat() - カウント数ã§ç¹°ã‚Šè¿”ã—ãŸæ–‡å­—列を返ã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr "replace() - パターンを検索ã—ã¦æŒ‡å®šæ–‡å­—列ã«ç½®ãæ›ãˆã‚‹"
@@ -20977,29 +21026,29 @@ msgstr "ç½®æ›æ–‡å­—列"
#: app/views/administration.geomaps.edit.php:48
msgid "represent tile coordinates;"
-msgstr ""
+msgstr "ã§ã‚¿ã‚¤ãƒ«ã®åº§æ¨™;"
#: app/views/administration.geomaps.edit.php:40
msgid "represents one of the available subdomains;"
-msgstr ""
+msgstr "利用å¯èƒ½ãªã‚µãƒ–ドメインã®1ã¤;"
#: app/views/administration.geomaps.edit.php:44
msgid "represents zoom level parameter in the URL;"
-msgstr ""
+msgstr "URLã®ã‚ºãƒ¼ãƒ ãƒ¬ãƒ™ãƒ«ãƒ‘ラメータ;"
#: include/classes/graphdraw/CLineGraphDraw.php:1516
msgid "right"
msgstr "å³"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr "right() - å³ç«¯ã®æ–‡å­—ã‚’è¿”ã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr "round() - å°æ•°ç‚¹ä»¥ä¸‹æ¡æ•°ã§å››æ¨äº”å…¥"
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr "rtrim() - 文字列ã®æœ€å¾Œã‹ã‚‰æŒ‡å®šã—ãŸæ–‡å­—を削除"
@@ -21090,35 +21139,35 @@ msgstr "アイコンã®ãƒžãƒƒãƒ”ングを表示"
msgid "sign in as guest"
msgstr "ゲストã¨ã—ã¦ã‚µã‚¤ãƒ³ã‚¤ãƒ³"
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr "signum() - 値ãŒè² ã®å ´åˆã¯-1ã€å€¤ãŒã‚¼ãƒ­ã®å ´åˆã¯0ã€å€¤ãŒæ­£ã®å ´åˆã¯1ã‚’è¿”ã™"
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr "sin() - 値ã®ã‚µã‚¤ãƒ³ã€ãƒ©ã‚¸ã‚¢ãƒ³ã§ç¤ºã•ã‚ŒãŸè§’度ã®å€¤"
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr "sinh() - 値ã®ãƒã‚¤ãƒ‘ボリックサイン"
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr "skewness() - 確率分布ã®éžå¯¾ç§°æ€§ã‚’測定"
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr "sqrt() - 値ã®å¹³æ–¹æ ¹"
#: app/partials/administration.ha.nodes.php:63
msgid "standalone server"
-msgstr ""
+msgstr "スタンドアローンサーãƒãƒ¼"
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr "stddevpop() - æ¯æ¨™æº–åå·®"
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr "stddevsamp() - サンプル標準åå·®"
@@ -21126,11 +21175,11 @@ msgstr "stddevsamp() - サンプル標準åå·®"
msgid "sum"
msgstr "åˆè¨ˆ"
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum() - 期間Tã§ã®åˆè¨ˆå€¤"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr "sumofsquares() - 平方和"
@@ -21158,7 +21207,7 @@ msgstr "指定ã•ã‚ŒãŸè³‡æ ¼æƒ…å ±ã¯ãƒ¦ãƒ‹ãƒ¼ã‚¯ã§ã¯ã‚ã‚Šã¾ã›ã‚“"
msgid "tag"
msgstr "ã‚¿ã‚°"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr "tan() - 値ã®ã‚¿ãƒ³ã‚¸ã‚§ãƒ³ãƒˆ"
@@ -21192,7 +21241,7 @@ msgstr "最後ã®æ”¹è¡ŒãŒã‚ã‚Šã¾ã›ã‚“"
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21239,31 +21288,35 @@ msgstr "デフォルトã®ãƒ•ã‚£ãƒ«ã‚¿æœŸé–“ãŒæœ€å¤§æœŸé–“を超ãˆã¾ã—ãŸ"
msgid "time shift"
msgstr "タイムシフト"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - ç¾åœ¨æ™‚刻"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - 期間Tã«åŸºã¥ã閾値ã«é”ã™ã‚‹ã¾ã§ã®æ™‚é–“"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr "trendavg() - 期間ã®ã‚·ãƒ•ãƒˆã‚’å«ã‚€æœŸé–“Tã§ã®å¹³å‡å€¤"
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr "trendcount() - 期間Tã§æ­£å¸¸ã«å–å¾—ã—ãŸå€¤ã®æ•°"
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr "trendmax() - 期間ã®ã‚·ãƒ•ãƒˆã‚’å«ã‚€æœŸé–“Tã§ã®æœ€å¤§å€¤"
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr "trendmin() - 期間ã®ã‚·ãƒ•ãƒˆã‚’å«ã‚€æœŸé–“Tã§ã®æœ€å°å€¤"
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr "trendstl() - STLã«ã‚ˆã‚‹æœŸé–“Tã§ã®ç•°å¸¸å€¤æ¤œå‡º"
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr "trendsum() - 期間ã®ã‚·ãƒ•ãƒˆã‚’å«ã‚€æœŸé–“Tã§ã®åˆè¨ˆå€¤"
@@ -21289,11 +21342,11 @@ msgstr "トリガーã®ãƒ—ロトタイプã¯ä»–ã®ãƒ†ãƒ³ãƒ—レートやホスト
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "リンクã®ã‚るトリガーã¯ä»–ã®ãƒ†ãƒ³ãƒ—レートやホストã«ç§»å‹•ã§ãã¾ã›ã‚“"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr "trim() - 文字列ã®å…ˆé ­ã‹ã‚‰æœ€å¾Œã¾ã§ã‚ˆã‚ŠæŒ‡å®šã—ãŸæ–‡å­—列を削除"
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr "truncate() - å°æ•°ç‚¹ä»¥ä¸‹æ¡æ•°ã§åˆ‡ã‚Šæ¨ã¦"
@@ -21350,7 +21403,7 @@ msgstr "マクロã®æœ«å°¾ãŒé–“é•ã£ã¦ã„ã¾ã™"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21393,7 +21446,7 @@ msgstr "値\"%1$s\"ãŒé–“é•ã£ã¦ã„ã¾ã™ã€‚"
msgid "unknown"
msgstr "ä¸æ˜Ž"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21590,11 +21643,11 @@ msgstr "2ã¤ã‚ã®ãƒ‘ラメータã®å€¤ãŒé•·ã™ãŽã¾ã™"
msgid "value of third parameter must be one of %1$s"
msgstr "3ã¤ã‚ã®ãƒ‘ラメータã®å€¤ã¯%1$sã‹ã‚‰é¸ã‚“ã§ãã ã•ã„"
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr "varpop() - æ¯åˆ†æ•£"
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr "varsamp() - サンプル分散"
@@ -21619,4 +21672,4 @@ msgstr "y"
#: include/classes/validators/CApiInputValidator.php:2815
#, c-format
msgid "zoom level must be between \"%1$s\" and \"%2$s\""
-msgstr ""
+msgstr "ズームレベルã¯\"%1$s\"ã‹ã‚‰\"%2$s\"ã¾ã§ã§æŒ‡å®šã—ã¦ãã ã•ã„"
diff --git a/ui/locale/ka/LC_MESSAGES/frontend.po b/ui/locale/ka/LC_MESSAGES/frontend.po
index 1f4e0c86895..70b596ce034 100644
--- a/ui/locale/ka/LC_MESSAGES/frontend.po
+++ b/ui/locale/ka/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2021-03-19 18:13+0300\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: none\n"
@@ -284,10 +284,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr "(მხáƒáƒšáƒáƒ“ სუპერ áƒáƒ“მინისტრáƒáƒ¢áƒáƒ áƒ”ბს შეუძლიáƒáƒ— ჯგუფების შექმნáƒ)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(პრáƒáƒ¥áƒ¡áƒ˜áƒ¡ გáƒáƒ áƒ”შე)"
@@ -436,7 +436,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -506,7 +506,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -525,11 +525,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -541,24 +541,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -576,7 +576,7 @@ msgstr ""
msgid "Action"
msgstr "მáƒáƒ¥áƒ›áƒ”დებáƒ"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "მáƒáƒ¥áƒ›áƒ”დებრ\"%1$s\" უკვე áƒáƒ áƒ¡áƒ”ბáƒáƒ‘ს."
@@ -586,7 +586,7 @@ msgstr "მáƒáƒ¥áƒ›áƒ”დებრ\"%1$s\" უკვე áƒáƒ áƒ¡áƒ”ბáƒáƒ‘á
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "მáƒáƒ¥áƒ›áƒ”დებრდáƒáƒ”მáƒáƒ¢áƒ"
@@ -595,16 +595,16 @@ msgstr "მáƒáƒ¥áƒ›áƒ”დებრდáƒáƒ”მáƒáƒ¢áƒ"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "მáƒáƒ¥áƒ›áƒ”დებრწáƒáƒ˜áƒ¨áƒáƒšáƒ"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "მáƒáƒ¥áƒ›áƒ”დებრგáƒáƒ›áƒáƒ áƒ—ულიáƒ"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "მáƒáƒ¥áƒ›áƒ”დებრჩáƒáƒ áƒ—ულიáƒ"
@@ -622,7 +622,7 @@ msgstr "მáƒáƒ¥áƒ›áƒ”დებების ჟურნáƒáƒšáƒ˜"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "მáƒáƒ¥áƒ›áƒ”დებრგáƒáƒœáƒáƒ®áƒšáƒ“áƒ"
@@ -670,7 +670,7 @@ msgid "Active till"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -729,14 +729,14 @@ msgstr ""
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -752,10 +752,10 @@ msgstr ""
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -767,9 +767,9 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -787,7 +787,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -832,7 +832,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -857,8 +857,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -871,7 +871,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1005,7 +1005,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1021,6 +1021,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "ფსევდáƒáƒœáƒ˜áƒ›áƒ˜"
@@ -1335,7 +1339,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1415,9 +1419,9 @@ msgstr ""
msgid "Authentication"
msgstr "áƒáƒ•áƒ—ენტიფიკáƒáƒªáƒ˜áƒ"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "áƒáƒ•áƒ—ენტიფიკáƒáƒªáƒ˜áƒ˜áƒ¡ áƒáƒšáƒ’áƒáƒ áƒ˜áƒ—მი"
@@ -1478,12 +1482,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒ˜"
@@ -1598,12 +1602,12 @@ msgstr "ბმის DN"
msgid "Bind password"
msgstr "ბმის პáƒáƒ áƒáƒšáƒ˜"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1813,7 +1817,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "მáƒáƒ¥áƒ›áƒ”დების დáƒáƒ›áƒáƒ¢áƒ”ბრვერ მáƒáƒ®áƒ”რხდáƒ"
@@ -2106,7 +2110,7 @@ msgstr[0] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Zabbix-ის შიდრმáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის \"%1$s\" წáƒáƒ¨áƒšáƒ ვერ მáƒáƒ®áƒ”რხდáƒ, სცáƒáƒ“ეთ áƒáƒ› მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის გáƒáƒ—იშვáƒ."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "მáƒáƒ¥áƒ›áƒ”დების წáƒáƒ¨áƒšáƒ ვერ მáƒáƒ®áƒ”რხდáƒ"
@@ -2258,12 +2262,12 @@ msgid "Cannot delete script"
msgid_plural "Cannot delete scripts"
msgstr[0] ""
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "სცენáƒáƒ áƒ”ბის წáƒáƒ¨áƒšáƒ ვერ მáƒáƒ®áƒ”რხდáƒ. სცენáƒáƒ áƒ˜ \"%1$s\" გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებრმáƒáƒ¥áƒ›áƒ”დების áƒáƒžáƒ”რáƒáƒªáƒ˜áƒáƒ¨áƒ˜ \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ მáƒáƒ¥áƒ›áƒ”დებების წáƒáƒ¨áƒšáƒ ვერ მáƒáƒ®áƒ”რხდáƒ"
@@ -2279,7 +2283,7 @@ msgstr[0] "სერვისის წáƒáƒ¨áƒšáƒ ვერ მáƒáƒ®áƒ”რხ
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "შáƒáƒ‘ლáƒáƒœáƒ˜áƒ¡ წáƒáƒ¨áƒšáƒ ვერ მáƒáƒ®áƒ”რხდáƒ"
@@ -2362,7 +2366,7 @@ msgid "Cannot disable API token"
msgid_plural "Cannot disable API tokens"
msgstr[0] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "მáƒáƒ¥áƒ›áƒ”დების გáƒáƒ—იშვრვერ მáƒáƒ®áƒ”რხდáƒ"
@@ -2429,7 +2433,7 @@ msgid "Cannot enable API token"
msgid_plural "Cannot enable API tokens"
msgstr[0] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2647,7 +2651,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
msgstr[0] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2824,7 +2828,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -2890,7 +2894,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr ""
@@ -2949,7 +2953,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr ""
@@ -3050,9 +3054,9 @@ msgstr ""
msgid "Cannot update script"
msgstr ""
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3079,7 +3083,7 @@ msgstr ""
msgid "Cannot update template"
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3163,14 +3167,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3188,10 +3192,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3231,9 +3235,9 @@ msgstr ""
msgid "Character string not included"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3249,7 +3253,7 @@ msgstr ""
msgid "Check already exists."
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr ""
@@ -3371,8 +3375,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr ""
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr ""
@@ -3399,16 +3403,16 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3537,7 +3541,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3809,13 +3813,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3823,9 +3827,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -3989,10 +3993,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr ""
@@ -4082,7 +4086,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4284,7 +4288,7 @@ msgid "Current value"
msgstr ""
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4526,7 +4530,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4599,11 +4603,11 @@ msgstr ""
msgid "Date HW purchased"
msgstr ""
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr ""
@@ -4644,8 +4648,8 @@ msgstr ""
msgid "December"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4655,7 +4659,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4786,7 +4790,7 @@ msgstr ""
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr ""
@@ -4795,11 +4799,11 @@ msgstr ""
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr ""
@@ -4932,7 +4936,7 @@ msgstr ""
msgid "Delete selected host groups?"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5040,7 +5044,7 @@ msgstr ""
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr ""
@@ -5101,7 +5105,7 @@ msgstr ""
msgid "Dependencies"
msgstr ""
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr ""
@@ -5109,7 +5113,7 @@ msgstr ""
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5120,7 +5124,7 @@ msgid "Deployment status"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5135,16 +5139,16 @@ msgstr ""
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5156,10 +5160,10 @@ msgstr ""
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr ""
@@ -5168,6 +5172,14 @@ msgstr ""
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr ""
@@ -5290,7 +5302,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5317,17 +5329,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr ""
@@ -5352,7 +5364,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5562,7 +5574,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5579,7 +5591,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5661,7 +5673,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5725,7 +5737,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr ""
@@ -5755,14 +5767,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6018,7 +6030,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6056,13 +6068,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6078,11 +6090,11 @@ msgstr ""
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6158,6 +6170,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr ""
@@ -6725,8 +6741,8 @@ msgctxt "page navigation"
msgid "First"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6838,12 +6854,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr ""
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr ""
@@ -6859,7 +6875,7 @@ msgstr ""
msgid "GUI"
msgstr ""
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr ""
@@ -7206,7 +7222,7 @@ msgstr ""
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7219,12 +7235,11 @@ msgid "Grouping by"
msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr ""
@@ -7443,7 +7458,7 @@ msgstr ""
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7474,7 +7489,7 @@ msgid "Horizontal align"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7483,7 +7498,7 @@ msgstr ""
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7494,7 +7509,7 @@ msgstr ""
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7617,7 +7632,7 @@ msgid "Host group label type"
msgstr ""
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7636,8 +7651,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7687,7 +7702,7 @@ msgstr ""
msgid "Host label type"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7699,7 +7714,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr ""
@@ -7736,7 +7751,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7758,7 +7773,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7783,7 +7798,7 @@ msgstr ""
msgid "Host update failed."
msgstr ""
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr ""
@@ -7860,6 +7875,10 @@ msgstr ""
msgid "Hosts updated"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr ""
@@ -7929,15 +7948,15 @@ msgstr ""
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr ""
@@ -8167,7 +8186,7 @@ msgstr ""
msgid "Images for all maps will be updated!"
msgstr ""
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr ""
@@ -8249,7 +8268,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8261,11 +8280,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8380,7 +8399,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr ""
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr ""
@@ -8388,7 +8407,7 @@ msgstr ""
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr ""
@@ -8400,15 +8419,15 @@ msgstr ""
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8417,11 +8436,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8429,7 +8448,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr ""
@@ -8439,11 +8458,11 @@ msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr ""
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8452,11 +8471,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8756,8 +8775,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr ""
@@ -9155,7 +9174,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9164,11 +9183,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9180,7 +9199,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9200,7 +9219,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr ""
@@ -9259,8 +9278,8 @@ msgstr ""
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9352,7 +9371,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9413,10 +9432,10 @@ msgstr ""
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9479,8 +9498,8 @@ msgstr ""
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9702,11 +9721,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr ""
@@ -9720,7 +9739,7 @@ msgid "Inventory field"
msgstr ""
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr ""
@@ -9728,10 +9747,10 @@ msgstr ""
msgid "Is online?"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9820,7 +9839,7 @@ msgstr[0] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10266,17 +10285,17 @@ msgstr ""
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr ""
@@ -10353,8 +10372,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10388,8 +10407,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr ""
@@ -10412,16 +10431,9 @@ msgstr ""
msgid "Link indicators"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr ""
@@ -10437,13 +10449,6 @@ msgstr ""
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10582,7 +10587,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr ""
@@ -10664,16 +10669,16 @@ msgstr ""
msgid "Macro \"%1$s\" already exists."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr ""
@@ -10772,12 +10777,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr ""
@@ -10920,16 +10925,16 @@ msgstr ""
msgid "Mark selected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -10962,11 +10967,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11194,7 +11199,7 @@ msgstr ""
msgid "Middle"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11295,7 +11300,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11373,9 +11378,9 @@ msgstr ""
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr ""
@@ -11394,6 +11399,7 @@ msgstr ""
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr ""
@@ -11506,8 +11512,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11577,11 +11583,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11609,8 +11615,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11631,7 +11637,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -11921,15 +11927,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12015,7 +12021,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12052,9 +12058,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12093,7 +12099,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12193,11 +12199,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12256,7 +12262,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12277,7 +12283,7 @@ msgid "No target selected."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12426,6 +12432,10 @@ msgstr ""
msgid "Notifications"
msgstr ""
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12512,6 +12522,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr ""
@@ -12687,7 +12701,7 @@ msgid "Off"
msgstr ""
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12734,7 +12748,7 @@ msgstr ""
msgid "One time only"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr ""
@@ -12810,12 +12824,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12849,8 +12863,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr ""
@@ -12885,7 +12899,7 @@ msgstr ""
msgid "Operator"
msgstr ""
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -12925,19 +12939,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -12967,10 +12981,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13233,10 +13247,10 @@ msgstr ""
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13249,19 +13263,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13313,12 +13327,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13373,13 +13387,13 @@ msgid "Passive"
msgstr ""
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13387,7 +13401,7 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13440,12 +13454,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13458,7 +13472,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13482,10 +13496,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13493,7 +13508,9 @@ msgstr ""
msgid "Period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13557,11 +13574,11 @@ msgstr ""
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13647,7 +13664,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13656,7 +13673,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13773,9 +13790,9 @@ msgstr ""
msgid "Private key file"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr ""
@@ -14181,7 +14198,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14311,20 +14328,20 @@ msgstr ""
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14333,10 +14350,10 @@ msgstr ""
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14380,7 +14397,7 @@ msgstr ""
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14463,14 +14480,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14483,8 +14500,8 @@ msgstr ""
msgid "Replace dependencies"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14685,7 +14702,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr ""
@@ -15214,7 +15231,7 @@ msgstr ""
msgid "Script"
msgstr ""
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15278,6 +15295,15 @@ msgstr ""
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15356,7 +15382,7 @@ msgstr ""
msgid "Selected"
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15595,6 +15621,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16048,7 +16075,7 @@ msgstr ""
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr ""
@@ -16083,8 +16110,8 @@ msgstr ""
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16092,7 +16119,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16171,7 +16198,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16275,7 +16302,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16329,12 +16356,12 @@ msgstr ""
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16355,10 +16382,10 @@ msgstr ""
msgid "Subject"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16552,7 +16579,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16568,13 +16595,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16591,7 +16618,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16601,7 +16628,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16637,14 +16664,12 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr ""
@@ -16688,7 +16713,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr ""
@@ -16700,11 +16725,11 @@ msgstr ""
msgid "Template linkage"
msgstr ""
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr ""
@@ -16739,13 +16764,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16754,10 +16778,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16768,7 +16794,7 @@ msgstr ""
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -16980,7 +17006,7 @@ msgstr ""
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17018,7 +17044,7 @@ msgstr ""
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17051,15 +17077,15 @@ msgstr ""
msgid "Till"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17096,13 +17122,13 @@ msgstr ""
msgid "Time period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17790,9 +17816,9 @@ msgstr ""
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr ""
@@ -17810,7 +17836,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr ""
@@ -17842,16 +17868,16 @@ msgstr ""
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr ""
@@ -17946,10 +17972,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -17958,16 +17984,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -17996,7 +18022,7 @@ msgstr ""
msgid "Update interval"
msgstr ""
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18023,7 +18049,7 @@ msgstr ""
msgid "Upper level maps"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18206,7 +18232,7 @@ msgstr[0] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18340,15 +18366,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr ""
@@ -18662,11 +18688,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18740,14 +18766,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr ""
@@ -18790,7 +18816,7 @@ msgstr ""
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -18890,7 +18916,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr ""
@@ -18916,7 +18942,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr ""
@@ -19022,6 +19048,10 @@ msgstr ""
msgid "Wednesday"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19294,7 +19324,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr ""
@@ -19354,7 +19385,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr ""
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19595,11 +19626,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19694,7 +19725,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19738,11 +19769,11 @@ msgstr ""
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19756,11 +19787,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19782,39 +19813,47 @@ msgstr ""
msgid "avg"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19829,7 +19868,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19871,7 +19910,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -19959,23 +19998,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20002,7 +20041,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20017,15 +20056,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20033,11 +20072,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20050,15 +20089,15 @@ msgstr ""
msgid "d.M"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20076,7 +20115,7 @@ msgstr ""
msgid "default"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20153,7 +20192,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20176,11 +20215,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20196,7 +20235,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20210,15 +20249,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20226,7 +20265,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20300,7 +20339,7 @@ msgstr ""
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20309,11 +20348,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20332,7 +20371,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20350,7 +20389,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20410,7 +20449,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20432,6 +20471,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20473,7 +20522,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20489,7 +20538,7 @@ msgctxt "week of month"
msgid "last"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20497,11 +20546,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20509,23 +20558,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20533,7 +20582,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20565,11 +20614,11 @@ msgstr ""
msgid "macro(s)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20605,7 +20654,7 @@ msgstr ""
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20619,7 +20668,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20636,7 +20685,7 @@ msgstr ""
msgid "min"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20651,15 +20700,15 @@ msgstr ""
msgid "mm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20741,7 +20790,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20775,7 +20824,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20796,7 +20845,7 @@ msgstr ""
msgid "not selected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -20883,15 +20932,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -20899,15 +20948,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -20956,11 +21005,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -20984,15 +21033,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21083,23 +21132,23 @@ msgstr ""
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21107,11 +21156,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21119,11 +21168,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21151,7 +21200,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21185,7 +21234,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21232,31 +21281,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21282,11 +21335,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21343,7 +21396,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21386,7 +21439,7 @@ msgstr ""
msgid "unknown"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21583,11 +21636,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/ko/LC_MESSAGES/frontend.po b/ui/locale/ko/LC_MESSAGES/frontend.po
index 42099a64eb0..8943e1193b5 100644
--- a/ui/locale/ko/LC_MESSAGES/frontend.po
+++ b/ui/locale/ko/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2016-01-22 16:15+0300\n"
"Last-Translator: JONGKWON <jkkim.photo@gmail.com>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -285,10 +285,10 @@ msgstr "(0 - 기본 ì•¡ì…˜ì„ ì‚¬ìš©)"
msgid "(Only super admins can create groups)"
msgstr "(최고관리ìžë§Œ ê·¸ë£¹ì„ ìž‘ì„±í•  수 있습니다)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(프ë¡ì‹œ ì—†ìŒ)"
@@ -436,7 +436,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -505,7 +505,7 @@ msgstr "ëŒ€ì‘ ì™„ë£Œëœ í•´ê²° ì´ë²¤íŠ¸"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -524,11 +524,11 @@ msgstr "ëŒ€ì‘ ì™„ë£Œëœ í•´ê²° ì´ë²¤íŠ¸"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -540,24 +540,24 @@ msgstr "ëŒ€ì‘ ì™„ë£Œëœ í•´ê²° ì´ë²¤íŠ¸"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -575,7 +575,7 @@ msgstr "ëŒ€ì‘ ì™„ë£Œëœ í•´ê²° ì´ë²¤íŠ¸"
msgid "Action"
msgstr "ì•¡ì…˜"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "ì•¡ì…˜ \"%1$s\"는 ì´ë¯¸ 존재합니다."
@@ -585,7 +585,7 @@ msgstr "ì•¡ì…˜ \"%1$s\"는 ì´ë¯¸ 존재합니다."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "ì•¡ì…˜ì„ ì¶”ê°€í•˜ì˜€ìŠµë‹ˆë‹¤"
@@ -594,16 +594,16 @@ msgstr "ì•¡ì…˜ì„ ì¶”ê°€í•˜ì˜€ìŠµë‹ˆë‹¤"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "ì•¡ì…˜ì„ ì‚­ì œí•˜ì˜€ìŠµë‹ˆë‹¤"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "ì•¡ì…˜ì„ ë¹„í™œì„±í™” 하였습니다"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "ì•¡ì…˜ì´ í™œì„±í™” ë˜ì—ˆìŠµë‹ˆë‹¤"
@@ -621,7 +621,7 @@ msgstr "액션 로그"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "ì•¡ì…˜ì„ ê°±ì‹ í•˜ì˜€ìŠµë‹ˆë‹¤"
@@ -668,7 +668,7 @@ msgid "Active till"
msgstr "종료시간"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -727,14 +727,14 @@ msgstr "종료시간"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -750,10 +750,10 @@ msgstr "종료시간"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -765,9 +765,9 @@ msgstr "종료시간"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -785,7 +785,7 @@ msgstr "종료시간"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -830,7 +830,7 @@ msgstr "하위 요소 추가"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -855,8 +855,8 @@ msgstr "ë³µìˆ˜ì˜ ë§µì„ ì¶”ê°€"
msgid "Add new data set"
msgstr "새로운 ë°ì´í„° ì…‹ì„ ì¶”ê°€"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -869,7 +869,7 @@ msgstr "새로운 오버ë¼ì´ë“œë¥¼ 추가"
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1003,7 +1003,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1019,6 +1019,10 @@ msgstr ""
msgid "Alert message"
msgstr "알림 메세지"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "ë¡œê·¸ì¸ ì´ë¦„"
@@ -1333,7 +1337,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "최소 하나 ì´ìƒì˜ 액션처리가 설정ë˜ì–´ 있어야 합니다."
@@ -1413,9 +1417,9 @@ msgstr ""
msgid "Authentication"
msgstr "ì¸ì¦"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "ì¸ì¦ 알고리즘"
@@ -1476,12 +1480,12 @@ msgstr "ìžë™ 로그ì¸ê³¼ ìžë™ ë¡œê·¸ì•„ì›ƒì„ ë™ì‹œì— 활성화 í•  수ëŠ
msgid "Auto-logout"
msgstr "ìžë™ 로그아웃"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "ìžë™"
@@ -1596,12 +1600,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind password"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1807,7 +1811,7 @@ msgstr "ìˆ˜ì¹˜í˜•ì´ ì•„ë‹Œ ì•„ì´í…œ \"%1$s\"는 그래프 \"%2$s\"ì— ì¶”ê°€í•
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "ìˆ˜ì¹˜í˜•ì´ ì•„ë‹Œ ì•„ì´í…œ \"%1$s\"는 그래프 프로토타입 \"%2$s\"ì— ì¶”ê°€í•  수 없습니다."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "ì•¡ì…˜ì„ ì¶”ê°€í•  수 없습니다"
@@ -2100,7 +2104,7 @@ msgstr[0] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Zabbix 유저 \"%1$s\"를 삭제할 수 없습니다. 유저를 비활성으로 설정해 주십시오."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "ì•¡ì…˜ì„ ì‚­ì œí•  수 없습니다"
@@ -2254,12 +2258,12 @@ msgid "Cannot delete script"
msgid_plural "Cannot delete scripts"
msgstr[0] "스í¬ë¦½íŠ¸ë¥¼ 삭제할 수 없습니다"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "스í¬ë¦½íŠ¸ë¥¼ 삭제할 수 없습니다. 스í¬ë¦½íŠ¸ \"%1$s\"는 실행하는 ì•¡ì…˜ \"%2$s\"ì—ì„œ ì´ìš©ë˜ê³  있습니다."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "ì„ íƒí•œ ì•¡ì…˜ì„ ì‚­ì œí•  수 없습니다"
@@ -2275,7 +2279,7 @@ msgstr[0] "서비스를 삭제할 수 없습니다"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "í…œí”Œë¦¿ì„ ì‚­ì œí•  수 없습니다"
@@ -2358,7 +2362,7 @@ msgid "Cannot disable API token"
msgid_plural "Cannot disable API tokens"
msgstr[0] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "ì•¡ì…˜ì„ ë¹„í™œì„±í™” í•  수 없습니다."
@@ -2425,7 +2429,7 @@ msgid "Cannot enable API token"
msgid_plural "Cannot enable API tokens"
msgstr[0] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "ì•¡ì…˜(action)ì„ ê°€ë™ ì‹œí‚¬ 수 없습니다."
@@ -2643,7 +2647,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
msgstr[0] "템플릿 \"%1$s\"를 가져올 수 없습니다. ë§í¬ë˜ì–´ 있는 템플릿 \"%2$s\"ê°€ 존재하지 않습니다."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "트리거 ì¡°ê±´ì‹ì„ 추가할 수 없습니다"
@@ -2820,7 +2824,7 @@ msgstr "í…œí”Œë¦¿ì˜ ë§í¬ë¥¼ 삭제할 수 없습니다."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "ì•¡ì…˜ \"%2$s\"ì˜ \"%1$s\"를 갱신할 수 없습니다."
@@ -2886,7 +2890,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "템플릿으로 ëœ Web 시나리오 \"%1$s\"를 갱신할 수 없습니다 : %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "ì•¡ì…˜ì„ ê°±ì‹ í•  수 없습니다"
@@ -2945,7 +2949,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "ë°œê²¬ëœ í˜¸ìŠ¤íŠ¸ \"%1$s\"ì˜ ê·¸ë£¹ì„ ê°±ì‹ í•  수 없습니다"
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "호스트를 갱신할 수 없습니다"
@@ -3046,9 +3050,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "스í¬ë¦½íŠ¸ë¥¼ 갱신할 수 없습니다"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3075,7 +3079,7 @@ msgstr "템플릿으로 ëœ Web 시나리오 \"%1$s\"ì˜ ìŠ¤íƒ­ì„ ê°±ì‹ í•  수
msgid "Cannot update template"
msgstr "í…œí”Œë¦¿ì„ ê°±ì‹ í•  수 없습니다"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3159,14 +3163,14 @@ msgstr "snmptrap[]ì•„ì´í…œìœ¼ë¡œ ìºì¹˜ë˜ì–´ 있지 ì•Šì€ ëª¨ë“  SNMP 트랩ì
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "ì¸ì¦ì„œ"
@@ -3184,10 +3188,10 @@ msgctxt "verb"
msgid "Change"
msgstr "변경"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3227,9 +3231,9 @@ msgstr "문ìžì—´ì´ í¬í•¨ë¨"
msgid "Character string not included"
msgstr "문ìžì—´ì´ í¬í•¨ë˜ì§€ ì•ŠìŒ"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3245,7 +3249,7 @@ msgstr "섀시 ì •ë³´. string ê°’ì„ ë¦¬í„´."
msgid "Check already exists."
msgstr "ì´ë¯¸ 존재합니다"
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "ì¡°ê±´ì‹ \"%1$s\" ì—ì„œ ì‹œìž‘ëœ ë¶€ë¶„ì„ í™•ì¸í•´ 주십시오."
@@ -3367,8 +3371,8 @@ msgstr "히스토리를 삭제"
msgid "Clear history and trends"
msgstr "히스토리와 트렌드를 삭제"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "ë§í¬ 삭제시 í´ë¦¬ì–´"
@@ -3395,16 +3399,16 @@ msgstr "ì‹œê°"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3533,7 +3537,7 @@ msgstr "압축"
msgid "Concurrent sessions"
msgstr "ë™ì‹œ ì„¸ì…˜ì˜ ìˆ«ìž"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3805,13 +3809,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "ì ‘ì†"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "호스트ì—ì„œ ì ‘ì†"
@@ -3819,9 +3823,9 @@ msgstr "호스트ì—ì„œ ì ‘ì†"
msgid "Connections from proxy"
msgstr "프ë¡ì‹œì—ì„œ ì ‘ì†"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "í˜¸ìŠ¤íŠ¸ì— ì ‘ì†"
@@ -3986,10 +3990,10 @@ msgstr "ìƒê´€ê´€ê³„ 규칙"
msgid "Correlation updated"
msgstr "ìƒê´€ê´€ê³„를 갱신하였습니다"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "회"
@@ -4079,7 +4083,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4281,7 +4285,7 @@ msgid "Current value"
msgstr "현재 값"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "커스텀"
@@ -4523,7 +4527,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4596,11 +4600,11 @@ msgstr "하드웨어 ë©”ì¸í„°ë„ŒìŠ¤ 종료ì¼"
msgid "Date HW purchased"
msgstr "하드웨어 구입ì¼"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "ì¼"
@@ -4641,8 +4645,8 @@ msgstr "12ì›”"
msgid "December"
msgstr "12ì›”"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4652,7 +4656,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4783,7 +4787,7 @@ msgstr "삭제"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "삭제와 í´ë¦¬ì–´"
@@ -4792,11 +4796,11 @@ msgstr "삭제와 í´ë¦¬ì–´"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "ì„ íƒí•œ 템플릿과 ë°ì´í„°ë¥¼ 삭제하시겠습니까? (경고: ë§í¬ë˜ì–´ 있는 모든 호스트ì—ì„œ ë°ì´í„°ê°€ ì‚­ì œë©ë‹ˆë‹¤!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "템플릿과 ë°ì´í„°ë¥¼ 삭제하시겠습니까? (경고: ë§í¬ë˜ì–´ 있는 모든 호스트ì—ì„œ ë°ì´í„°ê°€ ì‚­ì œë©ë‹ˆë‹¤!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "현재 ì•¡ì…˜ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
@@ -4929,7 +4933,7 @@ msgstr "ì„ íƒí•œ ê·¸ë£¹ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
msgid "Delete selected host groups?"
msgstr "ì„ íƒí•œ 호스트 그룹를 삭제하시겠습니까?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "ì„ íƒí•œ 호스트 í”„ë¡œí† íƒ€ìž…ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
@@ -5037,7 +5041,7 @@ msgstr "ì„ íƒí•œ 사용ìžë¥¼ 삭제하시겠습니까?"
msgid "Delete selected web scenarios?"
msgstr "ì„ íƒí•œ Web시나리오를 삭제하시겠습니까?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "í…œí”Œë¦¿ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?"
@@ -5098,7 +5102,7 @@ msgstr ""
msgid "Dependencies"
msgstr "ì˜ì¡´ê´€ê³„"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "ì˜ì¡´ì²˜"
@@ -5106,7 +5110,7 @@ msgstr "ì˜ì¡´ì²˜"
msgid "Dependent item"
msgstr "ì˜ì¡´ ì•„ì´í…œ"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5117,7 +5121,7 @@ msgid "Deployment status"
msgstr "ë°°í¬ìƒíƒœ"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5132,16 +5136,16 @@ msgstr "ë°°í¬ìƒíƒœ"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5153,10 +5157,10 @@ msgstr "ì´ë¦„"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "ìžì„¸ížˆ"
@@ -5165,6 +5169,14 @@ msgstr "ìžì„¸ížˆ"
msgid "Details of web scenario"
msgstr "Web시나리오 세부 내용"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "디바ì´ìŠ¤"
@@ -5287,7 +5299,7 @@ msgstr "ì„ íƒí•œ Web시나리오를 비활성으로 하시겠습니까?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5314,17 +5326,17 @@ msgstr "ì„ íƒí•œ Web시나리오를 비활성으로 하시겠습니까?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "비활성"
@@ -5349,7 +5361,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5561,7 +5573,7 @@ msgstr "누계 그래프 표시"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5578,7 +5590,7 @@ msgstr "%3$s ê±´ 중 %1$s ì—ì„œ %2$s 까지를 표시하고 있습니다"
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5660,7 +5672,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "설정 íŒŒì¼ ë‹¤ìš´ë¡œë“œ"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5724,7 +5736,7 @@ msgstr "맵 \"%2$s\"를 위한 유저 ë‚´ì˜ userid \"%1$s\"ê°€ 중복ë˜ì—ˆìŠµë
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "기간"
@@ -5754,14 +5766,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6017,7 +6029,7 @@ msgstr "íŠ¸ëž˜í•‘ì˜ í™œì„±í™”"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6055,13 +6067,13 @@ msgstr "íŠ¸ëž˜í•‘ì˜ í™œì„±í™”"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6077,11 +6089,11 @@ msgstr "활성"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "암호화"
@@ -6157,6 +6169,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "ì—러: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "ì´ë²¤íŠ¸"
@@ -6724,8 +6740,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "첫번째"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Fit"
@@ -6837,12 +6853,12 @@ msgid "Full"
msgstr "전부"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "ëª¨ë‘ ë³µì œ"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "기능"
@@ -6858,7 +6874,7 @@ msgstr "GSM 모뎀"
msgid "GUI"
msgstr "표시 설정"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "GUI 액세스를 비활성 하였습니다"
@@ -7205,7 +7221,7 @@ msgstr "그룹 ì´ë¦„"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "그룹 í”„ë¡œí† íƒ€ìž…ì— ë°œê²¬ëœ í˜¸ìŠ¤íŠ¸ìš©ì˜ ê·¸ë£¹ \"%1$s\"ì„ì´ìš©í•˜ëŠ” ê²ƒì€ í•  수 없습니다."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "그룹 프로토타입"
@@ -7218,12 +7234,11 @@ msgid "Grouping by"
msgstr "다ìŒì— ì˜í•œ 그루핑"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "그룹"
@@ -7442,7 +7457,7 @@ msgstr "ì´ë ¥ ì‚­ì œì— ì‹œê°„ì´ ê±¸ë¦´ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. 계ì†í•˜ì‹œê² ìŠ
msgid "History data selection"
msgstr "ì´ë ¥ ë°ì´í„°ì˜ ì„ íƒ"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7473,7 +7488,7 @@ msgid "Horizontal align"
msgstr "가로 위치"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7482,7 +7497,7 @@ msgstr "가로 위치"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7493,7 +7508,7 @@ msgstr "가로 위치"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7616,7 +7631,7 @@ msgid "Host group label type"
msgstr "호스트 ê·¸ë£¹ì˜ ë¼ë²¨íƒ€ìž…"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7635,8 +7650,8 @@ msgstr "ID \"%1$s\"ì˜ í˜¸ìŠ¤íŠ¸ê·¸ë£¹ì€ ì‚¬ìš©í•  수 없습니다."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7686,7 +7701,7 @@ msgstr "호스트 ì¸ë²¤í† ë¦¬ì˜ 개요"
msgid "Host label type"
msgstr "í˜¸ìŠ¤íŠ¸ì˜ ë¼ë²¨ 타입"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "호스트 매í¬ë¡œ"
@@ -7698,7 +7713,7 @@ msgstr "호스트 메타ë°ì´í„°"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "호스트 명"
@@ -7735,7 +7750,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "호스트 í”„ë¡œí† íƒ€ìž…ì„ ì‚­ì œí•˜ì˜€ìŠµë‹ˆë‹¤."
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7757,7 +7772,7 @@ msgstr "í˜¸ìŠ¤íŠ¸ì˜ í‘œì‹œëª… \"%1$s\"를 가진 호스트 í”„ë¡œí† íƒ€ìž…ì€ ë
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "호스트 프로토타입"
@@ -7782,7 +7797,7 @@ msgstr "호스트 시간"
msgid "Host update failed."
msgstr "í˜¸ìŠ¤íŠ¸ì˜ ê°±ì‹ ì— ì‹¤íŒ¨í•˜ì˜€ìŠµë‹ˆë‹¤."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "호스트를 갱신하였습니다"
@@ -7859,6 +7874,10 @@ msgstr "í˜¸ìŠ¤íŠ¸ì˜ ìœ„ì¹˜"
msgid "Hosts updated"
msgstr "호스트를 갱신하였습니다"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "시간"
@@ -7928,15 +7947,15 @@ msgstr "IP 주소 범위"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "IPì£¼ì†Œì˜ ë²”ìœ„ \"%1$s\"ê°€ 주소제한 \"%2$s\"ì„ ì´ˆê³¼í•©ë‹ˆë‹¤."
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8166,7 +8185,7 @@ msgstr "ì´ë¯¸ì§€"
msgid "Images for all maps will be updated!"
msgstr "모든 ë§µì˜ ì´ë¯¸ì§€ê°€ 업로드 ë©ë‹ˆë‹¤!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "즉시"
@@ -8248,7 +8267,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8260,11 +8279,11 @@ msgstr "접근할 수 없는 맵"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "접근할 수 없는 템플릿"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "ì ‘ì†ì´ 안ë˜ëŠ” 트리거"
@@ -8379,7 +8398,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ ë””ìŠ¤ì»¤ë²„ë¦¬ ê·œì¹™ì˜ ê°’ì´ ì˜¬ë°”ë¥´ì§€ 않습니다."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ ë””ìŠ¤ì»¤ë²„ë¦¬ ê·œì¹™ì˜ ê°’ì´ ì˜¬ë°”ë¥´ì§€ 않습니다. 디스커버리 ê·œì¹™ì´ ì¡´ìž¬í•˜ì§€ 않거나 ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤."
@@ -8387,7 +8406,7 @@ msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ ë””ìŠ¤ì»¤ë²„ë¦¬ ê·œì¹™ì˜ ê°’ì´ ì˜¬ë°”ë¥´ì§€ ì•Š
msgid "Incorrect action condition discovery object."
msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ ë””ìŠ¤ì»¤ë²„ë¦¬ 오브ì íŠ¸ê°€ 올바르지 않습니다."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ ë””ìŠ¤ì»¤ë²„ë¦¬ ê·œì¹™ì´ ì˜¬ë°”ë¥´ì§€ 않습니다. 디스커버리 ê·œì¹™ì´ ì¡´ìž¬í•˜ì§€ 않거나 ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤."
@@ -8399,15 +8418,15 @@ msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ ë””ìŠ¤ì»¤ë²„ë¦¬ 스테ì´í„°ìŠ¤ ê°’ì´ ì˜¬ë°”ë¥´ì
msgid "Incorrect action condition event type."
msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ ì´ë²¤íŠ¸íƒ€ìž…ì´ ì˜¬ë°”ë¥´ì§€ 않습니다."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8416,11 +8435,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ í¬íŠ¸ \"%1$s\"ê°€ 올바르지 않습니다."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ í”„ë¡ì‹œ ì„¤ì •ì´ ì˜¬ë°”ë¥´ì§€ 않습니다. 프ë¡ì‹œê°€ 존재하지 않거나 액세스 ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8428,7 +8447,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ íŠ¸ë¦¬ê±°ì˜ ì‹¬ê°ë„ê°€ 올바르지 않습니다."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "ì•¡ì…˜ ì‹¤í–‰ì¡°ê±´ì˜ íŠ¸ë¦¬ê±° ê°’ì´ ì˜¬ë°”ë¥´ì§€ 않습니다. 트리거가 존재하지 않거나 액세스 ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤."
@@ -8438,11 +8457,11 @@ msgstr "ì•¡ì…˜ì˜ ì‹¤í–‰ì¡°ê±´ íƒ€ìž…ì˜ ê°’ì´ ì˜¬ë°”ë¥´ì§€ 않습니다."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "실행하는 ì•¡ì…˜ì˜ ì—스컬레ì´ì…˜ 스í…ì˜ ê°’ì´ ì˜¬ë°”ë¥´ì§€ 않습니다."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8451,11 +8470,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "ì´ë²¤íŠ¸ 소스 \"%2$s\" ì— ì˜í•´ 실행ë˜ëŠ” ì•¡ì…˜ì˜ íƒ€ìž… \"%1$s\"ê°€ 올바르지 않습니다."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8755,8 +8774,8 @@ msgstr "í…œí”Œë¦¿ì˜ ì›¹ ì‹œë‚˜ë¦¬ì˜¤ì˜ ìŠ¤í… ì¹´ìš´íŠ¸ê°€ 올바르지 않습
msgid "Incorrect trigger expression"
msgstr "ìž˜ëª»ëœ íŠ¸ë¦¬ê±°ì˜ ì¡°ê±´ì‹"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "트리거조건ì‹ì´ 올바르지 않습니다."
@@ -9154,7 +9173,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "서비스 ì •ë³´ì˜ ìŠµë“. 파ë¼ë¯¸í„°ê°€ state나 startupì´ë¼ë©´ integer를 리턴. 파ë¼ë¯¸í„°ê°€ displayname, path, userë¼ë©´ stringì„ ë¦¬í„´. 파ë¼ë¯¸í„°ê°€ descriptionë¼ë©´ text를 리턴. 구체ì ìœ¼ë¡œëŠ” 파ë¼ë¯¸í„°ê°€ stateë¼ë©´ ìƒíƒœë¡œ : 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 를 리턴. í˜¹ì€ íŒŒë¼ë¯¸í„°ê°€ startupë¼ë©´ 스타트업 종류로 : 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown를 리턴"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9163,11 +9182,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "계승한 매í¬ë¡œì™€ 호스트 매í¬ë¡œ"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9179,7 +9198,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "계승한 매í¬ë¡œì™€ 템플릿 매í¬ë¡œ"
@@ -9199,7 +9218,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "삽입"
@@ -9258,8 +9277,8 @@ msgstr "\"%2$s\"ì˜ \"DNS를 사용\"ì— ì²´í¬ê°€ ë˜ì–´ìžˆëŠ” 경우, IP주소
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "IP주소 \"%1$s\"ê°€ ì„¤ì •ëœ ì¸í„°íŽ˜ì´ìŠ¤ì— DNS ì´ë¦„ì„ ì„¤ì •í•´ 주세요."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9351,7 +9370,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "ì•¡ì…˜ì˜ ì‹¤í–‰ì¡°ê±´ì´ ì˜¬ë°”ë¥´ì§€ 않습니다 : %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9412,10 +9431,10 @@ msgstr "ë©”ì†Œë“œì˜ íŒŒë¼ë¯¸í„°ê°€ 올바르지 않습니다."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9478,8 +9497,8 @@ msgstr "ë©”ì†Œë“œì˜ íŒŒë¼ë¯¸í„°ê°€ 올바르지 않습니다."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9701,11 +9720,11 @@ msgstr "ê¸°ê°„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "ì¸ë²¤í† ë¦¬"
@@ -9719,7 +9738,7 @@ msgid "Inventory field"
msgstr "ì¸ë²¤í† ë¦¬ 항목"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "ì¸ë²¤í† ë¦¬ 모드"
@@ -9727,10 +9746,10 @@ msgstr "ì¸ë²¤í† ë¦¬ 모드"
msgid "Is online?"
msgstr "ë¡œê·¸ì¸ ìƒíƒœ"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "발행ì¸(Issuer)"
@@ -9819,7 +9838,7 @@ msgstr[0] "ì•„ì´í…œì„ 활성화 하였습니다"
msgid "Item in \"not supported\" state"
msgstr "ì•„ì´í…œì´ \"습ë“불가\" ìƒíƒœ"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "ì•„ì´í…œì´ ì„ íƒë˜ì–´ 있지 않습니다"
@@ -10265,17 +10284,17 @@ msgstr "최근 1ê°œì›”ì˜ ê·¸ëž˜í”„"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "최근"
@@ -10352,8 +10371,8 @@ msgstr "왼쪽 trim"
msgid "Legend"
msgstr "범례"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10387,8 +10406,8 @@ msgstr "선 타입"
msgid "Line width"
msgstr "ì„  í­"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "ì—°ê²°"
@@ -10411,16 +10430,9 @@ msgstr ""
msgid "Link indicators"
msgstr "장애발ìƒì‹œì˜ 조건설정"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "í…œí”Œë¦¿ì„ ë§í¬"
@@ -10436,13 +10448,6 @@ msgstr "템플릿과 ë§í¬"
msgid "Linked map"
msgstr "ë§í¬ëœ 맵"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10581,7 +10586,7 @@ msgstr "매치하지 ì•Šì€ SNMPíŠ¸ëž©ì„ ë¡œê·¸ì— ê¸°ë¡"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "로그ì¸"
@@ -10663,16 +10668,16 @@ msgstr "매í¬ë¡œ \"%1$s\"는 \"%2$s\"ì— ì´ë¯¸ 존재합니다."
msgid "Macro \"%1$s\" already exists."
msgstr "매í¬ë¡œ \"%1$s\"는 ì´ë¯¸ 존재합니다."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "매í¬ë¡œ"
@@ -10771,12 +10776,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "수ë™"
@@ -10919,16 +10924,16 @@ msgstr "ì„ íƒ ì´ì™¸ 항목 색 지정"
msgid "Mark selected"
msgstr "ì„ íƒ í•­ëª© 색 지정"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "마스í¬"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -10961,11 +10966,11 @@ msgstr "마스터 ì•„ì´í…œ"
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11193,7 +11198,7 @@ msgstr ""
msgid "Middle"
msgstr "가운ë°"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11294,7 +11299,7 @@ msgstr "그래프 프로토타입 \"%1$s\"ì˜ ì•„ì´í…œì´ 존재하지 않습ë‹
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "호스트\"%2$s\"ì—는 키\"%1$s\"ê°€ 설정ë˜ì–´ 있지 않습니다"
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11372,9 +11377,9 @@ msgstr "ì›”"
msgid "Monitored by"
msgstr "ê°ì‹œìš© 서버"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "프ë¡ì‹œì— ì˜í•œ ê°ì‹œ"
@@ -11393,6 +11398,7 @@ msgstr "모니터ë§"
msgid "Monospace"
msgstr "Monospace"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "ì›”"
@@ -11505,8 +11511,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11576,11 +11582,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11608,8 +11614,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11630,7 +11636,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -11920,15 +11926,15 @@ msgstr "디스커버리 규칙IDì´ ì„¤ì •ë˜ì–´ 있지 않습니다"
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "암호 ì—†ìŒ"
@@ -12014,7 +12020,7 @@ msgstr "ì¡°ê±´ì— ì¼ì¹˜í•˜ëŠ” ë°ì´í„°ê°€ 없습니다"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12051,9 +12057,9 @@ msgstr "시스템 액세스 ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12092,7 +12098,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12192,11 +12198,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12255,7 +12261,7 @@ msgid "No public key file specified."
msgstr "공개키 파ì¼ì´ 설정ë˜ì–´ 있지 않습니다"
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12276,7 +12282,7 @@ msgid "No target selected."
msgstr "아무 ê²ƒë„ ì„ íƒë˜ì–´ 있지 않습니다."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12425,6 +12431,10 @@ msgstr "통지 보고서"
msgid "Notifications"
msgstr "통지"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12511,6 +12521,10 @@ msgstr "VMwareê°€ìƒ ë¨¸ì‹  ìƒì˜ 프로세서 수, <url> - VMware서비스URL,
msgid "Number of rows"
msgstr "í–‰ì˜ ìˆ˜"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "ìƒíƒœ 변경 횟수"
@@ -12686,7 +12700,7 @@ msgid "Off"
msgstr "OFF"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12733,7 +12747,7 @@ msgstr "1개"
msgid "One time only"
msgstr "한번만"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "ì¼ì‹œì ì¸ 정지 시간"
@@ -12809,12 +12823,12 @@ msgstr "OSì •ë³´. stringê°’ì„ ë¦¬í„´"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12848,8 +12862,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "오í¼ë ˆì´ì…˜"
@@ -12884,7 +12898,7 @@ msgstr "오í¼ë ˆì´ì…˜"
msgid "Operator"
msgstr "오í¼ë ˆì´í„°"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -12924,19 +12938,19 @@ msgstr "Or"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -12966,10 +12980,10 @@ msgstr "Or"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13232,10 +13246,10 @@ msgstr "장애"
msgid "PROBLEM event generation mode"
msgstr "장애 ì´ë²¤íŠ¸ì˜ ìƒì„±ëª¨ë“œ"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13248,19 +13262,19 @@ msgstr "장애 ì´ë²¤íŠ¸ì˜ ìƒì„±ëª¨ë“œ"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "PSK ì•„ì´ë´í‹°í‹°"
@@ -13312,12 +13326,12 @@ msgid "Parameters"
msgstr "파ë¼ë¯¸í„°"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "ìƒìœ„ 디스커버리 규칙"
@@ -13372,13 +13386,13 @@ msgid "Passive"
msgstr "패시브"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13386,7 +13400,7 @@ msgstr "패시브"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13439,12 +13453,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "ë§í¬ ì—†ì´ ë¶™ì—¬ë„£ê¸°"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "ìž ì‹œ ì–µì œëœ ë¬¸ì œì˜ ì‹¤í–‰ì„ ì¼ì‹œì¤‘지"
@@ -13457,7 +13471,7 @@ msgstr "í”¼í¬ ë•Œì˜ ë©”ëª¨ë¦¬ 사용량 : %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "백분율"
@@ -13481,10 +13495,11 @@ msgstr "백분위 선 (오른쪽)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "DNS쿼리를 실행. 요구한 ì •ë³´ íƒ€ìž…ì˜ stringì„ ë¦¬í„´."
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13492,7 +13507,9 @@ msgstr "DNS쿼리를 실행. 요구한 ì •ë³´ íƒ€ìž…ì˜ stringì„ ë¦¬í„´."
msgid "Period"
msgstr "기간"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13556,11 +13573,11 @@ msgstr "사운드 재ìƒ"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "설정 ê°’ì„ í™•ì¸í•´ì£¼ì„¸ìš”. 올바른 ê°’ì´ë©´ \"%1$s\"ë²„íŠ¼ì„ ëˆŒëŸ¬ 주세요. 아니면 \"%2$s\" ë²„íŠ¼ì„ ëˆŒëŸ¬ ì„¤ì •ê°’ì„ ìˆ˜ì •í•´ 주세요."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13646,7 +13663,7 @@ msgstr "í¬ìŠ¤íŠ¸ 형ì‹"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13655,7 +13672,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "설치 사전 준비 요약"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13772,9 +13789,9 @@ msgstr "비공개"
msgid "Private key file"
msgstr "비밀키 파ì¼"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "특권 레벨"
@@ -14180,7 +14197,7 @@ msgstr "복구조건ì‹"
msgid "Recovery expression syntax error."
msgstr "복구조건ì‹ì˜ syntax ì—러"
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "복구시 실행내용"
@@ -14310,20 +14327,20 @@ msgstr "ì›ê²© 명령"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14332,10 +14349,10 @@ msgstr "ì›ê²© 명령"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14379,7 +14396,7 @@ msgstr "ì›ê²© 명령"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14462,14 +14479,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14482,8 +14499,8 @@ msgstr "치환"
msgid "Replace dependencies"
msgstr "ì˜ì¡´ê´€ê³„를 치환"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14684,7 +14701,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "ê²°ê³¼"
@@ -15213,7 +15230,7 @@ msgstr "범위"
msgid "Script"
msgstr "스í¬ë¦½íŠ¸"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "스í¬ë¦½íŠ¸ \"%1$s\"ì€ ì´ë¯¸ 존재합니다."
@@ -15277,6 +15294,15 @@ msgstr "ê²€ìƒ‰íŒ¨í„´ì´ ê³µë°±ìž…ë‹ˆë‹¤"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Secondary POC ì…€"
@@ -15355,7 +15381,7 @@ msgstr "ìœ„ì ¯ì˜ ì„ íƒ"
msgid "Selected"
msgstr "ì„ íƒ"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "ì„ íƒí•œ ì•¡ì…˜ì„ ì‚­ì œí•˜ì˜€ìŠµë‹ˆë‹¤"
@@ -15595,6 +15621,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16048,7 +16075,7 @@ msgstr "스페ì¸ì–´ (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "실행하는 ì•¡ì…˜ 커맨드ì—ì„œ ì§€ì •ëœ ìŠ¤í¬ë¦½íŠ¸ê°€ 존재하지 않거나, ê¶Œí•œì´ ì—†ìŠµë‹ˆë‹¤."
@@ -16083,8 +16110,8 @@ msgstr "표준 ì•„ì´í…œ"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16092,7 +16119,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "시작시간"
@@ -16171,7 +16198,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16275,7 +16302,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "\"%1$s\"ì˜ ì´ë¦„를 지닌 스í…ì´ ì´ë¯¸ 존재합니다."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16329,12 +16356,12 @@ msgstr "Straight"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16355,10 +16382,10 @@ msgstr "서브필터"
msgid "Subject"
msgstr "제목"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "서브ì íŠ¸"
@@ -16552,7 +16579,7 @@ msgstr "태그 값"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16568,13 +16595,13 @@ msgstr "태그 값"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16591,7 +16618,7 @@ msgstr "태그 값"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16601,7 +16628,7 @@ msgstr "태그 값"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16637,14 +16664,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "템플릿"
@@ -16688,7 +16713,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "í…œí”Œë¦¿ì„ ì‚­ì œí•˜ì˜€ìŠµë‹ˆë‹¤"
@@ -16700,11 +16725,11 @@ msgstr "템플릿 그룹"
msgid "Template linkage"
msgstr "템플릿 ë§í¬"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "템플릿 매í¬ë¡œ"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "템플릿 ì´ë¦„"
@@ -16739,13 +16764,12 @@ msgstr "ê°™ì€ í‘œì‹œ ì´ë¦„\"%1$s\"를 지닌 í…œí”Œë¦¿ì´ ì´ë¯¸ 존재합니ë
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16754,10 +16778,12 @@ msgstr "ê°™ì€ í‘œì‹œ ì´ë¦„\"%1$s\"를 지닌 í…œí”Œë¦¿ì´ ì´ë¯¸ 존재합니ë
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16768,7 +16794,7 @@ msgstr "템플릿"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "템플릿 \"%1$s\"와 호스트\"%2$s\"ì˜ ë§í¬ë¥¼ 삭제하였습니다."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -16980,7 +17006,7 @@ msgstr "테마"
msgid "This day last week"
msgstr "ì €ë²ˆì£¼ì˜ ì˜¤ëŠ˜"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17018,7 +17044,7 @@ msgstr "올해"
msgid "This year so far"
msgstr "ì˜¬í•´ì˜ ì§€ê¸ˆê¹Œì§€"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "허용치(Threshold)"
@@ -17051,15 +17077,15 @@ msgstr ""
msgid "Till"
msgstr "종료"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17096,13 +17122,13 @@ msgstr ""
msgid "Time period"
msgstr "기간"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17790,9 +17816,9 @@ msgstr "단위"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "ì•Œ 수 ì—†ìŒ"
@@ -17810,7 +17836,7 @@ msgid "Unknown error"
msgstr "ì•Œ 수 없는 ì—러"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "ì•Œ 수 없는 ì•„ì´í…œ. ì„ íƒí•œ í˜¸ìŠ¤íŠ¸ì— ê·¸ëŸ° ì•„ì´í…œì€ 존재하지 않습니다"
@@ -17842,16 +17868,16 @@ msgstr "ì•Œ 수 없는 ê°’ì˜ íƒ€ìž…"
msgid "Unlimited"
msgstr "무제한"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "ë§í¬ ì‚­ì œ"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "ë§í¬ì™€ ë³´ì¡´ ë°ì´í„° ì‚­ì œ"
@@ -17946,10 +17972,10 @@ msgstr "Up"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -17958,16 +17984,16 @@ msgstr "Up"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -17996,7 +18022,7 @@ msgstr "ê¸°ì¡´ì„¤ì •ì„ ë®ì–´ì”Œì›€"
msgid "Update interval"
msgstr "갱신 간격"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "갱신시 실행내용"
@@ -18023,7 +18049,7 @@ msgstr "업로드"
msgid "Upper level maps"
msgstr "ìƒìœ„레벨 맵"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18206,7 +18232,7 @@ msgstr[0] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18340,15 +18366,15 @@ msgid "User/Recipient"
msgstr "유저/보낸곳"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "유저 ì´ë¦„"
@@ -18662,11 +18688,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18740,14 +18766,14 @@ msgstr "ê°’ 매핑 \"%1$s\"는 ì´ë¯¸ 존재합니다."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "값 매핑"
@@ -18790,7 +18816,7 @@ msgstr "ê°’: ë°ì´í„° ì—†ìŒ"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -18890,7 +18916,7 @@ msgstr "ê°€ìƒ ë©”ëª¨ë¦¬ 사ì´ì¦ˆì˜ ë°”ì´íŠ¸ 단위 í˜¹ì€ ì „ì²´ì—ì„œ í¼ì„
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "표시명"
@@ -18916,7 +18942,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "경고"
@@ -19022,6 +19048,10 @@ msgstr "수"
msgid "Wednesday"
msgstr "수"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19294,7 +19324,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "ë…„"
@@ -19354,7 +19385,7 @@ msgstr "\"%1$s\"ë¡œ ë¡œê·¸ì¸ í•˜ì˜€ìŠµë‹ˆë‹¤."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Webì„œë²„ì˜ ì–¸ì–´ê°€ ì¸ìŠ¤í†¨ë˜ì–´ìžˆì§€ 않기 ë•Œë¬¸ì— ëª‡ 언어를 ì´ìš©í•  수 없습니다."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "ë‹¹ì‹ ì€ ë¡œê·¸ì¸ ë˜ì§€ 않았습니다"
@@ -19595,11 +19626,11 @@ msgstr "시간범위를 지정해주세요"
msgid "a time unit is expected"
msgstr "ì‹œê°„ì˜ ë‹¨ìœ„ë¥¼ 지정해주세요"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19694,7 +19725,7 @@ msgstr "16진수 문ìžë¡œ 입력해주세요"
msgid "an explicit time is expected"
msgstr "구체ì ì¸ ì‹œê°„ì„ ì§€ì •í•´ 주십시오"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19738,11 +19769,11 @@ msgstr "빨강"
msgid "ascending"
msgstr "오름차순"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19756,11 +19787,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr "ì ì–´ë„ 1ê°œì˜ ì˜¤ë²„ë¼ì´ë“œ ì˜µì…˜ì„ ì§€ì •í•  필요가 있습니다"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19782,39 +19813,47 @@ msgstr ""
msgid "avg"
msgstr "í‰ê· "
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - 기간 Tê°’ì˜ í‰ê· ì¹˜"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19829,7 +19868,7 @@ msgstr "ì ë©¸"
msgid "both username and password should be either present or empty"
msgstr "유저명과 비밀번호를 ì–‘ìª½ì— ì§€ì •í•˜ê±°ë‚˜ 비워둘 필요가 있습니다"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19871,7 +19910,7 @@ msgstr "변경할 수 없습니다"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -19959,23 +19998,23 @@ msgstr "스í¬ë¡¤ API 리퀘스트를 실행할 수 없습니다. ë°ì´í„° ë’·ë
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - 최신값과 ì´ì „ê°’ì˜ ê°’ ì°¨ì´"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20002,7 +20041,7 @@ msgstr ""
msgid "comma-separated list"
msgstr "콤마로 나누는 리스트"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20018,15 +20057,15 @@ msgstr "설정"
msgid "contains"
msgstr "í¬í•¨"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20034,11 +20073,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - 기간 Të¡œ ìˆ˜ì§‘ëœ ê°’ V(오í¼ë ˆì´í„° O를 만족하는) ì˜ ìˆ˜"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20051,15 +20090,15 @@ msgstr "d"
msgid "d.M"
msgstr "m/d"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - í˜„ìž¬ì˜ ì‹œê°„"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - 월간 시간"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - ìš”ì¼ (ì›”ìš”ì¼ - 1, ì¼ìš”ì¼ - 7)"
@@ -20077,7 +20116,7 @@ msgstr "ì¼"
msgid "default"
msgstr "기본"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20154,7 +20193,7 @@ msgstr ""
msgid "does not match"
msgstr "ì¼ì¹˜í•˜ì§€ ì•ŠìŒ"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20177,11 +20216,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20197,7 +20236,7 @@ msgstr "JSONì˜ ë¶„ì„ì— ì‹¤íŒ¨í•˜ì˜€ìŠµë‹ˆë‹¤."
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20211,15 +20250,15 @@ msgstr "제1"
msgid "first parameter is expected"
msgstr "첫 파ë¼ë¯¸í„°ë¥¼ 지정해주세요"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - 기간 T를 기준으로 하는 ë‹¤ìŒ tì´ˆì˜ ì˜ˆì¸¡ì¹˜"
@@ -20227,7 +20266,7 @@ msgstr "forecast() - 기간 T를 기준으로 하는 ë‹¤ìŒ tì´ˆì˜ ì˜ˆì¸¡ì¹˜"
msgid "fourth"
msgstr "제4"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20301,7 +20340,7 @@ msgstr "범위 내"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20310,11 +20349,11 @@ msgstr ""
msgid "including subgroups"
msgstr "서브 ê·¸ë£¹ì„ í¬í•¨"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20333,7 +20372,7 @@ msgstr "ìš”ì†Œì˜ ìˆ˜ê°€ 올바르지 않습니다"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20351,7 +20390,7 @@ msgstr "ìž˜ëª»ëœ ì„œì‹ì´ \"%1$s\" 부근ì—ì„œ 발견ë˜ì—ˆìŠµë‹ˆë‹¤."
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20411,7 +20450,7 @@ msgstr "í˜¸ìŠ¤íŠ¸ê·¸ë£¹ëª…ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
msgid "invalid host name"
msgstr "í˜¸ìŠ¤íŠ¸ì˜ ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ 않습니다"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20433,6 +20472,16 @@ msgstr "정규표현ì‹ì´ 올바르지 않습니다"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20474,7 +20523,7 @@ msgstr "ì•„ì´í…œ 패턴"
msgid "key is empty"
msgstr "키가 설정ë˜ì§€ 않았습니다."
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20490,7 +20539,7 @@ msgctxt "week of month"
msgid "last"
msgstr "최신값"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - 최신값"
@@ -20498,11 +20547,11 @@ msgstr "last() - 최신값"
msgid "left"
msgstr "왼쪽"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20510,23 +20559,23 @@ msgstr ""
msgid "list of characters"
msgstr "문ìžì—´ì˜ 리스트"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20534,7 +20583,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "low-level 디스커버리 룰"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20566,11 +20615,11 @@ msgstr "매í¬ë¡œê°€ 설정ë˜ì–´ 있지 않습니다"
msgid "macro(s)"
msgstr "매í¬ë¡œ"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20606,7 +20655,7 @@ msgstr "최대"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - 기간T ì•ˆì˜ ìµœëŒ€ì¹˜"
@@ -20620,7 +20669,7 @@ msgstr "ì˜ì¡´ ì•„ì´í…œìˆ˜ê°€ 최대 ìˆ˜ì— ë„달하였습니다"
msgid "maximum number of dependency levels reached"
msgstr "ì˜ì¡´ 레벨 수가 ìµœëŒ€ìˆ˜ì— ë„달하였습니다"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20637,7 +20686,7 @@ msgstr ""
msgid "min"
msgstr "최소"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min() - 기간T ì•ˆì˜ ìµœì†Œì¹˜"
@@ -20652,15 +20701,15 @@ msgstr "%1$s ë¬¸ìž ì´ìƒ 입력해주세요"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20742,7 +20791,7 @@ msgstr "ì´ë¦„"
msgid "new"
msgstr "신규"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "신규"
@@ -20776,7 +20825,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20797,7 +20846,7 @@ msgstr "범위 밖"
msgid "not selected"
msgstr "ì„ íƒë˜ì§€ ì•ŠìŒ"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now() - Epoch를 기준으로 한 경과 시간 (초단위)"
@@ -20884,15 +20933,15 @@ msgstr ""
msgid "pattern"
msgstr "패턴"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile() - 기간 Tì˜ í¼ì„¼í…Œì¼ P"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -20900,15 +20949,15 @@ msgstr ""
msgid "problem pattern"
msgstr "장애 패턴"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -20957,11 +21006,11 @@ msgstr ""
msgid "regular expression"
msgstr "정규 표현"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -20985,15 +21034,15 @@ msgstr ""
msgid "right"
msgstr "오른쪽"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21084,23 +21133,23 @@ msgstr "ì•„ì´ì½˜ì˜ ë§¤í•‘ì„ í‘œì‹œ"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21108,11 +21157,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21120,11 +21169,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum() - 기간 Tì•ˆì˜ í•©ê³„ì¹˜"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21152,7 +21201,7 @@ msgstr "ì§€ì •ëœ ìžê²© 정보는 ìœ ë‹ˆí¬ ê°’ì´ ì•„ë‹™ë‹ˆë‹¤."
msgid "tag"
msgstr "태그"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21186,7 +21235,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21233,31 +21282,35 @@ msgstr ""
msgid "time shift"
msgstr "타임시프트"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - 현재시간"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - 기간T를 기준으로 하여 지정한 ê°’ì— ë„달하기 ê¹Œì§€ì˜ ì‹œê°„"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21283,11 +21336,11 @@ msgstr "트리거 í”„ë¡œí† íƒ€ìž…ì€ ë‹¤ë¥¸ 템플릿ì´ë‚˜ í˜¸ìŠ¤íŠ¸ì— ì´ë™í
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "ë§í¬ê°€ 있는 트리거는 다른 템플릿ì´ë‚˜ 호스트로 ì´ë™í•  수 없습니다"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21344,7 +21397,7 @@ msgstr "매í¬ë¡œì˜ ëë¶€ë¶„ì´ ìž˜ëª»ë˜ì–´ 있습니다"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21387,7 +21440,7 @@ msgstr "ê°’ \"%1$s\"ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤"
msgid "unknown"
msgstr "불명"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21584,11 +21637,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/lt/LC_MESSAGES/frontend.po b/ui/locale/lt/LC_MESSAGES/frontend.po
index 0da72491bb4..9ec7ed2fd96 100644
--- a/ui/locale/lt/LC_MESSAGES/frontend.po
+++ b/ui/locale/lt/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-10-10 08:29+0300\n"
"Last-Translator: richlv <richlv@nakts.net>\n"
"Language-Team: none\n"
@@ -318,10 +318,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr "(Tik super administratoriai gali kurti grupes)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(nerastas įgaliotasis serveris)"
@@ -475,7 +475,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -545,7 +545,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -564,11 +564,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -580,24 +580,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -615,7 +615,7 @@ msgstr ""
msgid "Action"
msgstr "Veiksmas"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr ""
@@ -625,7 +625,7 @@ msgstr ""
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Veiksmas pridÄ—tas"
@@ -634,18 +634,18 @@ msgstr "Veiksmas pridÄ—tas"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Veiksmas ištrintas"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] ""
@@ -665,7 +665,7 @@ msgstr ""
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Veiksmas atnaujintas"
@@ -712,7 +712,7 @@ msgid "Active till"
msgstr "Aktyvus iki"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -771,14 +771,14 @@ msgstr "Aktyvus iki"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -794,10 +794,10 @@ msgstr "Aktyvus iki"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -809,9 +809,9 @@ msgstr "Aktyvus iki"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -829,7 +829,7 @@ msgstr "Aktyvus iki"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -874,7 +874,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -899,8 +899,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -913,7 +913,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1047,7 +1047,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1063,6 +1063,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alternatyvus vardas"
@@ -1377,7 +1381,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1457,9 +1461,9 @@ msgstr ""
msgid "Authentication"
msgstr "Autentifikacija"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Autentifikacijos algoritmas"
@@ -1520,12 +1524,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automatinis"
@@ -1640,12 +1644,12 @@ msgstr "Įrišti DN"
msgid "Bind password"
msgstr "Įrišti slaptažodį"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1851,7 +1855,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Negalima pridÄ—ti veiksmo"
@@ -2154,7 +2158,7 @@ msgstr[2] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr ""
@@ -2330,12 +2334,12 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr ""
@@ -2352,7 +2356,7 @@ msgstr[2] ""
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr ""
@@ -2443,7 +2447,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] ""
@@ -2532,7 +2536,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2772,7 +2776,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2953,7 +2957,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -3019,7 +3023,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr ""
@@ -3080,7 +3084,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr ""
@@ -3185,9 +3189,9 @@ msgstr ""
msgid "Cannot update script"
msgstr ""
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3214,7 +3218,7 @@ msgstr ""
msgid "Cannot update template"
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3302,14 +3306,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3327,10 +3331,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3370,9 +3374,9 @@ msgstr ""
msgid "Character string not included"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3388,7 +3392,7 @@ msgstr ""
msgid "Check already exists."
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr ""
@@ -3510,8 +3514,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr ""
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr ""
@@ -3538,16 +3542,16 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3676,7 +3680,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3948,13 +3952,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3962,9 +3966,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4134,10 +4138,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr ""
@@ -4227,7 +4231,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4429,7 +4433,7 @@ msgid "Current value"
msgstr ""
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4673,7 +4677,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4746,11 +4750,11 @@ msgstr ""
msgid "Date HW purchased"
msgstr ""
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr ""
@@ -4791,8 +4795,8 @@ msgstr ""
msgid "December"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4802,7 +4806,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4933,7 +4937,7 @@ msgstr ""
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr ""
@@ -4942,11 +4946,11 @@ msgstr ""
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr ""
@@ -5079,7 +5083,7 @@ msgstr ""
msgid "Delete selected host groups?"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5187,7 +5191,7 @@ msgstr ""
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr ""
@@ -5248,7 +5252,7 @@ msgstr ""
msgid "Dependencies"
msgstr ""
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr ""
@@ -5256,7 +5260,7 @@ msgstr ""
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5267,7 +5271,7 @@ msgid "Deployment status"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5282,16 +5286,16 @@ msgstr ""
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5303,10 +5307,10 @@ msgstr ""
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr ""
@@ -5315,6 +5319,14 @@ msgstr ""
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr ""
@@ -5437,7 +5449,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5464,17 +5476,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr ""
@@ -5499,7 +5511,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5715,7 +5727,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5732,7 +5744,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5814,7 +5826,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5878,7 +5890,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr ""
@@ -5908,14 +5920,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6171,7 +6183,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6209,13 +6221,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6231,11 +6243,11 @@ msgstr ""
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6311,6 +6323,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr ""
@@ -6880,8 +6896,8 @@ msgctxt "page navigation"
msgid "First"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6993,12 +7009,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr ""
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr ""
@@ -7014,7 +7030,7 @@ msgstr ""
msgid "GUI"
msgstr ""
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr ""
@@ -7365,7 +7381,7 @@ msgstr ""
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7378,12 +7394,11 @@ msgid "Grouping by"
msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr ""
@@ -7602,7 +7617,7 @@ msgstr ""
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7633,7 +7648,7 @@ msgid "Horizontal align"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7642,7 +7657,7 @@ msgstr ""
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7653,7 +7668,7 @@ msgstr ""
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7782,7 +7797,7 @@ msgid "Host group label type"
msgstr ""
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7801,8 +7816,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7852,7 +7867,7 @@ msgstr ""
msgid "Host label type"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7864,7 +7879,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr ""
@@ -7901,7 +7916,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7925,7 +7940,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7950,7 +7965,7 @@ msgstr ""
msgid "Host update failed."
msgstr ""
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr ""
@@ -8027,6 +8042,10 @@ msgstr ""
msgid "Hosts updated"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr ""
@@ -8096,15 +8115,15 @@ msgstr ""
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr ""
@@ -8338,7 +8357,7 @@ msgstr ""
msgid "Images for all maps will be updated!"
msgstr ""
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr ""
@@ -8420,7 +8439,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8432,11 +8451,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8551,7 +8570,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr ""
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr ""
@@ -8559,7 +8578,7 @@ msgstr ""
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr ""
@@ -8571,15 +8590,15 @@ msgstr ""
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8588,11 +8607,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8600,7 +8619,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr ""
@@ -8610,11 +8629,11 @@ msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr ""
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8623,11 +8642,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8927,8 +8946,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr ""
@@ -9326,7 +9345,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9335,11 +9354,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9351,7 +9370,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9371,7 +9390,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr ""
@@ -9430,8 +9449,8 @@ msgstr ""
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9523,7 +9542,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9584,10 +9603,10 @@ msgstr ""
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9650,8 +9669,8 @@ msgstr ""
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9873,11 +9892,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr ""
@@ -9891,7 +9910,7 @@ msgid "Inventory field"
msgstr ""
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr ""
@@ -9899,10 +9918,10 @@ msgstr ""
msgid "Is online?"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9997,7 +10016,7 @@ msgstr[2] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10457,17 +10476,17 @@ msgstr ""
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr ""
@@ -10544,8 +10563,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10579,8 +10598,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr ""
@@ -10603,16 +10622,9 @@ msgstr ""
msgid "Link indicators"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr ""
@@ -10628,13 +10640,6 @@ msgstr ""
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10773,7 +10778,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr ""
@@ -10855,16 +10860,16 @@ msgstr ""
msgid "Macro \"%1$s\" already exists."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr ""
@@ -10963,12 +10968,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr ""
@@ -11111,16 +11116,16 @@ msgstr ""
msgid "Mark selected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11153,11 +11158,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11393,7 +11398,7 @@ msgstr ""
msgid "Middle"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11496,7 +11501,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11582,9 +11587,9 @@ msgstr ""
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr ""
@@ -11603,6 +11608,7 @@ msgstr ""
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr ""
@@ -11715,8 +11721,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11786,11 +11792,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11818,8 +11824,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11840,7 +11846,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12130,15 +12136,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12224,7 +12230,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12261,9 +12267,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12302,7 +12308,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12402,11 +12408,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12465,7 +12471,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12486,7 +12492,7 @@ msgid "No target selected."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12635,6 +12641,10 @@ msgstr ""
msgid "Notifications"
msgstr ""
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12721,6 +12731,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr ""
@@ -12896,7 +12910,7 @@ msgid "Off"
msgstr ""
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12943,7 +12957,7 @@ msgstr ""
msgid "One time only"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr ""
@@ -13021,12 +13035,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -13060,8 +13074,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr ""
@@ -13096,7 +13110,7 @@ msgstr ""
msgid "Operator"
msgstr ""
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13136,19 +13150,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13178,10 +13192,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13444,10 +13458,10 @@ msgstr ""
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13460,19 +13474,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13524,12 +13538,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13584,13 +13598,13 @@ msgid "Passive"
msgstr ""
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13598,7 +13612,7 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13651,12 +13665,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13669,7 +13683,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13693,10 +13707,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13704,7 +13719,9 @@ msgstr ""
msgid "Period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13768,11 +13785,11 @@ msgstr ""
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13858,7 +13875,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13867,7 +13884,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13984,9 +14001,9 @@ msgstr ""
msgid "Private key file"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr ""
@@ -14394,7 +14411,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14526,20 +14543,20 @@ msgstr ""
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14548,10 +14565,10 @@ msgstr ""
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14595,7 +14612,7 @@ msgstr ""
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14678,14 +14695,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14698,8 +14715,8 @@ msgstr ""
msgid "Replace dependencies"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14900,7 +14917,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr ""
@@ -15435,7 +15452,7 @@ msgstr ""
msgid "Script"
msgstr ""
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15501,6 +15518,15 @@ msgstr ""
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15579,7 +15605,7 @@ msgstr ""
msgid "Selected"
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15820,6 +15846,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16273,7 +16300,7 @@ msgstr ""
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr ""
@@ -16308,8 +16335,8 @@ msgstr ""
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16317,7 +16344,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16396,7 +16423,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16500,7 +16527,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16554,12 +16581,12 @@ msgstr ""
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16580,10 +16607,10 @@ msgstr ""
msgid "Subject"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16777,7 +16804,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16793,13 +16820,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16816,7 +16843,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16826,7 +16853,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16862,14 +16889,12 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr ""
@@ -16913,7 +16938,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr ""
@@ -16925,11 +16950,11 @@ msgstr ""
msgid "Template linkage"
msgstr ""
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr ""
@@ -16964,13 +16989,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16979,10 +17003,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16993,7 +17019,7 @@ msgstr ""
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17209,7 +17235,7 @@ msgstr ""
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17247,7 +17273,7 @@ msgstr ""
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17280,15 +17306,15 @@ msgstr ""
msgid "Till"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17325,13 +17351,13 @@ msgstr ""
msgid "Time period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -18027,9 +18053,9 @@ msgstr ""
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr ""
@@ -18047,7 +18073,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr ""
@@ -18079,16 +18105,16 @@ msgstr ""
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr ""
@@ -18185,10 +18211,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18197,16 +18223,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18235,7 +18261,7 @@ msgstr ""
msgid "Update interval"
msgstr ""
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18262,7 +18288,7 @@ msgstr ""
msgid "Upper level maps"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18451,7 +18477,7 @@ msgstr[2] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18589,15 +18615,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr ""
@@ -18911,11 +18937,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18989,14 +19015,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr ""
@@ -19039,7 +19065,7 @@ msgstr ""
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19139,7 +19165,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr ""
@@ -19165,7 +19191,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr ""
@@ -19275,6 +19301,10 @@ msgstr ""
msgid "Wednesday"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19547,7 +19577,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr ""
@@ -19607,7 +19638,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr ""
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19848,11 +19879,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19947,7 +19978,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19991,11 +20022,11 @@ msgstr ""
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -20009,11 +20040,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -20035,39 +20066,47 @@ msgstr ""
msgid "avg"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -20082,7 +20121,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20124,7 +20163,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20212,23 +20251,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20255,7 +20294,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20270,15 +20309,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20286,11 +20325,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20303,15 +20342,15 @@ msgstr ""
msgid "d.M"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20329,7 +20368,7 @@ msgstr ""
msgid "default"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20406,7 +20445,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20429,11 +20468,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20449,7 +20488,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20463,15 +20502,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20479,7 +20518,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20553,7 +20592,7 @@ msgstr ""
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20562,11 +20601,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20585,7 +20624,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20603,7 +20642,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20663,7 +20702,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20685,6 +20724,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20726,7 +20775,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20742,7 +20791,7 @@ msgctxt "week of month"
msgid "last"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20750,11 +20799,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20762,23 +20811,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20786,7 +20835,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20818,11 +20867,11 @@ msgstr ""
msgid "macro(s)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20858,7 +20907,7 @@ msgstr ""
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20872,7 +20921,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20889,7 +20938,7 @@ msgstr ""
msgid "min"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20904,15 +20953,15 @@ msgstr ""
msgid "mm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20994,7 +21043,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -21028,7 +21077,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -21049,7 +21098,7 @@ msgstr ""
msgid "not selected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21136,15 +21185,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21152,15 +21201,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21209,11 +21258,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21237,15 +21286,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21336,23 +21385,23 @@ msgstr ""
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21360,11 +21409,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21372,11 +21421,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21404,7 +21453,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21438,7 +21487,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21485,31 +21534,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21535,11 +21588,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21596,7 +21649,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21639,7 +21692,7 @@ msgstr ""
msgid "unknown"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21840,11 +21893,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/lv/LC_MESSAGES/frontend.po b/ui/locale/lv/LC_MESSAGES/frontend.po
index b6078a55590..22011ec9648 100644
--- a/ui/locale/lv/LC_MESSAGES/frontend.po
+++ b/ui/locale/lv/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-10-15 07:19+0300\n"
"Last-Translator: Jaba <janis.jaunbalodis@gmail.com>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -319,10 +319,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr "(Tikai super administratori var veidot grupas)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(bez starpniekservera)"
@@ -476,7 +476,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -545,7 +545,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -564,11 +564,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -580,24 +580,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -615,7 +615,7 @@ msgstr ""
msgid "Action"
msgstr "Darbība"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr ""
@@ -625,7 +625,7 @@ msgstr ""
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Darbība pievienota"
@@ -634,18 +634,18 @@ msgstr "Darbība pievienota"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Darbība izdzēsta"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] ""
@@ -665,7 +665,7 @@ msgstr ""
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Darbība atjaunota"
@@ -712,7 +712,7 @@ msgid "Active till"
msgstr "Aktīvs līdz"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -771,14 +771,14 @@ msgstr "Aktīvs līdz"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -794,10 +794,10 @@ msgstr "Aktīvs līdz"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -809,9 +809,9 @@ msgstr "Aktīvs līdz"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -829,7 +829,7 @@ msgstr "Aktīvs līdz"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -874,7 +874,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -899,8 +899,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -913,7 +913,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1049,7 +1049,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1065,6 +1065,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Saīsne"
@@ -1379,7 +1383,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1459,9 +1463,9 @@ msgstr ""
msgid "Authentication"
msgstr "AutentifikÄcija"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "AutentifikÄcijas algoritms"
@@ -1522,12 +1526,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "AutomÄtiski"
@@ -1642,12 +1646,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind parole"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1853,7 +1857,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr ""
@@ -2156,7 +2160,7 @@ msgstr[2] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr ""
@@ -2333,12 +2337,12 @@ msgstr[0] "Skriptu nav iespējams izdzēst"
msgstr[1] "Skriptu nav iespējams izdzēst"
msgstr[2] "Skriptu nav iespējams izdzēst"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr ""
@@ -2356,7 +2360,7 @@ msgstr[2] "Servisu nav iespējams izdzēst"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr ""
@@ -2447,7 +2451,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] ""
@@ -2536,7 +2540,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2776,7 +2780,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2957,7 +2961,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -3023,7 +3027,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr ""
@@ -3084,7 +3088,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr ""
@@ -3189,9 +3193,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Nevar modificēt skriptu"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3218,7 +3222,7 @@ msgstr ""
msgid "Cannot update template"
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3306,14 +3310,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3331,10 +3335,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3374,9 +3378,9 @@ msgstr "Simbolu rinda iekļauta"
msgid "Character string not included"
msgstr "Simbolu rinda nav iekļauta"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3392,7 +3396,7 @@ msgstr ""
msgid "Check already exists."
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr ""
@@ -3514,8 +3518,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr ""
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr ""
@@ -3542,16 +3546,16 @@ msgstr "Pulkstenis"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3680,7 +3684,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3952,13 +3956,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3966,9 +3970,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4138,10 +4142,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Skaits"
@@ -4231,7 +4235,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4433,7 +4437,7 @@ msgid "Current value"
msgstr ""
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4677,7 +4681,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4750,11 +4754,11 @@ msgstr ""
msgid "Date HW purchased"
msgstr "Datums, kad aparatÅ«ra iegÄdÄta"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Diena"
@@ -4795,8 +4799,8 @@ msgstr "Dec"
msgid "December"
msgstr "Decembris"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4806,7 +4810,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4937,7 +4941,7 @@ msgstr "Dzēst"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr ""
@@ -4946,11 +4950,11 @@ msgstr ""
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr ""
@@ -5083,7 +5087,7 @@ msgstr "Vai dzÄ“st iezÄ«mÄ“tÄs grupas?"
msgid "Delete selected host groups?"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5191,7 +5195,7 @@ msgstr "Vai dzÄ“st atlasÄ«tos lietotÄjus?"
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Dzēst"
@@ -5252,7 +5256,7 @@ msgstr ""
msgid "Dependencies"
msgstr ""
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr ""
@@ -5260,7 +5264,7 @@ msgstr ""
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5271,7 +5275,7 @@ msgid "Deployment status"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5286,16 +5290,16 @@ msgstr ""
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5307,10 +5311,10 @@ msgstr "Apraksts"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detaļas"
@@ -5319,6 +5323,14 @@ msgstr "Detaļas"
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "IekÄrta"
@@ -5441,7 +5453,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5468,17 +5480,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Atspējots"
@@ -5503,7 +5515,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5719,7 +5731,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5736,7 +5748,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5818,7 +5830,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5882,7 +5894,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Ilgums"
@@ -5912,14 +5924,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6175,7 +6187,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6213,13 +6225,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6235,11 +6247,11 @@ msgstr "Ieslēgts"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6315,6 +6327,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Notikums"
@@ -6885,8 +6901,8 @@ msgctxt "page navigation"
msgid "First"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6998,12 +7014,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr ""
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funkcija"
@@ -7019,7 +7035,7 @@ msgstr "GSM modems"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "GUI pieeja liegta."
@@ -7371,7 +7387,7 @@ msgstr "Grupas nosaukums"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7384,12 +7400,11 @@ msgid "Grouping by"
msgstr "Grupēt pēc"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Grupas"
@@ -7608,7 +7623,7 @@ msgstr "VÄ“stures dzÄ“Å¡ana var aizņemt daudz laika. Vai turpinÄt?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7639,7 +7654,7 @@ msgid "Horizontal align"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7648,7 +7663,7 @@ msgstr ""
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7659,7 +7674,7 @@ msgstr ""
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7789,7 +7804,7 @@ msgid "Host group label type"
msgstr ""
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7808,8 +7823,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7859,7 +7874,7 @@ msgstr ""
msgid "Host label type"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7871,7 +7886,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "IekÄrtas vÄrds"
@@ -7908,7 +7923,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7932,7 +7947,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7957,7 +7972,7 @@ msgstr "IekÄrtas laiks"
msgid "Host update failed."
msgstr ""
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr ""
@@ -8034,6 +8049,10 @@ msgstr "IekÄrtu atraÅ¡anÄs vieta"
msgid "Hosts updated"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Stundas"
@@ -8103,15 +8122,15 @@ msgstr "IP apgabals"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8345,7 +8364,7 @@ msgstr "Attēli"
msgid "Images for all maps will be updated!"
msgstr ""
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Nekavējoties"
@@ -8427,7 +8446,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8439,11 +8458,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8558,7 +8577,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr ""
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr ""
@@ -8566,7 +8585,7 @@ msgstr ""
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr ""
@@ -8578,15 +8597,15 @@ msgstr ""
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8595,11 +8614,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8607,7 +8626,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr ""
@@ -8617,11 +8636,11 @@ msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr ""
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8630,11 +8649,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8934,8 +8953,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr ""
@@ -9333,7 +9352,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9342,11 +9361,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9358,7 +9377,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9378,7 +9397,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Ievietot"
@@ -9437,8 +9456,8 @@ msgstr ""
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9530,7 +9549,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9591,10 +9610,10 @@ msgstr ""
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9657,8 +9676,8 @@ msgstr ""
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9880,11 +9899,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Uzskaite"
@@ -9898,7 +9917,7 @@ msgid "Inventory field"
msgstr ""
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr ""
@@ -9906,10 +9925,10 @@ msgstr ""
msgid "Is online?"
msgstr "Ir tiešsaistē?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -10004,7 +10023,7 @@ msgstr[2] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10464,17 +10483,17 @@ msgstr ""
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr ""
@@ -10551,8 +10570,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10586,8 +10605,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Saite"
@@ -10610,16 +10629,9 @@ msgstr ""
msgid "Link indicators"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr ""
@@ -10635,13 +10647,6 @@ msgstr ""
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10780,7 +10785,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Pieslēgties"
@@ -10862,16 +10867,16 @@ msgstr ""
msgid "Macro \"%1$s\" already exists."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr ""
@@ -10970,12 +10975,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr ""
@@ -11118,16 +11123,16 @@ msgstr "AtzÄ«mÄ“t pÄrÄ“jos"
msgid "Mark selected"
msgstr "IekrÄsot izvÄ“lÄ“tÄs"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11160,11 +11165,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11400,7 +11405,7 @@ msgstr ""
msgid "Middle"
msgstr "Pa vidu"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11503,7 +11508,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11589,9 +11594,9 @@ msgstr "Pirmdiena"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Uzraudzība ar starpniekserveri"
@@ -11610,6 +11615,7 @@ msgstr "Uzraudzība"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "MÄ“nesis"
@@ -11722,8 +11728,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11793,11 +11799,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11825,8 +11831,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11847,7 +11853,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12137,15 +12143,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12231,7 +12237,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12268,9 +12274,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12309,7 +12315,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12409,11 +12415,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12472,7 +12478,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12493,7 +12499,7 @@ msgid "No target selected."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12642,6 +12648,10 @@ msgstr ""
msgid "Notifications"
msgstr ""
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12728,6 +12738,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr ""
@@ -12903,7 +12917,7 @@ msgid "Off"
msgstr ""
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12950,7 +12964,7 @@ msgstr ""
msgid "One time only"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr ""
@@ -13028,12 +13042,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -13067,8 +13081,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "OperÄcija"
@@ -13103,7 +13117,7 @@ msgstr "OperÄcija"
msgid "Operator"
msgstr "Operators"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13143,19 +13157,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13185,10 +13199,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13451,10 +13465,10 @@ msgstr "PROBLÄ’MA"
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13467,19 +13481,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13531,12 +13545,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13591,13 +13605,13 @@ msgid "Passive"
msgstr ""
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13605,7 +13619,7 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13658,12 +13672,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13676,7 +13690,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13700,10 +13714,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13711,7 +13726,9 @@ msgstr ""
msgid "Period"
msgstr "Periods"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13775,11 +13792,11 @@ msgstr "Atskaņot skaņu"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13865,7 +13882,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13874,7 +13891,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13991,9 +14008,9 @@ msgstr ""
msgid "Private key file"
msgstr "PrivÄtÄs atslÄ“gas fails"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Privilēģiju līmenis"
@@ -14401,7 +14418,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14533,20 +14550,20 @@ msgstr "AttÄlinÄta komanda"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14555,10 +14572,10 @@ msgstr "AttÄlinÄta komanda"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14602,7 +14619,7 @@ msgstr "AttÄlinÄta komanda"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14685,14 +14702,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14705,8 +14722,8 @@ msgstr "AizstÄt"
msgid "Replace dependencies"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14907,7 +14924,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "RezultÄts"
@@ -15442,7 +15459,7 @@ msgstr ""
msgid "Script"
msgstr "Skripts"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Skripts \"%1$s\" jau eksistē."
@@ -15508,6 +15525,15 @@ msgstr ""
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15586,7 +15612,7 @@ msgstr ""
msgid "Selected"
msgstr "Atlasītie"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15827,6 +15853,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16280,7 +16307,7 @@ msgstr "SpÄņu (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr ""
@@ -16315,8 +16342,8 @@ msgstr ""
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16324,7 +16351,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16403,7 +16430,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16507,7 +16534,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16561,12 +16588,12 @@ msgstr ""
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16587,10 +16614,10 @@ msgstr ""
msgid "Subject"
msgstr "TÄ“ma"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16784,7 +16811,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16800,13 +16827,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16823,7 +16850,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16833,7 +16860,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16869,14 +16896,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Å ablons"
@@ -16920,7 +16945,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Šablons izdzēsts"
@@ -16932,11 +16957,11 @@ msgstr "Å ablona grupa"
msgid "Template linkage"
msgstr "Šablonu saistīšana"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Å ablonu nosaukums"
@@ -16971,13 +16996,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16986,10 +17010,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -17000,7 +17026,7 @@ msgstr "Å abloni"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17216,7 +17242,7 @@ msgstr "Motīvs"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17254,7 +17280,7 @@ msgstr "Å is gads"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17287,15 +17313,15 @@ msgstr ""
msgid "Till"
msgstr "LÄ«dz"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17332,13 +17358,13 @@ msgstr ""
msgid "Time period"
msgstr "Laika periods"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -18034,9 +18060,9 @@ msgstr "Vienības"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Nav zinÄms"
@@ -18054,7 +18080,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr ""
@@ -18086,16 +18112,16 @@ msgstr "NezinÄms vÄ“rtÄ«bas tips"
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Atvienot"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Atvienot un iztīrīt"
@@ -18192,10 +18218,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18204,16 +18230,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18242,7 +18268,7 @@ msgstr ""
msgid "Update interval"
msgstr "AtjaunoÅ¡anas intervÄls"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18269,7 +18295,7 @@ msgstr "AugÅ¡upielÄdÄ“t"
msgid "Upper level maps"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18458,7 +18484,7 @@ msgstr[2] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18596,15 +18622,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "LietotÄjvÄrds"
@@ -18918,11 +18944,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18996,14 +19022,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "VÄ“rtÄ«bu plÄnojums"
@@ -19046,7 +19072,7 @@ msgstr "Vērtība: nav datu"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19146,7 +19172,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr ""
@@ -19172,7 +19198,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "BrÄ«dinÄjums"
@@ -19282,6 +19308,10 @@ msgstr "Tre"
msgid "Wednesday"
msgstr "Trešdiena"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19554,7 +19584,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Gads"
@@ -19614,7 +19645,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr ""
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19855,11 +19886,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19954,7 +19985,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19998,11 +20029,11 @@ msgstr "sarkanas"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -20016,11 +20047,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -20042,39 +20073,47 @@ msgstr ""
msgid "avg"
msgstr "vid"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -20089,7 +20128,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20131,7 +20170,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20219,23 +20258,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20262,7 +20301,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20277,15 +20316,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20293,11 +20332,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20310,15 +20349,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20336,7 +20375,7 @@ msgstr "dienas"
msgid "default"
msgstr "noklusētais"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20413,7 +20452,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20436,11 +20475,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20456,7 +20495,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20470,15 +20509,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20486,7 +20525,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20560,7 +20599,7 @@ msgstr "iekÅ¡Ä"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20569,11 +20608,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20592,7 +20631,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20610,7 +20649,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20670,7 +20709,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20692,6 +20731,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20733,7 +20782,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20749,7 +20798,7 @@ msgctxt "week of month"
msgid "last"
msgstr "pēdējais"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20757,11 +20806,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20769,23 +20818,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20793,7 +20842,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20825,11 +20874,11 @@ msgstr ""
msgid "macro(s)"
msgstr "makros(i)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20865,7 +20914,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20879,7 +20928,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20896,7 +20945,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20911,15 +20960,15 @@ msgstr ""
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -21001,7 +21050,7 @@ msgstr ""
msgid "new"
msgstr "jauns"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -21035,7 +21084,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -21056,7 +21105,7 @@ msgstr "nav iekš"
msgid "not selected"
msgstr "nav izvēlēts"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21143,15 +21192,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21159,15 +21208,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21216,11 +21265,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21244,15 +21293,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21343,23 +21392,23 @@ msgstr "parÄdÄ«t ikonu plÄnojumu"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21367,11 +21416,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21379,11 +21428,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21411,7 +21460,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21445,7 +21494,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21492,31 +21541,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21542,11 +21595,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21603,7 +21656,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21646,7 +21699,7 @@ msgstr ""
msgid "unknown"
msgstr "nezinÄms"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21847,11 +21900,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/nb/LC_MESSAGES/frontend.po b/ui/locale/nb/LC_MESSAGES/frontend.po
index 334e37a4eaa..d876542057a 100644
--- a/ui/locale/nb/LC_MESSAGES/frontend.po
+++ b/ui/locale/nb/LC_MESSAGES/frontend.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2021-03-19 18:13+0300\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: none\n"
@@ -306,10 +306,10 @@ msgstr "(0 - bruk standard handling)"
msgid "(Only super admins can create groups)"
msgstr "(Kun superbrukere kan opprette grupper)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(ingen proxy)"
@@ -460,7 +460,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -529,7 +529,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -548,11 +548,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -564,24 +564,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -599,7 +599,7 @@ msgstr ""
msgid "Action"
msgstr "Handling"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Handling \"%1$s\" eksisterer allerede."
@@ -609,7 +609,7 @@ msgstr "Handling \"%1$s\" eksisterer allerede."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Handling lagt til"
@@ -618,17 +618,17 @@ msgstr "Handling lagt til"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Handling slettet"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Handling deaktivert"
msgstr[1] "Handlinger deaktivert"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Handling aktivert"
@@ -647,7 +647,7 @@ msgstr "Handlingslogg"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Handling oppdatert"
@@ -694,7 +694,7 @@ msgid "Active till"
msgstr "Aktiv til"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -753,14 +753,14 @@ msgstr "Aktiv til"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -776,10 +776,10 @@ msgstr "Aktiv til"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -791,9 +791,9 @@ msgstr "Aktiv til"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -811,7 +811,7 @@ msgstr "Aktiv til"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -856,7 +856,7 @@ msgstr "Legg til barnelement"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -881,8 +881,8 @@ msgstr "Legg til flere kart"
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -895,7 +895,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1029,7 +1029,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1045,6 +1045,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1359,7 +1363,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1439,9 +1443,9 @@ msgstr ""
msgid "Authentication"
msgstr "Autentisering"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Autentiseringsalgoritme"
@@ -1502,12 +1506,12 @@ msgstr "Auto-innlogging og automatisk utlogging kan ikke aktiveres sammen."
msgid "Auto-logout"
msgstr "Auto-avlogging"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automatisk"
@@ -1622,12 +1626,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind inn passord"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1833,7 +1837,7 @@ msgstr "Kan ikke legge til et ikke-numerisk element \"%1$s\" til grafen \"%2$s\"
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Kan ikke legge til et ikke-numerisk element \"%1$s\" til graf prototype \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Kan ikke legge til handling"
@@ -2131,7 +2135,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Kan ikke slette Zabbix intern bruker \"%1$s\", prøv å deaktivere brukeren."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Kan ikke slette handling"
@@ -2297,12 +2301,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Kan ikke slette skript"
msgstr[1] "Kan ikke slette skriptene"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Kan ikke slette skript. Skriptet \"%1$s\" brukes i handlingsoperasjon \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Kan ikke slette valgte handlinger"
@@ -2319,7 +2323,7 @@ msgstr[1] "Kan ikke slette tjenesten"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Kan ikke slette mal"
@@ -2406,7 +2410,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Kan ikke deaktivere handling"
@@ -2484,7 +2488,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Kan ikke aktivere handling"
@@ -2713,7 +2717,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "Kan ikke importere mal \"%1$s\", koblet mal \"%2$s\" eksisterer ikke."
msgstr[1] "Kan ikke importere mal \"%1$s\", koblete maler \"%2$s\" eksisterer ikke."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Kan ikke sette inn trigger-uttrykk"
@@ -2892,7 +2896,7 @@ msgstr "Kan ikke koble fra mal."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Kan ikke oppdatere \"%1$s\" for handling \"%2$s\"."
@@ -2958,7 +2962,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Kan ikke oppdatere et templert webscenario \"%1$s\":%2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Kan ikke oppdatere handling"
@@ -3018,7 +3022,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Kan ikke oppdatere grupper for oppdaget vert \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Kan ikke oppdatere verten"
@@ -3121,9 +3125,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Kan ikke oppdatere skript"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3150,7 +3154,7 @@ msgstr "Kan ikke oppdatere trinn for et templert webscenario \"%1$s\":%2$s."
msgid "Cannot update template"
msgstr "Kan ikke oppdatere mal"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3236,14 +3240,14 @@ msgstr "Fanger alle SNMP-feller som ikke ble fanget av noen av snmptrap [] -elem
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Sertifikat"
@@ -3261,10 +3265,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Endring"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3304,9 +3308,9 @@ msgstr "Karakterstreng inkludert"
msgid "Character string not included"
msgstr "Tegnstreng er ikke inkludert"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3322,7 +3326,7 @@ msgstr "Chassisinformasjon. Returnerer streng"
msgid "Check already exists."
msgstr "Sjekk allerede eksisterer."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Kontroller uttrykksdelen som starter fra \"%1$s\"."
@@ -3444,8 +3448,8 @@ msgstr "Slett logg"
msgid "Clear history and trends"
msgstr "Ryd historie og trender"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Fjern når du kobler fra"
@@ -3472,16 +3476,16 @@ msgstr "Klokke"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3610,7 +3614,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr "Samtidige økter"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3882,13 +3886,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Tilkoblinger"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Forbindelser fra verten"
@@ -3896,9 +3900,9 @@ msgstr "Forbindelser fra verten"
msgid "Connections from proxy"
msgstr "Tilkoblinger fra proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Tilkoblinger til verten"
@@ -4066,10 +4070,10 @@ msgstr "Korrelasjonsregel"
msgid "Correlation updated"
msgstr "Korrelasjon oppdatert"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Teller"
@@ -4159,7 +4163,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4361,7 +4365,7 @@ msgid "Current value"
msgstr "Nåværende verdi"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Tilpasset"
@@ -4604,7 +4608,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4677,11 +4681,11 @@ msgstr "Dato HW vedlikehold utløper"
msgid "Date HW purchased"
msgstr "Dato HW kjøpt"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Dag"
@@ -4722,8 +4726,8 @@ msgstr "Des"
msgid "December"
msgstr "Desember"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4733,7 +4737,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4864,7 +4868,7 @@ msgstr "Slett"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Slett og fjern"
@@ -4873,11 +4877,11 @@ msgstr "Slett og fjern"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Slett og fjern valgte maler? (Advarsel: alle tilknyttede verter blir ryddet!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Slett og fjern mal? (Advarsel: alle tilknyttede verter blir ryddet!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Slett nåværende handling?"
@@ -5010,7 +5014,7 @@ msgstr "Slett valgte grupper?"
msgid "Delete selected host groups?"
msgstr "Slett utvalgte vertsgrupper?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Slett valgt vert prototype?"
@@ -5118,7 +5122,7 @@ msgstr "Slett valgte brukere?"
msgid "Delete selected web scenarios?"
msgstr "Slett valgte webscenarier?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Slett mal?"
@@ -5179,7 +5183,7 @@ msgstr ""
msgid "Dependencies"
msgstr "avhengig"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Avhengig"
@@ -5187,7 +5191,7 @@ msgstr "Avhengig"
msgid "Dependent item"
msgstr "Avhengige gjenstand"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5198,7 +5202,7 @@ msgid "Deployment status"
msgstr "Distribusjonsstatus"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5213,16 +5217,16 @@ msgstr "Distribusjonsstatus"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5234,10 +5238,10 @@ msgstr "Beskrivelse"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detaljer"
@@ -5246,6 +5250,14 @@ msgstr "Detaljer"
msgid "Details of web scenario"
msgstr "Detaljer om webscenario"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Enhet"
@@ -5368,7 +5380,7 @@ msgstr "Deaktiver valgte webscenarier?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5395,17 +5407,17 @@ msgstr "Deaktiver valgte webscenarier?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Funksjonshemmet"
@@ -5430,7 +5442,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5644,7 +5656,7 @@ msgstr "Vis stablet graf"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5661,7 +5673,7 @@ msgstr "Viser %1$s til %2$s av %3$s funnet"
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5743,7 +5755,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Last ned konfigurasjonsfilen"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5807,7 +5819,7 @@ msgstr "Dupliser userid \"%1$s\" i brukere for kart \"%2$s\"."
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Varighet"
@@ -5837,14 +5849,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6100,7 +6112,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6138,13 +6150,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6160,11 +6172,11 @@ msgstr "aktivert"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "kryptering"
@@ -6240,6 +6252,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Feil: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Hendelse"
@@ -6809,8 +6825,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Første"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Passe"
@@ -6922,12 +6938,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Full klone"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funksjon"
@@ -6943,7 +6959,7 @@ msgstr "GSM-modem"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "GUI-tilgang deaktivert."
@@ -7292,7 +7308,7 @@ msgstr "Gruppe navn"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Gruppeprototype kan ikke baseres på en oppdaget vertsgruppe \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Gruppeprototyper"
@@ -7305,12 +7321,11 @@ msgid "Grouping by"
msgstr "Gruppering av"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Grupper"
@@ -7529,7 +7544,7 @@ msgstr "Historisk rydding kan ta lang tid. Fortsette?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7560,7 +7575,7 @@ msgid "Horizontal align"
msgstr "Horisontal justering"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7569,7 +7584,7 @@ msgstr "Horisontal justering"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7580,7 +7595,7 @@ msgstr "Horisontal justering"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7706,7 +7721,7 @@ msgid "Host group label type"
msgstr "Vertsgruppe etikett type"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7725,8 +7740,8 @@ msgstr "Vertsgruppe med ID \"%1$s\" er ikke tilgjengelig."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7776,7 +7791,7 @@ msgstr "Vert oversikt over verten"
msgid "Host label type"
msgstr "Verts etikettype"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Vertsmakroer"
@@ -7788,7 +7803,7 @@ msgstr "Vert metadata"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Vertsnavn"
@@ -7825,7 +7840,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Vertsprototype slettet"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7848,7 +7863,7 @@ msgstr "Vertsprototype med synlig navn \"%1$s\" finnes allerede i oppdagelsesreg
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Vert prototyper"
@@ -7873,7 +7888,7 @@ msgstr "Vert tid"
msgid "Host update failed."
msgstr "Vertsoppdatering mislyktes."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Vert oppdatert"
@@ -7950,6 +7965,10 @@ msgstr "Verter plassering"
msgid "Hosts updated"
msgstr "Verter oppdatert"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "timer"
@@ -8019,15 +8038,15 @@ msgstr "IP-område"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "IP-området \"%1$s\" overstiger \"%2$s\" adresse grense"
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8259,7 +8278,7 @@ msgstr "Bilder"
msgid "Images for all maps will be updated!"
msgstr "Bilder for alle kart vil bli oppdatert!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Med en gang"
@@ -8341,7 +8360,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8353,11 +8372,11 @@ msgstr "Utilgjengelig kart"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8472,7 +8491,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Feil handlingskode funn sjekk."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Feil handlingskode funn sjekk. Discovery-sjekken eksisterer ikke, eller du har ikke tilgang til det."
@@ -8480,7 +8499,7 @@ msgstr "Feil handlingskode funn sjekk. Discovery-sjekken eksisterer ikke, eller
msgid "Incorrect action condition discovery object."
msgstr "Feil gjenstand for gjenstand for funksjonsforhold."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Feil oppdagelsesregel for handling for funksjonsbetingelser. Oppdagelsesregel eksisterer ikke, eller du har ikke tilgang til det."
@@ -8492,15 +8511,15 @@ msgstr "Feil handling status funn status."
msgid "Incorrect action condition event type."
msgstr "Feil handlingstilstand hendelsestype."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8509,11 +8528,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Feil handlingstilstand port \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Feil handlingskode proxy. Proxy eksisterer ikke, eller du har ikke tilgang til det."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8521,7 +8540,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Feil handlingstilstand utløser alvorlighetsgrad."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Feil handlingstilstand utløser. Trigger eksisterer ikke, eller du har ikke tilgang til det."
@@ -8531,11 +8550,11 @@ msgstr "Feil handlingstilstand type."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Feil handlingstiltall for eskalering."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8544,11 +8563,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Feil handlingstype \"%1$s\" for hendelseskilden \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8848,8 +8867,8 @@ msgstr "Feil templated web scenarietrinnstelling."
msgid "Incorrect trigger expression"
msgstr "Feil utløsersuttrykk"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Feil utløsersuttrykk."
@@ -9247,7 +9266,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Informasjon om en tjeneste. Returnerer heltall med param som tilstand, oppstart; streng - med param som displaynavn, bane, bruker; tekst - med param som beskrivelse; Spesielt for tilstand: 0 - kjører, 1 - pauset, 2 - start ventende, 3 - pause venter 4 - fortsettende ventende, 5 - Stopp venter, 6 - Stoppet, 7 - Ukjent, 255 - Ingen slik tjeneste; Spesielt for oppstart: 0 - automatisk, 1 - automatisk forsinket, 2 - manuell, 3 - deaktivert, 4 - ukjent"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9256,11 +9275,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Arv og vertsmakroer"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9272,7 +9291,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Inherited og mall makroer"
@@ -9292,7 +9311,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Sett inn"
@@ -9351,8 +9370,8 @@ msgstr "Grensesnitt med IP \"%1$s\" kan ikke ha tomt DNS-navn mens du har \"Bruk
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Grensesnitt med IP \"%1$s\" kan ikke ha tomt DNS-navn."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9444,7 +9463,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "Ugyldig handlingstilstand: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9505,10 +9524,10 @@ msgstr "Ugyldige metodeparametere."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9571,8 +9590,8 @@ msgstr "Ugyldige metodeparametere."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9794,11 +9813,11 @@ msgstr "Ugyldig tidsperiode."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventar"
@@ -9812,7 +9831,7 @@ msgid "Inventory field"
msgstr "Lagerfelt"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Lagermodus"
@@ -9820,10 +9839,10 @@ msgstr "Lagermodus"
msgid "Is online?"
msgstr "Er online?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "utsteder"
@@ -9915,7 +9934,7 @@ msgstr[1] "Elementer aktivert"
msgid "Item in \"not supported\" state"
msgstr "Element i \"ikke støttet\" tilstand"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Varen er ikke valgt"
@@ -10369,17 +10388,17 @@ msgstr "Forrige måned graf"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Siste av"
@@ -10456,8 +10475,8 @@ msgstr "Venstre trim"
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10491,8 +10510,8 @@ msgstr "Linjetype"
msgid "Line width"
msgstr "Linje bredde"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Lenk"
@@ -10515,16 +10534,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Link indikatorer"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Link maler"
@@ -10540,13 +10552,6 @@ msgstr "Link til maler"
msgid "Linked map"
msgstr "Koblet kart"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10685,7 +10690,7 @@ msgstr "Logg på uovertruffen SNMP-feller"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
#, fuzzy
msgid "Login"
msgstr "P"
@@ -10768,16 +10773,16 @@ msgstr "Makro \"%1$s\" eksisterer allerede på \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Makro \"%1$s\" eksisterer allerede."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "makroer"
@@ -10876,12 +10881,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manual"
@@ -11024,16 +11029,16 @@ msgstr "Merk andre"
msgid "Mark selected"
msgstr "Marker valgt"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Maske"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11066,11 +11071,11 @@ msgstr "Master element"
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11302,7 +11307,7 @@ msgstr ""
msgid "Middle"
msgstr "Midten"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11404,7 +11409,7 @@ msgstr "Manglende elementer for graf prototype \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Manglende nøkkel \"%1$s\" for verten \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11486,9 +11491,9 @@ msgstr "Mandag"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Overvåket ved fullmakt"
@@ -11507,6 +11512,7 @@ msgstr "Overvåkning"
msgid "Monospace"
msgstr "Monospace"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "MÃ¥ned"
@@ -11619,8 +11625,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11690,11 +11696,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11722,8 +11728,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11744,7 +11750,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12034,15 +12040,15 @@ msgstr "Ingen oppdagelsesregel-IDer er gitt."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Ingen kryptering"
@@ -12128,7 +12134,7 @@ msgstr "Ingen treff funnet"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12165,9 +12171,9 @@ msgstr "Ingen tillatelser for systemtilgang."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12206,7 +12212,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12306,11 +12312,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12369,7 +12375,7 @@ msgid "No public key file specified."
msgstr "Ingen offentlig nøkkelfil spesifisert."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12390,7 +12396,7 @@ msgid "No target selected."
msgstr "Ingen mål valgt."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12539,6 +12545,10 @@ msgstr "Varslingsrapport"
msgid "Notifications"
msgstr "Varsler"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12625,6 +12635,10 @@ msgstr "Antall prosessorer på virtuell VMware-maskin, <url> - VMware-tjenestead
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Antall statusendringer"
@@ -12800,7 +12814,7 @@ msgid "Off"
msgstr "Av"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12847,7 +12861,7 @@ msgstr "En"
msgid "One time only"
msgstr "Kun en gang"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Engangs nedetid"
@@ -12924,12 +12938,12 @@ msgstr "Operativsysteminformasjon. Returnerer streng"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12963,8 +12977,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operasjoner"
@@ -12999,7 +13013,7 @@ msgstr "Operasjoner"
msgid "Operator"
msgstr "Operatør"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13039,19 +13053,19 @@ msgstr "Eller"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13081,10 +13095,10 @@ msgstr "Eller"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13347,10 +13361,10 @@ msgstr "PROBLEM"
msgid "PROBLEM event generation mode"
msgstr "PROBLEM hendelsesgenereringsmodus"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13363,19 +13377,19 @@ msgstr "PROBLEM hendelsesgenereringsmodus"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "PSK-identitet"
@@ -13427,12 +13441,12 @@ msgid "Parameters"
msgstr "Parametere"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Oppdagelsesregler for foreldre"
@@ -13487,13 +13501,13 @@ msgid "Passive"
msgstr "Passiv"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13501,7 +13515,7 @@ msgstr "Passiv"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13554,12 +13568,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Lim inn uten eksterne lenker"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13572,7 +13586,7 @@ msgstr "Maksimal minnebruk: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Prosentdel"
@@ -13596,10 +13610,11 @@ msgstr "Percentil linje (høyre)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Utfører en DNS-spørring. Returnerer tegnstreng med nødvendig informasjon"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13607,7 +13622,9 @@ msgstr "Utfører en DNS-spørring. Returnerer tegnstreng med nødvendig informas
msgid "Period"
msgstr "Periode"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13671,11 +13688,11 @@ msgstr "Spill lyd"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Vennligst sjekk konfigurasjonsparametere. Hvis alt er riktig, trykk \"%1$s\" -knappen eller \"%2$s\" -knappen for å endre konfigurasjonsparametere."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13761,7 +13778,7 @@ msgstr "Posttype"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13770,7 +13787,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Pre-installasjon sammendrag"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13887,9 +13904,9 @@ msgstr "Privat"
msgid "Private key file"
msgstr "Privat nøkkelfil"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Privilege nivå"
@@ -14296,7 +14313,7 @@ msgstr "Recovery uttrykk"
msgid "Recovery expression syntax error."
msgstr "Syntaksfeil for gjenopprettingsuttrykk."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Gjenopprettingsoperasjoner"
@@ -14427,20 +14444,20 @@ msgstr "Fjernkommando"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14449,10 +14466,10 @@ msgstr "Fjernkommando"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14496,7 +14513,7 @@ msgstr "Fjernkommando"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14579,14 +14596,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14599,8 +14616,8 @@ msgstr "Erstatt"
msgid "Replace dependencies"
msgstr "Erstatt avhengigheter"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14801,7 +14818,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Resultat"
@@ -15333,7 +15350,7 @@ msgstr ""
msgid "Script"
msgstr "Skript"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Skriptet \"%1$s\" eksisterer allerede."
@@ -15398,6 +15415,15 @@ msgstr "Søkemønsteret er tomt"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Sekundær POC-celle"
@@ -15476,7 +15502,7 @@ msgstr "Velg widget"
msgid "Selected"
msgstr "Valgt"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Utvalgte handlinger slettet"
@@ -15717,6 +15743,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16170,7 +16197,7 @@ msgstr "Spansk (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Spesifisert skript eksisterer ikke, eller du har ikke rettigheter på det for handlingsoperasjonskommando."
@@ -16205,8 +16232,8 @@ msgstr "Standardelementer"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16214,7 +16241,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Start i"
@@ -16293,7 +16320,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16397,7 +16424,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Trinn med navn \"%1$s\" eksisterer allerede."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16451,12 +16478,12 @@ msgstr "Rett"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16477,10 +16504,10 @@ msgstr "Subfilter"
msgid "Subject"
msgstr "Emne"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Emne"
@@ -16674,7 +16701,7 @@ msgstr "Merkverdien"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16690,13 +16717,13 @@ msgstr "Merkverdien"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16713,7 +16740,7 @@ msgstr "Merkverdien"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16723,7 +16750,7 @@ msgstr "Merkverdien"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16759,14 +16786,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Mal"
@@ -16810,7 +16835,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Mal slettet"
@@ -16822,11 +16847,11 @@ msgstr "Mal gruppen"
msgid "Template linkage"
msgstr "Malkobling"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Malmekroner"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Malnavn"
@@ -16861,13 +16886,12 @@ msgstr "Mal med det samme synlige navnet \"%1$s\" eksisterer allerede."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16876,10 +16900,12 @@ msgstr "Mal med det samme synlige navnet \"%1$s\" eksisterer allerede."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16890,7 +16916,7 @@ msgstr "maler"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Maler \"%1$s\" koblet fra verter \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17104,7 +17130,7 @@ msgstr "Tema"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17142,7 +17168,7 @@ msgstr "Dette året"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Terskel"
@@ -17175,15 +17201,15 @@ msgstr ""
msgid "Till"
msgstr "Inntil"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17220,13 +17246,13 @@ msgstr ""
msgid "Time period"
msgstr "Tidsperiode"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17918,9 +17944,9 @@ msgstr "Enheter"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Ukjent"
@@ -17938,7 +17964,7 @@ msgid "Unknown error"
msgstr "Ukjent feil"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Ukjent vertsobjekt, ikke noe element i valgt vert"
@@ -17970,16 +17996,16 @@ msgstr "Ukjent verdi type"
msgid "Unlimited"
msgstr "Ubegrenset"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Fjern tilknytningen"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Fjern koblingen og fjern"
@@ -18075,10 +18101,10 @@ msgstr "Opp"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18087,16 +18113,16 @@ msgstr "Opp"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18125,7 +18151,7 @@ msgstr "Oppdater eksisterende"
msgid "Update interval"
msgstr "Oppdateringsintervall"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18152,7 +18178,7 @@ msgstr "Last opp"
msgid "Upper level maps"
msgstr "Øvre nivå kart"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18338,7 +18364,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18474,15 +18500,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Brukernavn"
@@ -18796,11 +18822,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18874,14 +18900,14 @@ msgstr "Verdikart \"%1$s\" eksisterer allerede."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Verdi kartlegging"
@@ -18924,7 +18950,7 @@ msgstr "Verdi: ingen data"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19024,7 +19050,7 @@ msgstr "Virtuell plassstørrelse i byte eller i prosent fra totalt. Returnerer h
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Synlig navn"
@@ -19050,7 +19076,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Advarsel"
@@ -19158,6 +19184,10 @@ msgstr "Ons"
msgid "Wednesday"
msgstr "Onsdag"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19430,7 +19460,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "Ã…Ã…Ã…Ã…-MM-DDThh: mm: ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Ã…r"
@@ -19490,7 +19521,7 @@ msgstr "Du er innlogget som \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Du kan ikke velge noen av språkene, fordi lokalene for dem ikke er installert på webserveren."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Du er ikke innlogget"
@@ -19731,11 +19762,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr "en tidsenhet er forventet"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19830,7 +19861,7 @@ msgstr "et jevnt antall heksadesimale tegn forventes"
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19874,11 +19905,11 @@ msgstr "som Rød"
msgid "ascending"
msgstr "stigende"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19892,11 +19923,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19918,39 +19949,47 @@ msgstr ""
msgid "avg"
msgstr "avg"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19965,7 +20004,7 @@ msgstr "blinker"
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20007,7 +20046,7 @@ msgstr "kan ikke endres"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20095,23 +20134,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20138,7 +20177,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20153,15 +20192,15 @@ msgstr "konfigurer"
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20169,11 +20208,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20186,15 +20225,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20212,7 +20251,7 @@ msgstr "dager"
msgid "default"
msgstr "normalverdi"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20289,7 +20328,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20312,11 +20351,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20332,7 +20371,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20346,15 +20385,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr "første parameter forventes"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20362,7 +20401,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20437,7 +20476,7 @@ msgstr "i"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20446,11 +20485,11 @@ msgstr ""
msgid "including subgroups"
msgstr "inkludert undergrupper"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20469,7 +20508,7 @@ msgstr "Feil elementtelling"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20487,7 +20526,7 @@ msgstr "feil syntaks nær \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20547,7 +20586,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20569,6 +20608,16 @@ msgstr "ugyldig regulært uttrykk"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20610,7 +20659,7 @@ msgstr ""
msgid "key is empty"
msgstr "nøkkelen er tom"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20626,7 +20675,7 @@ msgctxt "week of month"
msgid "last"
msgstr "siste"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20634,11 +20683,11 @@ msgstr ""
msgid "left"
msgstr "venstre"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20646,23 +20695,23 @@ msgstr ""
msgid "list of characters"
msgstr "liste over tegn"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20670,7 +20719,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "lavnivå oppdagelsesregel"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20702,11 +20751,11 @@ msgstr "makro er tom"
msgid "macro(s)"
msgstr "makro(er)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20742,7 +20791,7 @@ msgstr "maks"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20756,7 +20805,7 @@ msgstr "Maksimalt avhengige gjenstandstall nås"
msgid "maximum number of dependency levels reached"
msgstr "maksimalt antall avhengighetsnivåer nådd"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20773,7 +20822,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20788,15 +20837,15 @@ msgstr "Minste lengde er %1$s tegn"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20878,7 +20927,7 @@ msgstr "navn"
msgid "new"
msgstr "ny"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "ny"
@@ -20912,7 +20961,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20933,7 +20982,7 @@ msgstr "ikke i"
msgid "not selected"
msgstr "ikke valgt"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21020,15 +21069,15 @@ msgstr ""
msgid "pattern"
msgstr "mønster"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21036,15 +21085,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21093,11 +21142,11 @@ msgstr ""
msgid "regular expression"
msgstr "vanlig uttrykk"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21121,15 +21170,15 @@ msgstr ""
msgid "right"
msgstr "Ikke sant"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21220,23 +21269,23 @@ msgstr "vis ikon mappings"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21244,11 +21293,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21256,11 +21305,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21288,7 +21337,7 @@ msgstr ""
msgid "tag"
msgstr "tagg"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21322,7 +21371,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21369,31 +21418,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21419,11 +21472,11 @@ msgstr "utløser prototype kan ikke flyttes til en annen mal eller vert"
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "Utløseren med koblinger kan ikke flyttes til en annen mal eller vert"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21480,7 +21533,7 @@ msgstr "uventet slutten av makroen"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21523,7 +21576,7 @@ msgstr "uventet verdi \"%1$s\""
msgid "unknown"
msgstr "ukjent"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21722,11 +21775,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/nl/LC_MESSAGES/frontend.po b/ui/locale/nl/LC_MESSAGES/frontend.po
index daa1a34fc5e..319d55c075d 100644
--- a/ui/locale/nl/LC_MESSAGES/frontend.po
+++ b/ui/locale/nl/LC_MESSAGES/frontend.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-08-07 16:41+0300\n"
"Last-Translator: open-future <patrik@open-future.be>\n"
"Language-Team: NL\n"
@@ -304,10 +304,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr "(Alleen hoofdbeheerders kunnen groepen aanmaken)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(geen proxy)"
@@ -458,7 +458,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -527,7 +527,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -546,11 +546,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -562,24 +562,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -597,7 +597,7 @@ msgstr ""
msgid "Action"
msgstr "Actie"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Actie \"%1$s\" bestaat reeds."
@@ -607,7 +607,7 @@ msgstr "Actie \"%1$s\" bestaat reeds."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Actie toegevoegd"
@@ -616,17 +616,17 @@ msgstr "Actie toegevoegd"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Actie verwijderd"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Actie uitgeschakeld"
msgstr[1] "Acties uitgeschakeld"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Actie geactiveerd"
@@ -645,7 +645,7 @@ msgstr "Actie log"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Actie bijgewerkt"
@@ -692,7 +692,7 @@ msgid "Active till"
msgstr "Actief tot"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -751,14 +751,14 @@ msgstr "Actief tot"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -774,10 +774,10 @@ msgstr "Actief tot"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -789,9 +789,9 @@ msgstr "Actief tot"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -809,7 +809,7 @@ msgstr "Actief tot"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -854,7 +854,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -879,8 +879,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -893,7 +893,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1027,7 +1027,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1043,6 +1043,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1357,7 +1361,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1437,9 +1441,9 @@ msgstr ""
msgid "Authentication"
msgstr "Authenticatie"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Authenticatie algoritme"
@@ -1500,12 +1504,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automatisch"
@@ -1620,12 +1624,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind paswoord"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1831,7 +1835,7 @@ msgstr "Kan geen niet-numeriek item \"%1$s\" aan grafiek \"%2$s\" toevoegen."
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Kan geen niet-numeriek item aan \"%1$s\" aan grafiek-prototype \"%2$s\" toevoegen."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "kan actie niet toevoegen"
@@ -2129,7 +2133,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Kan de Zabbix gebruiker \"%1$s\" niet verwijderen, probeer de gebruiker uit te schakelen."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Kan actie niet verwijderen"
@@ -2294,12 +2298,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Kan script niet verwijderen"
msgstr[1] "Kan script niet verwijderen"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Kan de scripts niet verwijderen. Het script \"%1$s\" wordt gebruikt in een handeling voor actie \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Kan de geslecteerde acties niet verwijderen"
@@ -2316,7 +2320,7 @@ msgstr[1] "Kan service niet verwijderen"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Kan template niet verwijderen"
@@ -2403,7 +2407,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Kan actie niet uitschakelen."
@@ -2481,7 +2485,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Kan actie niet activeren"
@@ -2710,7 +2714,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "Kan sjabloon niet importeren \"%1$s\", gekoppeld sjabloon \"%2$s\" bestaat niet."
msgstr[1] "Kan sjabloon niet importeren \"%1$s\", gekoppelde sjablonen \"%2$s\" bestaan niet."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Kan trigger-expressie niet invoegen"
@@ -2889,7 +2893,7 @@ msgstr "Kan sjabloon niet ontkoppelen."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Kan \"%1$s\" niet bijwerken voor actie \"%2$s\"."
@@ -2955,7 +2959,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Kan actie niet bijwerken"
@@ -3015,7 +3019,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Kan geen groepen updaten voor ontdekte host \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Kan host niet bijwerken"
@@ -3120,9 +3124,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Kan script niet bijwerken"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3149,7 +3153,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "Kan template niet bijwerken"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3236,14 +3240,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3261,10 +3265,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3304,9 +3308,9 @@ msgstr "Iedere character string meegenomen"
msgid "Character string not included"
msgstr "Chassis info - geeft standaard de volledige informatie"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3322,7 +3326,7 @@ msgstr ""
msgid "Check already exists."
msgstr "Controle bestaat al."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Controleer stuk van expressie beginnend bij \"%1$s\"."
@@ -3444,8 +3448,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr "Wis geschiedenis en trends"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Wis bij ontkoppelen"
@@ -3472,16 +3476,16 @@ msgstr "Klok"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3610,7 +3614,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3882,13 +3886,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3896,9 +3900,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4065,10 +4069,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Telling"
@@ -4158,7 +4162,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4360,7 +4364,7 @@ msgid "Current value"
msgstr "Huidige waarde"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4603,7 +4607,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4676,11 +4680,11 @@ msgstr "Datum HW onderhoud vervalt"
msgid "Date HW purchased"
msgstr "Datum HW aangekocht"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Dag"
@@ -4721,8 +4725,8 @@ msgstr "Dec"
msgid "December"
msgstr "December"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4732,7 +4736,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4863,7 +4867,7 @@ msgstr "Verwijder"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Verwijder en opschonen"
@@ -4872,11 +4876,11 @@ msgstr "Verwijder en opschonen"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Geselecteerde sjablonen verwijderen en opschonen? (Aandacht: alle gelinkte host worden opgeschoont!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Sjabloon verwijderen en opschonen? (Aandacht: alle gelinkte host worden opgeschoont!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Huidige actie verwijderen?"
@@ -5009,7 +5013,7 @@ msgstr "Geselecteerde groepen verwijderen?"
msgid "Delete selected host groups?"
msgstr "Geselecteerde hostgroepen verwijderen?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Geselecteerde host-prototype verwijderen?"
@@ -5117,7 +5121,7 @@ msgstr "Geselecteerde gebruikers verwijderen?"
msgid "Delete selected web scenarios?"
msgstr "Geselecteerde webdraaiboeken verwijderen?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Sjabloon verwijderen?"
@@ -5178,7 +5182,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Afhankelijkheden"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Afhankelijk"
@@ -5186,7 +5190,7 @@ msgstr "Afhankelijk"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5197,7 +5201,7 @@ msgid "Deployment status"
msgstr "Uitrol status"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5212,16 +5216,16 @@ msgstr "Uitrol status"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5233,10 +5237,10 @@ msgstr "Omschrijving"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Details"
@@ -5245,6 +5249,14 @@ msgstr "Details"
msgid "Details of web scenario"
msgstr "Details van webdraaiboek"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Apparaat"
@@ -5367,7 +5379,7 @@ msgstr "Geselecteerde webdraaiboeken uitschakelen?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5394,17 +5406,17 @@ msgstr "Geselecteerde webdraaiboeken uitschakelen?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Gedeactiveerd"
@@ -5429,7 +5441,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5643,7 +5655,7 @@ msgstr "Toon gestapelde grafiek"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5660,7 +5672,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5742,7 +5754,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5806,7 +5818,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Looptijd"
@@ -5836,14 +5848,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6099,7 +6111,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6137,13 +6149,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6159,11 +6171,11 @@ msgstr "Geactiveerd"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6239,6 +6251,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Fout: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Gebeurtenis"
@@ -6807,8 +6823,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Eerst"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6920,12 +6936,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Volledige klone"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Functie"
@@ -6941,7 +6957,7 @@ msgstr "GSM modem"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "GUI toegang uitgeschakeld."
@@ -7290,7 +7306,7 @@ msgstr "Groep naam"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Groep-prototype kan niet worden gebaseerd op ontdekte hostgroep \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Groep prototypes"
@@ -7303,12 +7319,11 @@ msgid "Grouping by"
msgstr "Groeperen door"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Groepen"
@@ -7527,7 +7542,7 @@ msgstr "Geschiedenis opkuisen kan een lange tijd duren. Doorgaan?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7558,7 +7573,7 @@ msgid "Horizontal align"
msgstr "Horizontale uitlijning"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7567,7 +7582,7 @@ msgstr "Horizontale uitlijning"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7578,7 +7593,7 @@ msgstr "Horizontale uitlijning"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7704,7 +7719,7 @@ msgid "Host group label type"
msgstr "Hostgroep typeplaatje"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7723,8 +7738,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7774,7 +7789,7 @@ msgstr "Host inventaris overzicht"
msgid "Host label type"
msgstr "Host typeplaatje"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7786,7 +7801,7 @@ msgstr "Host metadata"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Host naam"
@@ -7823,7 +7838,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Host prototype verwijderd"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7847,7 +7862,7 @@ msgstr "Host prototype met zichtbare naam \"%1$s\" bestaat al op ontdekking rege
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Host prototypes"
@@ -7872,7 +7887,7 @@ msgstr "Host tijd"
msgid "Host update failed."
msgstr "Host update is mislukt."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Host bijgewerkt"
@@ -7949,6 +7964,10 @@ msgstr "Hosts locatie"
msgid "Hosts updated"
msgstr "Hosts bijgewerkt"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Uren"
@@ -8018,15 +8037,15 @@ msgstr "IP bereik"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8258,7 +8277,7 @@ msgstr "Afbeeldingen"
msgid "Images for all maps will be updated!"
msgstr "Afbeeldingen voor alle kaarten worden bijgewerkt!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Onmiddellijk"
@@ -8340,7 +8359,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8352,11 +8371,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8471,7 +8490,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Verkeerde actie, conditie discovery controleren."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Verkeerde actie, conditie discovery controleren. Discovery controle bestaat niet of u heeft geen toegang.Verkeerde actie, conditie discovery controleren. Discovery controle bestaat niet of u heeft geen toegang.Verkeerde actie, conditie discovery controleren. Discovery controle bestaat niet of u heeft geen toegang.Verkeerde actie, conditie discovery controleren. Discovery controle bestaat niet of u heeft geen toegang."
@@ -8479,7 +8498,7 @@ msgstr "Verkeerde actie, conditie discovery controleren. Discovery controle best
msgid "Incorrect action condition discovery object."
msgstr "Verkeerde actie conditie discovery object."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Verkeerde actie conditie discovery regel. Discovery regel bestaat niet of u hebt er geen toegang toe."
@@ -8491,15 +8510,15 @@ msgstr "Verkeerde actie conditie discovery status."
msgid "Incorrect action condition event type."
msgstr "Verkeerde actie conditie type gebeurtenis."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8508,11 +8527,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Verkeerde actie voorwaarde poort \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Verkeerde actie voorwaarde proxy. Proxy bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde proxy. Proxy bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde proxy. Proxy bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde proxy. Proxy bestaat niet of u hebt geen toegang."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8520,7 +8539,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Verkeerde actie voorwaarde trigger gevoeligheid."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Verkeerde actie voorwaarde trigger. Trigger bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde trigger. Trigger bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde trigger. Trigger bestaat niet of u hebt geen toegang.Verkeerde actie voorwaarde trigger. Trigger bestaat niet of u hebt geen toegang."
@@ -8530,11 +8549,11 @@ msgstr "Verkeerd type actie voorwaarde."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Verkeerde actie bediening escalatie stap waarden."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8543,11 +8562,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8847,8 +8866,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr "Verkeerde trigger expressie"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Verkeerde trigger expressie."
@@ -9246,7 +9265,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9255,11 +9274,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9271,7 +9290,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9291,7 +9310,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Invoegen"
@@ -9350,8 +9369,8 @@ msgstr "Interface met IP \"%1$s\" kan geen lege DNS naam hebben zolang er gebrui
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Interface met IP-adres \"%1$s\" kan geen lege DNS-naam hebben."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9443,7 +9462,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9504,10 +9523,10 @@ msgstr "Ongeldige werkwijze parameters."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9570,8 +9589,8 @@ msgstr "Ongeldige werkwijze parameters."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9793,11 +9812,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventaris"
@@ -9811,7 +9830,7 @@ msgid "Inventory field"
msgstr "Inventaris veld"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Inventaris modus"
@@ -9819,10 +9838,10 @@ msgstr "Inventaris modus"
msgid "Is online?"
msgstr "Is verbonden?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9914,7 +9933,7 @@ msgstr[1] "Items ingeschakeld"
msgid "Item in \"not supported\" state"
msgstr "Item in \"niet ondersteund\" toestand"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Item niet geselecteerd"
@@ -10368,17 +10387,17 @@ msgstr "Grafiek voor de laatste maand"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Laatste van"
@@ -10455,8 +10474,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10490,8 +10509,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Koppeling"
@@ -10514,16 +10533,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Koppelings indicatoren"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Koppel sjablonen"
@@ -10539,13 +10551,6 @@ msgstr "Koppel aan templates"
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10684,7 +10689,7 @@ msgstr "Log niet overeenkomende SNMP-traps"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Login"
@@ -10766,16 +10771,16 @@ msgstr "Macro \"%1$s\"bestaat al op \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Macro \"%1$s\" bestaat al."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Macros"
@@ -10874,12 +10879,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Handmatig"
@@ -11022,16 +11027,16 @@ msgstr "Markeer andere"
msgid "Mark selected"
msgstr "Markeer geselecteerde"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Masker"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11064,11 +11069,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11300,7 +11305,7 @@ msgstr ""
msgid "Middle"
msgstr "Midden"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11402,7 +11407,7 @@ msgstr "Items ontbreken voor grafiek-prototype \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Sleutelwaarde \"%1$s\" ontbreekt voor host \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11484,9 +11489,9 @@ msgstr "Maandag"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Gemonitoord door proxy"
@@ -11505,6 +11510,7 @@ msgstr "Monitoring"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Maand"
@@ -11617,8 +11623,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11688,11 +11694,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11720,8 +11726,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11742,7 +11748,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12032,15 +12038,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12126,7 +12132,7 @@ msgstr "Geen overeenkomsten gevonden."
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12163,9 +12169,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12204,7 +12210,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12304,11 +12310,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12367,7 +12373,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12388,7 +12394,7 @@ msgid "No target selected."
msgstr "Geen doel geselecteerd."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12537,6 +12543,10 @@ msgstr "Notificaties report"
msgid "Notifications"
msgstr "Notificaties"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12623,6 +12633,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Aantal keren veranderd"
@@ -12798,7 +12812,7 @@ msgid "Off"
msgstr "UIT"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12845,7 +12859,7 @@ msgstr ""
msgid "One time only"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Eenmalige onderbreking"
@@ -12922,12 +12936,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12961,8 +12975,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr ""
@@ -12997,7 +13011,7 @@ msgstr ""
msgid "Operator"
msgstr ""
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13037,19 +13051,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13079,10 +13093,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13345,10 +13359,10 @@ msgstr ""
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13361,19 +13375,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13425,12 +13439,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13485,13 +13499,13 @@ msgid "Passive"
msgstr "Passief"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13499,7 +13513,7 @@ msgstr "Passief"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13552,12 +13566,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13570,7 +13584,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13594,10 +13608,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13605,7 +13620,9 @@ msgstr ""
msgid "Period"
msgstr "Periode"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13669,11 +13686,11 @@ msgstr "Geluid afspelen"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13759,7 +13776,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13768,7 +13785,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13885,9 +13902,9 @@ msgstr ""
msgid "Private key file"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr ""
@@ -14294,7 +14311,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14425,20 +14442,20 @@ msgstr "Remote commando"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14447,10 +14464,10 @@ msgstr "Remote commando"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14494,7 +14511,7 @@ msgstr "Remote commando"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14577,14 +14594,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14597,8 +14614,8 @@ msgstr ""
msgid "Replace dependencies"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14799,7 +14816,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr ""
@@ -15331,7 +15348,7 @@ msgstr ""
msgid "Script"
msgstr "Script"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15396,6 +15413,15 @@ msgstr ""
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15474,7 +15500,7 @@ msgstr ""
msgid "Selected"
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15715,6 +15741,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16168,7 +16195,7 @@ msgstr "Spanish (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr ""
@@ -16203,8 +16230,8 @@ msgstr ""
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16212,7 +16239,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16291,7 +16318,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16395,7 +16422,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16449,12 +16476,12 @@ msgstr ""
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16475,10 +16502,10 @@ msgstr ""
msgid "Subject"
msgstr "Onderwerp"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16672,7 +16699,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16688,13 +16715,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16711,7 +16738,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16721,7 +16748,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16757,14 +16784,12 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Template"
@@ -16808,7 +16833,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr ""
@@ -16820,11 +16845,11 @@ msgstr ""
msgid "Template linkage"
msgstr "Template verbindingen"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr ""
@@ -16859,13 +16884,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16874,10 +16898,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16888,7 +16914,7 @@ msgstr "Templates"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17102,7 +17128,7 @@ msgstr ""
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17140,7 +17166,7 @@ msgstr ""
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17173,15 +17199,15 @@ msgstr ""
msgid "Till"
msgstr "Tot"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17218,13 +17244,13 @@ msgstr ""
msgid "Time period"
msgstr "Tijd periode"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17916,9 +17942,9 @@ msgstr "Eenheden"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Onbekend"
@@ -17936,7 +17962,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Onbekend host item, het item bestaat niet voor de geselecteerde host"
@@ -17968,16 +17994,16 @@ msgstr "Onbekend waarde type"
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Ontkoppelen"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Ontkoppelen en opschonen"
@@ -18073,10 +18099,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18085,16 +18111,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18123,7 +18149,7 @@ msgstr "Bestaande bijwerken"
msgid "Update interval"
msgstr "Bijwerk interval"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18150,7 +18176,7 @@ msgstr "Upload"
msgid "Upper level maps"
msgstr "Kaarten op hoger liggend niveau"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18336,7 +18362,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18472,15 +18498,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Gebruikersnaam"
@@ -18794,11 +18820,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18872,14 +18898,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Waarde afbeeldingen"
@@ -18922,7 +18948,7 @@ msgstr ""
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19022,7 +19048,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Zichbare naam"
@@ -19048,7 +19074,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Waarschuwing"
@@ -19156,6 +19182,10 @@ msgstr ""
msgid "Wednesday"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19428,7 +19458,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Jaar"
@@ -19488,7 +19519,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Je kunt een aantal talen niet selecteren omdat de locales hiervoor ontbreken op de webserver."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19729,11 +19760,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19828,7 +19859,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19872,11 +19903,11 @@ msgstr "als Rood"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19890,11 +19921,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19916,39 +19947,47 @@ msgstr ""
msgid "avg"
msgstr "gmd"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19963,7 +20002,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20005,7 +20044,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20093,23 +20132,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20136,7 +20175,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20151,15 +20190,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20167,11 +20206,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20184,15 +20223,15 @@ msgstr ""
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20210,7 +20249,7 @@ msgstr "dagen"
msgid "default"
msgstr "standaard"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20287,7 +20326,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20310,11 +20349,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20330,7 +20369,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20344,15 +20383,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20360,7 +20399,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20434,7 +20473,7 @@ msgstr "in"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20443,11 +20482,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20466,7 +20505,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20484,7 +20523,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20544,7 +20583,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20566,6 +20605,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20607,7 +20656,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20623,7 +20672,7 @@ msgctxt "week of month"
msgid "last"
msgstr "laatste"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20631,11 +20680,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20643,23 +20692,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20667,7 +20716,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20699,11 +20748,11 @@ msgstr ""
msgid "macro(s)"
msgstr "macro(s)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20739,7 +20788,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20753,7 +20802,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20770,7 +20819,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20785,15 +20834,15 @@ msgstr ""
msgid "mm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20875,7 +20924,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20909,7 +20958,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20930,7 +20979,7 @@ msgstr "niet in"
msgid "not selected"
msgstr "niet geselecteerd"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21017,15 +21066,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21033,15 +21082,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21090,11 +21139,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21118,15 +21167,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21217,23 +21266,23 @@ msgstr "Laat icon mappings zien"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21241,11 +21290,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21253,11 +21302,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21285,7 +21334,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21319,7 +21368,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21366,31 +21415,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21416,11 +21469,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21477,7 +21530,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21520,7 +21573,7 @@ msgstr ""
msgid "unknown"
msgstr "onbekend"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21719,11 +21772,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/pl/LC_MESSAGES/frontend.po b/ui/locale/pl/LC_MESSAGES/frontend.po
index 438b496f77c..32464b7a280 100644
--- a/ui/locale/pl/LC_MESSAGES/frontend.po
+++ b/ui/locale/pl/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2014-06-04 11:22+0300\n"
"Last-Translator: Paweł <pawel.seledec@zetosoftware.pl>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -319,10 +319,10 @@ msgstr "(0 - użyj domyślnej opcji)"
msgid "(Only super admins can create groups)"
msgstr "(Tylko super administrator może tworzyć grupy)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(brak proxy)"
@@ -477,7 +477,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -546,7 +546,7 @@ msgstr "Oznacz zdarzenia ROZWIÄ„ZANE"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -565,11 +565,11 @@ msgstr "Oznacz zdarzenia ROZWIÄ„ZANE"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -581,24 +581,24 @@ msgstr "Oznacz zdarzenia ROZWIÄ„ZANE"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -616,7 +616,7 @@ msgstr "Oznacz zdarzenia ROZWIÄ„ZANE"
msgid "Action"
msgstr "Akcja"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Akcja \"%1$s\" już istnieje."
@@ -626,7 +626,7 @@ msgstr "Akcja \"%1$s\" już istnieje."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Dodano akcjÄ™"
@@ -635,18 +635,18 @@ msgstr "Dodano akcjÄ™"
msgid "Action class %1$s must extend %2$s class."
msgstr "Akcja klasy %1$s musi rozszerzyć %2$s klasę."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Usunięto akcję"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Wyłączono akcję"
msgstr[1] "Wyłączono akcje"
msgstr[2] "Wyłączono akcje"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "WÅ‚Ä…czono akcjÄ™"
@@ -666,7 +666,7 @@ msgstr "Log akcji"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Zaktualizowano akcjÄ™"
@@ -713,7 +713,7 @@ msgid "Active till"
msgstr "Aktywne do"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -772,14 +772,14 @@ msgstr "Aktywne do"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -795,10 +795,10 @@ msgstr "Aktywne do"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -810,9 +810,9 @@ msgstr "Aktywne do"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -830,7 +830,7 @@ msgstr "Aktywne do"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -875,7 +875,7 @@ msgstr "Dodaj element potomny"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -900,8 +900,8 @@ msgstr "Dodaj wiele map"
msgid "Add new data set"
msgstr "Dodaj nowy zbiór danych"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr "Dodaj nowy interfejs"
@@ -914,7 +914,7 @@ msgstr "Dodaj nowe sterowanie"
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1048,7 +1048,7 @@ msgstr ""
msgid "Aggregate"
msgstr "Agregacja"
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1064,6 +1064,10 @@ msgstr "Agregacja odstępów"
msgid "Alert message"
msgstr "Wiadomość ostrzegawcza"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias (Login)"
@@ -1378,7 +1382,7 @@ msgstr "Przynajmniej jedna baza MySQL, PostgreSQL lub Oracle powinna być wspier
msgid "At least one operation must be selected."
msgstr "Przynajmniej jedna operacja musi być wybrana."
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "Przynajmnniej jedna operacja musi istnieć."
@@ -1458,9 +1462,9 @@ msgstr "Prośba o uwierzytelnienie"
msgid "Authentication"
msgstr "Uwierzytelnianie"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Algorytm uwierzytelniania"
@@ -1521,12 +1525,12 @@ msgstr "Opcje automatycznego logowania i wylogowania nie mogą być razem włąc
msgid "Auto-logout"
msgstr "Automatyczne wylogowanie"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automatycznie"
@@ -1641,12 +1645,12 @@ msgstr "DN dostępu"
msgid "Bind password"
msgstr "Hasło dostępu"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1852,7 +1856,7 @@ msgstr "Nie można dodać nienumerycznej pozycji \"%1$s\" do wykresu \"%2$s\"."
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Nie można dodać nienumerycznej pozycji \"%1$s\" do prototypu wykresu \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Nie można dodać akcji"
@@ -2155,7 +2159,7 @@ msgstr[2] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Nie można usunąć wewnętrznego użytkownika Zabbix \"%1$s\", proszę spróbować wyłączyć tego użytkownika."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Nie można usunąć akcji"
@@ -2331,12 +2335,12 @@ msgstr[0] "Nie można usunąć skryptu"
msgstr[1] "Nie można usunąć skryptu"
msgstr[2] "Nie można usunąć skryptu"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Nie można usunąć skryptu. Skrypt \"%1$s\" jest wykoprzystywany w akcji \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Nie można usunąć wybranych akcji"
@@ -2354,7 +2358,7 @@ msgstr[2] "Nie można usunąć usługi"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Nie można usunąć szablonu"
@@ -2445,7 +2449,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Nie można wyłączyć akcji"
@@ -2534,7 +2538,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Nie można włączyć akcji"
@@ -2774,7 +2778,7 @@ msgstr[0] "Nie można zaimportować szablonu \"%1$s\", nie istnieje podłączony
msgstr[1] "Nie można zaimportować szablonu \"%1$s\", nie istnieją podłączone szablony \"%2$s\"."
msgstr[2] "Nie można zaimportować szablonu \"%1$s\", nie istnieją podłączone szablony \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Nie można dodać wyrażenia wyzwalacza"
@@ -2955,7 +2959,7 @@ msgstr "Nie można odłączyć szablonu."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr "Nie można odlinkować wyzwalacza \"%1$s\", posiada on elementy z szablonu, który pozostaje podlinkowany do hosta"
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Nie można zaktualizować \"%1$s\" dla akcji \"%2$s\"."
@@ -3021,7 +3025,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "nie można zaktualizować szablonu scenariusza webowego\"%1$s\": %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Nie można zaktualizować akcji"
@@ -3082,7 +3086,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Nie można zaktualizować grup dla wykrytego hosta \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Nie można zaktualizować hosta"
@@ -3187,9 +3191,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Nie można zaktualizować skryptu"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3216,7 +3220,7 @@ msgstr "Nie można zaktualizować kroku dla szablonowego scenariusza webowego \"
msgid "Cannot update template"
msgstr "Nie można zaktualizować szablonu"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr "Nie można aktualizować szablonów"
@@ -3304,14 +3308,14 @@ msgstr "Wyłapuje wszystkie pułapki SNMP, które nie zostały wyłapane przez j
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Certyfikat"
@@ -3329,10 +3333,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Zmień"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr "Zmień PSK"
@@ -3372,9 +3376,9 @@ msgstr "Zawiera podany ciąg znaków"
msgid "Character string not included"
msgstr "Nie zawiera podanego ciągu znaków"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3390,7 +3394,7 @@ msgstr "Informacje o obudowie. Zwraca ciąg znaków"
msgid "Check already exists."
msgstr "Test już istnieje."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Proszę sprawdzić część wyrażenia zaczynającą się od \"%1$s\"."
@@ -3512,8 +3516,8 @@ msgstr "Wyczyść historię"
msgid "Clear history and trends"
msgstr "Wyczyść historię i trendy"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Wyczyść podczas odłączania"
@@ -3540,16 +3544,16 @@ msgstr "Zegar"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3678,7 +3682,7 @@ msgstr "Kompresja"
msgid "Concurrent sessions"
msgstr "Sesje bieżące"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3961,13 +3965,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr "Połączenie nie będzie szyfrowane, ponieważ używane są Unixowe sockety lub pamięć w Windowsie jest współdzielone."
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Połączenia"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Połączenia z hosta"
@@ -3975,9 +3979,9 @@ msgstr "Połączenia z hosta"
msgid "Connections from proxy"
msgstr "Połączenia z proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Połączenia do hosta"
@@ -4147,10 +4151,10 @@ msgstr "Reguła współzależności"
msgid "Correlation updated"
msgstr "Współzależność zaktualizowana"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Ilość"
@@ -4240,7 +4244,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4442,7 +4446,7 @@ msgid "Current value"
msgstr "Bieżąca wartość"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Indywidualne"
@@ -4686,7 +4690,7 @@ msgid "Database TLS key file"
msgstr "Plik klucza TLS bazy danych"
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4759,11 +4763,11 @@ msgstr "Data zakończenia umowy serwisowej"
msgid "Date HW purchased"
msgstr "Data zakupu sprzętu"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Dzień"
@@ -4804,8 +4808,8 @@ msgstr "Gru"
msgid "December"
msgstr "Grudzień"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4815,7 +4819,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4946,7 +4950,7 @@ msgstr "Usuń"
msgid "Delete all elements that are not present in the import file?"
msgstr "Usunąć wszystkie elementy, które nie są obecne w pliku importu?"
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Usuń i wyczyść"
@@ -4955,11 +4959,11 @@ msgstr "Usuń i wyczyść"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Usunąć i wyczyścić wybrane szablony? (Uwaga: wszystkie połączone hosty zostaną wyczyszczone!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Usunąć i wyczyścić szablon? (Uwaga: wszystkie powiązane hosty zostaną wyczyszczone!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Usunąć aktualną akcję?"
@@ -5092,7 +5096,7 @@ msgstr "Usunąć wybrane grupy?"
msgid "Delete selected host groups?"
msgstr "Usunąć wybrane grupy hostów?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Usunąć wybrany prototyp hosta?"
@@ -5200,7 +5204,7 @@ msgstr "Usunąć wybranych użytkowników?"
msgid "Delete selected web scenarios?"
msgstr "Usunąć wybrane scenariusze sieci www?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Usunąć szablon?"
@@ -5261,7 +5265,7 @@ msgstr "Lista zabroniona"
msgid "Dependencies"
msgstr "Zależności"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Zależny"
@@ -5269,7 +5273,7 @@ msgstr "Zależny"
msgid "Dependent item"
msgstr "Element zależny"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5280,7 +5284,7 @@ msgid "Deployment status"
msgstr "Stan instalacji"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5295,16 +5299,16 @@ msgstr "Stan instalacji"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5316,10 +5320,10 @@ msgstr "Opis"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Szczegóły"
@@ -5328,6 +5332,14 @@ msgstr "Szczegóły"
msgid "Details of web scenario"
msgstr "Szczegóły scenariusza sieci www"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "UrzÄ…dzenie"
@@ -5450,7 +5462,7 @@ msgstr "Wyłączyć wybrane scenariusze sieci www?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5477,17 +5489,17 @@ msgstr "Wyłączyć wybrane scenariusze sieci www?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Wyłączony"
@@ -5512,7 +5524,7 @@ msgstr "Odrzuć wartość"
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5728,7 +5740,7 @@ msgstr "Wyświetl wykres skumulowany"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5745,7 +5757,7 @@ msgstr "Wyświetlone od %1$s do %2$s z %3$s znalezionych"
msgid "Displaying options"
msgstr "Wyświetlanie opcji"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5827,7 +5839,7 @@ msgstr "Pobierz obraz"
msgid "Download the configuration file"
msgstr "Pobranie pliku konfiguracyjnego"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5891,7 +5903,7 @@ msgstr "Powtórzone userid (id użytkownika) \"%1$s\" w użytkownikach dla mapy
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Czas trwania"
@@ -5921,14 +5933,14 @@ msgstr "Każdy element"
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6184,7 +6196,7 @@ msgstr "Włącz wyłapywanie"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6222,13 +6234,13 @@ msgstr "Włącz wyłapywanie"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6244,11 +6256,11 @@ msgstr "WÅ‚Ä…czony"
msgid "Encrypt"
msgstr "Szyfruj"
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Szyfrowanie"
@@ -6324,6 +6336,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "BÅ‚Ä…d: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Zdarzenie"
@@ -6893,8 +6909,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Pierwsza"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Dopasowanie"
@@ -7006,12 +7022,12 @@ msgid "Full"
msgstr "Pełny"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Pełne powielenie"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funkcja"
@@ -7027,7 +7043,7 @@ msgstr "Modem GSM"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Dostęp do GUI wyłączony."
@@ -7378,7 +7394,7 @@ msgstr "Nazwa grupy"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Prototyp grupy nie może bazować na wykrytej grupie hostów \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Prototypy grup"
@@ -7391,12 +7407,11 @@ msgid "Grouping by"
msgstr "Grupowanie wg"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Grupy"
@@ -7615,7 +7630,7 @@ msgstr "Czyszczenie historii może zająć dużo czasu. Kontynuować?"
msgid "History data selection"
msgstr "Wybór danych historii"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7646,7 +7661,7 @@ msgid "Horizontal align"
msgstr "Ułożenie poziome"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7655,7 +7670,7 @@ msgstr "Ułożenie poziome"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7666,7 +7681,7 @@ msgstr "Ułożenie poziome"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7795,7 +7810,7 @@ msgid "Host group label type"
msgstr "Typ etykiety grupy hostów"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7814,8 +7829,8 @@ msgstr "Grupa hosta o ID \"%1$s\" jest niedostępna."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7865,7 +7880,7 @@ msgstr "PrzeglÄ…d inwentarza hosta"
msgid "Host label type"
msgstr "Typ etykiety hosta"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Makra hosta"
@@ -7877,7 +7892,7 @@ msgstr "Meta-dane hosta"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Nazwa hosta"
@@ -7914,7 +7929,7 @@ msgstr "Prototyp hosta nie może mieć więcej niż jednego domyślnego interfej
msgid "Host prototype deleted"
msgstr "Usunięto prototyp hosta"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr "Makra prototypu hosta"
@@ -7938,7 +7953,7 @@ msgstr "Istnieje już prototyp hosta z widoczną nazwą \"%1$s\" w regule wykryw
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Prototypy hostów"
@@ -7963,7 +7978,7 @@ msgstr "Czas hosta"
msgid "Host update failed."
msgstr "Aktualizacja hosta się nie powiodła."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Zaktualizowano hosta"
@@ -8040,6 +8055,10 @@ msgstr "Lokalizacja hosta"
msgid "Hosts updated"
msgstr "Zaktualizowano hosty"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Godziny"
@@ -8109,15 +8128,15 @@ msgstr "Zakres IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "Zakres IP \"%1$s\" osiÄ…gnÄ…Å‚ limit adresowy \"%2$s\""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8351,7 +8370,7 @@ msgstr "Obrazy"
msgid "Images for all maps will be updated!"
msgstr "Obrazy dla wszystkich map zostanÄ… zaktualizowane!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Teraz"
@@ -8433,7 +8452,7 @@ msgstr "NieosiÄ…galny prototyp elementu"
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "NieosiÄ…galne utrzymanie"
@@ -8445,11 +8464,11 @@ msgstr "NieosiÄ…galna mapa"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "NieosiÄ…galny szablon"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "NieosiÄ…galny wyzwalacz"
@@ -8564,7 +8583,7 @@ msgstr "Błędny teoken sejfu."
msgid "Incorrect action condition discovery check."
msgstr "Błędny test wykrywania warunku akcji."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Błędny test wykrywania warunku akcji. Test wykrywania nie istnieje lub brak praw dostępu do niego."
@@ -8572,7 +8591,7 @@ msgstr "Błędny test wykrywania warunku akcji. Test wykrywania nie istnieje lub
msgid "Incorrect action condition discovery object."
msgstr "Błędny obiekt wykrywania warunku akcji."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Błędna reguła wykrywania warunku akcji. Reguła wykrywania nie istnieje lub brak praw dostępu do niej."
@@ -8584,15 +8603,15 @@ msgstr "Błędny stan wykrywania warunku akcji."
msgid "Incorrect action condition event type."
msgstr "Błędny typ zdarzenia warunku akcji."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8601,11 +8620,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Błędny port \"%1$s\" warunku akcji."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Błędne proxy warunku akcji. Serwer proxy nie istnieje lub brak praw dostępu do niego."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8613,7 +8632,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Błędny poziom wyzwalacza warunku akcji."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Błędny wyzwalacz warunku akcji. Wyzwalacz nie istnieje lub brak praw dostępu do niego."
@@ -8623,11 +8642,11 @@ msgstr "Błędny typ warunku akcji."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Błędne wartości kolejnego kroku operacji akcji."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8636,11 +8655,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Błędny typ operacji akcji \"%1$s\" dla źródła zdarzenia \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8940,8 +8959,8 @@ msgstr "Błędna liczba kroków szablonowego scenariusza sieci www."
msgid "Incorrect trigger expression"
msgstr "Błędne wyrażenie wyzwalacza"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Błędne wyrażenie wyzwalacza."
@@ -9339,7 +9358,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Informacje o usłudze. Zwraca liczbę całkowitą dla parametrów state, startup; ciąg znaków - dla parametrów displayname, path, user; tekst - dla parametru description; Specyficzne dla state: 0 - działa, 1 - wstrzymany, 2 - w trakcie uruchamiania, 3 - w trakcie wstrzymywania, 4 - w trakcie wznawiania, 5 - w trakcie zatrzymywania, 6 - zatrzymany, 7 - nieznany, 255 - nie ma takiej usługi; Specyficzne dla startup: 0 - automatyczny, 1 - automatyczny opóźniony, 2 - ręczny, 3 - wyłączony, 4 - nieznany"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr "Dziedzicz"
@@ -9348,11 +9367,11 @@ msgstr "Dziedzicz"
msgid "Inherited"
msgstr "Dziedziczone"
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Makra dziedziczone i hosta"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr "Prototypy makr dziedziczone i hosta"
@@ -9364,7 +9383,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Makra dziedziczone i szablonu"
@@ -9384,7 +9403,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Wprowadź"
@@ -9443,8 +9462,8 @@ msgstr "Interfejs o IP \"%1$s\" nie może mieć pustej nazwy DNS jeżeli właśc
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Interfejs z polem IP \"%1$s\" nie może mieć pustej nazwy DNS."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr "Interfejsy"
@@ -9536,7 +9555,7 @@ msgstr "Nieprawidłowa treść pliku YAML"
msgid "Invalid action condition: %1$s."
msgstr "Nieprawidłowy warunek akcji: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9597,10 +9616,10 @@ msgstr "Nieprawidłowe parametry metody."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9663,8 +9682,8 @@ msgstr "Nieprawidłowe parametry metody."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9886,11 +9905,11 @@ msgstr "Nieprawidłowy okres czasu."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inwentarz"
@@ -9904,7 +9923,7 @@ msgid "Inventory field"
msgstr "Pole inwentarzowe"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Tryb inwentarzowy"
@@ -9912,10 +9931,10 @@ msgstr "Tryb inwentarzowy"
msgid "Is online?"
msgstr "Czy jest zalogowany?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Wydawca"
@@ -10010,7 +10029,7 @@ msgstr[2] "WÅ‚Ä…czono pozycje"
msgid "Item in \"not supported\" state"
msgstr "Pozycja w stanie \"niewspierany\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Nie wybrano pozycji"
@@ -10470,17 +10489,17 @@ msgstr "Wykres z ostatniego miesiÄ…ca"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Ostatni z"
@@ -10557,8 +10576,8 @@ msgstr "Przycięcie z lewej"
msgid "Legend"
msgstr "Legenda"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10592,8 +10611,8 @@ msgstr "Typ linii"
msgid "Line width"
msgstr "Szerokość linii"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Połączenie"
@@ -10616,16 +10635,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Wskaźnik połączenia"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr "Połączenie do nowych szablonów"
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Połącz szablony"
@@ -10641,13 +10653,6 @@ msgstr "Połącz z szablonami"
msgid "Linked map"
msgstr "Podłączona mapa"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10786,7 +10791,7 @@ msgstr "Logowanie niedopasowanych pułapek SNMP"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Logowanie"
@@ -10868,16 +10873,16 @@ msgstr "Makro \"%1$s\" już istnieje w \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Makro \"%1$s\" już istnieje."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Makra"
@@ -10976,12 +10981,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Ręcznie"
@@ -11124,16 +11129,16 @@ msgstr "Zaznacz inne"
msgid "Mark selected"
msgstr "Zaznacz wybrane"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Maska"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11166,11 +11171,11 @@ msgstr "Element główny"
msgid "Matches regular expression"
msgstr "Pasuje wyrażenie regularne"
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11406,7 +11411,7 @@ msgstr "Microsoft Edge"
msgid "Middle"
msgstr "Åšrodek"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11509,7 +11514,7 @@ msgstr "BrakujÄ…ce pozycje dla prototypu wykresu \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "BrakujÄ…cy klucz \"%1$s\" dla hosta \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11595,9 +11600,9 @@ msgstr "Poniedziałek"
msgid "Monitored by"
msgstr "Monitorowany przez"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Monitorowany przez proxy"
@@ -11616,6 +11621,7 @@ msgstr "Monitorowanie"
msgid "Monospace"
msgstr "Stała szerokość"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "MiesiÄ…c"
@@ -11728,8 +11734,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11799,11 +11805,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11831,8 +11837,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11853,7 +11859,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12143,15 +12149,15 @@ msgstr "Nie podano żadnego identifykatora reguł wykrywania."
msgid "No enabled modules found."
msgstr "Nie znaleziono włączonych modułów."
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Brak szyfrowania"
@@ -12237,7 +12243,7 @@ msgstr "Nie znaleziono"
msgid "No new modules discovered"
msgstr "Brak wykrytych nowych modułów"
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12274,9 +12280,9 @@ msgstr "Brak uprawnień dla dostępu do systemu."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12315,7 +12321,7 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12415,11 +12421,11 @@ msgstr "Brak uprawnień do wywołania \"%1$s.%2$s\"."
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12478,7 +12484,7 @@ msgid "No public key file specified."
msgstr "Nie określono pliku klucza publicznego."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12499,7 +12505,7 @@ msgid "No target selected."
msgstr "Nie wybrano żadnego celu."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12648,6 +12654,10 @@ msgstr "Raport powiadomień"
msgid "Notifications"
msgstr "Powiadomienia"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12734,6 +12744,10 @@ msgstr "Liczba procesorów maszyny wirtualnej VMware, <url> - URL usługi VMware
msgid "Number of rows"
msgstr "Liczba wierszy"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Liczba zmian stanu"
@@ -12909,7 +12923,7 @@ msgid "Off"
msgstr "Wyłączone"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12956,7 +12970,7 @@ msgstr "Jeden"
msgid "One time only"
msgstr "Jednorazowo"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Jednorazowa przerwa w pracy"
@@ -13034,12 +13048,12 @@ msgstr "Informacje o systemie operacyjnym. Zwraca ciąg znaków"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr "Operacja \"%1$s\" już istnieje."
@@ -13073,8 +13087,8 @@ msgstr "Dane operacyjne"
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operacje"
@@ -13109,7 +13123,7 @@ msgstr "Operacje"
msgid "Operator"
msgstr "Operator"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13149,19 +13163,19 @@ msgstr "Lub"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13191,10 +13205,10 @@ msgstr "Lub"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13457,10 +13471,10 @@ msgstr "PROBLEM"
msgid "PROBLEM event generation mode"
msgstr "PROBLEM - tryb generowania zdarzenia"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13473,19 +13487,19 @@ msgstr "PROBLEM - tryb generowania zdarzenia"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "Tożsamość PSK"
@@ -13537,12 +13551,12 @@ msgid "Parameters"
msgstr "Parametry"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Nadrzędne reguły wykrywania"
@@ -13597,13 +13611,13 @@ msgid "Passive"
msgstr "Pasywny"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13611,7 +13625,7 @@ msgstr "Pasywny"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13664,12 +13678,12 @@ msgstr "Wklej widżet"
msgid "Paste without external links"
msgstr "Wklej bez zewnętrznych łączy"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr "Wzór"
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "Zatrzymaj operacje dla wstrzymanych problemów"
@@ -13682,7 +13696,7 @@ msgstr "Szczytowe zużycie pamięci: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr "Procent czasu wystartowania maszyny wirtualnej ponieważ rywalizuje o dostęp do fizycznych CPU, <url> - URL usługi VMware, <uuid> - nazwa hosta wirtualnej maszyny Vmware"
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Procent"
@@ -13706,10 +13720,11 @@ msgstr "Linia procentowa (z prawej)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Wykonuje zapytanie DNS. Zwraca ciąg znaków z wymaganym typem informacji"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13717,7 +13732,9 @@ msgstr "Wykonuje zapytanie DNS. Zwraca ciąg znaków z wymaganym typem informacj
msgid "Period"
msgstr "Okres"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr "Przesunięcie okresu"
@@ -13781,11 +13798,11 @@ msgstr "Odtwórz dźwięk"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Proszę sprawdzić parametry konfiguracji. Jeżeli wszystko jest poprawne, należy nacisnąć przycisk \"%1$s\", lub można zmienić parametry konfiguracji przyciskiem \"%2$s\"."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr "Proszę potwierdzić czy chcesz usunąc wszystkie makra."
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13871,7 +13888,7 @@ msgstr "Typ metody post"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr "Zużycie prądu, <url> - URL usługi VMware, <uuid> - nazwa hosta hipernadzorcy VMware, <max> - dozwolone maksymalne zużycie prądu"
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13880,7 +13897,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Podsumowanie przed instalacjÄ…"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13997,9 +14014,9 @@ msgstr "Prywatne"
msgid "Private key file"
msgstr "Plik zawierajÄ…cy klucz prywatny"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Poziom uprawnień"
@@ -14407,7 +14424,7 @@ msgstr "Wyrażenie dla przywracania"
msgid "Recovery expression syntax error."
msgstr "Błąd składni wyrażenia przywracania."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Operacje przywracania"
@@ -14539,20 +14556,20 @@ msgstr "Zdalne polecenie"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14561,10 +14578,10 @@ msgstr "Zdalne polecenie"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14608,7 +14625,7 @@ msgstr "Zdalne polecenie"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14691,14 +14708,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14711,8 +14728,8 @@ msgstr "ZastÄ…p"
msgid "Replace dependencies"
msgstr "Zamień zależności"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14913,7 +14930,7 @@ msgstr "Typ odpowiedzi: łańcuch znaków"
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Wynik"
@@ -15448,7 +15465,7 @@ msgstr "Zakres"
msgid "Script"
msgstr "Skrypt"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Skrypt \"%1$s\" już istnieje."
@@ -15514,6 +15531,15 @@ msgstr "Pusty wzorzec wyszukiwania"
msgid "Search type"
msgstr "Typ wyszukiwania"
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Telefon komórkowy drugiego punktu kontaktu"
@@ -15592,7 +15618,7 @@ msgstr "Wybierz widżet"
msgid "Selected"
msgstr "Wybrane"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Usunięto wybrane akcje"
@@ -15834,6 +15860,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr "BÅ‚Ä…d inicjalizacji sesji."
@@ -16287,7 +16314,7 @@ msgstr "Hiszpański (es_ES)"
msgid "Specified role was not found."
msgstr "Określona rola nie została znaleziona."
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Podany skrypt nie istnieje lub brak uprawnień dla polecenia operacji akcji."
@@ -16322,8 +16349,8 @@ msgstr "Podstawowe pozycje"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16331,7 +16358,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Uruchom w"
@@ -16410,7 +16437,7 @@ msgstr "Statystyki i dostępności zapisu pamięci Zabbix. Pamięć - jedna z wa
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16514,7 +16541,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Krok o nazwie \"%1$s\" już istnieje."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16568,12 +16595,12 @@ msgstr "Prosty"
msgid "Strict"
msgstr "Ścisły"
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr "ÅaÅ„cuch znaków"
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16594,10 +16621,10 @@ msgstr "Podfiltr"
msgid "Subject"
msgstr "Temat"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Temat"
@@ -16791,7 +16818,7 @@ msgstr "Wartość znacznika"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16807,13 +16834,13 @@ msgstr "Wartość znacznika"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16830,7 +16857,7 @@ msgstr "Wartość znacznika"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16840,7 +16867,7 @@ msgstr "Wartość znacznika"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16876,14 +16903,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Szablon"
@@ -16927,7 +16952,7 @@ msgstr "Szablon panelu"
msgid "Template dashboards"
msgstr "Szablon paneli"
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Usunięto szablon"
@@ -16939,11 +16964,11 @@ msgstr "Grupa szablonów"
msgid "Template linkage"
msgstr "PowiÄ…zania szablonu"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Makra szablonu"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Nazwa szablonu"
@@ -16978,13 +17003,12 @@ msgstr "Szablon o takiej samej widocznej nazwie \"%s\" już istnieje."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16993,10 +17017,12 @@ msgstr "Szablon o takiej samej widocznej nazwie \"%s\" już istnieje."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -17007,7 +17033,7 @@ msgstr "Szablony"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Szablony \"%1$s\" odłączone od hostów \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr "Zaktualizowane szablony"
@@ -17223,7 +17249,7 @@ msgstr "Motyw"
msgid "This day last week"
msgstr "Ten dzień jest ostatnim dniem tygodnia"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr "To pole jest automatycznie uzupełniane przez element \"%1$s\"."
@@ -17261,7 +17287,7 @@ msgstr "Ten rok"
msgid "This year so far"
msgstr "Ten rok jak dotÄ…d"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Próg"
@@ -17294,15 +17320,15 @@ msgstr ""
msgid "Till"
msgstr "Do"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17339,13 +17365,13 @@ msgstr "Czas ostatniego dostępu do proxy. Nazwa - nazwa proxy. Ważnymi paramte
msgid "Time period"
msgstr "Okres"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -18041,9 +18067,9 @@ msgstr "Jednostki"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Nieznany"
@@ -18061,7 +18087,7 @@ msgid "Unknown error"
msgstr "Nieznany błąd"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Nieznana pozycja hosta, taka pozycja nie istnieje na wybranym hoście"
@@ -18093,16 +18119,16 @@ msgstr "Nieznany typ wartości"
msgid "Unlimited"
msgstr "Bez limitu"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Odłącz"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Odłącz i wyczyść"
@@ -18199,10 +18225,10 @@ msgstr "Działa"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18211,16 +18237,16 @@ msgstr "Działa"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18249,7 +18275,7 @@ msgstr "Aktualizuj istniejÄ…ce"
msgid "Update interval"
msgstr "Interwał aktualizacji"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "Aktualizacja operacji"
@@ -18276,7 +18302,7 @@ msgstr "Wyślij"
msgid "Upper level maps"
msgstr "Mapy wyższego poziomu"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18465,7 +18491,7 @@ msgstr[2] "Zaktualizowanych grup użytkownika"
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18603,15 +18629,15 @@ msgid "User/Recipient"
msgstr "Użytkownik/Odbiorca"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Login"
@@ -18925,11 +18951,11 @@ msgstr "Sprawdzenie"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -19003,14 +19029,14 @@ msgstr "Mapa wartości \"%s\" już istnieje."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Mapowanie wartości"
@@ -19053,7 +19079,7 @@ msgstr "Wartość: brak danych"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19153,7 +19179,7 @@ msgstr "Rozmiar przestrzeni wirtualnej w bajtach lub procentach ogółem. Zwraca
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Widoczna nazwa"
@@ -19179,7 +19205,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Ostrzeżenie"
@@ -19289,6 +19315,10 @@ msgstr "Åšr"
msgid "Wednesday"
msgstr "Åšroda"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19561,7 +19591,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Rok"
@@ -19621,7 +19652,7 @@ msgstr "JesteÅ› zalogowany jako \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Nie można wybrać niektórych języków, ponieważ nie zostały one zainstalowane na serwerze."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Nie zalogowano."
@@ -19862,11 +19893,11 @@ msgstr "oczekiwano zakresu czasu"
msgid "a time unit is expected"
msgstr "oczekiwano jednostki czasu"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19961,7 +19992,7 @@ msgstr "oczekiwano parzystej liczby znaków heksadecymalnych"
msgid "an explicit time is expected"
msgstr "oczekiwano jawnego czasu"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -20005,11 +20036,11 @@ msgstr "jako Czerwone"
msgid "ascending"
msgstr "rosnÄ…co"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -20023,11 +20054,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr "co najmnniej jedna opcja sterownia musi być określona"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -20049,39 +20080,47 @@ msgstr "autorejestracja"
msgid "avg"
msgstr "śr"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - średnia wartośc okresu T"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -20096,7 +20135,7 @@ msgstr "migotanie"
msgid "both username and password should be either present or empty"
msgstr "zarówna nazwa użytkownika i hasło powinny być obecne lub puste"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20138,7 +20177,7 @@ msgstr "nie może być zmieniony"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20226,23 +20265,23 @@ msgstr "nie można wykonać prośby o Scroll API, dane nie mogą być skrócone"
msgid "cannot update property for templated discovery rule"
msgstr "nie można zaktualizować własności dla zasady wykrywania"
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - Różnica pomiędzy ostatnią i poprzednią wartością"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20269,7 +20308,7 @@ msgstr ""
msgid "comma-separated list"
msgstr "lista oddzielona przecinkami"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20284,15 +20323,15 @@ msgstr "konfiguracja"
msgid "contains"
msgstr "zawiera"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20300,11 +20339,11 @@ msgstr ""
msgid "count"
msgstr "zliczyć"
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - Liczba udanych pobrań wartości Y (które uzupełnia operator 0) dla okresu T"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20317,15 +20356,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - Aktualna data"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - Dzień miesiąca"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - Dzień tygodnia"
@@ -20343,7 +20382,7 @@ msgstr "dni"
msgid "default"
msgstr "domyślny"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20420,7 +20459,7 @@ msgstr ""
msgid "does not match"
msgstr "nie pasuje"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20443,11 +20482,11 @@ msgstr "wiadomość z błędem"
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20463,7 +20502,7 @@ msgstr "nieudane przetwarzanie JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20477,15 +20516,15 @@ msgstr "pierwszy"
msgid "first parameter is expected"
msgstr "oczekiwano pierwszego parametru"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - Prognoza dla następnych t sekund oparta o okres T"
@@ -20493,7 +20532,7 @@ msgstr "forecast() - Prognoza dla następnych t sekund oparta o okres T"
msgid "fourth"
msgstr "czwarty"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime() - Różnica pomiędzy wartością elementy (jako znacznika czasu) i znacznika czasu serwera Zabbix jest mniejsza lub równa T sekund (1 - prawda, 0 - fałsz)"
@@ -20567,7 +20606,7 @@ msgstr "w"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20576,11 +20615,11 @@ msgstr ""
msgid "including subgroups"
msgstr "Dołączanie podgrup"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr "nieprawidłowo obliczona fomuła elementu"
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr "nieprawidłowo obliczona formuła elementu zaczyna się od \"%1$s\""
@@ -20599,7 +20638,7 @@ msgstr "nieprawidłowa liczność elementu"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20617,7 +20656,7 @@ msgstr "niepoprawna składnia przy \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20677,7 +20716,7 @@ msgstr "niepoprawna nazwa grupy hosta"
msgid "invalid host name"
msgstr "niepoprawna nazwa hosta"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20699,6 +20738,16 @@ msgstr "niepoprawne wyrażenie regularne"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20740,7 +20789,7 @@ msgstr "wzór elementu"
msgid "key is empty"
msgstr "klucz jest pusty"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20756,7 +20805,7 @@ msgctxt "week of month"
msgid "last"
msgstr "ostatni"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - Ostatnia (najnowsza) wartość T"
@@ -20764,11 +20813,11 @@ msgstr "last() - Ostatnia (najnowsza) wartość T"
msgid "left"
msgstr "lewy"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20776,23 +20825,23 @@ msgstr ""
msgid "list of characters"
msgstr "lista znaków"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20800,7 +20849,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "niskopoziomowa reguła wykrywania"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20832,11 +20881,11 @@ msgstr "makro jest puste"
msgid "macro(s)"
msgstr "makro(a)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20872,7 +20921,7 @@ msgstr "maks"
msgid "max period is less than time filter default period"
msgstr "maksymalny okres jest mniejszy niż filtr czasu domyślnego okresu"
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - Maksymalna wartość dla okresu T"
@@ -20886,7 +20935,7 @@ msgstr "osiągnięto maksymlany stopień zależnego elementu"
msgid "maximum number of dependency levels reached"
msgstr "osiągnięto maksymlaną liczbę zależnych poziomów"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20903,7 +20952,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min() - Minimalna wartość dla okresu T"
@@ -20918,15 +20967,15 @@ msgstr "minimalna ilość znaków: %1$s"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -21008,7 +21057,7 @@ msgstr "nazwa"
msgid "new"
msgstr "nowy"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "nowy"
@@ -21042,7 +21091,7 @@ msgstr "brak uprawnień do tworzenia i edycji map"
msgid "no permissions to unacknowledge problems"
msgstr "brak uprawnień do od potwierdzenia problemów"
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr "nodata() - Nie odebrano danych podczas okresu czasu T (1 - prawda, 0- fałśz), Tryb (ścisły - ignoruj czas opóźenienia proxy w wysyłanych danych)"
@@ -21063,7 +21112,7 @@ msgstr "nie w"
msgid "not selected"
msgstr "nie wybrane"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now() - Liczba sekund od Epoki"
@@ -21150,15 +21199,15 @@ msgstr "ścieżka/do/tajny:klucz"
msgid "pattern"
msgstr "wzór"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile() - Percentyl P okresu T"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21166,15 +21215,15 @@ msgstr ""
msgid "problem pattern"
msgstr "problem ze wzorem"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21223,11 +21272,11 @@ msgstr ""
msgid "regular expression"
msgstr "wyrażenie regularne"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21251,15 +21300,15 @@ msgstr ""
msgid "right"
msgstr "prawidłowy"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21350,23 +21399,23 @@ msgstr "pokaż mapowanie ikon"
msgid "sign in as guest"
msgstr "zaloguj się jako gość"
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21374,11 +21423,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21386,11 +21435,11 @@ msgstr ""
msgid "sum"
msgstr "suma"
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum() - Suma wartości okresu T"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21418,7 +21467,7 @@ msgstr "dostarczone dane logowania nie sÄ… unikalne"
msgid "tag"
msgstr "znacznik"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21452,7 +21501,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21499,31 +21548,35 @@ msgstr "czas domyślnego okresu filtra osiągnął maksymalny okres"
msgid "time shift"
msgstr "przesunięcie czasu"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - Aktualny czas"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - Czas do osiągnięcia progu oszacowanego na podstawie okresu T"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr "trendavg() - Średnia wartość okresu T z dokładnym przesunięciem okresu"
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr "trendmax() - Maksymalna wartość okresu T z dokładnym przesunięciem okresu"
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr "trendmin() - Minimalna wartość okresu T z dokładnym przesunięciem okresu"
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr "trendsum() - Suma wartości okresu T z dokładnym przesunięciem okresu"
@@ -21549,11 +21602,11 @@ msgstr "prototyp wyzwalacza nie może zostać przeniesiony do innego szablonu lu
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "wyzwalacz z odsyłaczami nie może być przesuwany do innego szablonu lub hosta"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21610,7 +21663,7 @@ msgstr "nieoczekiwany koniec makra"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21653,7 +21706,7 @@ msgstr "nieoczekiwana wartość \"%1$s\""
msgid "unknown"
msgstr "nieznany"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21854,11 +21907,11 @@ msgstr "wartość drugiego paramteru jest za długa"
msgid "value of third parameter must be one of %1$s"
msgstr "wartość trzecigo paramteru mysu być jedną z %1$s"
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/pt_BR/LC_MESSAGES/frontend.po b/ui/locale/pt_BR/LC_MESSAGES/frontend.po
index 55e24d599c4..2fe413a433f 100644
--- a/ui/locale/pt_BR/LC_MESSAGES/frontend.po
+++ b/ui/locale/pt_BR/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2021-01-25 11:38+0300\n"
"Last-Translator: Marlon <Marlon@outlook.com>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -302,10 +302,10 @@ msgstr "(0 - usar a ação padrão)"
msgid "(Only super admins can create groups)"
msgstr "(Apenas super administradores podem criar grupos)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(sem proxy)"
@@ -456,7 +456,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -525,7 +525,7 @@ msgstr "Eventos confirmados RESOLVIDOS"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -544,11 +544,11 @@ msgstr "Eventos confirmados RESOLVIDOS"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -560,24 +560,24 @@ msgstr "Eventos confirmados RESOLVIDOS"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -595,7 +595,7 @@ msgstr "Eventos confirmados RESOLVIDOS"
msgid "Action"
msgstr "Ação"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "A ação \"%1$s\" já existe."
@@ -605,7 +605,7 @@ msgstr "A ação \"%1$s\" já existe."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Ação incluída"
@@ -614,17 +614,17 @@ msgstr "Ação incluída"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Ação excluída"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Ação desativada"
msgstr[1] "Ações desativadas"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Ação ativada"
@@ -643,7 +643,7 @@ msgstr "Log de ações"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Ação atualizada"
@@ -690,7 +690,7 @@ msgid "Active till"
msgstr "Ativo até"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -749,14 +749,14 @@ msgstr "Ativo até"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -772,10 +772,10 @@ msgstr "Ativo até"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -787,9 +787,9 @@ msgstr "Ativo até"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -807,7 +807,7 @@ msgstr "Ativo até"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -852,7 +852,7 @@ msgstr "Adicionar elemento filho"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -877,8 +877,8 @@ msgstr "Adicionar múltiplos mapas"
msgid "Add new data set"
msgstr "Adicionar novo conjunto de dados"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -891,7 +891,7 @@ msgstr "Adicionar nova sobreposição"
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1026,7 +1026,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1042,6 +1042,10 @@ msgstr ""
msgid "Alert message"
msgstr "Mensagem de alerta"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Apelido"
@@ -1358,7 +1362,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "Ao menos uma operação deve existir."
@@ -1438,9 +1442,9 @@ msgstr ""
msgid "Authentication"
msgstr "Autenticação"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Algoritmo de autenticação"
@@ -1501,12 +1505,12 @@ msgstr "Não é possível habilitar as opções de login automático e logout au
msgid "Auto-logout"
msgstr "Logout automático"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automático"
@@ -1621,12 +1625,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Senha para o Bind"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1832,7 +1836,7 @@ msgstr "Não é possível adicionar o item não numérico \"%1$s\" ao gráfico \
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Não foi possível adicionar o item não numérico \"%1$s\" ao protótipo de gráfico \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Ação não foi adicionada"
@@ -2130,7 +2134,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Não é possível excluir o usuário interno do Zabbix \"%1$s\", tente desabilitar esse usuário."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Ação não foi excluída"
@@ -2296,12 +2300,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Não foi possível excluir script"
msgstr[1] "Não foi possível excluir script"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Não foi possível excluir os scripts. Script \"%1$s\" é usado na operação de ação \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Ações selecionadas não foram excluídas"
@@ -2318,7 +2322,7 @@ msgstr[1] "Serviço não foi removido"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Não foi possível excluir template"
@@ -2405,7 +2409,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Não foi possível desativar a ação"
@@ -2483,7 +2487,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Não foi possível ativar a ação"
@@ -2712,7 +2716,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "Não foi possível importar o template \"%1$s\", vinculado com o template \"%2$s\" que não existe."
msgstr[1] "Não foi possível importar o template \"%1$s\", vinculado com os templates \"%2$s\" que não existem."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Não foi possível incluir a expressão de trigger"
@@ -2891,7 +2895,7 @@ msgstr "Não foi possível desvincular ao template."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Não foi possível atualizar \"%1$s\" para a ação \"%2$s\"."
@@ -2957,7 +2961,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Não foi possível atualizar o cenário web oriundo de template \"%1$s\": %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Ação não foi atualizada"
@@ -3017,7 +3021,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Não é possível atualizar os grupos para o host descoberto \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Host não foi atualizado"
@@ -3120,9 +3124,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Não foi possível atualizar script"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3149,7 +3153,7 @@ msgstr "Não foi possível atualizar o passo do cenário web baseado em template
msgid "Cannot update template"
msgstr "Não foi possível atualizar template"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3235,14 +3239,14 @@ msgstr "Recebe todos os traps SNMP que não foram recebidos por nenhum item de s
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Certificado"
@@ -3260,10 +3264,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Modificar"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3303,9 +3307,9 @@ msgstr "Sequência de caracteres incluídos"
msgid "Character string not included"
msgstr "Sequência de caracteres não incluídos"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3321,7 +3325,7 @@ msgstr "Informação do chassi. Retorna um texto"
msgid "Check already exists."
msgstr "Verificação já existe."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Verifique a expressão a partir de \"%1$s\"."
@@ -3443,8 +3447,8 @@ msgstr "Limpar histórico"
msgid "Clear history and trends"
msgstr "Limpar histórico e estatísticas (médias)"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Limpar ao desassociar"
@@ -3471,16 +3475,16 @@ msgstr "Relógio"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3609,7 +3613,7 @@ msgstr "Compressão"
msgid "Concurrent sessions"
msgstr "Sessões concorrentes"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3881,13 +3885,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Conexões"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Conexões do host (ativas)"
@@ -3895,9 +3899,9 @@ msgstr "Conexões do host (ativas)"
msgid "Connections from proxy"
msgstr "Conexões do proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Conexões com o host (passivas)"
@@ -4065,10 +4069,10 @@ msgstr "Regra de correlação"
msgid "Correlation updated"
msgstr "Correlacionamento atualizado"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Contador"
@@ -4158,7 +4162,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4360,7 +4364,7 @@ msgid "Current value"
msgstr "Valor atual"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Customizar"
@@ -4603,7 +4607,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4676,11 +4680,11 @@ msgstr "Data de fim da garantia do HW"
msgid "Date HW purchased"
msgstr "Data de aquisição do HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Dia"
@@ -4721,8 +4725,8 @@ msgstr "Dez"
msgid "December"
msgstr "Dezembro"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4732,7 +4736,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4863,7 +4867,7 @@ msgstr "Excluir"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Excluir e limpar"
@@ -4872,11 +4876,11 @@ msgstr "Excluir e limpar"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Excluir e limpar templates selecionados? (Aviso: todos os hosts associados terão as entidades herdadas dos templates excluídas, bem como os dados coletados!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Excluir e limpar template? (Aviso: todos os hosts associados terão as entidades herdadas dos templates excluídas, bem como os dados coletados!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Excluir a ação atual?"
@@ -5009,7 +5013,7 @@ msgstr "Excluir grupos selecionados?"
msgid "Delete selected host groups?"
msgstr "Excluir os grupos de hosts selecionados?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Excluir os protótipos de host selecionados?"
@@ -5118,7 +5122,7 @@ msgstr "Excluir usuários selecionados?"
msgid "Delete selected web scenarios?"
msgstr "Excluir os cenários web selecionados?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Excluir template?"
@@ -5179,7 +5183,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Dependências"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Dependente"
@@ -5187,7 +5191,7 @@ msgstr "Dependente"
msgid "Dependent item"
msgstr "Item dependente"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5198,7 +5202,7 @@ msgid "Deployment status"
msgstr "Status de desenvolvimento"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5213,16 +5217,16 @@ msgstr "Status de desenvolvimento"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5234,10 +5238,10 @@ msgstr "Descrição"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detalhes"
@@ -5246,6 +5250,14 @@ msgstr "Detalhes"
msgid "Details of web scenario"
msgstr "Detalhes do cenário web"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Dispositivo"
@@ -5368,7 +5380,7 @@ msgstr "Desativar os cenários web selecionados?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5395,17 +5407,17 @@ msgstr "Desativar os cenários web selecionados?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Inativo"
@@ -5430,7 +5442,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5645,7 +5657,7 @@ msgstr "Exibir gráfico empilhado"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5662,7 +5674,7 @@ msgstr "Apresentando %1$s até %2$s de %3$s encontrados"
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5744,7 +5756,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Receber a configuração"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5808,7 +5820,7 @@ msgstr "O userid \"%1$s\" está duplicado nos usuários do mapa \"%2$s\"."
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Duração"
@@ -5838,14 +5850,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6101,7 +6113,7 @@ msgstr "Ativar traps"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6139,13 +6151,13 @@ msgstr "Ativar traps"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6161,11 +6173,11 @@ msgstr "Ativo"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Criptografia"
@@ -6241,6 +6253,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Erro: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Evento"
@@ -6809,8 +6825,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Primeiro"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Ajuste"
@@ -6922,12 +6938,12 @@ msgid "Full"
msgstr "Cheio"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Clone completo"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Função"
@@ -6943,7 +6959,7 @@ msgstr "Modem GSM"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Acesso à GUI desativado."
@@ -7292,7 +7308,7 @@ msgstr "Nome do grupo"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "O protótipo de grupo não pode ser baseado em regra de autobusca no host \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Protótipos de grupo"
@@ -7305,12 +7321,11 @@ msgid "Grouping by"
msgstr "Agrupando por"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Grupos"
@@ -7529,7 +7544,7 @@ msgstr "Zerar o histórico pode levar um tempo bem longo. Continuar?"
msgid "History data selection"
msgstr "Seleção de dados do histórico"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7560,7 +7575,7 @@ msgid "Horizontal align"
msgstr "Alinhamento horizontal"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7569,7 +7584,7 @@ msgstr "Alinhamento horizontal"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7580,7 +7595,7 @@ msgstr "Alinhamento horizontal"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7706,7 +7721,7 @@ msgid "Host group label type"
msgstr "Tipo de rótulo do grupo de hosts"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7725,8 +7740,8 @@ msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7776,7 +7791,7 @@ msgstr "Visão geral do inventário de host"
msgid "Host label type"
msgstr "Tipo do rótulo do host"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Macros de host"
@@ -7788,7 +7803,7 @@ msgstr "Metadados do host"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Nome do host"
@@ -7825,7 +7840,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Protótipo de host foi excluído"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7848,7 +7863,7 @@ msgstr "Já existe protótipo de host com o nome visível \"%1$s\" na autobusca
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Protótipos de host"
@@ -7873,7 +7888,7 @@ msgstr "Hora do host"
msgid "Host update failed."
msgstr "A atualização do host falhou."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Host atualizado"
@@ -7950,6 +7965,10 @@ msgstr "Localização dos hosts"
msgid "Hosts updated"
msgstr "Hosts atualizados"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Horas"
@@ -8019,15 +8038,15 @@ msgstr "Intervalo de IPs"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "O range de IP \"%1$s\" excede o limite de endereços \"%2$s\""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8259,7 +8278,7 @@ msgstr "Imagens"
msgid "Images for all maps will be updated!"
msgstr "As imagens de todos os mapas serão atualizadas!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Imediatamente"
@@ -8341,7 +8360,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8353,11 +8372,11 @@ msgstr "Mapa inacessível"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "Template inacessível"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "Trigger inacessível"
@@ -8472,7 +8491,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "A verificação de condição da ação de descoberta está incorreta."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "A verificação de condição da ação de descoberta está incorreta. A regra de descoberta não existe ou você não possui acesso à ela."
@@ -8480,7 +8499,7 @@ msgstr "A verificação de condição da ação de descoberta está incorreta. A
msgid "Incorrect action condition discovery object."
msgstr "O objeto de descoberta da ação está incorreto."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "A verificação de condição da ação de descoberta está incorreta. A regra de descoberta não existe ou você não possui acesso à ela."
@@ -8492,15 +8511,15 @@ msgstr "A ação possui condição incorreta: Status da descoberta de rede."
msgid "Incorrect action condition event type."
msgstr "A ação possui condição incorreta: Tipo de evento."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8509,11 +8528,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "A ação possui porta de condição incorreta: \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "A ação possui condição incorreta: proxy. O proxy não existe ou você não possui acesso à ele."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8521,7 +8540,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "A ação possui condição de severidade de trigger incorreta."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "A ação possui condição incorreta: trigger. A trigger não existe ou você não possui acesso à ela."
@@ -8531,11 +8550,11 @@ msgstr "A ação possui condição incorreta: tipo."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Valores incorretos para a operação de escalonamento da ação."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8544,11 +8563,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "O tipo de operação \"%1$s\" é inválido na ação para o tipo de evento \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8848,8 +8867,8 @@ msgstr "Contagem incorreta de cenários web oriundos de template."
msgid "Incorrect trigger expression"
msgstr "Expressão de trigger incorreta"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Expressão de trigger inválida."
@@ -9247,7 +9266,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Informação sobre um serviço. Retorna inteiro - (state, startup); Caractere - (displayname, path, user); Texto - (description); Especificamente para estado: 0 - em execução, 1 - pausado, 2 - iniciação pendente, 3 - pausa pendente, 4 - retorno pendente, 5 - finalização pendente, 6 - finalizado, 7 - desconhecido, 255 - serviço desconhecido; Especificamente para inicialização: 0 - automático, 1 - Automático com atraso, 2 - Manual, 3 - Desabilitado, 4 - desconhecido"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9256,11 +9275,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Macros herdadas e do host"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9272,7 +9291,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Macros herdadas e de template"
@@ -9292,7 +9311,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Inserir"
@@ -9351,8 +9370,8 @@ msgstr "A interface com o IP \"%1$s\" não pode possuir nome de DNS nulo enquant
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "A interface com IP \"%1$s\" não pode possuir nome de DNS nulo."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9445,7 +9464,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "Condição inválida na ação: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9506,10 +9525,10 @@ msgstr "Os parâmetros do método são inválidos."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9572,8 +9591,8 @@ msgstr "Os parâmetros do método são inválidos."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9795,11 +9814,11 @@ msgstr "Período de tempo inválido."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventário"
@@ -9813,7 +9832,7 @@ msgid "Inventory field"
msgstr "Campo de inventário"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Modo de inventário"
@@ -9821,10 +9840,10 @@ msgstr "Modo de inventário"
msgid "Is online?"
msgstr "Online?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Emissor"
@@ -9918,7 +9937,7 @@ msgstr[1] "Itens ativados"
msgid "Item in \"not supported\" state"
msgstr "O item está como \"não suportado\""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Item não selecionado"
@@ -10371,17 +10390,17 @@ msgstr "Gráfico último mês"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Última de"
@@ -10458,8 +10477,8 @@ msgstr "Remover espaços à esquerda"
msgid "Legend"
msgstr "Legenda"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10493,8 +10512,8 @@ msgstr "Tipo da linha"
msgid "Line width"
msgstr "Largura da linha"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Link"
@@ -10517,16 +10536,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Indicadores de link"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Templates vinculados"
@@ -10542,13 +10554,6 @@ msgstr "Vínculo com templates"
msgid "Linked map"
msgstr "Mapa linkado"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10687,7 +10692,7 @@ msgstr "Registrar traps SNMP não correspondentes"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Login"
@@ -10769,16 +10774,16 @@ msgstr "A macro \"%1$s\" já existe em \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "A macro \"%1$s\" já existe."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Macros"
@@ -10877,12 +10882,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manual"
@@ -11025,16 +11030,16 @@ msgstr "Marcar outros"
msgid "Mark selected"
msgstr "Marcar selecionados"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Máscara"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11067,11 +11072,11 @@ msgstr "Item mestre"
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11303,7 +11308,7 @@ msgstr ""
msgid "Middle"
msgstr "Meio"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11405,7 +11410,7 @@ msgstr "Estão faltando itens no protótipo de gráfico \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Está faltando a chave \"%1$s\" para o host \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11487,9 +11492,9 @@ msgstr "Segunda-feira"
msgid "Monitored by"
msgstr "Monitorado por"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Monitorado por proxy"
@@ -11508,6 +11513,7 @@ msgstr "Monitoramento"
msgid "Monospace"
msgstr "Monoespaçada"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Mês"
@@ -11620,8 +11626,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11691,11 +11697,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11723,8 +11729,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11745,7 +11751,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12035,15 +12041,15 @@ msgstr "Não foram informados os IDs de regra de descoberta."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Sem criptografia"
@@ -12131,7 +12137,7 @@ msgstr "Nenhuma correspondência encontrada"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12168,9 +12174,9 @@ msgstr "Sem permissão de acesso ao sistema."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12209,7 +12215,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12309,11 +12315,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12372,7 +12378,7 @@ msgid "No public key file specified."
msgstr "Não foi informado o arquivo de chave pública."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12393,7 +12399,7 @@ msgid "No target selected."
msgstr "Nenhum alvo selecionado."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12542,6 +12548,10 @@ msgstr "Relatório de notificações"
msgid "Notifications"
msgstr "Notificações"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12628,6 +12638,10 @@ msgstr "Número de processadores na máquina virtual VMware, <url> - URL de serv
msgid "Number of rows"
msgstr "Quantidade de linhas"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Alterações no status"
@@ -12803,7 +12817,7 @@ msgid "Off"
msgstr "Inativo"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12850,7 +12864,7 @@ msgstr "Um"
msgid "One time only"
msgstr "Apenas uma vez"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Downtime único"
@@ -12927,12 +12941,12 @@ msgstr "Informação sobre o sistema operacional. Retorna: texto"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12966,8 +12980,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operações"
@@ -13002,7 +13016,7 @@ msgstr "Operações"
msgid "Operator"
msgstr "Operador"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13042,19 +13056,19 @@ msgstr "Ou"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13084,10 +13098,10 @@ msgstr "Ou"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13350,10 +13364,10 @@ msgstr "INCIDENTE"
msgid "PROBLEM event generation mode"
msgstr "Modo de geração de eventos de INCIDENTE"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13366,19 +13380,19 @@ msgstr "Modo de geração de eventos de INCIDENTE"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "Identidade PSK"
@@ -13430,12 +13444,12 @@ msgid "Parameters"
msgstr "Parâmetros"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Autobusca herdada"
@@ -13490,13 +13504,13 @@ msgid "Passive"
msgstr "Passivo"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13504,7 +13518,7 @@ msgstr "Passivo"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13557,12 +13571,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Colar sem os links externos"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "Pausar operações para incidentes suprimidos"
@@ -13575,7 +13589,7 @@ msgstr "Pico de utilização de memória: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Percentual"
@@ -13599,10 +13613,11 @@ msgstr "Linha percentual (direita)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requisitado"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13610,7 +13625,9 @@ msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requ
msgid "Period"
msgstr "Período"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13674,11 +13691,11 @@ msgstr "Executar som"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Por favor verifique os parâmetros de configuração. Se tudo estiver correto pressione o botão \"%1$s\", ou pressione o botão \"%2$s\" para modificar parâmetros de configuração."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13764,7 +13781,7 @@ msgstr "Tipo do post"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13773,7 +13790,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Sumário da pré-instalação"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13890,9 +13907,9 @@ msgstr "Privado"
msgid "Private key file"
msgstr "Arquivo de chave privada"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Nível de acesso"
@@ -14299,7 +14316,7 @@ msgstr "Expressão de recuperação"
msgid "Recovery expression syntax error."
msgstr "Erro de sintaxe na expressão de recuperação."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Operações de recuperação"
@@ -14430,20 +14447,20 @@ msgstr "Comando remoto"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14452,10 +14469,10 @@ msgstr "Comando remoto"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14499,7 +14516,7 @@ msgstr "Comando remoto"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14582,14 +14599,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14602,8 +14619,8 @@ msgstr "Substituir"
msgid "Replace dependencies"
msgstr "Substituir dependências"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14804,7 +14821,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Resultado"
@@ -15336,7 +15353,7 @@ msgstr "Escopo"
msgid "Script"
msgstr "Script"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "O scritp \"%1$s\" já existe."
@@ -15401,6 +15418,15 @@ msgstr "Padrão de busca está vazio"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "POC - Célula secundária"
@@ -15479,7 +15505,7 @@ msgstr "Selecione o widget"
msgid "Selected"
msgstr "Selecionado"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "A ação selecionada foi excluída"
@@ -15720,6 +15746,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16173,7 +16200,7 @@ msgstr "Espanhol (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "O script informado não existe ou você não possui privilégios para executa-lo."
@@ -16208,8 +16235,8 @@ msgstr "Itens padrões"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16217,7 +16244,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Iniciar em"
@@ -16296,7 +16323,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16400,7 +16427,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Já existe um passo com o nome \"%1$s\"."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16454,12 +16481,12 @@ msgstr "Direto"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16480,10 +16507,10 @@ msgstr "Subfiltro"
msgid "Subject"
msgstr "Assunto"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Segurado"
@@ -16677,7 +16704,7 @@ msgstr "Valor da etiqueta"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16693,13 +16720,13 @@ msgstr "Valor da etiqueta"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16716,7 +16743,7 @@ msgstr "Valor da etiqueta"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16726,7 +16753,7 @@ msgstr "Valor da etiqueta"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16762,14 +16789,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Template"
@@ -16813,7 +16838,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Template removido"
@@ -16825,11 +16850,11 @@ msgstr "Grupo de templates"
msgid "Template linkage"
msgstr "Associação a templates"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Macros de template"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Nome do template"
@@ -16864,13 +16889,12 @@ msgstr "Já existe template com o nome visível \"%1$s\"."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16879,10 +16903,12 @@ msgstr "Já existe template com o nome visível \"%1$s\"."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16893,7 +16919,7 @@ msgstr "Templates"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Os templates \"%1$s\" foram desvinculados dos hosts \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17107,7 +17133,7 @@ msgstr "Tema"
msgid "This day last week"
msgstr "Este dia na semana passada"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17145,7 +17171,7 @@ msgstr "Este ano"
msgid "This year so far"
msgstr "Até agora neste ano"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Limiar"
@@ -17178,15 +17204,15 @@ msgstr ""
msgid "Till"
msgstr "Até"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17223,13 +17249,13 @@ msgstr ""
msgid "Time period"
msgstr "Intervalo"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17921,9 +17947,9 @@ msgstr "Unidades"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Desconhecido"
@@ -17941,7 +17967,7 @@ msgid "Unknown error"
msgstr "Erro desconhecido"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Item de host desconhecido; não existe este item no host selecionado"
@@ -17973,16 +17999,16 @@ msgstr "Tipo de valor desconhecido"
msgid "Unlimited"
msgstr "Ilimitado"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Desassociar"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Desassociar e limpar"
@@ -18078,10 +18104,10 @@ msgstr "Ligado"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18090,16 +18116,16 @@ msgstr "Ligado"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18128,7 +18154,7 @@ msgstr "Atualizar existente"
msgid "Update interval"
msgstr "Intervalo de atualização"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "Operações de atualização"
@@ -18155,7 +18181,7 @@ msgstr "Enviar"
msgid "Upper level maps"
msgstr "Mapas de nível superior"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18341,7 +18367,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18477,15 +18503,15 @@ msgid "User/Recipient"
msgstr "Usuário/Recipiente"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Usuário"
@@ -18799,11 +18825,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18877,14 +18903,14 @@ msgstr "O mapeamento de valores \"%1$s\" já existe."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Mapeamento de valor"
@@ -18927,7 +18953,7 @@ msgstr "Valor: sem dados"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19027,7 +19053,7 @@ msgstr "Espaço virtual em bytes ou percentual do total. Retorna inteiro para by
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Nome visível"
@@ -19053,7 +19079,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Atenção"
@@ -19161,6 +19187,10 @@ msgstr "Qua"
msgid "Wednesday"
msgstr "Quarta-feira"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19433,7 +19463,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Ano"
@@ -19493,7 +19524,7 @@ msgstr "Você está autenticado como \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Não é possível selecionar alguns idiomas, o suporte aos idiomas adicionais necessita da instalação do pacote \"locale\" em seu servidor web."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Você não está autenticado em"
@@ -19734,11 +19765,11 @@ msgstr "um período de tempo é aguardado"
msgid "a time unit is expected"
msgstr "uma unidade de tempo é aguardada"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19833,7 +19864,7 @@ msgstr "é aguardado um par de caracteres hexadecimais"
msgid "an explicit time is expected"
msgstr "um horário explícito é esperado"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19877,11 +19908,11 @@ msgstr "em Vermelho"
msgid "ascending"
msgstr "ascedente"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19895,11 +19926,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr "ao menos uma opção de sobreposição deve ser especificada"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19921,39 +19952,47 @@ msgstr ""
msgid "avg"
msgstr "méd"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - Valor médio de um período T"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19968,7 +20007,7 @@ msgstr "piscando"
msgid "both username and password should be either present or empty"
msgstr "tanto o usuário quanto a senha precisam ser fornecidos ou estarem vazios"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20010,7 +20049,7 @@ msgstr "não pode ser modificado"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20098,23 +20137,23 @@ msgstr "não foi possível executar a solicitação de rolagem de API, os dados
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - Diferença entre o último valor e seu antecessor"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20141,7 +20180,7 @@ msgstr ""
msgid "comma-separated list"
msgstr "lista separada por pontos"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20156,15 +20195,15 @@ msgstr "configurar"
msgid "contains"
msgstr "contêm"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20172,11 +20211,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - Quantidade de valores V recuperados com sucesso (que correspondam com o operador O) em um período T"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20189,15 +20228,15 @@ msgstr "d"
msgid "d.M"
msgstr "d/M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - Data atual"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - Dias do mês"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - Dia da semana"
@@ -20215,7 +20254,7 @@ msgstr "dias"
msgid "default"
msgstr "padrão"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20292,7 +20331,7 @@ msgstr ""
msgid "does not match"
msgstr "não corresponde"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20315,11 +20354,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20335,7 +20374,7 @@ msgstr "falha ao analisar o JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20349,15 +20388,15 @@ msgstr "primeiro"
msgid "first parameter is expected"
msgstr "é esperado um primeiro parâmetro"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - Previsão para os próximos t segundos a partir de um período T"
@@ -20365,7 +20404,7 @@ msgstr "forecast() - Previsão para os próximos t segundos a partir de um perí
msgid "fourth"
msgstr "quarto"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20439,7 +20478,7 @@ msgstr "em"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20448,11 +20487,11 @@ msgstr ""
msgid "including subgroups"
msgstr "incluindo subgrupos"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20471,7 +20510,7 @@ msgstr "contagem de elementos incorreta"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20489,7 +20528,7 @@ msgstr "sintaxe incorreta próximo de \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20550,7 +20589,7 @@ msgstr "nome inválido de grupo de hosts"
msgid "invalid host name"
msgstr "nome inválido de host"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20572,6 +20611,16 @@ msgstr "expressão regular inválida"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20613,7 +20662,7 @@ msgstr "padrão de item"
msgid "key is empty"
msgstr "a chave está vazia"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20629,7 +20678,7 @@ msgctxt "week of month"
msgid "last"
msgstr "último"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - Último valor T (mais recente)"
@@ -20637,11 +20686,11 @@ msgstr "last() - Último valor T (mais recente)"
msgid "left"
msgstr "esquerda"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20649,23 +20698,23 @@ msgstr ""
msgid "list of characters"
msgstr "lista de caracteres"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20673,7 +20722,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "regra de autobusca (LLD)"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20705,11 +20754,11 @@ msgstr "macro vazia"
msgid "macro(s)"
msgstr "macro(s)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20745,7 +20794,7 @@ msgstr "máx"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - Valor máximo em um período T"
@@ -20759,7 +20808,7 @@ msgstr "o máximo de itens dependentes foi alcançado"
msgid "maximum number of dependency levels reached"
msgstr "o nível máximo de dependência foi alcançado"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20776,7 +20825,7 @@ msgstr ""
msgid "min"
msgstr "mín"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min() - Valor mínimo em um período T"
@@ -20791,15 +20840,15 @@ msgstr "o tamanho mínimo é %1$s caracteres"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20881,7 +20930,7 @@ msgstr "nome"
msgid "new"
msgstr "novo"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "novo"
@@ -20915,7 +20964,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20936,7 +20985,7 @@ msgstr "não em"
msgid "not selected"
msgstr "não selecionado"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now() - Quantidade de segundos desde Epoch"
@@ -21023,15 +21072,15 @@ msgstr ""
msgid "pattern"
msgstr "padrão"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile() - Percentil P de um período T"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21039,15 +21088,15 @@ msgstr ""
msgid "problem pattern"
msgstr "padrão de incidente"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21096,11 +21145,11 @@ msgstr ""
msgid "regular expression"
msgstr "expressão regular"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21124,15 +21173,15 @@ msgstr ""
msgid "right"
msgstr "direita"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21223,23 +21272,23 @@ msgstr "mostrar mapeamento de ícones"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21247,11 +21296,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21259,11 +21308,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum() - Total de valores em um período T"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21291,7 +21340,7 @@ msgstr "as credenciais informadas não são únicas"
msgid "tag"
msgstr "etiqueta"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21325,7 +21374,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21372,31 +21421,35 @@ msgstr ""
msgid "time shift"
msgstr "mudança de horário"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - Hora atual"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - Tempo para alcançar o limite estimado com base no período T"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21422,11 +21475,11 @@ msgstr "um protótipo de trigger não pode ser movido para outro template ou hos
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "uma trigger com associações não pode ser movida para outro template ou host"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21483,7 +21536,7 @@ msgstr "fim inesperado da macro"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21526,7 +21579,7 @@ msgstr "valor inesperado \"%1$s\""
msgid "unknown"
msgstr "desconhecido"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21725,11 +21778,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/pt_PT/LC_MESSAGES/frontend.po b/ui/locale/pt_PT/LC_MESSAGES/frontend.po
index 793360ac5ea..a41c963f89c 100644
--- a/ui/locale/pt_PT/LC_MESSAGES/frontend.po
+++ b/ui/locale/pt_PT/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-10-10 08:35+0300\n"
"Last-Translator: richlv <richlv@nakts.net>\n"
"Language-Team: none\n"
@@ -301,10 +301,10 @@ msgstr "(0 - usar acção padrão)"
msgid "(Only super admins can create groups)"
msgstr "(Só super-administradores podem criar grupos)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(sem proxy)"
@@ -455,7 +455,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -524,7 +524,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -543,11 +543,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -559,24 +559,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -594,7 +594,7 @@ msgstr ""
msgid "Action"
msgstr "Acção"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Acção \"%1$s\" já existe."
@@ -604,7 +604,7 @@ msgstr "Acção \"%1$s\" já existe."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Acção adicionada"
@@ -613,17 +613,17 @@ msgstr "Acção adicionada"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Acção eliminada"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Acção desactivada"
msgstr[1] "Acções desactivadas"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Acção activada"
@@ -642,7 +642,7 @@ msgstr "Registo de acções"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Acção actualizada"
@@ -689,7 +689,7 @@ msgid "Active till"
msgstr "Activo até"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -748,14 +748,14 @@ msgstr "Activo até"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -771,10 +771,10 @@ msgstr "Activo até"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -786,9 +786,9 @@ msgstr "Activo até"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -806,7 +806,7 @@ msgstr "Activo até"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -851,7 +851,7 @@ msgstr "Adicionar elemento filho"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -876,8 +876,8 @@ msgstr "Adicionar multiplos mapas"
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -890,7 +890,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1024,7 +1024,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1040,6 +1040,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1354,7 +1358,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1434,9 +1438,9 @@ msgstr ""
msgid "Authentication"
msgstr "Autenticação"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Algoritmo de autenticação"
@@ -1497,12 +1501,12 @@ msgstr "Não é possível activar as opções de login automático e logout auto
msgid "Auto-logout"
msgstr "Logout automático"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automático"
@@ -1617,12 +1621,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind password"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1828,7 +1832,7 @@ msgstr "Não é possível adicionar o item não numérico \"%1$s\" ao gráfico \
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Não foi possível adicionar o item não numérico \"%1$s\" ao protótipo de gráfico \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Não foi possível adicionar acção"
@@ -2126,7 +2130,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Não é possível eliminar o utilizador interno do Zabbix \"%1$s\", tente desactivar esse utilizador."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Não foi possível eliminar acção"
@@ -2292,12 +2296,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Não foi possível eliminar script"
msgstr[1] "Não foi possível eliminar script"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Não foi possível eliminar scripts. Script \"%1$s\" está a ser utilizado na acção \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Não foi possível eliminar as acções seleccionadas"
@@ -2314,7 +2318,7 @@ msgstr[1] "Não foi possível eliminar serviço"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Não foi possível eliminar template"
@@ -2401,7 +2405,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Não foi possível desactivar a acção"
@@ -2479,7 +2483,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Não foi possível activar a acção"
@@ -2708,7 +2712,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "Não foi possível importar o template \"%1$s\", vinculado com o template \"%2$s\" que não existe."
msgstr[1] "Não foi possível importar o template \"%1$s\", vinculado com os templates \"%2$s\" que não existem."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Não foi possível incluir a expressão de trigger"
@@ -2887,7 +2891,7 @@ msgstr "Não foi possível desvincular ao template."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Não foi possível actualizar \"%1$s\" para a acção \"%2$s\"."
@@ -2953,7 +2957,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Não foi possível actualizar o cenário web oriundo de template \"%1$s\": %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Não foi possível actualizar a acção"
@@ -3013,7 +3017,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Não é possível actualizar os grupos para o host descoberto \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Não foi possível actualizar o host"
@@ -3116,9 +3120,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Não foi possível actualizar o script"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3145,7 +3149,7 @@ msgstr "Não foi possível actualizar o passo do cenário web baseado em templat
msgid "Cannot update template"
msgstr "Não foi possível actualizar o template"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3231,14 +3235,14 @@ msgstr "Captura todas as traps SNMP que não tiverem sido recebidas por nenhum i
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Certificado"
@@ -3256,10 +3260,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Modificar"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3299,9 +3303,9 @@ msgstr "Sequência de caracteres incluídos"
msgid "Character string not included"
msgstr "Sequência de caracteres não incluídos"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3317,7 +3321,7 @@ msgstr "Informação do chassis. Retorna um texto"
msgid "Check already exists."
msgstr "Verificação já existe."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Verifique a parte da expressão que começa com \"%1$s\"."
@@ -3439,8 +3443,8 @@ msgstr "Limpar hístorico"
msgid "Clear history and trends"
msgstr "Limpar histórico e tendências"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Limpar ao desvincular"
@@ -3467,16 +3471,16 @@ msgstr "Relógio"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3605,7 +3609,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr "Sessões concorrentes"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3877,13 +3881,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Ligações"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Ligações do host (ativas)"
@@ -3891,9 +3895,9 @@ msgstr "Ligações do host (ativas)"
msgid "Connections from proxy"
msgstr "Ligações do proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Ligações com o host (passivas)"
@@ -4061,10 +4065,10 @@ msgstr "Regra de correlação"
msgid "Correlation updated"
msgstr "Correlacionamento actualizado"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Contador"
@@ -4154,7 +4158,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4356,7 +4360,7 @@ msgid "Current value"
msgstr "Valor actual"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Personalizar"
@@ -4599,7 +4603,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4672,11 +4676,11 @@ msgstr "Período de manutenção do HW expira"
msgid "Date HW purchased"
msgstr "Data de aquisição do HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Dia"
@@ -4717,8 +4721,8 @@ msgstr "Dez"
msgid "December"
msgstr "Dezembro"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4728,7 +4732,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4859,7 +4863,7 @@ msgstr "Eliminar"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Eliminar e limpar"
@@ -4868,11 +4872,11 @@ msgstr "Eliminar e limpar"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Eliminar e limpar os templates seleccionados? (Atenção: todos os hosts associados serão limpos!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Eliminar e limpar template? (Atenção: todos os hosts associados serão limpos!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Eliminar acção actual?"
@@ -5005,7 +5009,7 @@ msgstr "Eliminar grupos seleccionados?"
msgid "Delete selected host groups?"
msgstr "Eliminar grupos de hosts seleccionados?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Eliminar os protótipos de host seleccionados?"
@@ -5114,7 +5118,7 @@ msgstr "Eliminar utilizadores seleccionados?"
msgid "Delete selected web scenarios?"
msgstr "Eliminar os cenários web selecionados?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Eliminar template?"
@@ -5175,7 +5179,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Dependências"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Dependente"
@@ -5183,7 +5187,7 @@ msgstr "Dependente"
msgid "Dependent item"
msgstr "Item dependente"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5194,7 +5198,7 @@ msgid "Deployment status"
msgstr "Estado de deployment"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5209,16 +5213,16 @@ msgstr "Estado de deployment"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5230,10 +5234,10 @@ msgstr "Descrição"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detalhes"
@@ -5242,6 +5246,14 @@ msgstr "Detalhes"
msgid "Details of web scenario"
msgstr "Detalhes do cenário web"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Dispositivo"
@@ -5364,7 +5376,7 @@ msgstr "Desactivar os cenários web selecionados?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5391,17 +5403,17 @@ msgstr "Desactivar os cenários web selecionados?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Desactivado"
@@ -5426,7 +5438,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5640,7 +5652,7 @@ msgstr "Mostrar gráfico empilhado"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5657,7 +5669,7 @@ msgstr "Apresentando %1$s até %2$s de %3$s encontrados"
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5739,7 +5751,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Transferir a configuração"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5803,7 +5815,7 @@ msgstr "O userid \"%1$s\" está duplicado nos utilizadores do mapa \"%2$s\"."
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Duração"
@@ -5833,14 +5845,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6096,7 +6108,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6134,13 +6146,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6156,11 +6168,11 @@ msgstr "Activado"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Encriptação"
@@ -6236,6 +6248,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Erro: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Evento"
@@ -6805,8 +6821,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Primeiro"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Ajuste"
@@ -6918,12 +6934,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Clone completo"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Função"
@@ -6939,7 +6955,7 @@ msgstr "Modem GSM"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Acesso ao GUI desactivado."
@@ -7288,7 +7304,7 @@ msgstr "Nome do grupo"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "O protótipo de grupo não pode ser baseado em regra de autodescoberta no host \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Protótipos de grupo"
@@ -7301,12 +7317,11 @@ msgid "Grouping by"
msgstr "Agrupar por"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Grupos"
@@ -7525,7 +7540,7 @@ msgstr "Eliminar o histórico pode demorar bastante tempo. Continuar?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7556,7 +7571,7 @@ msgid "Horizontal align"
msgstr "Alinhamento horizontal"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7565,7 +7580,7 @@ msgstr "Alinhamento horizontal"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7576,7 +7591,7 @@ msgstr "Alinhamento horizontal"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7702,7 +7717,7 @@ msgid "Host group label type"
msgstr "Tipo de etiqueta do grupo de hosts"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7721,8 +7736,8 @@ msgstr "O grupo de hosts com o ID \"%1$s\" não está disponível."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7772,7 +7787,7 @@ msgstr "Vista global do inventário de host"
msgid "Host label type"
msgstr "Tipo de etiqueta do host"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Macros de host"
@@ -7784,7 +7799,7 @@ msgstr "Metadados do host"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Nome do host"
@@ -7821,7 +7836,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Protótipo de host foi eliminado"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7844,7 +7859,7 @@ msgstr "Já existe protótipo de host com o nome visível \"%1$s\" na autodescob
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Protótipos de host"
@@ -7869,7 +7884,7 @@ msgstr "Hora do host"
msgid "Host update failed."
msgstr "Não foi possível actualizar o host."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Host actualizado"
@@ -7946,6 +7961,10 @@ msgstr "Localização dos hosts"
msgid "Hosts updated"
msgstr "Hosts actualizados"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Horas"
@@ -8015,15 +8034,15 @@ msgstr "Gama de IPs"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "O range de IP \"%1$s\" excede o limite de endereços \"%2$s\""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8255,7 +8274,7 @@ msgstr "Imagens"
msgid "Images for all maps will be updated!"
msgstr "Irão ser actualizadas as imagens de todos os mapas!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Imediatamente"
@@ -8337,7 +8356,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8349,11 +8368,11 @@ msgstr "Mapa inacessível"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8468,7 +8487,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "A verificação de descoberta é invalida para esta acção."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "A acção tem uma condição de descoberta inválida. A verificação de descoberta não existe ou o utilizador não tem acesso a ela."
@@ -8476,7 +8495,7 @@ msgstr "A acção tem uma condição de descoberta inválida. A verificação de
msgid "Incorrect action condition discovery object."
msgstr "O objeto de descoberta da acção está incorrecto."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "A acção tem uma condição de descoberta inválida. A regra de descoberta não existe ou o utilizador não tem acesso a ela."
@@ -8488,15 +8507,15 @@ msgstr "A acção tem uma condição de descoberta com um estado inválido."
msgid "Incorrect action condition event type."
msgstr "A acção possui condição incorrecta: Tipo de evento."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8505,11 +8524,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "A acção possui porta de condição incorrecta: \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "A acção tem uma condição com proxy inválido. O proxy não existe ou o utilizador não tem acesso a ele."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8517,7 +8536,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "A acção possui condição de severidade de trigger incorrecta."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "A acção tem uma condição com trigger inválido. O trigger não existe ou o utilizador não tem acesso a ele."
@@ -8527,11 +8546,11 @@ msgstr "A acção tem uma condição com tipo inválido."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "A acção tem uma condição de operação com valor de passo de escalonamento inválido."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8540,11 +8559,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "O tipo de operação \"%1$s\" é inválido na acção para o tipo de evento \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8844,8 +8863,8 @@ msgstr "Contagem incorrecta de cenários web oriundos de template."
msgid "Incorrect trigger expression"
msgstr "Expressão de trigger incorrecta"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Trigger com expressão inválida."
@@ -9243,7 +9262,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Informação sobre um serviço. Retorna inteiro - (state, startup); Caractere - (displayname, path, user); Texto - (description); Especificamente para estado: 0 - em execução, 1 - pausado, 2 - iniciação pendente, 3 - pausa pendente, 4 - retorno pendente, 5 - finalização pendente, 6 - finalizado, 7 - desconhecido, 255 - serviço desconhecido; Especificamente para inicialização: 0 - automático, 1 - Automático com atraso, 2 - Manual, 3 - Desabilitado, 4 - desconhecido"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9252,11 +9271,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Macros herdadas e do host"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9268,7 +9287,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Macros herdadas e de template"
@@ -9288,7 +9307,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Inserir"
@@ -9347,8 +9366,8 @@ msgstr "A interface com o IP \"%1$s\" não pode ter o DNS vazio enquanto a propr
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "A interface com o IP \"%1$s\" não pode ter o nome de DNS vazio."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9441,7 +9460,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "Condição inválida na acção: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9502,10 +9521,10 @@ msgstr "Parâmetros inválidos para o método."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9568,8 +9587,8 @@ msgstr "Parâmetros inválidos para o método."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9791,11 +9810,11 @@ msgstr "Período de tempo inválido."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventário"
@@ -9809,7 +9828,7 @@ msgid "Inventory field"
msgstr "Campo do inventário"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Modo de inventário"
@@ -9817,10 +9836,10 @@ msgstr "Modo de inventário"
msgid "Is online?"
msgstr "Online?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Emissor"
@@ -9912,7 +9931,7 @@ msgstr[1] "Itens activados"
msgid "Item in \"not supported\" state"
msgstr "O item está como \"não suportado\""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Item não seleccionado"
@@ -10365,17 +10384,17 @@ msgstr "Gráfico do último mês"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Último de"
@@ -10452,8 +10471,8 @@ msgstr "Remover espaços à esquerda"
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10487,8 +10506,8 @@ msgstr "Tipo da linha"
msgid "Line width"
msgstr "Largura da linha"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Ligação"
@@ -10511,16 +10530,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Indicadores de ligação"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Ligação entre templates"
@@ -10536,13 +10548,6 @@ msgstr "Ligar a templates"
msgid "Linked map"
msgstr "Mapa linkado"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10681,7 +10686,7 @@ msgstr "Registar traps SNMP sem correspondência"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Iniciar sessão"
@@ -10763,16 +10768,16 @@ msgstr "A macro \"%1$s\" já existe em \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "A macro \"%1$s\" já existe."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Macros"
@@ -10871,12 +10876,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manual"
@@ -11019,16 +11024,16 @@ msgstr "Marcar outros"
msgid "Mark selected"
msgstr "Marcar seleccionados"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Máscara"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11061,11 +11066,11 @@ msgstr "Item mestre"
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11297,7 +11302,7 @@ msgstr ""
msgid "Middle"
msgstr "Centro"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11399,7 +11404,7 @@ msgstr "Estão a faltar itens no protótipo de gráfico \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "A chave \"%1$s\" está em falta para o host \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11481,9 +11486,9 @@ msgstr "Segunda-feira"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Monitorizado por proxy"
@@ -11502,6 +11507,7 @@ msgstr "Em monitoria"
msgid "Monospace"
msgstr "Monoespaçada"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Mês"
@@ -11614,8 +11620,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11685,11 +11691,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11717,8 +11723,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11739,7 +11745,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12029,15 +12035,15 @@ msgstr "Não foram fornecidos IDs de regras de descoberta."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Sem encriptação"
@@ -12123,7 +12129,7 @@ msgstr "Nenhuma correspondência encontrada"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12160,9 +12166,9 @@ msgstr "Sem permissões para acesso ao sistema."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12201,7 +12207,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12301,11 +12307,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12364,7 +12370,7 @@ msgid "No public key file specified."
msgstr "Não foi especificado o ficheiro de chave pública."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12385,7 +12391,7 @@ msgid "No target selected."
msgstr "Não foi seleccionado nenhum destino."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12534,6 +12540,10 @@ msgstr "Relatório de notificações"
msgid "Notifications"
msgstr "Notificações"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12620,6 +12630,10 @@ msgstr "Número de processadores na máquina virtual VMware, <url> - URL de serv
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Número de alterações de estado"
@@ -12795,7 +12809,7 @@ msgid "Off"
msgstr "Inactivo"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12842,7 +12856,7 @@ msgstr "Um"
msgid "One time only"
msgstr "Apenas uma vez"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Downtime único"
@@ -12919,12 +12933,12 @@ msgstr "Informação sobre o sistema operativo. Retorna: texto"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12958,8 +12972,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operações"
@@ -12994,7 +13008,7 @@ msgstr "Operações"
msgid "Operator"
msgstr "Operador"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13034,19 +13048,19 @@ msgstr "Ou"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13076,10 +13090,10 @@ msgstr "Ou"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13342,10 +13356,10 @@ msgstr "PROBLEMA"
msgid "PROBLEM event generation mode"
msgstr "Modo de geração de eventos de INCIDENTE"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13358,19 +13372,19 @@ msgstr "Modo de geração de eventos de INCIDENTE"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "Identidade PSK"
@@ -13422,12 +13436,12 @@ msgid "Parameters"
msgstr "Parâmetros"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Regras de descoberta pai"
@@ -13482,13 +13496,13 @@ msgid "Passive"
msgstr "Passivo"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13496,7 +13510,7 @@ msgstr "Passivo"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13549,12 +13563,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Colar sem os links externos"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13567,7 +13581,7 @@ msgstr "Pico de utilização de memória: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Percentual"
@@ -13591,10 +13605,11 @@ msgstr "Linha percentagem (direita)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requisitado"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13602,7 +13617,9 @@ msgstr "Executa uma consulta DNS. Retorna: texto com o tipo de informação requ
msgid "Period"
msgstr "Período"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13666,11 +13683,11 @@ msgstr "Tocar som"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Por favor verifique os parâmetros de configuração. Se tudo estiver correto pressione o botão \"%1$s\", ou pressione o botão \"%2$s\" para modificar parâmetros de configuração."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13756,7 +13773,7 @@ msgstr "Tipo do publicação"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13765,7 +13782,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Sumário da pré-instalação"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13882,9 +13899,9 @@ msgstr "Privado"
msgid "Private key file"
msgstr "Ficheiro de chave privada"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Nível de privilégios"
@@ -14291,7 +14308,7 @@ msgstr "Expressão de recuperação"
msgid "Recovery expression syntax error."
msgstr "Erro de sintaxe na expressão de recuperação."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Operações de recuperação"
@@ -14422,20 +14439,20 @@ msgstr "Comando remoto"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14444,10 +14461,10 @@ msgstr "Comando remoto"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14491,7 +14508,7 @@ msgstr "Comando remoto"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14574,14 +14591,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14594,8 +14611,8 @@ msgstr "Substituir"
msgid "Replace dependencies"
msgstr "Substituir dependências"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14796,7 +14813,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Resultado"
@@ -15328,7 +15345,7 @@ msgstr ""
msgid "Script"
msgstr "Script"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "O scritp \"%1$s\" já existe."
@@ -15393,6 +15410,15 @@ msgstr "O padrão de pesquisa está vazio"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Célula POC secundário"
@@ -15471,7 +15497,7 @@ msgstr "Selecione o widget"
msgid "Selected"
msgstr "Seleccionado"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Acções seleccionadas eliminadas"
@@ -15712,6 +15738,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16165,7 +16192,7 @@ msgstr "Espanhol (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "O script especificado não existe ou o utilizador não tem permissões para realizar a operação comando da acção."
@@ -16200,8 +16227,8 @@ msgstr "Itens padrão"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16209,7 +16236,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Começar em"
@@ -16288,7 +16315,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16392,7 +16419,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Já existe um passo com o nome \"%1$s\"."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16446,12 +16473,12 @@ msgstr "Directo"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16472,10 +16499,10 @@ msgstr "Subfiltro"
msgid "Subject"
msgstr "Assunto"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Segurado"
@@ -16669,7 +16696,7 @@ msgstr "Valor da etiqueta"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16685,13 +16712,13 @@ msgstr "Valor da etiqueta"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16708,7 +16735,7 @@ msgstr "Valor da etiqueta"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16718,7 +16745,7 @@ msgstr "Valor da etiqueta"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16754,14 +16781,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Template"
@@ -16805,7 +16830,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Template eliminado"
@@ -16817,11 +16842,11 @@ msgstr "Grupo de templates"
msgid "Template linkage"
msgstr "Associação de templates"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Macros de template"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Nome do template"
@@ -16856,13 +16881,12 @@ msgstr "Já existe template com o nome visível \"%1$s\"."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16871,10 +16895,12 @@ msgstr "Já existe template com o nome visível \"%1$s\"."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16885,7 +16911,7 @@ msgstr "Templates"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Templates \"%1$s\" desassociados dos hosts \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17099,7 +17125,7 @@ msgstr "Tema"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17137,7 +17163,7 @@ msgstr "Este ano"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Limiar"
@@ -17170,15 +17196,15 @@ msgstr ""
msgid "Till"
msgstr "Até"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17215,13 +17241,13 @@ msgstr ""
msgid "Time period"
msgstr "Período de tempo"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17913,9 +17939,9 @@ msgstr "Unidades"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Desconhecido"
@@ -17933,7 +17959,7 @@ msgid "Unknown error"
msgstr "Erro desconhecido"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Item do host desconhecido, não existe esse item no host seleccionado"
@@ -17965,16 +17991,16 @@ msgstr "Tipo de valor desconhecido"
msgid "Unlimited"
msgstr "Ilimitado"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Desassociar"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Desassociar e eliminar"
@@ -18070,10 +18096,10 @@ msgstr "Ligado"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18082,16 +18108,16 @@ msgstr "Ligado"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18120,7 +18146,7 @@ msgstr "Actualizar existentes"
msgid "Update interval"
msgstr "Intervalo de actualização"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18147,7 +18173,7 @@ msgstr "Carregar"
msgid "Upper level maps"
msgstr "Mapas de nível superior"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18333,7 +18359,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18469,15 +18495,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Nome de utilizador"
@@ -18791,11 +18817,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18869,14 +18895,14 @@ msgstr "O mapa de valores \"%1$s\" já existe."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Mapeamento de valores"
@@ -18919,7 +18945,7 @@ msgstr "Valor: sem dados"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19019,7 +19045,7 @@ msgstr "Espaço virtual em bytes ou percentagem do total. Retorna inteiro para b
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Nome visível"
@@ -19045,7 +19071,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Warning"
@@ -19153,6 +19179,10 @@ msgstr "Qua"
msgid "Wednesday"
msgstr "Quarta-feira"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19425,7 +19455,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Ano"
@@ -19485,7 +19516,7 @@ msgstr "Está autenticado como \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Não é possível seleccionar algumas das línguas, porque os locales para estas não estão instaladas no servidor web."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Não está autenticado em"
@@ -19726,11 +19757,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr "uma unidade de tempo é esperada"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19825,7 +19856,7 @@ msgstr "é esperado um par de caracteres hexadecimais"
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19869,11 +19900,11 @@ msgstr "como Vermelho"
msgid "ascending"
msgstr "ascedente"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19887,11 +19918,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19913,39 +19944,47 @@ msgstr ""
msgid "avg"
msgstr "média"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19960,7 +19999,7 @@ msgstr "piscando"
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20002,7 +20041,7 @@ msgstr "não pode ser modificado"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20090,23 +20129,23 @@ msgstr "não foi possível executar a rotação da requisição de API, os dados
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20133,7 +20172,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20148,15 +20187,15 @@ msgstr "configurar"
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20164,11 +20203,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20181,15 +20220,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20207,7 +20246,7 @@ msgstr "dias"
msgid "default"
msgstr "por omissão"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20284,7 +20323,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20307,11 +20346,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20327,7 +20366,7 @@ msgstr "falha ao analisar o JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20341,15 +20380,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr "é esperado um primeiro parâmetro"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20357,7 +20396,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20431,7 +20470,7 @@ msgstr "contido em"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20440,11 +20479,11 @@ msgstr ""
msgid "including subgroups"
msgstr "incluindo subgrupos"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20463,7 +20502,7 @@ msgstr "contagem de elementos incorrecta"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20481,7 +20520,7 @@ msgstr "sintaxe incorrecta próximo de \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20542,7 +20581,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20564,6 +20603,16 @@ msgstr "expressão regular inválida"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20605,7 +20654,7 @@ msgstr ""
msgid "key is empty"
msgstr "a chave está vazia"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20621,7 +20670,7 @@ msgctxt "week of month"
msgid "last"
msgstr "último"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20629,11 +20678,11 @@ msgstr ""
msgid "left"
msgstr "esquerda"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20641,23 +20690,23 @@ msgstr ""
msgid "list of characters"
msgstr "lista de caracteres"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20665,7 +20714,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "regra de autodescoberta (LLD)"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20697,11 +20746,11 @@ msgstr "macro vazia"
msgid "macro(s)"
msgstr "macro(s)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20737,7 +20786,7 @@ msgstr "máx"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20751,7 +20800,7 @@ msgstr "o máximo de itens dependentes foi alcançado"
msgid "maximum number of dependency levels reached"
msgstr "o nível máximo de dependência foi alcançado"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20768,7 +20817,7 @@ msgstr ""
msgid "min"
msgstr "mín"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20783,15 +20832,15 @@ msgstr "o tamanho mínimo é %1$s caracteres"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20873,7 +20922,7 @@ msgstr "nome"
msgid "new"
msgstr "novo"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "novo"
@@ -20907,7 +20956,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20928,7 +20977,7 @@ msgstr "não contido em"
msgid "not selected"
msgstr "não seleccionada"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21015,15 +21064,15 @@ msgstr ""
msgid "pattern"
msgstr "padrão"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21031,15 +21080,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21088,11 +21137,11 @@ msgstr ""
msgid "regular expression"
msgstr "expressão regular"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21116,15 +21165,15 @@ msgstr ""
msgid "right"
msgstr "direita"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21215,23 +21264,23 @@ msgstr "mostrar mapeamento de ícones"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21239,11 +21288,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21251,11 +21300,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21283,7 +21332,7 @@ msgstr ""
msgid "tag"
msgstr "etiqueta"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21317,7 +21366,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21364,31 +21413,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21414,11 +21467,11 @@ msgstr "um protótipo de trigger não pode ser movido para outro template ou hos
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "um trigger com associações não pode ser movido para outro template ou host"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21475,7 +21528,7 @@ msgstr "fim inesperado da macro"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21518,7 +21571,7 @@ msgstr "valor inesperado \"%1$s\""
msgid "unknown"
msgstr "desconhecido"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21717,11 +21770,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/ro/LC_MESSAGES/frontend.po b/ui/locale/ro/LC_MESSAGES/frontend.po
index e2ef9f3f970..338666dfb43 100644
--- a/ui/locale/ro/LC_MESSAGES/frontend.po
+++ b/ui/locale/ro/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-09-08 17:57+0300\n"
"Last-Translator: altmir <rmircea@birotec.ro>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -319,10 +319,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr "(Numai super administratorii pot creea grupuri)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(fără proxy)"
@@ -476,7 +476,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -545,7 +545,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -564,11 +564,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -580,24 +580,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -615,7 +615,7 @@ msgstr ""
msgid "Action"
msgstr "Acțiune"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Acțiunea \"%1$s\" există deja."
@@ -625,7 +625,7 @@ msgstr "Acțiunea \"%1$s\" există deja."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Acțiune adăugată"
@@ -634,18 +634,18 @@ msgstr "Acțiune adăugată"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Acțiune ștearsă"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Acțiune dezactivată"
msgstr[1] "Acțiuni dezactivate"
msgstr[2] "Acțiuni dezactivate"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Acțiune activată"
@@ -665,7 +665,7 @@ msgstr ""
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Acțiune actualizată"
@@ -712,7 +712,7 @@ msgid "Active till"
msgstr "Activ până la"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -771,14 +771,14 @@ msgstr "Activ până la"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -794,10 +794,10 @@ msgstr "Activ până la"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -809,9 +809,9 @@ msgstr "Activ până la"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -829,7 +829,7 @@ msgstr "Activ până la"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -874,7 +874,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -899,8 +899,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -913,7 +913,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1047,7 +1047,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1063,6 +1063,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1377,7 +1381,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1457,9 +1461,9 @@ msgstr ""
msgid "Authentication"
msgstr "Autentificare"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Algoritm de autentificare"
@@ -1520,12 +1524,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automată"
@@ -1640,12 +1644,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Parolă asociată"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1851,7 +1855,7 @@ msgstr "Nu se poate adăuga elementul non-numeric \"%1$s\" la graficul \"%2$s\".
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Nu se poate adăuga elementul non-numeric \"%1$s\" la prototipul grafic \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Nu se poate adăuga acțiunea"
@@ -2154,7 +2158,7 @@ msgstr[2] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Nu se poate șterge utilizatorul intern Zabbix \"%1$s\", încercați să dezactivați acest utilizator."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Nu se poate șterge acțiunea"
@@ -2335,12 +2339,12 @@ msgstr[0] "Nu se poate șterge scriptul"
msgstr[1] "Nu se poate șterge scriptul"
msgstr[2] "Nu se poate șterge scriptul"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Nu se pot șterge scripturile. Scriptul \"%1$s\" este folosit in acțiunea \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Nu se pot șterge acțiunile selectate"
@@ -2358,7 +2362,7 @@ msgstr[2] "Nu se poate șterge serviciul"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Nu se poate șterge șablonul"
@@ -2449,7 +2453,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Nu se poate dezactiva acţiunea"
@@ -2538,7 +2542,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Nu se poate activa acțiunea"
@@ -2778,7 +2782,7 @@ msgstr[0] "Nu se poate importa template-ul \"%1$s\", șablonul corelat \"%2$s\"
msgstr[1] "Nu se poate importa template-ul \"%1$s\", șabloanele corelate \"%2$s\" nu există."
msgstr[2] "Nu se poate importa template-ul \"%1$s\", șabloanele corelate \"%2$s\" nu există."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Nu se poate introduce expresia trigger"
@@ -2959,7 +2963,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Nu se poate actualiza \"%1$s\" pentru acțiunea \"%2$s\"."
@@ -3025,7 +3029,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Nu se poate actualiza acțiunea"
@@ -3086,7 +3090,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Nu se pot actualiza grupurile pentru serverul detectat \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Nu se poate actualiza serverul"
@@ -3193,9 +3197,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Nu se poate actualiza scriptul"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3222,7 +3226,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "Nu se poate actualiza șablonul"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3311,14 +3315,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3336,10 +3340,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3379,9 +3383,9 @@ msgstr "Șir de caractere inclus"
msgid "Character string not included"
msgstr "Șir de caractere neinclus"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3397,7 +3401,7 @@ msgstr ""
msgid "Check already exists."
msgstr "Verificarea există deja."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Verifică partea din expresie care începe de la \"%1$s\"."
@@ -3519,8 +3523,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr "Șterge istoric și tendințe"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Șterge la deconectare"
@@ -3547,16 +3551,16 @@ msgstr "Ceas"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3685,7 +3689,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3957,13 +3961,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3971,9 +3975,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4143,10 +4147,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Număr"
@@ -4236,7 +4240,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4438,7 +4442,7 @@ msgid "Current value"
msgstr "Valoare curentă"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4682,7 +4686,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4755,11 +4759,11 @@ msgstr "Data de mentenanță HW expiră"
msgid "Date HW purchased"
msgstr "Data achiziției HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Zi"
@@ -4800,8 +4804,8 @@ msgstr "Dec"
msgid "December"
msgstr "Decembrie"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4811,7 +4815,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4942,7 +4946,7 @@ msgstr "Șterge"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Șterge și curăță"
@@ -4951,11 +4955,11 @@ msgstr "Șterge și curăță"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Ștergere si curățare șabloane selectate? (Avertizare: toate serverele conectate vor fi șterse!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Ștergere si curățare șablon? (Avertizare: toate serverele conectate vor fi șterse!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Ștergere acțiune curentă?"
@@ -5088,7 +5092,7 @@ msgstr "Ștergere grupuri selectate?"
msgid "Delete selected host groups?"
msgstr "Ștergere grupuri de servere selectate?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Ștergere prototipuri de servere selectați?"
@@ -5196,7 +5200,7 @@ msgstr "Ștergere utilizatori selectați?"
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Ștergere șablon?"
@@ -5257,7 +5261,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Dependențe"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Dependenţă"
@@ -5265,7 +5269,7 @@ msgstr "Dependenţă"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5276,7 +5280,7 @@ msgid "Deployment status"
msgstr "Stare de implementare"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5291,16 +5295,16 @@ msgstr "Stare de implementare"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5312,10 +5316,10 @@ msgstr "Descriere"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detalii"
@@ -5324,6 +5328,14 @@ msgstr "Detalii"
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Echipament"
@@ -5446,7 +5458,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5473,17 +5485,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Dezactivat"
@@ -5508,7 +5520,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5725,7 +5737,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5742,7 +5754,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5824,7 +5836,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5888,7 +5900,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Durată"
@@ -5918,14 +5930,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6181,7 +6193,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6219,13 +6231,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6241,11 +6253,11 @@ msgstr "Activat"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6321,6 +6333,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Eroare: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Eveniment"
@@ -6891,8 +6907,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Primul"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -7004,12 +7020,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Clonă completă"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funcție"
@@ -7025,7 +7041,7 @@ msgstr "Modem GSM"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Acces GUI dezactivat."
@@ -7377,7 +7393,7 @@ msgstr "Nume grup"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Grupul prototip nu se poate baza pe un grup server detectat \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Prototipuri grup"
@@ -7390,12 +7406,11 @@ msgid "Grouping by"
msgstr "Grupare după"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Grupuri"
@@ -7614,7 +7629,7 @@ msgstr "Golirea istoricului poate lua o perioadă lungă de timp. Continuare?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7645,7 +7660,7 @@ msgid "Horizontal align"
msgstr "Aliniere orizontală"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7654,7 +7669,7 @@ msgstr "Aliniere orizontală"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7665,7 +7680,7 @@ msgstr "Aliniere orizontală"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7795,7 +7810,7 @@ msgid "Host group label type"
msgstr "Tipul etichetei grupului de servere"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7814,8 +7829,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7865,7 +7880,7 @@ msgstr "Prezentare generală inventar server"
msgid "Host label type"
msgstr "Tip eticheta server"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7877,7 +7892,7 @@ msgstr "Metadate server"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Nume server"
@@ -7914,7 +7929,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Prototip grafic șters"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7939,7 +7954,7 @@ msgstr "Server prototip cu nume vizibil \"%1$s\" există deja în regula de dete
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Prototipuri de servere"
@@ -7964,7 +7979,7 @@ msgstr "Timp server"
msgid "Host update failed."
msgstr "Actualizare server nereușită."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Server actualizat"
@@ -8041,6 +8056,10 @@ msgstr "Locație servere"
msgid "Hosts updated"
msgstr "Servere actualizate"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Ore"
@@ -8110,15 +8129,15 @@ msgstr "Interval IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8352,7 +8371,7 @@ msgstr "Imagini"
msgid "Images for all maps will be updated!"
msgstr "Imaginile pentru toate hărțile vor fi actualizate!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Imediat"
@@ -8434,7 +8453,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8446,11 +8465,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8565,7 +8584,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Condiție de acțiune incorectă la verificare detecție."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Condiție de acțiune incorectă la verificare detecție. Verificarea detecției nu există sau nu ai acces la ea."
@@ -8573,7 +8592,7 @@ msgstr "Condiție de acțiune incorectă la verificare detecție. Verificarea de
msgid "Incorrect action condition discovery object."
msgstr "Condiție de acțiune incorectă la detecție obiect."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Condiție de acțiune incorectă la regula de detecție. Regula de detecție nu există sau nu ai acces la ea."
@@ -8585,15 +8604,15 @@ msgstr "Condiție de acțiune incorectă la starea de detecție."
msgid "Incorrect action condition event type."
msgstr "Condiție de acțiune incorectă la tipul eveniment."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8602,11 +8621,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Condiție de acțiune incorectă port \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Condiție de acțiune incorectă proxy. Proxy nu există sau nu ai acces la el."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8614,7 +8633,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Condiție de acțiune incorectă la gravitate trigger."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Condiție de acțiune incorectă trigger. Trigger nu există sau nu ai acces la el."
@@ -8624,11 +8643,11 @@ msgstr "Condiție de acțiune incorectă gen."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Operațiune de acțiune incorectă tip valoare crescută cu un pas."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8637,11 +8656,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8941,8 +8960,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr "Expresie trigger incorectă"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Expresii trigger incorecte."
@@ -9340,7 +9359,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9349,11 +9368,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9365,7 +9384,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9385,7 +9404,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Inserează"
@@ -9444,8 +9463,8 @@ msgstr "Interfața cu IP \"%1$s\" nu poate avea nume DNS gol în timp ce are \"F
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Interfața cu IP \"%1$s\" nu poate avea nume DNS gol."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9537,7 +9556,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9598,10 +9617,10 @@ msgstr "Parametrii metodei invalizi. "
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9664,8 +9683,8 @@ msgstr "Parametrii metodei invalizi. "
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9887,11 +9906,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventar"
@@ -9905,7 +9924,7 @@ msgid "Inventory field"
msgstr "Câmp inventar"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Mod inventar"
@@ -9913,10 +9932,10 @@ msgstr "Mod inventar"
msgid "Is online?"
msgstr "Este online?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -10011,7 +10030,7 @@ msgstr[2] "Itemi activați"
msgid "Item in \"not supported\" state"
msgstr "Item în stare \"nesuportată\""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Item neselectat"
@@ -10472,17 +10491,17 @@ msgstr "Graficul ultimei luni"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Ultima din"
@@ -10559,8 +10578,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10594,8 +10613,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Legătură"
@@ -10618,16 +10637,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Indicatori de legătură"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Leagă șabloane"
@@ -10643,13 +10655,6 @@ msgstr "Legătură către șabloane"
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10788,7 +10793,7 @@ msgstr "Înregistrarea nu se potrivește cu capcanele SNMP"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Autentificare"
@@ -10870,16 +10875,16 @@ msgstr "Macro-ul \"%1$s\" există deja pe \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Macro-ul \"%1$s\" există deja."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Macro-uri"
@@ -10978,12 +10983,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manual"
@@ -11126,16 +11131,16 @@ msgstr "Marchează pe alții"
msgid "Mark selected"
msgstr "Marchează selecția"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Mască"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11168,11 +11173,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11409,7 +11414,7 @@ msgstr ""
msgid "Middle"
msgstr "Mijloc"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11512,7 +11517,7 @@ msgstr "Itemi lipsă pentru prototipul grafic \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Cheie lipsă \"%1$s\" pentru server \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11598,9 +11603,9 @@ msgstr "Luni"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Monitorizat de proxy"
@@ -11619,6 +11624,7 @@ msgstr "Monitorizare"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Lună"
@@ -11731,8 +11737,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11802,11 +11808,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11834,8 +11840,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11856,7 +11862,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12146,15 +12152,15 @@ msgstr "Nicio regulă de detecție IDs dată."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12240,7 +12246,7 @@ msgstr "Nicio potrivire găsită"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12277,9 +12283,9 @@ msgstr "Nicio permisiune de acces la sistem."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12318,7 +12324,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12418,11 +12424,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12481,7 +12487,7 @@ msgid "No public key file specified."
msgstr "Nu a fost specificat nici un fișier cu cheie publică."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12502,7 +12508,7 @@ msgid "No target selected."
msgstr "Nu a fost selectată nicio țintă."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12651,6 +12657,10 @@ msgstr "Raport de notificare"
msgid "Notifications"
msgstr "Notificări"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12737,6 +12747,10 @@ msgstr "Numărul de procesoare pe mașina virtuală VMware, <url> - VMware servi
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Numărul schimbărilor de status"
@@ -12912,7 +12926,7 @@ msgid "Off"
msgstr "Oprit"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12959,7 +12973,7 @@ msgstr ""
msgid "One time only"
msgstr "O singură dată"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Întrerupere unică"
@@ -13037,12 +13051,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -13076,8 +13090,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operațiuni"
@@ -13112,7 +13126,7 @@ msgstr "Operațiuni"
msgid "Operator"
msgstr "Operator"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13152,19 +13166,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13194,10 +13208,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13460,10 +13474,10 @@ msgstr "PROBLEMÄ‚"
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13476,19 +13490,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13540,12 +13554,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Reguli de detecție părinte"
@@ -13600,13 +13614,13 @@ msgid "Passive"
msgstr "Pasiv"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13614,7 +13628,7 @@ msgstr "Pasiv"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13667,12 +13681,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13685,7 +13699,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13709,10 +13723,11 @@ msgstr "Linie crescătoare (dreapta)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13720,7 +13735,9 @@ msgstr ""
msgid "Period"
msgstr "Perioadă"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13784,11 +13801,11 @@ msgstr "Redare sunet"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13874,7 +13891,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13883,7 +13900,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -14000,9 +14017,9 @@ msgstr ""
msgid "Private key file"
msgstr "Fișier cheie privată"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Nivel privilegiat"
@@ -14411,7 +14428,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14543,20 +14560,20 @@ msgstr "Comandă de la distanță"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14565,10 +14582,10 @@ msgstr "Comandă de la distanță"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14612,7 +14629,7 @@ msgstr "Comandă de la distanță"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14695,14 +14712,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14715,8 +14732,8 @@ msgstr "ÃŽnlocuire"
msgid "Replace dependencies"
msgstr "Înlocuiește dependențele"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14917,7 +14934,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Rezultat"
@@ -15452,7 +15469,7 @@ msgstr ""
msgid "Script"
msgstr "Script"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Scriptul \"%1$s\" există deja."
@@ -15519,6 +15536,15 @@ msgstr "Modelul de căutare este gol"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Celulă POC secundară"
@@ -15597,7 +15623,7 @@ msgstr ""
msgid "Selected"
msgstr "Selectat"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Acțiunile selectate șterse"
@@ -15839,6 +15865,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16292,7 +16319,7 @@ msgstr "Spaniolă (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Scriptul specificat nu există sau nu ai drepturi pentru comanda acțiunii de operare."
@@ -16327,8 +16354,8 @@ msgstr "Itemi standard"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16336,7 +16363,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "ÃŽncepe la"
@@ -16415,7 +16442,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16519,7 +16546,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Pas cu nume \"%1$s\" există deja."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16573,12 +16600,12 @@ msgstr "Normală"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16599,10 +16626,10 @@ msgstr ""
msgid "Subject"
msgstr "Subiect"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16796,7 +16823,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16812,13 +16839,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16835,7 +16862,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16845,7 +16872,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16881,14 +16908,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Șablon"
@@ -16932,7 +16957,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Șablon șters"
@@ -16944,11 +16969,11 @@ msgstr "Grup șablon"
msgid "Template linkage"
msgstr "Legătură șablon"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Nume șablon"
@@ -16983,13 +17008,12 @@ msgstr "Șablon cu același nume vizibil \"%1$s\" există deja."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16998,10 +17022,12 @@ msgstr "Șablon cu același nume vizibil \"%1$s\" există deja."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -17012,7 +17038,7 @@ msgstr "Șabloane"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Șabloane \"%1$s\" nelegate de servere \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17228,7 +17254,7 @@ msgstr "Temă"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17266,7 +17292,7 @@ msgstr "Anul acesta"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17299,15 +17325,15 @@ msgstr ""
msgid "Till"
msgstr "Până când"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17344,13 +17370,13 @@ msgstr ""
msgid "Time period"
msgstr "Perioadă de timp"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -18047,9 +18073,9 @@ msgstr "Unități"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Necunoscut"
@@ -18067,7 +18093,7 @@ msgid "Unknown error"
msgstr "Eroare necunoscută"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Item server necunoscut, nu există asemenea item în serverul selectat"
@@ -18099,16 +18125,16 @@ msgstr "Tip valoare necunoscută"
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Dezleagă"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Dezleagă și curăță"
@@ -18205,10 +18231,10 @@ msgstr "Sus"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18217,16 +18243,16 @@ msgstr "Sus"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18255,7 +18281,7 @@ msgstr "Actualizează existent"
msgid "Update interval"
msgstr "Actualizare inventar"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18282,7 +18308,7 @@ msgstr "Încarcă"
msgid "Upper level maps"
msgstr "Hărți de nivel superior"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18471,7 +18497,7 @@ msgstr[2] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18609,15 +18635,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Nume utilizator"
@@ -18931,11 +18957,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -19009,14 +19035,14 @@ msgstr "Valoare hartă \"%1$s\" există deja."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Valoare mapare"
@@ -19059,7 +19085,7 @@ msgstr "Valoare: fără date"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19159,7 +19185,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Nume vizibil"
@@ -19185,7 +19211,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Avertisment"
@@ -19295,6 +19321,10 @@ msgstr "Mie"
msgid "Wednesday"
msgstr "Miercuri"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19567,7 +19597,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "An"
@@ -19627,7 +19658,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Nu poți să alegi unele dintre limbi, pentru că localelel lor nu sunt instalate pe serverul web."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19868,11 +19899,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19967,7 +19998,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -20011,11 +20042,11 @@ msgstr "ca Roșu"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -20029,11 +20060,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -20055,39 +20086,47 @@ msgstr ""
msgid "avg"
msgstr "avg"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -20102,7 +20141,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20144,7 +20183,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20232,23 +20271,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20275,7 +20314,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20290,15 +20329,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20306,11 +20345,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20323,15 +20362,15 @@ msgstr "z"
msgid "d.M"
msgstr "z.L"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20349,7 +20388,7 @@ msgstr "zile"
msgid "default"
msgstr "implicit"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20426,7 +20465,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20449,11 +20488,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20469,7 +20508,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20483,15 +20522,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20499,7 +20538,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20573,7 +20612,7 @@ msgstr "în"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20582,11 +20621,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20605,7 +20644,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20623,7 +20662,7 @@ msgstr "sintaxă incorectă lângă \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20683,7 +20722,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20705,6 +20744,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20746,7 +20795,7 @@ msgstr ""
msgid "key is empty"
msgstr "cheia este goală"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20762,7 +20811,7 @@ msgctxt "week of month"
msgid "last"
msgstr "ultima"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20770,11 +20819,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20782,23 +20831,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20806,7 +20855,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "regulă de detecție de nivel inferior"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20838,11 +20887,11 @@ msgstr ""
msgid "macro(s)"
msgstr "macro(uri)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20878,7 +20927,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20892,7 +20941,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20909,7 +20958,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20924,15 +20973,15 @@ msgstr ""
msgid "mm"
msgstr "ll"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -21014,7 +21063,7 @@ msgstr ""
msgid "new"
msgstr "nou"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "nou"
@@ -21048,7 +21097,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -21069,7 +21118,7 @@ msgstr "nu este în"
msgid "not selected"
msgstr "neselectat"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21156,15 +21205,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21172,15 +21221,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21229,11 +21278,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21257,15 +21306,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21356,23 +21405,23 @@ msgstr "arată mapări iconițe"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21380,11 +21429,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21392,11 +21441,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21424,7 +21473,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21458,7 +21507,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21505,31 +21554,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21555,11 +21608,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21616,7 +21669,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21659,7 +21712,7 @@ msgstr ""
msgid "unknown"
msgstr "necunoscut"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21860,11 +21913,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/ru/LC_MESSAGES/frontend.po b/ui/locale/ru/LC_MESSAGES/frontend.po
index 8c5c4520df3..01610159ac4 100644
--- a/ui/locale/ru/LC_MESSAGES/frontend.po
+++ b/ui/locale/ru/LC_MESSAGES/frontend.po
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
-"PO-Revision-Date: 2021-11-05 14:43+0300\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
+"PO-Revision-Date: 2021-11-13 21:53+0300\n"
"Last-Translator: Alexey <dotneft@gmail.com>\n"
"Language-Team: Zabbix translation team\n"
"Language: ru\n"
@@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Pootle 2.5.1.3\n"
"X-Poedit-Basepath: ../../\n"
-"X-POOTLE-MTIME: 1636116199.000000\n"
+"X-POOTLE-MTIME: 1636833203.000000\n"
#: include/classes/db/MysqlDbBackend.php:70
#: include/classes/db/OracleDbBackend.php:142
@@ -319,10 +319,10 @@ msgstr "(0 - иÑпользовать умолчание дейÑтвиÑ)"
msgid "(Only super admins can create groups)"
msgstr "(Только Ñупер админиÑтраторы могут Ñоздавать группы)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(без прокÑи)"
@@ -476,7 +476,7 @@ msgstr "API токен обновлен"
msgid "API tokens"
msgstr "API токены"
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr "ОÑÑŒ абÑциÑÑ"
@@ -545,7 +545,7 @@ msgstr "Подтвержденные РЕШЕÐÐЫЕ ÑобытиÑ"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -564,11 +564,11 @@ msgstr "Подтвержденные РЕШЕÐÐЫЕ ÑобытиÑ"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -580,24 +580,24 @@ msgstr "Подтвержденные РЕШЕÐÐЫЕ ÑобытиÑ"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -615,7 +615,7 @@ msgstr "Подтвержденные РЕШЕÐÐЫЕ ÑобытиÑ"
msgid "Action"
msgstr "ДейÑтвие"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "ДейÑтвие \"%1$s\" уже ÑущеÑтвует."
@@ -625,7 +625,7 @@ msgstr "ДейÑтвие \"%1$s\" уже ÑущеÑтвует."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr "ДейÑтвие \"%2$s\" недоÑтупно Ð´Ð»Ñ \"%1$s\" роли пользователей."
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "ДейÑтвие добавлено"
@@ -634,18 +634,18 @@ msgstr "ДейÑтвие добавлено"
msgid "Action class %1$s must extend %2$s class."
msgstr "КлаÑÑ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ %1$s должен раÑширÑÑ‚ÑŒ %2$s клаÑÑ."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "ДейÑтвие удалено"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "ДейÑтвие деактивировано"
msgstr[1] "ДейÑтвий деактивировано"
msgstr[2] "ДейÑÑ‚Ð²Ð¸Ñ Ð´ÐµÐ°ÐºÑ‚Ð¸Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ñ‹"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "ДейÑтвие активировано"
@@ -665,7 +665,7 @@ msgstr "Журнал дейÑтвий"
msgid "Action operation"
msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð´ÐµÐ¹ÑтвиÑ"
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "ДейÑтвие обновлено"
@@ -712,7 +712,7 @@ msgid "Active till"
msgstr "Ðктивно до"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -771,14 +771,14 @@ msgstr "Ðктивно до"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -794,10 +794,10 @@ msgstr "Ðктивно до"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -809,9 +809,9 @@ msgstr "Ðктивно до"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -829,7 +829,7 @@ msgstr "Ðктивно до"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -874,7 +874,7 @@ msgstr "Добавить Ñлемент потомка"
msgid "Add child service"
msgstr "Добавить дочернюю уÑлугу"
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr "Добавление дочерних уÑлуг"
@@ -899,8 +899,8 @@ msgstr "Добавить неÑколько карт"
msgid "Add new data set"
msgstr "Добавить новый набор данных"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr "Добавить новый интерфейÑ"
@@ -913,7 +913,7 @@ msgstr "Добавить новое замещение"
msgid "Add page"
msgstr "Добавить Ñтраницу"
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr "Добавление родительÑких уÑлуг"
@@ -1041,13 +1041,13 @@ msgstr "ИнтерфейÑÑ‹ агента"
#: include/classes/data/CItemData.php:844
msgid "Agent variant check. Returns 1 - for Zabbix agent; 2 - for Zabbix agent 2"
-msgstr ""
+msgstr "Проверка разновидноÑти агента. ВозвращаетÑÑ 1 - Ð´Ð»Ñ Zabbix агента; 2 - Ð´Ð»Ñ Zabbix агента 2"
#: include/classes/widgets/CWidgetHelper.php:1163
msgid "Aggregate"
msgstr "ÐгрегациÑ"
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr "Функции агрегации"
@@ -1063,6 +1063,10 @@ msgstr "Интервал агрегации"
msgid "Alert message"
msgstr "Сообщение оповещениÑ"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "ПÑевдоним"
@@ -1381,7 +1385,7 @@ msgstr "Должна поддерживатьÑÑ Ð¿Ð¾ крайней мере Ð
msgid "At least one operation must be selected."
msgstr "Должна быть выбрана по крайней мере одна операциÑ."
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "Должна ÑущеÑтвовать по крайней мере одна операциÑ."
@@ -1461,9 +1465,9 @@ msgstr "ЗапроÑÑ‹ AuthN"
msgid "Authentication"
msgstr "ÐутентификациÑ"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Ðлгоритм аутентификации"
@@ -1524,12 +1528,12 @@ msgstr "Опции авто-вход и авто-выход Ð½ÐµÐ»ÑŒÐ·Ñ Ð°ÐºÑ‚Ð
msgid "Auto-logout"
msgstr "Ðвто-выход"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "ÐвтоматичеÑки"
@@ -1644,12 +1648,12 @@ msgstr "Ð˜Ð¼Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ (Bind DN)"
msgid "Bind password"
msgstr "Пароль Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ (Bind password)"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr "Битов Ð´Ð»Ñ Ñдвига"
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr "Битовые функции"
@@ -1855,7 +1859,7 @@ msgstr "Ðе удалоÑÑŒ добавить не чиÑловой ÑлеменÑ
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Ðе удалоÑÑŒ добавить не чиÑловой Ñлемент данных \"%1$s\" к прототипу графика \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Ðе удалоÑÑŒ добавить дейÑтвие"
@@ -2158,7 +2162,7 @@ msgstr[2] "Ðе удалоÑÑŒ удалить API токены"
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Ðевозможно удалить внутреннего Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Zabbix \"%1$s\", попробуйте отключить его."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Ðе удалоÑÑŒ удалить дейÑтвие"
@@ -2334,12 +2338,12 @@ msgstr[0] "Ðе удалоÑÑŒ удалить Ñкрипт"
msgstr[1] "Ðе удалоÑÑŒ удалить Ñкрипты"
msgstr[2] "Ðе удалоÑÑŒ удалить Ñкрипты"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Ðе удалоÑÑŒ удалить Ñкрипты. Скрипт \"%1$s\" иÑпользуетÑÑ Ð² операции дейÑÑ‚Ð²Ð¸Ñ \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Ðе удалоÑÑŒ удалить выбранные дейÑтвиÑ"
@@ -2356,7 +2360,7 @@ msgstr[2] "Ðе удалоÑÑŒ удалить уÑлуг"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr "Ðе удалоÑÑŒ удалить уÑлугу \"%1$s\": %2$s."
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Ðе удалоÑÑŒ удалить шаблон"
@@ -2447,7 +2451,7 @@ msgstr[0] "Ðе удалоÑÑŒ деактивировать API токен"
msgstr[1] "Ðе удалоÑÑŒ деактивировать API токены"
msgstr[2] "Ðе удалоÑÑŒ деактивировать API токены"
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Ðе удалоÑÑŒ деактивировать дейÑтвие"
@@ -2536,7 +2540,7 @@ msgstr[0] "Ðе удалоÑÑŒ активировать API токен"
msgstr[1] "Ðе удалоÑÑŒ активировать API токены"
msgstr[2] "Ðе удалоÑÑŒ активировать API токены"
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Ðе удалоÑÑŒ активировать дейÑтвие"
@@ -2776,7 +2780,7 @@ msgstr[0] "Ðе удалоÑÑŒ импортировать шаблон \"%1$s\",
msgstr[1] "Ðе удалоÑÑŒ импортировать шаблон \"%1$s\", Ñоединенные шаблоны \"%2$s\" не ÑущеÑтвуют."
msgstr[2] "Ðе удалоÑÑŒ импортировать шаблон \"%1$s\", Ñоединенные шаблоны \"%2$s\" не ÑущеÑтвуют."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Ðе удалоÑÑŒ вÑтавить выражение триггера"
@@ -2957,7 +2961,7 @@ msgstr "Ðе удалоÑÑŒ отÑоединить шаблон."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr "Ðе удалоÑÑŒ отÑоединить триггер \"%1$s\", у него имеютÑÑ Ñлементы данных Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð°, который оÑтаетÑÑ Ð¿Ñ€Ð¸Ñоединённым к узлу Ñети."
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Ðе удалоÑÑŒ обновить \"%1$s\" Ð´Ð»Ñ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ \"%2$s\"."
@@ -3023,7 +3027,7 @@ msgstr "Ðе удалоÑÑŒ обновить обнаруженную групп
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Ðе удалоÑÑŒ обновить унаÑледованный из шаблона веб-Ñценарий \"%1$s\": %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Ðе удалоÑÑŒ обновить дейÑтвие"
@@ -3084,7 +3088,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Ðе удалоÑÑŒ обновить группы Ð´Ð»Ñ Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð½Ð¾Ð³Ð¾ узла Ñети \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Ðе удалоÑÑŒ обновить узел Ñети"
@@ -3189,9 +3193,9 @@ msgstr "Ðе удалоÑÑŒ обновить регулÑрный отчет"
msgid "Cannot update script"
msgstr "Ðе удалоÑÑŒ обновить Ñкрипт"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr "Ðе удалоÑÑŒ обновить облаÑÑ‚ÑŒ иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ñкрипта. Скрипт \"%1$s\" иÑпользуетÑÑ Ð² дейÑтвии \"%2$s\"."
@@ -3218,7 +3222,7 @@ msgstr "Ðе удалоÑÑŒ обновить шаг унаÑледованног
msgid "Cannot update template"
msgstr "Ðе удалоÑÑŒ обновить шаблон"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr "Ðе удалоÑÑŒ обновить шаблоны"
@@ -3306,14 +3310,14 @@ msgstr "Отлов вÑех SNMP трапов, которые не были по
msgid "Center"
msgstr "По центру"
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Сертификат"
@@ -3331,10 +3335,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Изменить"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr "Изменить PSK"
@@ -3374,9 +3378,9 @@ msgstr "Строка Ñимволов включена"
msgid "Character string not included"
msgstr "Строка Ñимволов не включена"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr "Символы"
@@ -3392,7 +3396,7 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ шаÑÑи. Возвращает Ñтроку"
msgid "Check already exists."
msgstr "Проверка уже ÑущеÑтвует."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Проверьте чаÑÑ‚ÑŒ Ð²Ñ‹Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ \"%1$s\"."
@@ -3514,8 +3518,8 @@ msgstr "ОчиÑтить иÑторию"
msgid "Clear history and trends"
msgstr "ОчиÑтить иÑторию и динамику изменений"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "ОчиÑтить при отÑоединении"
@@ -3542,16 +3546,16 @@ msgstr "ЧаÑÑ‹"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3680,7 +3684,7 @@ msgstr "Сжатие"
msgid "Concurrent sessions"
msgstr "Одновременные ÑеÑÑии"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3963,13 +3967,13 @@ msgstr "Ðеудачное подключение к Zabbix Ñерверу. Пр
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr "Подключение не будет зашифровано так как иÑпользуетÑÑ Ñокет файл (на Unix) или разделÑÐµÐ¼Ð°Ñ Ð¿Ð°Ð¼ÑÑ‚ÑŒ (Windows)."
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "СоединениÑ"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑƒÐ·Ð»Ð° Ñети"
@@ -3977,9 +3981,9 @@ msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑƒÐ·Ð»Ð° Ñети"
msgid "Connections from proxy"
msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ Ð¿Ñ€Ð¾ÐºÑи"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "ÐŸÐ¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº узлу Ñети"
@@ -4149,10 +4153,10 @@ msgstr "Правило коррелÑции"
msgid "Correlation updated"
msgstr "КоррелÑÑ†Ð¸Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð°"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "КоличеÑтво"
@@ -4242,7 +4246,7 @@ msgid "Create discovery rule (select template first)"
msgstr "Создать правило Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ (выберите Ñначала шаблон)"
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4444,7 +4448,7 @@ msgid "Current value"
msgstr "Текущее значение"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "ПользовательÑкое"
@@ -4688,7 +4692,7 @@ msgid "Database TLS key file"
msgstr "Файл TLS ключа базы данных"
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4761,11 +4765,11 @@ msgstr "Дата Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ Ð¾Ð±ÑÐ»ÑƒÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ HW"
msgid "Date HW purchased"
msgstr "Дата покупки HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr "Функции даты и времени"
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "День"
@@ -4806,8 +4810,8 @@ msgstr "Дек."
msgid "December"
msgstr "Декабрь"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr "ЧиÑло деÑÑтичных знаков"
@@ -4817,7 +4821,7 @@ msgstr "Уменьшение на"
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4948,7 +4952,7 @@ msgstr "Удалить"
msgid "Delete all elements that are not present in the import file?"
msgstr "Удалить вÑе Ñлементы, которые не приÑутÑтвуют в файле импорта?"
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Удалить и очиÑтить"
@@ -4957,11 +4961,11 @@ msgstr "Удалить и очиÑтить"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Удалить и очиÑтить выбранные шаблоны? (Внимание: вÑе приÑоединенные к ним узлы Ñети будут очищены!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Удалить и очиÑтить шаблон? (Внимание: вÑе приÑоединенные к нему узлы Ñети будут очищены!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Удалить текущее дейÑтвие?"
@@ -5094,7 +5098,7 @@ msgstr "Удалить выбранные группы?"
msgid "Delete selected host groups?"
msgstr "Удалить выбранные группы узлов Ñети?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Удалить выбранный прототип узлов Ñети?"
@@ -5202,7 +5206,7 @@ msgstr "Удалить выбранных пользователей?"
msgid "Delete selected web scenarios?"
msgstr "Удалить выбранные веб-Ñценарии?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Удалить шаблон?"
@@ -5263,7 +5267,7 @@ msgstr "СпиÑок запретов"
msgid "Dependencies"
msgstr "ЗавиÑимоÑти"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "ЗавиÑимоÑÑ‚ÑŒ"
@@ -5271,7 +5275,7 @@ msgstr "ЗавиÑимоÑÑ‚ÑŒ"
msgid "Dependent item"
msgstr "ЗавиÑимый Ñлемент данных"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5282,7 +5286,7 @@ msgid "Deployment status"
msgstr "СоÑтоÑние развертываниÑ"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5297,16 +5301,16 @@ msgstr "СоÑтоÑние развертываниÑ"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5318,10 +5322,10 @@ msgstr "ОпиÑание"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Детали"
@@ -5330,6 +5334,14 @@ msgstr "Детали"
msgid "Details of web scenario"
msgstr "ПодробноÑти о веб-Ñценарии"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "УÑтройÑтво"
@@ -5452,7 +5464,7 @@ msgstr "Деактивировать выбранные веб-Ñценарии?
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5479,17 +5491,17 @@ msgstr "Деактивировать выбранные веб-Ñценарии?
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Деактивировано"
@@ -5514,7 +5526,7 @@ msgstr "ОтброÑить значение"
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5730,7 +5742,7 @@ msgstr "Показать ÑÑ‚Ñкируемый график"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5747,7 +5759,7 @@ msgstr "Отображено Ñ %1$s до %2$s из %3$s найденных"
msgid "Displaying options"
msgstr "Опции отображениÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr "Знаменатель делениÑ"
@@ -5829,7 +5841,7 @@ msgstr "Загрузить изображение"
msgid "Download the configuration file"
msgstr "Загрузить конфигурационный файл"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5893,7 +5905,7 @@ msgstr "Дубликат userid \"%1$s\" в пользователÑÑ… у кар
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "ДлительноÑÑ‚ÑŒ"
@@ -5923,14 +5935,14 @@ msgstr "Каждый Ñлемент данных"
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6186,7 +6198,7 @@ msgstr "Ðктивировать трапы"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6224,13 +6236,13 @@ msgstr "Ðктивировать трапы"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6246,11 +6258,11 @@ msgstr "Ðктивировано"
msgid "Encrypt"
msgstr "Шифрование"
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Шифрование"
@@ -6326,6 +6338,10 @@ msgstr "Ошибка! Zabbix Ñервер не может Ñтартовать Ð
msgid "Error: %1$s"
msgstr "Ошибка: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Событие"
@@ -6895,8 +6911,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "ПерваÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "ÐппрокÑимациÑ"
@@ -7008,12 +7024,12 @@ msgid "Full"
msgstr "Полное"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Полное клонирование"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "ФункциÑ"
@@ -7029,7 +7045,7 @@ msgstr "GSM модем"
msgid "GUI"
msgstr "Веб-интерфейÑ"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "ДоÑтуп к веб-интерфейÑу деактивирован."
@@ -7380,7 +7396,7 @@ msgstr "Ð˜Ð¼Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Прототип группы не может оÑновыватьÑÑ Ð½Ð° обнаруженной группе узлов Ñети \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Прототипы групп"
@@ -7393,12 +7409,11 @@ msgid "Grouping by"
msgstr "Сгруппировать по"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Группы"
@@ -7617,7 +7632,7 @@ msgstr "ОчиÑтка иÑтории может занÑÑ‚ÑŒ продолжит
msgid "History data selection"
msgstr "Выбор данных иÑтории"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr "Функции иÑтории"
@@ -7648,7 +7663,7 @@ msgid "Horizontal align"
msgstr "Выравнивание по горизонтали"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7657,7 +7672,7 @@ msgstr "Выравнивание по горизонтали"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7668,7 +7683,7 @@ msgstr "Выравнивание по горизонтали"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7797,7 +7812,7 @@ msgid "Host group label type"
msgstr "Тип подпиÑи к группе узлов Ñети"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7816,8 +7831,8 @@ msgstr "Группа узлов Ñети Ñ ID \"%1$s\" недоÑтупна."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7867,7 +7882,7 @@ msgstr "Обзор инвентарных данных узла Ñети"
msgid "Host label type"
msgstr "Тип подпиÑи к узлу Ñети"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "МакроÑÑ‹ узла Ñети"
@@ -7879,7 +7894,7 @@ msgstr "Метаданные узлов Ñети"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Ð˜Ð¼Ñ ÑƒÐ·Ð»Ð° Ñети"
@@ -7916,7 +7931,7 @@ msgstr "Прототип узлов Ñети не может иметь боле
msgid "Host prototype deleted"
msgstr "Прототип узлов Ñети удален"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr "МакроÑÑ‹ прототипов узлов Ñети"
@@ -7940,7 +7955,7 @@ msgstr "Прототип узла Ñети Ñ Ð²Ð¸Ð´Ð¸Ð¼Ñ‹Ð¼ именем \"%1$s
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Прототипы узлов Ñети"
@@ -7965,7 +7980,7 @@ msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð½Ð° узле Ñети"
msgid "Host update failed."
msgstr "Ошибка при обновлении узла Ñети."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Узел Ñети обновлен"
@@ -8042,6 +8057,10 @@ msgstr "РаÑположение узлов Ñети"
msgid "Hosts updated"
msgstr "Узлы Ñети обновлены"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "ЧаÑÑ‹"
@@ -8111,15 +8130,15 @@ msgstr "Диапазон IP адреÑов"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "Диапазон IP \"%1$s\" превышает допуÑтимый лимит адреÑов в \"%2$s\""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8353,7 +8372,7 @@ msgstr "ИзображениÑ"
msgid "Images for all maps will be updated!"
msgstr "Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð²Ñех карт Ñетей будут обновлены!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Ðезамедлительно"
@@ -8435,7 +8454,7 @@ msgstr "ÐедоÑтупный прототип Ñлементов данных"
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "ÐедоÑтупное обÑлуживание"
@@ -8447,11 +8466,11 @@ msgstr "ÐедоÑÑ‚ÑƒÐ¿Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð° Ñети"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "ÐедоÑтупный шаблон"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "ÐедоÑтупный триггер"
@@ -8566,7 +8585,7 @@ msgstr "Ðекорректный токен Vault."
msgid "Incorrect action condition discovery check."
msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð² уÑловии дейÑтвиÑ."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð² уÑловии дейÑтвиÑ. Проверка Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑущеÑтвует или у Ð²Ð°Ñ Ð½ÐµÑ‚ прав доÑтупа к ней."
@@ -8574,7 +8593,7 @@ msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ° Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð² уÑ
msgid "Incorrect action condition discovery object."
msgstr "Ðекорректный объект Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð² уÑловии дейÑтвиÑ."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Ðекорректное правило Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð² уÑловии дейÑтвиÑ. Правило Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑущеÑтвует или у Ð²Ð°Ñ Ð½ÐµÑ‚ прав доÑтупа к нему."
@@ -8586,15 +8605,15 @@ msgstr "Ðекорректное ÑоÑтоÑние Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð² у
msgid "Incorrect action condition event type."
msgstr "Ðекорректный тип ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð² уÑловии дейÑтвиÑ."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8603,11 +8622,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Ðекорректный порт \"%1$s\" в уÑловии дейÑтвиÑ."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Ðекорректный прокÑи в уÑловии дейÑтвиÑ. ПрокÑи не ÑущеÑтвует или у Ð²Ð°Ñ Ð½ÐµÑ‚ прав доÑтупа к нему."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8615,7 +8634,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ð²Ð°Ð¶Ð½Ð¾ÑÑ‚ÑŒ триггера в уÑловии дейÑтвиÑ."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Ðекорректный триггер в уÑловии дейÑтвиÑ. Триггер не ÑущеÑтвует или у Ð²Ð°Ñ Ð½ÐµÑ‚ прав доÑтупа к нему."
@@ -8625,11 +8644,11 @@ msgstr "Ðекорректный тип уÑÐ»Ð¾Ð²Ð¸Ñ Ð´ÐµÐ¹ÑтвиÑ."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Ðекорректные Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ ÑˆÐ°Ð³Ð° ÑÑкалации Ð´Ð»Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ð¸ дейÑтвиÑ."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8638,11 +8657,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Ðекорректный тип операции дейÑÑ‚Ð²Ð¸Ñ \"%1$s\" Ð´Ð»Ñ Ð¸Ñточника Ñобытий \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8942,8 +8961,8 @@ msgstr "Ðекорректное количеÑтво шагов у шаблон
msgid "Incorrect trigger expression"
msgstr "Ðекорректное выражение триггера"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Ðекорректное выражение триггера."
@@ -9341,7 +9360,7 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ файле. ВозвращаетÑÑ JSON"
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾ Ñлужбе. Возвращает чиÑло Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ как ÑоÑтоÑние, запуÑка; Ñтрока - Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ как отображаемое имÑ, пуÑÑ‚ÑŒ, пользователь; текÑÑ‚ - Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ как опиÑание; Ð’ чаÑтноÑти Ð´Ð»Ñ ÑоÑтоÑниÑ: 0 - запущено, 1 - приоÑтановлено, 2 - выполнение запуÑка, 3 - выполнение приоÑтановки, 4 - выполнение продолжениÑ, 5 - выполнение оÑтановки, 6 - оÑтановлено, 7 - неизвеÑтно, 255 - отÑутÑтвие Ñлужбы; Ð’ чаÑтноÑти Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка: 0 - автоматичеÑкий, 1 - автоматичеÑкий отложенный, 2 - вручную, 3 - отключен, 4 - неизвеÑтно"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr "ÐаÑледовать"
@@ -9350,11 +9369,11 @@ msgstr "ÐаÑледовать"
msgid "Inherited"
msgstr "УнаÑледованные"
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "МакроÑÑ‹ узла Ñети и унаÑледованные"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr "УнаÑледованные и макроÑÑ‹ прототипов узлов Ñети"
@@ -9366,7 +9385,7 @@ msgstr "УнаÑледованные и ÑобÑтвенные теги"
msgid "Inherited and scenario tags"
msgstr "УнаÑледованные и ÑобÑтвенные теги"
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "УнаÑледованные и макроÑÑ‹ из шаблонов"
@@ -9386,7 +9405,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Ð’Ñтавить"
@@ -9445,8 +9464,8 @@ msgstr "У интерфейÑа Ñ IP адреÑом \"%1$s\" не может б
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "У интерфейÑа Ñ IP адреÑом \"%1$s\" не может быть пуÑтого DNS имени."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr "ИнтерфейÑÑ‹"
@@ -9538,7 +9557,7 @@ msgstr "Ошибочное Ñодержимое YAML файла."
msgid "Invalid action condition: %1$s."
msgstr "Ошибочное уÑловие дейÑтвиÑ: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr "Ошибочное уÑловие: %1$s."
@@ -9599,10 +9618,10 @@ msgstr "Ошибочные параметры метода."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9665,8 +9684,8 @@ msgstr "Ошибочные параметры метода."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9888,11 +9907,11 @@ msgstr "Ошибочный период времени."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "ИнвентаризациÑ"
@@ -9906,7 +9925,7 @@ msgid "Inventory field"
msgstr "Поле инвентарных данных"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Режим инвентарных данных"
@@ -9914,10 +9933,10 @@ msgstr "Режим инвентарных данных"
msgid "Is online?"
msgstr "Ð’ ÑиÑтеме?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Издатель"
@@ -10012,7 +10031,7 @@ msgstr[2] "Элементы данных активированы"
msgid "Item in \"not supported\" state"
msgstr "Элемент данных в \"неподдерживаемом\" ÑоÑтоÑнии"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Элемент данных не выбран"
@@ -10472,17 +10491,17 @@ msgstr "График за поÑледний меÑÑц"
msgid "Last name"
msgstr "ФамилиÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "За поÑледние"
@@ -10559,8 +10578,8 @@ msgstr "Обрезать Ñлева"
msgid "Legend"
msgstr "Легенда"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr "Длина"
@@ -10594,8 +10613,8 @@ msgstr "Тип линии"
msgid "Line width"
msgstr "Толщина линии"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "СвÑзь"
@@ -10618,16 +10637,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Индикаторы ÑвÑзи"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr "ПриÑоединение новых шаблонов"
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "ПриÑоединить шаблоны"
@@ -10643,13 +10655,6 @@ msgstr "ПриÑоединить к шаблонам"
msgid "Linked map"
msgstr "СвÑÐ·Ð°Ð½Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð°"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10788,7 +10793,7 @@ msgstr "Журналировать не Ñовпадающие SNMP трапы"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Вход в ÑиÑтему"
@@ -10870,16 +10875,16 @@ msgstr "ÐœÐ°ÐºÑ€Ð¾Ñ \"%1$s\" уже ÑущеÑтвует у \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "ÐœÐ°ÐºÑ€Ð¾Ñ \"%1$s\" уже ÑущеÑтвует."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "МакроÑÑ‹"
@@ -10978,12 +10983,12 @@ msgstr "Управление API токенами"
msgid "Manage scheduled reports"
msgstr "Управление регулÑрными отчетами"
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Вручную"
@@ -11126,16 +11131,16 @@ msgstr "Пометить оÑтальное"
msgid "Mark selected"
msgstr "Пометить выбранное"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "МаÑка"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11168,11 +11173,11 @@ msgstr "ОÑновной Ñлемент данных"
msgid "Matches regular expression"
msgstr "Совпадение регулÑрному выражению"
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr "МатематичеÑкие функции"
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11408,7 +11413,7 @@ msgstr "Microsoft Edge"
msgid "Middle"
msgstr "По Ñередине"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11511,7 +11516,7 @@ msgstr "ОтÑутÑтвуют Ñлементы данных Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾Ñ‚
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "ОтÑутÑтвует ключ \"%1$s\" Ð´Ð»Ñ ÑƒÐ·Ð»Ð° Ñети \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11597,9 +11602,9 @@ msgstr "Понедельник"
msgid "Monitored by"
msgstr "Ðаблюдение через"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Ðаблюдение через прокÑи"
@@ -11618,6 +11623,7 @@ msgstr "Мониторинг"
msgid "Monospace"
msgstr "Моноширинный"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "МеÑÑц"
@@ -11730,8 +11736,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11801,11 +11807,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11833,8 +11839,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11855,7 +11861,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12145,15 +12151,15 @@ msgstr "ID правил Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð½Ðµ указаны."
msgid "No enabled modules found."
msgstr "Ðктивированные модули не найдены."
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Без шифрованиÑ"
@@ -12239,7 +12245,7 @@ msgstr "Ð¡Ð¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð½Ðµ найдены"
msgid "No new modules discovered"
msgstr "Ðовые модули не обнаружены"
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12276,9 +12282,9 @@ msgstr "Ðет прав доÑтупа в ÑиÑтему."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12317,7 +12323,7 @@ msgstr "Ðет прав доÑтупа на вызов \"%1$s.%2$s\"."
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12417,11 +12423,11 @@ msgstr "Ðет прав доÑтупа на вызов \"%1$s.%2$s\"."
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12480,7 +12486,7 @@ msgid "No public key file specified."
msgstr "Файл публичного ключа не указан."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12501,7 +12507,7 @@ msgid "No target selected."
msgstr "Цель не выбрана."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12650,6 +12656,10 @@ msgstr "Отчет об оповещениÑÑ…"
msgid "Notifications"
msgstr "ОповещениÑ"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12736,6 +12746,10 @@ msgstr "КоличеÑтво процеÑÑоров виртуальной маÑ
msgid "Number of rows"
msgstr "КоличеÑтво Ñтрок"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "КоличеÑтво изменений ÑоÑтоÑниÑ"
@@ -12911,7 +12925,7 @@ msgid "Off"
msgstr "Выкл"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12958,7 +12972,7 @@ msgstr "Одна"
msgid "One time only"
msgstr "Единовременно"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "ÐžÐ´Ð½Ð¾ÐºÑ€Ð°Ñ‚Ð½Ð°Ñ Ð½ÐµÐ´Ð¾ÑтупноÑÑ‚ÑŒ"
@@ -13036,12 +13050,12 @@ msgstr "Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð¾Ð± операционной ÑиÑтеме. ВоÐ
msgid "Operation"
msgstr "ОперациÑ"
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr "ÐžÐ¿ÐµÑ€Ð°Ñ†Ð¸Ñ \"%1$s\" уже ÑущеÑтвует."
@@ -13075,8 +13089,8 @@ msgstr "Оперативные данные"
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Операции"
@@ -13111,7 +13125,7 @@ msgstr "Операции"
msgid "Operator"
msgstr "Оператор"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr "Операторные функции"
@@ -13151,19 +13165,19 @@ msgstr "Или"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13193,10 +13207,10 @@ msgstr "Или"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13459,10 +13473,10 @@ msgstr "ПРОБЛЕМÐ"
msgid "PROBLEM event generation mode"
msgstr "Режим генерации Ñобытий ПРОБЛЕМÐ"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13475,19 +13489,19 @@ msgstr "Режим генерации Ñобытий ПРОБЛЕМÐ"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "Идентификатор PSK"
@@ -13539,12 +13553,12 @@ msgid "Parameters"
msgstr "Параметры"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "РодительÑкие правила обнаружениÑ"
@@ -13599,13 +13613,13 @@ msgid "Passive"
msgstr "ПаÑÑивный"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13613,7 +13627,7 @@ msgstr "ПаÑÑивный"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13666,12 +13680,12 @@ msgstr "Ð’Ñтавить виджет"
msgid "Paste without external links"
msgstr "Ð’Ñтавить без внешних ÑвÑзей"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr "Шаблон"
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "ПриоÑтановить операции Ð´Ð»Ñ Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… проблем"
@@ -13684,7 +13698,7 @@ msgstr "Пиковое иÑпользование памÑти: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr "Процент времени, когда виртуальной машине не удалоÑÑŒ запуÑтитьÑÑ Ð¿Ð¾ причине ÐºÐ¾Ð½ÐºÑƒÑ€Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð° доÑтуп к физичеÑким CPU, <url> - URL Ñлужбы VMware, <uuid> - Ð¸Ð¼Ñ Ñ…Ð¾Ñта виртуальной машины VMware"
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Проценты"
@@ -13708,10 +13722,11 @@ msgstr "ÐŸÑ€Ð¾Ñ†ÐµÐ½Ñ‚Ð½Ð°Ñ Ð»Ð¸Ð½Ð¸Ñ (Ñправа)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Выполнение DNS запроÑа. Возвращает Ñтроку Ñимволов Ñ Ñ‚Ñ€ÐµÐ±ÑƒÐµÐ¼Ñ‹Ð¼ типом информации"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13719,7 +13734,9 @@ msgstr "Выполнение DNS запроÑа. Возвращает Ñтрок
msgid "Period"
msgstr "Период"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr "Сдвиг периода"
@@ -13783,11 +13800,11 @@ msgstr "ВоÑпроизведение звукового Ñигнала"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "ПожалуйÑта, проверьте параметры конфигурации. ЕÑли вÑе верно, нажмите кнопку \"%1$s\" или кнопку \"%2$s\" Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð² конфигурации."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr "ПожалуйÑта, подтвердите, что вы хотите удалить вÑе макроÑÑ‹."
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr "ПожалуйÑта, подтвердите, что хотите удалить вÑе Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ð¹."
@@ -13873,7 +13890,7 @@ msgstr "Тип Post"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr "ПотреблÑÐµÐ¼Ð°Ñ Ð¼Ð¾Ñ‰Ð½Ð¾ÑÑ‚ÑŒ, <url> - URL Ñлужбы VMware, <uuid> - Ð¸Ð¼Ñ Ñ…Ð¾Ñта гипервизора VMware, <макÑ> - макÑимально Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð½Ð°Ñ Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð»ÑÐµÐ¼Ð°Ñ Ð¼Ð¾Ñ‰Ð½Ð¾ÑÑ‚ÑŒ"
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr "Значение Ñтепени"
@@ -13882,7 +13899,7 @@ msgstr "Значение Ñтепени"
msgid "Pre-installation summary"
msgstr "Предварительный обзор инÑталлÑции"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr "Функции прогнозированиÑ"
@@ -13999,9 +14016,9 @@ msgstr "Приватный"
msgid "Private key file"
msgstr "Файл приватного ключа"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Уровень привилегий"
@@ -14409,7 +14426,7 @@ msgstr "Выражение воÑÑтановлениÑ"
msgid "Recovery expression syntax error."
msgstr "СинтакÑичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ° в выражении воÑÑтановлениÑ."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Операции воÑÑтановлениÑ"
@@ -14541,20 +14558,20 @@ msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14563,10 +14580,10 @@ msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14610,7 +14627,7 @@ msgstr "Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14693,14 +14710,14 @@ msgstr "Повторение в"
msgid "Repeats"
msgstr "ПериодичноÑÑ‚ÑŒ"
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14713,8 +14730,8 @@ msgstr "Замена"
msgid "Replace dependencies"
msgstr "Заменить завиÑимоÑти"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr "Замена"
@@ -14915,7 +14932,7 @@ msgstr "Тип ответа: Строка"
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Результат"
@@ -15450,7 +15467,7 @@ msgstr "Границы"
msgid "Script"
msgstr "Скрипт"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Скрипт \"%1$s\" уже ÑущеÑтвует."
@@ -15516,6 +15533,15 @@ msgstr "Шаблон поиÑка пуÑтой"
msgid "Search type"
msgstr "Тип поиÑка"
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Вторичный мобильный Ð´Ð»Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ð°"
@@ -15594,7 +15620,7 @@ msgstr "Выберите виджет"
msgid "Selected"
msgstr "Выбранные"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Выбранные дейÑÑ‚Ð²Ð¸Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ñ‹"
@@ -15835,6 +15861,7 @@ msgid "Services updated"
msgstr "УÑлуги обновлены"
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr "Ошибка инициализации ÑеÑÑии."
@@ -16288,7 +16315,7 @@ msgstr "ИÑпанÑкий (es_ES)"
msgid "Specified role was not found."
msgstr "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ Ñ€Ð¾Ð»ÑŒ не найдена."
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Указанный Ñкрипт не ÑущеÑтвует или вы не имеете к нему прав доÑтупа в команде операции дейÑтвиÑ."
@@ -16323,8 +16350,8 @@ msgstr "Стандартные Ñлементы данных"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr "Ðачало"
@@ -16332,7 +16359,7 @@ msgstr "Ðачало"
msgid "Start date"
msgstr "Дата начала"
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Ðачинать в"
@@ -16411,7 +16438,7 @@ msgstr "СтатиÑтика и доÑтупноÑÑ‚ÑŒ кÑша запиÑи в
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16515,7 +16542,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Шаг Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ \"%1$s\" уже ÑущеÑтвует."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16569,12 +16596,12 @@ msgstr "Straight"
msgid "Strict"
msgstr "Строгий"
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr "Строка"
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr "Строковые функции"
@@ -16595,10 +16622,10 @@ msgstr "Подфильтр"
msgid "Subject"
msgstr "Тема"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Субъект"
@@ -16792,7 +16819,7 @@ msgstr "Значение тега"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16808,13 +16835,13 @@ msgstr "Значение тега"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16831,7 +16858,7 @@ msgstr "Значение тега"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16841,7 +16868,7 @@ msgstr "Значение тега"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16877,14 +16904,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Шаблон"
@@ -16928,7 +16953,7 @@ msgstr "Шаблон панели"
msgid "Template dashboards"
msgstr "Шаблоны панелей"
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Шаблон удален"
@@ -16940,11 +16965,11 @@ msgstr "Группа шаблона"
msgid "Template linkage"
msgstr "Ð¡Ð¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð°Ð¼Ð¸"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Шаблонные макроÑÑ‹"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Ð˜Ð¼Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð°"
@@ -16979,13 +17004,12 @@ msgstr "Шаблон Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же видимым именем \"%1$s\" уÐ
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16994,10 +17018,12 @@ msgstr "Шаблон Ñ Ñ‚Ð°ÐºÐ¸Ð¼ же видимым именем \"%1$s\" уÐ
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -17008,7 +17034,7 @@ msgstr "Шаблоны"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Шаблоны \"%1$s\" отÑоединены от узлов Ñети \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr "Шаблоны обновлены"
@@ -17224,7 +17250,7 @@ msgstr "Тема"
msgid "This day last week"
msgstr "Этот день прошлой недели"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr "Это поле автоматичеÑки заполнÑетÑÑ \"%1$s\" Ñлементом данных."
@@ -17262,7 +17288,7 @@ msgstr "Этот год"
msgid "This year so far"
msgstr "Ð’ Ñтом году"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Порог"
@@ -17295,15 +17321,15 @@ msgstr ""
msgid "Till"
msgstr "До"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17340,13 +17366,13 @@ msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð¿Ð¾Ñледнего Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾ÐºÑи. ИмÑ
msgid "Time period"
msgstr "Период времени"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -18042,9 +18068,9 @@ msgstr "Ед. измерениÑ"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "ÐеизвеÑтно"
@@ -18062,7 +18088,7 @@ msgid "Unknown error"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "ÐеизвеÑтный Ñлемент данных узла Ñети, такого Ñлемента данных нет у выбранного узла Ñети"
@@ -18094,16 +18120,16 @@ msgstr "ÐеизвеÑтный тип значениÑ"
msgid "Unlimited"
msgstr "Ðеограничено"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "ОтÑоединить"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "ОтÑоединить и очиÑтить"
@@ -18200,10 +18226,10 @@ msgstr "ДоÑтупен"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18212,16 +18238,16 @@ msgstr "ДоÑтупен"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18250,7 +18276,7 @@ msgstr "Обновить ÑущеÑтвующее"
msgid "Update interval"
msgstr "Интервал обновлениÑ"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "Операции обновлениÑ"
@@ -18277,7 +18303,7 @@ msgstr "Загрузить"
msgid "Upper level maps"
msgstr "Карты верхнего уровнÑ"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18466,7 +18492,7 @@ msgstr[2] "Группы пользователей обновлены"
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18604,15 +18630,15 @@ msgid "User/Recipient"
msgstr "Пользователь/Получатель"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ"
@@ -18691,7 +18717,7 @@ msgstr "BIOS UUID гипервизора VMware, <url> - URL Ñлужбы VMware
#: include/classes/data/CItemData.php:1400
msgid "VMware hypervisor HW vendor state sensors, <url> - VMware service URL, <uuid> - VMware hypervisor host name. Returns JSON"
-msgstr ""
+msgstr "Датчики ÑоÑтоÑÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÐµÐ»Ñ HW гипервизора VMware, <url> - URL Ñлужбы VMware, <uuid> - Ð¸Ð¼Ñ Ñ…Ð¾Ñта гипервизора VMware. ВозвращаетÑÑ JSON"
#: include/classes/data/CItemData.php:1372
msgid "VMware hypervisor ballooned memory size, <url> - VMware service URL, <uuid> - VMware hypervisor host name"
@@ -18926,11 +18952,11 @@ msgstr "ВалидациÑ"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -19004,14 +19030,14 @@ msgstr "Преобразование значений \"%1$s\" уже ÑущеÑ
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Преобразование значений"
@@ -19054,7 +19080,7 @@ msgstr "Значение: нет данных"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr "Преобразование значений Ñ ID \"%1$s\" недоÑтупно на \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19154,7 +19180,7 @@ msgstr "Размер виртуального проÑтранÑтва в бай
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Видимое имÑ"
@@ -19180,7 +19206,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Предупреждение"
@@ -19290,6 +19316,10 @@ msgstr "Ср"
msgid "Wednesday"
msgstr "Среда"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19562,7 +19592,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Год"
@@ -19622,7 +19653,7 @@ msgstr "Вы вошли под именем \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Ð’Ñ‹ не можете выбрать некоторые Ñзыки, Ñ‚.к. локали Ð´Ð»Ñ Ð½Ð¸Ñ… не уÑтановлены на вашем веб-Ñервере."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Вы не выполнили вход"
@@ -19863,11 +19894,11 @@ msgstr "ожидалÑÑ Ð¿ÐµÑ€Ð¸Ð¾Ð´ времени"
msgid "a time unit is expected"
msgstr "ожидаетÑÑ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð° времени"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr "abs() - ÐбÑолютное значение"
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr "acos() - ÐрккоÑÐ¸Ð½ÑƒÑ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² виде угла, в радианах."
@@ -19962,7 +19993,7 @@ msgstr "ожидаетÑÑ Ñ‡ÐµÑ‚Ð½Ð¾Ðµ количеÑтво шеÑтнадцаÑ
msgid "an explicit time is expected"
msgstr "ожидаетÑÑ Ð²Ñ€ÐµÐ¼Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ñвно"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr "идентификатор не задан в формуле"
@@ -20006,11 +20037,11 @@ msgstr "краÑным"
msgid "ascending"
msgstr "по возраÑтанию"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr "ascii() - Возвращает ASCII Ñамого левого Ñимвола значениÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr "asin() - ÐркÑÐ¸Ð½ÑƒÑ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² виде угла, в радианах."
@@ -20024,11 +20055,11 @@ msgstr "необходимо выбрать по крайней мере одиÐ
msgid "at least one override option must be specified"
msgstr "должна быть указана по крайней мере одна Ð¾Ð¿Ñ†Ð¸Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸Ñи"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr "atan() - ÐÑ€ÐºÑ‚Ð°Ð½Ð³ÐµÐ½Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð² виде угла, в радианах"
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr "atan2() - ÐÑ€ÐºÑ‚Ð°Ð½Ð³ÐµÐ½Ñ ÐºÐ¾Ð¾Ñ€Ð´Ð¸Ð½Ð°Ñ‚ ординаты (exprue) и абÑциÑÑÑ‹, заданный углом, в радианах."
@@ -20050,39 +20081,47 @@ msgstr "авторегиÑтрациÑ"
msgid "avg"
msgstr "Ñред"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - Среднее значение за период Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr "between() - Проверка, входит ли значение в заданный диапазон (1 - в диапазоне, 0 - в противном Ñлучае)"
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr "band() - Побитовое И"
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr "bitlength() - Возвращает длину в битах"
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr "bitlshift() - Битовый Ñдвиг Ñлева"
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr "bitnot() - Побитовое ÐЕ"
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr "bitor() - Побитовое ИЛИ"
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr "bitrshift() - Битовый Ñдвиг Ñправа"
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr "bitxor() - Битовое иÑключающее ИЛИ"
@@ -20097,7 +20136,7 @@ msgstr "мигание"
msgid "both username and password should be either present or empty"
msgstr "как Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, так и пароль должны приÑутÑтвовать или быть пуÑтыми"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr "bytelength() - Возвращает длину в байтах"
@@ -20139,7 +20178,7 @@ msgstr "Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ð·Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20227,23 +20266,23 @@ msgstr "не удалоÑÑŒ выполнить Scroll API запроÑ, данн
msgid "cannot update property for templated discovery rule"
msgstr "не удалоÑÑŒ обновить ÑвойÑтво у правила Ð¾Ð±Ð½Ð°Ñ€ÑƒÐ¶ÐµÐ½Ð¸Ñ Ð¸Ð· шаблона"
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr "cbrt() - Корень третьей Ñтепени"
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr "ceil() - Округление до ближайшего большего целого чиÑла"
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - Разница между поÑледним и предыдущим значениÑми"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr "char() - Возвращает Ñимвол, который задаетÑÑ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ñ‹Ð¼ ASCII кодом"
@@ -20270,7 +20309,7 @@ msgstr "цвет"
msgid "comma-separated list"
msgstr "ÑпиÑок, разделенный запÑтыми"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr "concat() - Возвращает Ñтроку, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑвлÑетÑÑ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð¾Ð¼ Ð¾Ð±ÑŠÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¸ Ñтроки"
@@ -20285,15 +20324,15 @@ msgstr "наÑтройка"
msgid "contains"
msgstr "Ñодержит"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr "cos() - КоÑÐ¸Ð½ÑƒÑ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ, где значением ÑвлÑетÑÑ ÑƒÐ³Ð¾Ð», в радианах."
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr "cosh() - ГиперболичеÑкий коÑÐ¸Ð½ÑƒÑ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ"
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr "cot() - ÐšÐ¾Ñ‚Ð°Ð½Ð³ÐµÐ½Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ, где значением ÑвлÑетÑÑ ÑƒÐ³Ð¾Ð», в радианах."
@@ -20301,11 +20340,11 @@ msgstr "cot() - ÐšÐ¾Ñ‚Ð°Ð½Ð³ÐµÐ½Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ, где значением Ñ
msgid "count"
msgstr "кол-во"
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - КоличеÑтво уÑпешно полученных значений V (которым удовлетворÑет оператор О) за период Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr "countunique() - КоличеÑтво уникальных значений"
@@ -20318,15 +20357,15 @@ msgstr "д"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð´Ð°Ñ‚Ð°"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - День меÑÑца"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - День недели"
@@ -20344,7 +20383,7 @@ msgstr "дней"
msgid "default"
msgstr "по умолчанию"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr "degrees() - ÐšÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð°Ñ†Ð¸Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¸Ð· радианов в градуÑÑ‹"
@@ -20421,7 +20460,7 @@ msgstr "не ÑущеÑтвует"
msgid "does not match"
msgstr "не ÑоответÑтвует"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr "e() - Возвращает чиÑло Эйлера"
@@ -20444,11 +20483,11 @@ msgstr "Ñообщение об ошибке"
msgid "exists"
msgstr "ÑущеÑтвует"
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr "exp() - ЧиÑло Эйлера в Ñтепени значениÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr "expm1() - ЧиÑло Эйлера в Ñтепени Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¼Ð¸Ð½ÑƒÑ 1"
@@ -20464,7 +20503,7 @@ msgstr "ошибка при разборе JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr "find() - Проверка Ð½Ð°Ð»Ð¸Ñ‡Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° V (который удволетворÑет оператору O) за период T (1 - ÑоответÑтвует, 0 - не ÑоответÑтвует)"
@@ -20478,15 +20517,15 @@ msgstr "первый"
msgid "first parameter is expected"
msgstr "ожидаетÑÑ Ð¿ÐµÑ€Ð²Ñ‹Ð¹ параметр"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr "first() - Самое Ñтарое значение за указанный период времени"
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr "floor() - Округление до ближайшего меньшего целого чиÑла"
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - Прогноз Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· t Ñекунд на оÑнове периода Т"
@@ -20494,7 +20533,7 @@ msgstr "forecast() - Прогноз Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· t Ñекунд Ð
msgid "fourth"
msgstr "четвёртый"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime() - Разница между значением Ñлемента данных (в виде отметки времени) и отметкой времени Zabbix Ñервера меньше чем или равна T Ñекундам (1 - правда, 0 - ложь)"
@@ -20568,7 +20607,7 @@ msgstr "в"
msgid "in range"
msgstr "в диапазоне"
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr "in() - ПроверÑет равно ли значение одному из перечиÑленных значений (1 - равно, 0 - в противном Ñлучае)"
@@ -20577,11 +20616,11 @@ msgstr "in() - ПроверÑет равно ли значение одному
msgid "including subgroups"
msgstr "Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð¿Ð¾Ð´Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr "Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð°Ñ Ñ„Ð¾Ñ€Ð¼ÑƒÐ»Ð° вычиÑÐ»ÐµÐ½Ð¸Ñ Ñлемента данных"
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr "некорректное формула вычиÑÐ»ÐµÐ½Ð¸Ñ Ñлемента данных Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ \"%1$s\""
@@ -20600,7 +20639,7 @@ msgstr "некорректное количеÑтво Ñлементов"
msgid "incorrect expression starting from \"%1$s\""
msgstr "некорректное выражение Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ \"%1$s\""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20618,7 +20657,7 @@ msgstr "некорректный ÑинтакÑÐ¸Ñ Ð¾ÐºÐ¾Ð»Ð¾ \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr "некорректное иÑпользование функции \"%1$s\""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr "insert() - Добавление указанных Ñимволов или пробелов в Ñтроку Ñимволов, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ð¾Ñ‚ указанной позиции в Ñтроке"
@@ -20678,7 +20717,7 @@ msgstr "ошибочное Ð¸Ð¼Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ узлов Ñети"
msgid "invalid host name"
msgstr "ошибочное Ð¸Ð¼Ñ ÑƒÐ·Ð»Ð° Ñети"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20700,6 +20739,16 @@ msgstr "ошибочное регулÑрное выражение"
msgid "invalid second parameter in function \"%1$s\""
msgstr "недопуÑтимый второй параметр в функции \"%1$s\""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20741,7 +20790,7 @@ msgstr "шаблон Ñлемента данных"
msgid "key is empty"
msgstr "ключ пуÑтой"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr "kurtosis() - Измерение \"оÑтровершинноÑти\" в раÑпределении вероÑтноÑтей"
@@ -20757,7 +20806,7 @@ msgctxt "week of month"
msgid "last"
msgstr "поÑл"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - ПоÑледнее (наиболее новое) значение Т"
@@ -20765,11 +20814,11 @@ msgstr "last() - ПоÑледнее (наиболее новое) значени
msgid "left"
msgstr "Ñлева"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr "left() - Возвращает Ñамые левые Ñимволы"
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr "length() - Длина поÑледнего (Ñамого Ñвежего) Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ T в количеÑтве Ñимволов"
@@ -20777,23 +20826,23 @@ msgstr "length() - Длина поÑледнего (Ñамого Ñвежего)
msgid "list of characters"
msgstr "ÑпиÑок Ñимволов"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr "log() - Ðатуральный логарифм"
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr "log10() - Обыкновенный логарифм"
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr "logeventid() - СоответÑтвие ID ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ Ð¿Ð¾Ñледней запиÑи журнала регулÑрному выражению V за период T (1 - ÑоответÑтвует, 0 - не ÑоответÑтвует)"
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr "logseverity() - ВажноÑÑ‚ÑŒ журнала поÑледней запиÑи журнала за период T"
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr "logsource() - СоответÑтвие иÑточника журнала поÑледней запиÑи журнала параметру V за период Е (1 - ÑоответÑтвует, 0 - не ÑоответÑтвует)"
@@ -20801,7 +20850,7 @@ msgstr "logsource() - СоответÑтвие иÑточника журнала
msgid "low-level discovery rule"
msgstr "правило низкоуровневого обнаружениÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr "ltrim() - Удаление указанных Ñимволов Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° Ñтроки"
@@ -20833,11 +20882,11 @@ msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ Ð¿ÑƒÑтой"
msgid "macro(s)"
msgstr "макроÑ(Ñ‹)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr "mad() - ÐбÑолютное отклонение Ñреднего"
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr "пропущен обÑзательный параметр в функции \"%1$s\""
@@ -20873,7 +20922,7 @@ msgstr "макÑ"
msgid "max period is less than time filter default period"
msgstr "макÑ. период меньше чем период фильтра времени по умолчанию"
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - МакÑимальное значение за период Т"
@@ -20887,7 +20936,7 @@ msgstr "доÑтигнуто макÑимальное количеÑтво заÐ
msgid "maximum number of dependency levels reached"
msgstr "доÑтигнуто макÑимальное количеÑтво уровней завиÑимоÑтей"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr "mid() - Возвращает подÑтроку, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ð¸ Ñимвола, указанной Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° Ð´Ð»Ñ N Ñимволов"
@@ -20904,7 +20953,7 @@ msgstr "mid() - Возвращает подÑтроку, Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Ð¿Ð¾Ð
msgid "min"
msgstr "мин"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min() - Минимальное значение за период Т"
@@ -20919,15 +20968,15 @@ msgstr "Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° %1$s Ñимволов"
msgid "mm"
msgstr "мм"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr "mod() - ОÑтаток от делениÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -21009,7 +21058,7 @@ msgstr "название"
msgid "new"
msgstr "новый"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "новый"
@@ -21043,7 +21092,7 @@ msgstr "нет прав Ñоздавать и редактировать карÑ
msgid "no permissions to unacknowledge problems"
msgstr "нет прав отменÑÑ‚ÑŒ подтверждение проблем"
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr "nodata() - ОтÑутÑтвие данных полученных за период времени T (1 - правда, 0 - ложь), Режим (strict - игнорировать задержку прокÑи при отправке данных)"
@@ -21064,7 +21113,7 @@ msgstr "не в"
msgid "not selected"
msgstr "не выбрано"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now() - КоличеÑтво Ñекунд Ð½Ð°Ñ‡Ð¸Ð½Ð°Ñ Ñ Epoch"
@@ -21151,15 +21200,15 @@ msgstr "путь/к/Ñекрету:ключ"
msgid "pattern"
msgstr "шаблон"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile() - Процентиль P за период Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr "pi() - Возвращает Пи конÑтанту"
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr "power() - Степень оÑновного Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ðº значению Ñтепени"
@@ -21167,15 +21216,15 @@ msgstr "power() - Степень оÑновного Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ðº знач
msgid "problem pattern"
msgstr "шаблон проблем"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr "radians() - ÐšÐ¾Ð½Ð²ÐµÑ€Ñ‚Ð°Ñ†Ð¸Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¸Ð· градуÑов в радианы"
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr "rand() - Случайное целое чиÑло"
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21224,11 +21273,11 @@ msgstr "регулÑрное выражение"
msgid "regular expression"
msgstr "регулÑрное выражение"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr "repeat() - Возвращает Ñтроку ÑоÑтоÑщую из значений, которые повторÑÑŽÑ‚ÑÑ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ количеÑтво раз"
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr "replace() - ПоиÑк шаблона, входÑщего в значение, и замена на заменитель"
@@ -21252,15 +21301,15 @@ msgstr ""
msgid "right"
msgstr "Ñправа"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr "right() - Возвращает количеÑтво Ñамых правых Ñимволов"
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr "round() - Округление значение до деÑÑтичных знаков"
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr "rtrim() - Удаление указанных Ñимволов Ñ ÐºÐ¾Ð½Ñ†Ð° Ñтроки"
@@ -21351,23 +21400,23 @@ msgstr "показать ÑоответÑÑ‚Ð²Ð¸Ñ Ð¸ÐºÐ¾Ð½Ð¾Ðº"
msgid "sign in as guest"
msgstr "войти как гоÑÑ‚ÑŒ"
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr "signum() - Возвращает -1 - еÑли значение отрицательное, 0 - еÑли значение ноль, 1 - еÑли значение положительное"
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr "sin() - Ð¡Ð¸Ð½ÑƒÑ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ, где Ñамо значение предÑтавлÑет Ñобой угол, в радианах."
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr "sinh() - ГиперболичеÑкий ÑÐ¸Ð½ÑƒÑ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ"
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr "skewness() - Измерение аÑимметрии раÑÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð²ÐµÑ€Ð¾ÑтноÑтей"
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr "sqrt() - Квадратный корень значениÑ"
@@ -21375,11 +21424,11 @@ msgstr "sqrt() - Квадратный корень значениÑ"
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr "stddevpop() - СреднеквадратичеÑкое отклонение"
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr "stddevsamp() - Выборочное ÑреднеквадратичеÑкое отклонение"
@@ -21387,11 +21436,11 @@ msgstr "stddevsamp() - Выборочное ÑреднеквадратичеÑк
msgid "sum"
msgstr "Ñумма"
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum() - Сумма значений за период Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr "sumofsquares() - Сумма квадратов"
@@ -21419,7 +21468,7 @@ msgstr "Ð·Ð°Ð´Ð°Ð½Ð½Ð°Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ не уникальна"
msgid "tag"
msgstr "тег"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr "tan() - Ð¢Ð°Ð½Ð³ÐµÐ½Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ"
@@ -21453,7 +21502,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21500,31 +21549,35 @@ msgstr "период времени фильтра по умолчанию прÐ
msgid "time shift"
msgstr "Ñдвиг времени"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - Текущее времÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - Ð’Ñ€ÐµÐ¼Ñ Ð´Ð¾ÑÑ‚Ð¸Ð¶ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñ€Ð¾Ð³Ð° вычиÑленное на оÑнове периода Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr "trendavg() - Среднее значение за период Т Ñ Ñ‚Ð¾Ñ‡Ð½Ñ‹Ð¼ Ñдвигом периода"
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr "trendcount() - КоличеÑтво уÑпешно полученных значений за период Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr "trendmax() - МакÑимальное значение за период Т Ñ Ñ‚Ð¾Ñ‡Ð½Ñ‹Ð¼ Ñдвигом периода"
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr "trendmin() - Минимальное значение за период Т Ñ Ñ‚Ð¾Ñ‡Ð½Ñ‹Ð¼ Ñдвигом периода"
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr "trendsum() - Сумма значений за период Т Ñ Ñ‚Ð¾Ñ‡Ð½Ñ‹Ð¼ Ñдвигом периода"
@@ -21550,11 +21603,11 @@ msgstr "прототип триггера Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить в
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "триггер Ñо ÑвÑзÑми Ð½ÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить в другой шаблон или узел Ñети"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr "trim() - Удаление указанных Ñимволов Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° и конца Ñтроки"
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr "truncate() - УÑечение Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð¾ деÑÑтичных знаков"
@@ -21611,7 +21664,7 @@ msgstr "неожиданное завершение макроÑа"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21654,7 +21707,7 @@ msgstr "неожиданное значение \"%1$s\""
msgid "unknown"
msgstr "неизвеÑтно"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21855,11 +21908,11 @@ msgstr "значение второго параметра Ñлишком дли
msgid "value of third parameter must be one of %1$s"
msgstr "значением третьего параметра должно быть %1$s"
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr "varpop() - ДиÑперÑÐ¸Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ð»ÑŒÐ½Ð¾Ð¹ ÑовокупноÑти"
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr "varsamp() - Ð’Ñ‹Ð±Ð¾Ñ€Ð¾Ñ‡Ð½Ð°Ñ Ð´Ð¸ÑперÑиÑ"
diff --git a/ui/locale/sk/LC_MESSAGES/frontend.po b/ui/locale/sk/LC_MESSAGES/frontend.po
index d423d6fc68f..190b4ba0519 100644
--- a/ui/locale/sk/LC_MESSAGES/frontend.po
+++ b/ui/locale/sk/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2013-08-25 22:42+0300\n"
"Last-Translator: Jan <jan.garaj@gmail.com>\n"
"Language-Team: Zabbix translation team\n"
@@ -320,10 +320,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr "(Skupiny môžu vytvárať iba super administrátori)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(bez proxy)"
@@ -477,7 +477,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -546,7 +546,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -565,11 +565,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -581,24 +581,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -616,7 +616,7 @@ msgstr ""
msgid "Action"
msgstr "Akcia"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Akcia \"%1$s\" už existuje."
@@ -626,7 +626,7 @@ msgstr "Akcia \"%1$s\" už existuje."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Akcia bola pridaná"
@@ -635,18 +635,18 @@ msgstr "Akcia bola pridaná"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Akcia bola zmazaná"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Akcia vypnutá"
msgstr[1] "Akcie vypnuté"
msgstr[2] "Akcie vypnuté"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Akcia povolená"
@@ -666,7 +666,7 @@ msgstr "Log akcií"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Akcia aktualizovaná"
@@ -713,7 +713,7 @@ msgid "Active till"
msgstr "Aktívny do"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -772,14 +772,14 @@ msgstr "Aktívny do"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -795,10 +795,10 @@ msgstr "Aktívny do"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -810,9 +810,9 @@ msgstr "Aktívny do"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -830,7 +830,7 @@ msgstr "Aktívny do"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -875,7 +875,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -900,8 +900,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -914,7 +914,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1048,7 +1048,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1064,6 +1064,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1378,7 +1382,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1458,9 +1462,9 @@ msgstr ""
msgid "Authentication"
msgstr "Autentifikácia"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "AutentifikaÄný algoritmus"
@@ -1521,12 +1525,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Automaticky"
@@ -1641,12 +1645,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind heslo"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1852,7 +1856,7 @@ msgstr "Nie je možné pridaÅ¥ neÄíselnú položku \"%1$s\" do grafu \"%2$s\".
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Nie je možné pridaÅ¥ neÄíselnú položku \"%1$s\" k prototypu grafu \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Nie je možné pridať akciu"
@@ -2155,7 +2159,7 @@ msgstr[2] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Nie je možné zmazať interného Zabbix používateľa \"%1$s\", skúste ho vypnúť."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Nie je možné zmazať akciu"
@@ -2332,12 +2336,12 @@ msgstr[0] "Nie je možné zmazať skript"
msgstr[1] "Nie je možné zmazať skript"
msgstr[2] "Nie je možné zmazať skript"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Nie je možné zmazať skripty. Skript \"%1$s\" sa používa v operácii akcie \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Nie je možné zmazaÅ¥ oznaÄené akcie"
@@ -2355,7 +2359,7 @@ msgstr[2] "Nie je možné zmazať službu"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Nie je možné zmazať šablónu"
@@ -2446,7 +2450,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Nie je možné vypnúť akciu"
@@ -2535,7 +2539,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Nie je možné vypnúť akciu"
@@ -2775,7 +2779,7 @@ msgstr[0] "Nie je možné importovať šablónu \"%1$s\", prepojená šablóna \
msgstr[1] "Nie je možné importovať šablónu \"%1$s\", prepojené šablóny \"%2$s\" neexistujú."
msgstr[2] "Nie je možné importovať šablónu \"%1$s\", prepojené šablóny \"%2$s\" neexistujú."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Nie je možné vložiÅ¥ výraz spúšťaÄa"
@@ -2956,7 +2960,7 @@ msgstr "Nie je možné zrušiť prepojenie šablóny."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Nie je možné aktualizovať \"%1$s\" pre akciu \"%2$s\"."
@@ -3022,7 +3026,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Nie je možné aktualizovať akciu"
@@ -3083,7 +3087,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Nie je možné aktualizovať skupiny pre zisteného hosta \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Nie je možné aktualizovať hosta"
@@ -3190,9 +3194,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Nie je možné aktualizovať skript"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3219,7 +3223,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "Nie je možné aktualizovať šablónu"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3308,14 +3312,14 @@ msgstr "Spracovávať všetky SNMP trapy, ktoré nie su spracované nejakou snmp
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Certifikát"
@@ -3333,10 +3337,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3376,9 +3380,9 @@ msgstr "Obsahuje reťazec"
msgid "Character string not included"
msgstr "Neobsahuje reťazec"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3394,7 +3398,7 @@ msgstr "Informácie o šasi. Vráti reťazec"
msgid "Check already exists."
msgstr "Kontrola už existuje."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Skontrolujte ÄasÅ¥ výrazu zaÄínajúcu od \"%1$s\"."
@@ -3516,8 +3520,8 @@ msgstr "VyÄistiÅ¥ históriu"
msgid "Clear history and trends"
msgstr "VyÄistiÅ¥ históriu a trendy"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "VyÄistiÅ¥ pri odpojení"
@@ -3544,16 +3548,16 @@ msgstr "Hodiny"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3682,7 +3686,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3954,13 +3958,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Spojenia"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Spojenia z hosta"
@@ -3968,9 +3972,9 @@ msgstr "Spojenia z hosta"
msgid "Connections from proxy"
msgstr "Spojenia z proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Spojenia k hostovi"
@@ -4140,10 +4144,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "PoÄet"
@@ -4233,7 +4237,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4435,7 +4439,7 @@ msgid "Current value"
msgstr "Aktuálna hodnota"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4679,7 +4683,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4752,11 +4756,11 @@ msgstr "Dátum vypršania kontraktu podpory HW"
msgid "Date HW purchased"
msgstr "Dátum kúpy HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Deň"
@@ -4797,8 +4801,8 @@ msgstr "Dec"
msgid "December"
msgstr "December"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4808,7 +4812,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4939,7 +4943,7 @@ msgstr "Zmazať"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "ZmazaÅ¥ a vyÄistiÅ¥"
@@ -4948,11 +4952,11 @@ msgstr "ZmazaÅ¥ a vyÄistiÅ¥"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "ZmazaÅ¥ a vyÄistiÅ¥ oznaÄené Å¡ablóny? (Pozor: vÅ¡etky prepojené hosty budú tiež vyÄistené!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "ZmazaÅ¥ a vyÄistiÅ¥ Å¡ablónu? (Pozor: vÅ¡etky prepojené hosty budú tiež vyÄistené!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Zmazať aktuálnu akciu?"
@@ -5085,7 +5089,7 @@ msgstr "ZmazaÅ¥ oznaÄené skupiny?"
msgid "Delete selected host groups?"
msgstr "ZmazaÅ¥ oznaÄené skupiny?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "ZmazaÅ¥ oznaÄený prototyp hosta?"
@@ -5193,7 +5197,7 @@ msgstr "ZmazaÅ¥ oznaÄených používateľov?"
msgid "Delete selected web scenarios?"
msgstr "ZmazaÅ¥ oznaÄené scenáre?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Zmazať šablónu?"
@@ -5254,7 +5258,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Závislosti"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Podradená závislosť (tento ovplyvňuje)"
@@ -5262,7 +5266,7 @@ msgstr "Podradená závislosť (tento ovplyvňuje)"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5273,7 +5277,7 @@ msgid "Deployment status"
msgstr "Stav nasadenia"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5288,16 +5292,16 @@ msgstr "Stav nasadenia"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5309,10 +5313,10 @@ msgstr "Poznámka"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Podrobnosti"
@@ -5321,6 +5325,14 @@ msgstr "Podrobnosti"
msgid "Details of web scenario"
msgstr "Detaily web scenára"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Zariadenie"
@@ -5443,7 +5455,7 @@ msgstr "ZakázaÅ¥ oznaÄené scenáre?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5470,17 +5482,17 @@ msgstr "ZakázaÅ¥ oznaÄené scenáre?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Vypnuté"
@@ -5505,7 +5517,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5722,7 +5734,7 @@ msgstr "Zobraziť skladaný graf"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5739,7 +5751,7 @@ msgstr "Zobrazujem %1$s do %2$s z %3$s nájdených"
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5821,7 +5833,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "StiahnuÅ¥ konfiguraÄný súbor"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5885,7 +5897,7 @@ msgstr "Duplicitné userid \"%1$s\" v používateľoch pre mapu \"%2$s\"."
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Trvanie"
@@ -5915,14 +5927,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6178,7 +6190,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6216,13 +6228,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6238,11 +6250,11 @@ msgstr "Povolené"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Å ifrovanie"
@@ -6318,6 +6330,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Chyba: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Udalosť"
@@ -6887,8 +6903,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Prvá"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Fit"
@@ -7000,12 +7016,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Vytvoriť úplnú kópiu"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funkcia"
@@ -7021,7 +7037,7 @@ msgstr "GSM modem"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "GUI prístup vypnutý."
@@ -7372,7 +7388,7 @@ msgstr "Meno skupiny"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Prototyp skupiny nemôže byť založený na zistenej skupine hostov \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Prototypy skupiny"
@@ -7385,12 +7401,11 @@ msgid "Grouping by"
msgstr "Zoskupovať podľa"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Skupiny"
@@ -7609,7 +7624,7 @@ msgstr "ÄŒistenie histórie môže trvaÅ¥ dlhší Äas. PokraÄovaÅ¥?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7640,7 +7655,7 @@ msgid "Horizontal align"
msgstr "Vodorovné zarovnanie"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7649,7 +7664,7 @@ msgstr "Vodorovné zarovnanie"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7660,7 +7675,7 @@ msgstr "Vodorovné zarovnanie"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7789,7 +7804,7 @@ msgid "Host group label type"
msgstr "Typ popisku skupiny"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7808,8 +7823,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7859,7 +7874,7 @@ msgstr "Prehľad hostovho inventára"
msgid "Host label type"
msgstr "Typ popisu hosta"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Makrá hosta"
@@ -7871,7 +7886,7 @@ msgstr "Hostove metaúdaje"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Meno hosta"
@@ -7908,7 +7923,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Prototyp hosta zmazaný"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7933,7 +7948,7 @@ msgstr "Prototyp hosta so zobrazovaným menom \"%1$s\" už existuje v zisťovaco
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Prototypy hostov"
@@ -7958,7 +7973,7 @@ msgstr "Hostov Äas"
msgid "Host update failed."
msgstr "Aktualizácia hosta zlyhala."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Host aktualizovaný"
@@ -8035,6 +8050,10 @@ msgstr "Umiestnenie hostov"
msgid "Hosts updated"
msgstr "Hosty aktualizované"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "hodín"
@@ -8104,15 +8123,15 @@ msgstr "Rozsah IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8346,7 +8365,7 @@ msgstr "Obrázky"
msgid "Images for all maps will be updated!"
msgstr "Obrázky pre všetky mapy budú aktualizované!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "HneÄ"
@@ -8428,7 +8447,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8440,11 +8459,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8559,7 +8578,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Neplatná podmienka akcie zisťovacej kontroly."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Neplatná podmienka akcie zisťovacej kontroly. Zisťovacia kontrola neexistuje alebo nemáte k nej prístup."
@@ -8567,7 +8586,7 @@ msgstr "Neplatná podmienka akcie zisťovacej kontroly. Zisťovacia kontrola nee
msgid "Incorrect action condition discovery object."
msgstr "Neplatná podmienka akcie zisťovacieho pravidla."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Neplatná podmienka akcie zisťovacieho pravidla. Zisťovacie pravidlo neexituje alebo nemáte k nemu prístup."
@@ -8579,15 +8598,15 @@ msgstr "Neplatná podmienka akcie zisťovacieho stavu."
msgid "Incorrect action condition event type."
msgstr "Neplatná podmienka akcie typu udalosti."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8596,11 +8615,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Neplatná podmienka akcie portu \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Neplatná podmienka akcie proxy. Proxy neexistuje alebo nemáte k nej prístup."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8608,7 +8627,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Neplatná podmienka akcie závažnosti spúšťaÄa."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Neplatná podmienka akcie spúšťaÄa. SpúšťaÄ neexistuje alebo nemáte k nemu prístup."
@@ -8618,11 +8637,11 @@ msgstr "Neplatná podmienka akcie typu."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Neplatné hodnoty eskalaÄného kroku v prevádzkovej akcii."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8631,11 +8650,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8935,8 +8954,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr "Neplatný výraz spúšťaÄa"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Neplatný výraz spúšťaÄa."
@@ -9334,7 +9353,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Informácia o službe. Vráti celé Äíslo s parametrom ako status, startup, reÅ¥azec - s parametrom ako displayname, cesta, používateľ, text - s parametrom ako popis. Å peciálne pre state: 0 - beží, 1 - pozastavený, 2 - Äakajúci na Å¡tart, 3 - Äakajúci na pozastavenie, 4 - Äakajúci na pokraÄovanie, 5 - Äakajúci na zastavenie, 6 - zastavený, 7 - neznámy, 255 - žiadna služba. Å peciálne pro startup: 0 - automatický, 1 - automatický oneskorený, 2 - manuálny, 3 - zakázaný, 4 - neznámy"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9343,11 +9362,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Zdedené makrá hosta"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9359,7 +9378,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Zdedené makrá šablón"
@@ -9379,7 +9398,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Vložiť"
@@ -9438,8 +9457,8 @@ msgstr "Rozhranie s IP \"%1$s\" nemôže mať prázdne DNS meno, pokiaľ použí
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Rozhranie s IP \"%1$s\" nemôže mať prázdne DNS meno."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9531,7 +9550,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9592,10 +9611,10 @@ msgstr "Neplatné parametre metódy."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9658,8 +9677,8 @@ msgstr "Neplatné parametre metódy."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9881,11 +9900,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventár"
@@ -9899,7 +9918,7 @@ msgid "Inventory field"
msgstr "Pole inventára"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Režim inventára"
@@ -9907,10 +9926,10 @@ msgstr "Režim inventára"
msgid "Is online?"
msgstr "Prihlásený?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Vydavateľ"
@@ -10005,7 +10024,7 @@ msgstr[2] "Položky povolené"
msgid "Item in \"not supported\" state"
msgstr "Položka je v \"not supported\" stave"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Položka nie je oznaÄená"
@@ -10466,17 +10485,17 @@ msgstr "Graf posledného mesiaca"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Posledných"
@@ -10553,8 +10572,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10588,8 +10607,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Spojnica"
@@ -10612,16 +10631,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Ukazovateľ stavu spojnice"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Pripojiť šablóny"
@@ -10637,13 +10649,6 @@ msgstr "Pripojiť k šablónam"
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10782,7 +10787,7 @@ msgstr "Logovať aj nenastavené SNMP trapy"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Prihlásenie"
@@ -10864,16 +10869,16 @@ msgstr "Makro \"%1$s\" už existuje na \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Makro \"%1$s\" už existuje."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Makrá"
@@ -10972,12 +10977,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Manuál"
@@ -11120,16 +11125,16 @@ msgstr "OznaÄiÅ¥ ostatné"
msgid "Mark selected"
msgstr "OznaÄiÅ¥ vybrané"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Maska"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11162,11 +11167,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11402,7 +11407,7 @@ msgstr ""
msgid "Middle"
msgstr "Stred"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11505,7 +11510,7 @@ msgstr "Chýbajúce položky pre prototyp grafu \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "Chýbajúci kÄ¾ÃºÄ \"%1$s\" pre host \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11591,9 +11596,9 @@ msgstr "Pondelok"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Monitorovanie cez proxy"
@@ -11612,6 +11617,7 @@ msgstr "Monitorovanie"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Mesiac"
@@ -11724,8 +11730,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11795,11 +11801,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11827,8 +11833,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11849,7 +11855,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12139,15 +12145,15 @@ msgstr "Žiadne stanovené ID zisťovacích pravidiel."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Bez Å¡ifrovania"
@@ -12233,7 +12239,7 @@ msgstr "Žiadne výbery nenájdené"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12270,9 +12276,9 @@ msgstr "Žiadne oprávnenia pre prístup do systému."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12311,7 +12317,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12411,11 +12417,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12474,7 +12480,7 @@ msgid "No public key file specified."
msgstr "Žiadny Å¡pecifikovaný súbor s verejným kľúÄom."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12495,7 +12501,7 @@ msgid "No target selected."
msgstr "Nie je vybraný cieľ."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12644,6 +12650,10 @@ msgstr "Report hlásení"
msgid "Notifications"
msgstr "Správy"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12730,6 +12740,10 @@ msgstr "PoÄet procesorov na virtuálnom stroji VMware, <url> - URL VMware služ
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "PoÄet zmien stavu"
@@ -12905,7 +12919,7 @@ msgid "Off"
msgstr "Vypnuté"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12952,7 +12966,7 @@ msgstr ""
msgid "One time only"
msgstr "Jednorázovo"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Jednorázový prestoj"
@@ -13030,12 +13044,12 @@ msgstr "Informácie o operaÄnom systéme. Vráti reÅ¥azec"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -13069,8 +13083,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Operácie"
@@ -13105,7 +13119,7 @@ msgstr "Operácie"
msgid "Operator"
msgstr "Operátor"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13145,19 +13159,19 @@ msgstr "Alebo"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13187,10 +13201,10 @@ msgstr "Alebo"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13453,10 +13467,10 @@ msgstr "PROBLÉM"
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13469,19 +13483,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "PSK identita"
@@ -13533,12 +13547,12 @@ msgid "Parameters"
msgstr "Parametre"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Nadradené zisťovacie pravidlá"
@@ -13593,13 +13607,13 @@ msgid "Passive"
msgstr "Pasívny"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13607,7 +13621,7 @@ msgstr "Pasívny"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13660,12 +13674,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13678,7 +13692,7 @@ msgstr "Maximálne využitie pamäte: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Percentá"
@@ -13702,10 +13716,11 @@ msgstr "Percentilová Äiara (vpravo)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Vykonať DNS dotaz. Vráti reťazec s požadovaným typom informácie"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13713,7 +13728,9 @@ msgstr "Vykonať DNS dotaz. Vráti reťazec s požadovaným typom informácie"
msgid "Period"
msgstr "Perióda"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13777,11 +13794,11 @@ msgstr "Prehrávať zvuk"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Prosím skontrolujte konfiguraÄné parametre. Ak sú v poriadku stlaÄte tlaÄidlo \"%1$s\", prípadne tlaÄidlo \"%2$s\" pre zmenu konfiguraÄných parametrov."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13867,7 +13884,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13876,7 +13893,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "PredinÅ¡talaÄné zhrnutie"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13993,9 +14010,9 @@ msgstr "Privátny"
msgid "Private key file"
msgstr "Súbor so súkromným kľúÄom"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Úroveň oprávnenia"
@@ -14403,7 +14420,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14535,20 +14552,20 @@ msgstr "Vzdialený príkaz"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14557,10 +14574,10 @@ msgstr "Vzdialený príkaz"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14604,7 +14621,7 @@ msgstr "Vzdialený príkaz"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14687,14 +14704,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14707,8 +14724,8 @@ msgstr "Nahradiť"
msgid "Replace dependencies"
msgstr "Nahradiť závislosti"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14909,7 +14926,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Výsledok"
@@ -15444,7 +15461,7 @@ msgstr ""
msgid "Script"
msgstr "Skript"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Skript \"%1$s\" už existuje."
@@ -15510,6 +15527,15 @@ msgstr "Vyhľadávací vzor je prázdny"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Sekundárna POC bunka"
@@ -15588,7 +15614,7 @@ msgstr ""
msgid "Selected"
msgstr "OznaÄené"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "OznaÄené akcie zmazané"
@@ -15830,6 +15856,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16283,7 +16310,7 @@ msgstr "Å panielsky (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Špecifikovaný skript neexistuje alebo nemáte práva na jeho vykonanie."
@@ -16318,8 +16345,8 @@ msgstr "Štandardné položky"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16327,7 +16354,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "ZaÄiatok v"
@@ -16406,7 +16433,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16510,7 +16537,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Krok s menom \"%1$s\" už existuje."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16564,12 +16591,12 @@ msgstr "Priamy"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16590,10 +16617,10 @@ msgstr "Podfilter"
msgid "Subject"
msgstr "Predmet"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Subjekt"
@@ -16787,7 +16814,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16803,13 +16830,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16826,7 +16853,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16836,7 +16863,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16872,14 +16899,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Šablóna"
@@ -16923,7 +16948,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Šablóna zmazaná"
@@ -16935,11 +16960,11 @@ msgstr "Skupina šablón"
msgid "Template linkage"
msgstr "Pripojenia šablón"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Makrá šablón"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Meno šablóny"
@@ -16974,13 +16999,12 @@ msgstr "Šablóna s rovnakým viditeľným menom \"%1$s\" už existuje."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16989,10 +17013,12 @@ msgstr "Šablóna s rovnakým viditeľným menom \"%1$s\" už existuje."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -17003,7 +17029,7 @@ msgstr "Šablóny"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Šablóny \"%1$s\" odpojené od hostov \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17219,7 +17245,7 @@ msgstr "Téma"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17257,7 +17283,7 @@ msgstr "Tento rok"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Prahová hodnota"
@@ -17290,15 +17316,15 @@ msgstr ""
msgid "Till"
msgstr "Do"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17335,13 +17361,13 @@ msgstr ""
msgid "Time period"
msgstr "Časová perióda"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -18038,9 +18064,9 @@ msgstr "Jednotky"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Neznámy"
@@ -18058,7 +18084,7 @@ msgid "Unknown error"
msgstr "Neznáma chyba"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Neznáme položky hosta, nenájdené položky na oznaÄenom hostovi"
@@ -18090,16 +18116,16 @@ msgstr "Neznámy typ hodnoty"
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Odpojiť"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "OdpojiÅ¥ a vyÄistiÅ¥"
@@ -18196,10 +18222,10 @@ msgstr "Dostupný"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18208,16 +18234,16 @@ msgstr "Dostupný"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18246,7 +18272,7 @@ msgstr "Aktualizovať existujúce"
msgid "Update interval"
msgstr "Interval obnovovania"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18273,7 +18299,7 @@ msgstr "Nahrať"
msgid "Upper level maps"
msgstr "Mapa najvyššej úrovne"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18462,7 +18488,7 @@ msgstr[2] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18600,15 +18626,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Používateľské meno"
@@ -18922,11 +18948,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -19000,14 +19026,14 @@ msgstr "Mapa hodnôt \"%1$s\" už existuje."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Mapovanie hodnôt"
@@ -19050,7 +19076,7 @@ msgstr "Hodnota: bez údajov"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19150,7 +19176,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Zobrazované meno"
@@ -19176,7 +19202,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Varovná"
@@ -19286,6 +19312,10 @@ msgstr "St"
msgid "Wednesday"
msgstr "Streda"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19558,7 +19588,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Rok"
@@ -19618,7 +19649,7 @@ msgstr "Ste prihlásený ako \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Nemôžete si vybrať niektoré jazyky pretože locales pre ne nie sú nainštalované na web servery."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Nie ste prihlásený"
@@ -19859,11 +19890,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19958,7 +19989,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -20002,11 +20033,11 @@ msgstr "na Äerveno"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -20020,11 +20051,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -20046,39 +20077,47 @@ msgstr ""
msgid "avg"
msgstr "priemer"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -20093,7 +20132,7 @@ msgstr "blikajúci"
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20135,7 +20174,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20223,23 +20262,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20266,7 +20305,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20281,15 +20320,15 @@ msgstr "nastaviť"
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20297,11 +20336,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20314,15 +20353,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20340,7 +20379,7 @@ msgstr "dní"
msgid "default"
msgstr "predvolené"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20417,7 +20456,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20440,11 +20479,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20460,7 +20499,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20474,15 +20513,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20490,7 +20529,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20564,7 +20603,7 @@ msgstr "v"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20573,11 +20612,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20596,7 +20635,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20614,7 +20653,7 @@ msgstr "nesprávna syntax pri \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20674,7 +20713,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20696,6 +20735,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20737,7 +20786,7 @@ msgstr ""
msgid "key is empty"
msgstr "kÄ¾ÃºÄ je prázdny"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20753,7 +20802,7 @@ msgctxt "week of month"
msgid "last"
msgstr "naposledy"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20761,11 +20810,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20773,23 +20822,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20797,7 +20846,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "nízko úrovňové zisťovacie pravidlo"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20829,11 +20878,11 @@ msgstr "makro je prázdne"
msgid "macro(s)"
msgstr "makro(á)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20869,7 +20918,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20883,7 +20932,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20900,7 +20949,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20915,15 +20964,15 @@ msgstr ""
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -21005,7 +21054,7 @@ msgstr ""
msgid "new"
msgstr "nový"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "nový"
@@ -21039,7 +21088,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -21060,7 +21109,7 @@ msgstr "mimo"
msgid "not selected"
msgstr "nie je vybratý"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21147,15 +21196,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21163,15 +21212,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21220,11 +21269,11 @@ msgstr ""
msgid "regular expression"
msgstr "regulárny výraz"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21248,15 +21297,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21347,23 +21396,23 @@ msgstr "zobraziť mapovanie ikon"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21371,11 +21420,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21383,11 +21432,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21415,7 +21464,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21449,7 +21498,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21496,31 +21545,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21546,11 +21599,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21607,7 +21660,7 @@ msgstr "neoÄakávaný koniec makra"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21650,7 +21703,7 @@ msgstr "neoÄakávaná hodnota \"%1$s\""
msgid "unknown"
msgstr "neznámy"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21851,11 +21904,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/sv/LC_MESSAGES/frontend.po b/ui/locale/sv/LC_MESSAGES/frontend.po
index 3fb82641bd4..570b2a90d25 100644
--- a/ui/locale/sv/LC_MESSAGES/frontend.po
+++ b/ui/locale/sv/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2021-03-19 18:15+0300\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -302,10 +302,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr ""
@@ -456,7 +456,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -525,7 +525,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -544,11 +544,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -560,24 +560,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -595,7 +595,7 @@ msgstr ""
msgid "Action"
msgstr "Åtgärd"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr ""
@@ -605,7 +605,7 @@ msgstr ""
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Åtgärd lades till"
@@ -614,17 +614,17 @@ msgstr "Åtgärd lades till"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Åtgärd borttagen"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] ""
@@ -643,7 +643,7 @@ msgstr ""
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Åtgärd uppdaterad"
@@ -690,7 +690,7 @@ msgid "Active till"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -749,14 +749,14 @@ msgstr ""
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -772,10 +772,10 @@ msgstr ""
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -787,9 +787,9 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -807,7 +807,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -852,7 +852,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -877,8 +877,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -891,7 +891,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1025,7 +1025,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1041,6 +1041,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Alias"
@@ -1355,7 +1359,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1435,9 +1439,9 @@ msgstr ""
msgid "Authentication"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr ""
@@ -1498,12 +1502,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr ""
@@ -1618,12 +1622,12 @@ msgstr ""
msgid "Bind password"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1829,7 +1833,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Kan inte lägga till åtgärd"
@@ -2127,7 +2131,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Kan inte ta bort åtgärd"
@@ -2292,12 +2296,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] ""
msgstr[1] ""
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr ""
@@ -2314,7 +2318,7 @@ msgstr[1] "Kan inte ta bort tjänst"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr ""
@@ -2401,7 +2405,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] ""
@@ -2479,7 +2483,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] ""
@@ -2708,7 +2712,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] ""
msgstr[1] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr ""
@@ -2887,7 +2891,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -2953,7 +2957,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Kan inte uppdatera åtgärd"
@@ -3013,7 +3017,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Kan inte uppdatera värd"
@@ -3116,9 +3120,9 @@ msgstr ""
msgid "Cannot update script"
msgstr ""
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3145,7 +3149,7 @@ msgstr ""
msgid "Cannot update template"
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3231,14 +3235,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3256,10 +3260,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3299,9 +3303,9 @@ msgstr ""
msgid "Character string not included"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3317,7 +3321,7 @@ msgstr ""
msgid "Check already exists."
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr ""
@@ -3439,8 +3443,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr ""
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr ""
@@ -3467,16 +3471,16 @@ msgstr "Klocka"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3605,7 +3609,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3877,13 +3881,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3891,9 +3895,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -4060,10 +4064,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Antal"
@@ -4153,7 +4157,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4355,7 +4359,7 @@ msgid "Current value"
msgstr ""
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4598,7 +4602,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4671,11 +4675,11 @@ msgstr ""
msgid "Date HW purchased"
msgstr ""
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Dag"
@@ -4716,8 +4720,8 @@ msgstr ""
msgid "December"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4727,7 +4731,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4858,7 +4862,7 @@ msgstr "Ta bort"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr ""
@@ -4867,11 +4871,11 @@ msgstr ""
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr ""
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr ""
@@ -5004,7 +5008,7 @@ msgstr ""
msgid "Delete selected host groups?"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5112,7 +5116,7 @@ msgstr ""
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr ""
@@ -5173,7 +5177,7 @@ msgstr ""
msgid "Dependencies"
msgstr ""
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr ""
@@ -5181,7 +5185,7 @@ msgstr ""
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5192,7 +5196,7 @@ msgid "Deployment status"
msgstr ""
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5207,16 +5211,16 @@ msgstr ""
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5228,10 +5232,10 @@ msgstr "Beskrivning"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detaljer"
@@ -5240,6 +5244,14 @@ msgstr "Detaljer"
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr ""
@@ -5362,7 +5374,7 @@ msgstr ""
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5389,17 +5401,17 @@ msgstr ""
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Inaktiverad"
@@ -5424,7 +5436,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5637,7 +5649,7 @@ msgstr ""
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5654,7 +5666,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5736,7 +5748,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5800,7 +5812,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Längd"
@@ -5830,14 +5842,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6093,7 +6105,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6131,13 +6143,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6153,11 +6165,11 @@ msgstr "Aktiverad"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6233,6 +6245,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr ""
@@ -6801,8 +6817,8 @@ msgctxt "page navigation"
msgid "First"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6914,12 +6930,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr ""
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Funktion"
@@ -6935,7 +6951,7 @@ msgstr "GSM-modem"
msgid "GUI"
msgstr ""
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr ""
@@ -7285,7 +7301,7 @@ msgstr "Gruppnamn"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7298,12 +7314,11 @@ msgid "Grouping by"
msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Grupper"
@@ -7522,7 +7537,7 @@ msgstr ""
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7553,7 +7568,7 @@ msgid "Horizontal align"
msgstr "Horisontell justering"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7562,7 +7577,7 @@ msgstr "Horisontell justering"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7573,7 +7588,7 @@ msgstr "Horisontell justering"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7699,7 +7714,7 @@ msgid "Host group label type"
msgstr ""
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7718,8 +7733,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7769,7 +7784,7 @@ msgstr ""
msgid "Host label type"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7781,7 +7796,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr ""
@@ -7818,7 +7833,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7841,7 +7856,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7866,7 +7881,7 @@ msgstr ""
msgid "Host update failed."
msgstr ""
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Värd uppdaterades"
@@ -7943,6 +7958,10 @@ msgstr ""
msgid "Hosts updated"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr ""
@@ -8012,15 +8031,15 @@ msgstr ""
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr ""
@@ -8252,7 +8271,7 @@ msgstr "Bilder"
msgid "Images for all maps will be updated!"
msgstr ""
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr ""
@@ -8334,7 +8353,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8346,11 +8365,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8465,7 +8484,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr ""
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr ""
@@ -8473,7 +8492,7 @@ msgstr ""
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr ""
@@ -8485,15 +8504,15 @@ msgstr ""
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8502,11 +8521,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8514,7 +8533,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr ""
@@ -8524,11 +8543,11 @@ msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr ""
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8537,11 +8556,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8841,8 +8860,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr ""
@@ -9240,7 +9259,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9249,11 +9268,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9265,7 +9284,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9285,7 +9304,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr ""
@@ -9344,8 +9363,8 @@ msgstr ""
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9437,7 +9456,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9498,10 +9517,10 @@ msgstr ""
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9564,8 +9583,8 @@ msgstr ""
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9787,11 +9806,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Inventarier"
@@ -9805,7 +9824,7 @@ msgid "Inventory field"
msgstr ""
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr ""
@@ -9813,10 +9832,10 @@ msgstr ""
msgid "Is online?"
msgstr "Är ansluten?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9908,7 +9927,7 @@ msgstr[1] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10361,17 +10380,17 @@ msgstr ""
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr ""
@@ -10448,8 +10467,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10483,8 +10502,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Länk"
@@ -10507,16 +10526,9 @@ msgstr ""
msgid "Link indicators"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr ""
@@ -10532,13 +10544,6 @@ msgstr ""
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10677,7 +10682,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Inloggning"
@@ -10759,16 +10764,16 @@ msgstr ""
msgid "Macro \"%1$s\" already exists."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr ""
@@ -10867,12 +10872,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr ""
@@ -11015,16 +11020,16 @@ msgstr "Markera övriga"
msgid "Mark selected"
msgstr "Markera markerade"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11057,11 +11062,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11293,7 +11298,7 @@ msgstr ""
msgid "Middle"
msgstr "Mitten"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11395,7 +11400,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11477,9 +11482,9 @@ msgstr ""
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr ""
@@ -11498,6 +11503,7 @@ msgstr "Övervakning"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "MÃ¥nad"
@@ -11610,8 +11616,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11681,11 +11687,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11713,8 +11719,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11735,7 +11741,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12025,15 +12031,15 @@ msgstr ""
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12119,7 +12125,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12156,9 +12162,9 @@ msgstr ""
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12197,7 +12203,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12297,11 +12303,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12360,7 +12366,7 @@ msgid "No public key file specified."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12381,7 +12387,7 @@ msgid "No target selected."
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12530,6 +12536,10 @@ msgstr "Notifieringsrapport"
msgid "Notifications"
msgstr "Notifieringar"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12616,6 +12626,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Antal statusändringar"
@@ -12791,7 +12805,7 @@ msgid "Off"
msgstr "AV"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12838,7 +12852,7 @@ msgstr ""
msgid "One time only"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr ""
@@ -12915,12 +12929,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12954,8 +12968,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr ""
@@ -12990,7 +13004,7 @@ msgstr ""
msgid "Operator"
msgstr ""
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13030,19 +13044,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13072,10 +13086,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13338,10 +13352,10 @@ msgstr ""
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13354,19 +13368,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13418,12 +13432,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr ""
@@ -13478,13 +13492,13 @@ msgid "Passive"
msgstr ""
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13492,7 +13506,7 @@ msgstr ""
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13545,12 +13559,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13563,7 +13577,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13587,10 +13601,11 @@ msgstr ""
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13598,7 +13613,9 @@ msgstr ""
msgid "Period"
msgstr "Period"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13662,11 +13679,11 @@ msgstr ""
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13752,7 +13769,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13761,7 +13778,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13878,9 +13895,9 @@ msgstr ""
msgid "Private key file"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr ""
@@ -14287,7 +14304,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14418,20 +14435,20 @@ msgstr "Fjärrkommando"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14440,10 +14457,10 @@ msgstr "Fjärrkommando"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14487,7 +14504,7 @@ msgstr "Fjärrkommando"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14570,14 +14587,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14590,8 +14607,8 @@ msgstr ""
msgid "Replace dependencies"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14792,7 +14809,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr ""
@@ -15324,7 +15341,7 @@ msgstr ""
msgid "Script"
msgstr "Skript"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15389,6 +15406,15 @@ msgstr ""
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr ""
@@ -15467,7 +15493,7 @@ msgstr ""
msgid "Selected"
msgstr ""
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr ""
@@ -15708,6 +15734,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16161,7 +16188,7 @@ msgstr "Spanska (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr ""
@@ -16196,8 +16223,8 @@ msgstr ""
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16205,7 +16232,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr ""
@@ -16284,7 +16311,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16388,7 +16415,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16442,12 +16469,12 @@ msgstr ""
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16468,10 +16495,10 @@ msgstr ""
msgid "Subject"
msgstr "Ämne"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16665,7 +16692,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16681,13 +16708,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16704,7 +16731,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16714,7 +16741,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16750,14 +16777,12 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Mall"
@@ -16801,7 +16826,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr ""
@@ -16813,11 +16838,11 @@ msgstr ""
msgid "Template linkage"
msgstr "Mallkoppling"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr ""
@@ -16852,13 +16877,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16867,10 +16891,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16881,7 +16907,7 @@ msgstr "Mallar"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17095,7 +17121,7 @@ msgstr ""
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17133,7 +17159,7 @@ msgstr ""
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17166,15 +17192,15 @@ msgstr ""
msgid "Till"
msgstr "Till"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17211,13 +17237,13 @@ msgstr ""
msgid "Time period"
msgstr "Tidsperiod"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17909,9 +17935,9 @@ msgstr "Enheter"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Okänd"
@@ -17929,7 +17955,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr ""
@@ -17961,16 +17987,16 @@ msgstr ""
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr ""
@@ -18066,10 +18092,10 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18078,16 +18104,16 @@ msgstr ""
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18116,7 +18142,7 @@ msgstr ""
msgid "Update interval"
msgstr "Uppdateringsintervall"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18143,7 +18169,7 @@ msgstr "Skicka upp"
msgid "Upper level maps"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18329,7 +18355,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18465,15 +18491,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr ""
@@ -18787,11 +18813,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18865,14 +18891,14 @@ msgstr ""
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Värdesmappning"
@@ -18915,7 +18941,7 @@ msgstr ""
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19015,7 +19041,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr ""
@@ -19041,7 +19067,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Varning"
@@ -19149,6 +19175,10 @@ msgstr ""
msgid "Wednesday"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19421,7 +19451,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Ã…r"
@@ -19481,7 +19512,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr ""
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19722,11 +19753,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19821,7 +19852,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19865,11 +19896,11 @@ msgstr "som Röd"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19883,11 +19914,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19909,39 +19940,47 @@ msgstr ""
msgid "avg"
msgstr "medel"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19956,7 +19995,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19998,7 +20037,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20086,23 +20125,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20129,7 +20168,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20144,15 +20183,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20160,11 +20199,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20177,15 +20216,15 @@ msgstr ""
msgid "d.M"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20203,7 +20242,7 @@ msgstr ""
msgid "default"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20280,7 +20319,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20303,11 +20342,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20323,7 +20362,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20337,15 +20376,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20353,7 +20392,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20427,7 +20466,7 @@ msgstr ""
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20436,11 +20475,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20459,7 +20498,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20477,7 +20516,7 @@ msgstr ""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20537,7 +20576,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20559,6 +20598,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20600,7 +20649,7 @@ msgstr ""
msgid "key is empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20616,7 +20665,7 @@ msgctxt "week of month"
msgid "last"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20624,11 +20673,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20636,23 +20685,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20660,7 +20709,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20692,11 +20741,11 @@ msgstr ""
msgid "macro(s)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20732,7 +20781,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20746,7 +20795,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20763,7 +20812,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20778,15 +20827,15 @@ msgstr ""
msgid "mm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20868,7 +20917,7 @@ msgstr ""
msgid "new"
msgstr ""
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr ""
@@ -20902,7 +20951,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20923,7 +20972,7 @@ msgstr ""
msgid "not selected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21010,15 +21059,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21026,15 +21075,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21083,11 +21132,11 @@ msgstr ""
msgid "regular expression"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21111,15 +21160,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21210,23 +21259,23 @@ msgstr ""
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21234,11 +21283,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21246,11 +21295,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21278,7 +21327,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21312,7 +21361,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21359,31 +21408,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21409,11 +21462,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21470,7 +21523,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21513,7 +21566,7 @@ msgstr ""
msgid "unknown"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21712,11 +21765,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/tr/LC_MESSAGES/frontend.po b/ui/locale/tr/LC_MESSAGES/frontend.po
index 64f12e302f6..d3fdd340b2a 100644
--- a/ui/locale/tr/LC_MESSAGES/frontend.po
+++ b/ui/locale/tr/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2021-03-19 18:15+0300\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: Zabbix translation team\n"
@@ -303,10 +303,10 @@ msgstr "(0 - eylem öntanımlısını kullan)"
msgid "(Only super admins can create groups)"
msgstr "(Yalnızca süper yöneticiler grup oluşturabilir)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(vekil sunucu yok)"
@@ -458,7 +458,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -527,7 +527,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -546,11 +546,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -562,24 +562,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -597,7 +597,7 @@ msgstr ""
msgid "Action"
msgstr "Eylem"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "\"%1$s\" eylemi halihazırda var."
@@ -607,7 +607,7 @@ msgstr "\"%1$s\" eylemi halihazırda var."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Eylem eklendi"
@@ -616,17 +616,17 @@ msgstr "Eylem eklendi"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Eylem silindi"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Eylem devre dışı"
msgstr[1] "Eylemler devre dışı"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Eylem etkin"
@@ -645,7 +645,7 @@ msgstr "Eylem günlüğü"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Eylem güncellendi"
@@ -692,7 +692,7 @@ msgid "Active till"
msgstr "Åžu zamana kadar aktif"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -751,14 +751,14 @@ msgstr "Åžu zamana kadar aktif"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -774,10 +774,10 @@ msgstr "Åžu zamana kadar aktif"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -789,9 +789,9 @@ msgstr "Åžu zamana kadar aktif"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -809,7 +809,7 @@ msgstr "Åžu zamana kadar aktif"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -854,7 +854,7 @@ msgstr "Alt öğe ekle"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -879,8 +879,8 @@ msgstr "Birden çok harita ekle"
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -893,7 +893,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1027,7 +1027,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1043,6 +1043,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Rumuz"
@@ -1357,7 +1361,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1437,9 +1441,9 @@ msgstr ""
msgid "Authentication"
msgstr "Kimlik DoÄŸrulama"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Kimlik doğrulama algoritması"
@@ -1500,12 +1504,12 @@ msgstr "Otomatik giriş ve otomatik çıkış seçenekleri birlikte etkinleştir
msgid "Auto-logout"
msgstr "Otomatik çıkış"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Otomatik"
@@ -1620,12 +1624,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bağlanma parolası"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1832,7 +1836,7 @@ msgstr "\"%2$s\" grafiğine sayısal olmayan \"%1$s\" öğesi eklenemez."
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "\"%2$s\" grafik prototipine sayısal olmayan \"%1$s\" öğesi eklenemez."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Eylem eklenemiyor"
@@ -2130,7 +2134,7 @@ msgstr[1] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "\"%1$s\" Zabbix dahili kullanıcısı silinemiyor, bu kullanıcıyı devredışı bırakmayı deneyin."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Eylem silinemiyor"
@@ -2296,12 +2300,12 @@ msgid_plural "Cannot delete scripts"
msgstr[0] "Betik silinemiyor"
msgstr[1] "Betikler silinemiyor"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Betikler silinemiyor. \"%1$s\" betiği \"%2$s\" eylem işleminde kullanılıyor."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Seçilen eylemler silinemiyor"
@@ -2318,7 +2322,7 @@ msgstr[1] "Servis silinemiyor"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Åžablon silinemiyor"
@@ -2405,7 +2409,7 @@ msgid_plural "Cannot disable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Eylem devre dışı bırakılamıyor"
@@ -2483,7 +2487,7 @@ msgid_plural "Cannot enable API tokens"
msgstr[0] ""
msgstr[1] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Eylem etkinleÅŸtirilemiyor"
@@ -2712,7 +2716,7 @@ msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not
msgstr[0] "\"%1$s\" şablonu içe aktarılamıyor, \"%2$s\" bağlantılı şablonu mevcut değil."
msgstr[1] "\"%1$s\" şablonu içe aktarılamıyor, \"%2$s\" bağlantılı şablonları mevcut değil."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Tetikleyici ifadesi eklenemiyor"
@@ -2891,7 +2895,7 @@ msgstr "Şablonun bağlantısı kaldırılamıyor."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "\"%2$s\" eylemi için \"%1$s\" güncellenemiyor."
@@ -2957,7 +2961,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Şablon web senaryosu \"%1$s\" güncellenemiyor: %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Eylem güncellenemez"
@@ -3017,7 +3021,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Keşfedilen ana makine \"%1$s\" için gruplar güncellenemiyor."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Ana makine güncellenemiyor"
@@ -3120,9 +3124,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Betik güncellenemiyor"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3149,7 +3153,7 @@ msgstr "Şablon web senaryosu \"%1$s\" için adım güncellenemiyor: %2$s."
msgid "Cannot update template"
msgstr "Şablon güncellenemiyor"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3235,14 +3239,14 @@ msgstr "snmptrap[] öğelerinden herhangi biri tarafından yakalanmayan tüm SNM
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Sertifika"
@@ -3260,10 +3264,10 @@ msgctxt "verb"
msgid "Change"
msgstr "DeÄŸiÅŸtir"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3303,9 +3307,9 @@ msgstr "Karakter dizgisi içeriliyor"
msgid "Character string not included"
msgstr "Karakter dizgisi içerilmiyor"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3321,7 +3325,7 @@ msgstr "Şasi bilgisi. Karakter dizgisi döndürür"
msgid "Check already exists."
msgstr "Halihazırda olanları kontrol et."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "İfade bölümünü \"%1$s\" kısmından başlayarak kontrol edin."
@@ -3443,8 +3447,8 @@ msgstr "Geçmişi temizle"
msgid "Clear history and trends"
msgstr "Geçmişi ve eğilimleri temizle"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "Bağlantı kaldırılırken temizle"
@@ -3471,16 +3475,16 @@ msgstr "Saat"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3609,7 +3613,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr "Eşzamanlı oturumlar"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3881,13 +3885,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Bağlantılar"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Ana makineden yapılan bağlantılar"
@@ -3895,9 +3899,9 @@ msgstr "Ana makineden yapılan bağlantılar"
msgid "Connections from proxy"
msgstr "Vekil sunucudan yapılan bağlantılar"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Ana makineye yapılan bağlantılar"
@@ -4065,10 +4069,10 @@ msgstr "Korelasyon kuralı"
msgid "Correlation updated"
msgstr "Korelasyon güncellendi"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "Sayı"
@@ -4158,7 +4162,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4360,7 +4364,7 @@ msgid "Current value"
msgstr "Geçerli değer"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Özel"
@@ -4603,7 +4607,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4676,11 +4680,11 @@ msgstr "Donanımın bakım zamanının bittiği tarih"
msgid "Date HW purchased"
msgstr "Donanımın alındığı tarih"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Gün"
@@ -4721,8 +4725,8 @@ msgstr "Ara"
msgid "December"
msgstr "Aralık"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4732,7 +4736,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4863,7 +4867,7 @@ msgstr "Sil"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Sil ve temizle"
@@ -4872,11 +4876,11 @@ msgstr "Sil ve temizle"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Seçilen şablonlar silinsin ve temizlensin mi? (Uyarı: bütün bağlantılı ana makineler temizlenecektir!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Şablon silinsin ve temizlensin mi? (Uyarı: bütün bağlantılı ana makineler temizlenecektir!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Åžu anki eylem silinsin mi?"
@@ -5009,7 +5013,7 @@ msgstr "Seçilen gruplar silinsin mi?"
msgid "Delete selected host groups?"
msgstr "Seçili ana makine grupları silinsin mi?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Seçili ana makine prototipi silinsin mi?"
@@ -5117,7 +5121,7 @@ msgstr "Seçilen kullanıcılar silinsin mi?"
msgid "Delete selected web scenarios?"
msgstr "Seçilen web senaryoları silinsin mi?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Åžablon silinsin mi?"
@@ -5178,7 +5182,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Bağımlılıklar"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Bağımlı"
@@ -5186,7 +5190,7 @@ msgstr "Bağımlı"
msgid "Dependent item"
msgstr "Bağımlı öğe"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5197,7 +5201,7 @@ msgid "Deployment status"
msgstr "Dağıtım durumu"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5212,16 +5216,16 @@ msgstr "Dağıtım durumu"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5233,10 +5237,10 @@ msgstr "Açıklama"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Detaylar"
@@ -5245,6 +5249,14 @@ msgstr "Detaylar"
msgid "Details of web scenario"
msgstr "Web senaryosunun detayları"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "Aygıt"
@@ -5367,7 +5379,7 @@ msgstr "Seçilen web senaryoları devre dışı bırakılsın mı?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5394,17 +5406,17 @@ msgstr "Seçilen web senaryoları devre dışı bırakılsın mı?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Devre dışı"
@@ -5429,7 +5441,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5643,7 +5655,7 @@ msgstr "Yığılmış grafik göster"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5660,7 +5672,7 @@ msgstr "%3$s bulunandan %1$s - %2$s arası gösteriliyor"
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5742,7 +5754,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Yapılandırma dosyasını indir"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5806,7 +5818,7 @@ msgstr "\"%2$s\" haritası için kullanıcılarda \"%1$s\" userid'si mükerrer."
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Süre"
@@ -5836,14 +5848,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6099,7 +6111,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6137,13 +6149,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6159,11 +6171,11 @@ msgstr "Etkin"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Åžifreleme"
@@ -6239,6 +6251,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Hata: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Olay"
@@ -6807,8 +6823,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Ä°lk"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Sığdır"
@@ -6920,12 +6936,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Tam klonla"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Fonksiyon"
@@ -6941,7 +6957,7 @@ msgstr "GSM modem"
msgid "GUI"
msgstr "Grafik arayüz"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Grafik arayüz erişimi devre dışı."
@@ -7290,7 +7306,7 @@ msgstr "Grup adı"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Grup prototipi, keşfedilmiş \"%1$s\" ana makine grubuna dayalı olamaz."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Grup prototipleri"
@@ -7303,12 +7319,11 @@ msgid "Grouping by"
msgstr "Gruplama tipi"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Gruplar"
@@ -7527,7 +7542,7 @@ msgstr "Geçmişi temizlemek uzun zaman alabilir. Devam edilsin mi?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7558,7 +7573,7 @@ msgid "Horizontal align"
msgstr "Yatay hizalama"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7567,7 +7582,7 @@ msgstr "Yatay hizalama"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7578,7 +7593,7 @@ msgstr "Yatay hizalama"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7704,7 +7719,7 @@ msgid "Host group label type"
msgstr "Ana makine grubu etiket türü"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7723,8 +7738,8 @@ msgstr "\"%1$s\" ID'li ana makine grubu mevcut deÄŸil."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7774,7 +7789,7 @@ msgstr "Ana makine envanteri genel bakış"
msgid "Host label type"
msgstr "Ana makine etiket türü"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Ana makine makroları"
@@ -7786,7 +7801,7 @@ msgstr "Ana makine üstverisi"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Ana makine adı"
@@ -7823,7 +7838,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Ana makine prototipi silindi"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7846,7 +7861,7 @@ msgstr "Görünür adı \"%1$s\" olan ana makine prototipi, \"%2$s\" keşif kura
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Ana makine prototipleri"
@@ -7871,7 +7886,7 @@ msgstr "Ana makine zamanı"
msgid "Host update failed."
msgstr "Ana makine güncelleme başarısız."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Ana makine güncellendi"
@@ -7948,6 +7963,10 @@ msgstr "Ana makinelerin konumu"
msgid "Hosts updated"
msgstr "Ana makineler güncellendi"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Saat"
@@ -8017,15 +8036,15 @@ msgstr "IP aralığı"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "\"%1$s\" IP aralığı, \"%2$s\" adres sınırını aşıyor"
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8257,7 +8276,7 @@ msgstr "Resimler"
msgid "Images for all maps will be updated!"
msgstr "Tüm haritalar için resimler güncellenecek!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Hemen"
@@ -8339,7 +8358,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8351,11 +8370,11 @@ msgstr "EriÅŸilemeyen harita"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8470,7 +8489,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Yanlış eylem koşul keşif kontrolü."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Yanlış eylem koşulu keşif kontrolü. Keşif kontrolü mevcut değil ya da ona erişiminiz yok."
@@ -8478,7 +8497,7 @@ msgstr "Yanlış eylem koşulu keşif kontrolü. Keşif kontrolü mevcut değil
msgid "Incorrect action condition discovery object."
msgstr "Yanlış eylem koşulu keşif nesnesi."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Yanlış eylem koşulu keşif kuralı. Keşif kuralı mevcut değil ya da ona erişiminiz yok."
@@ -8490,15 +8509,15 @@ msgstr "Yanlış eylem koşul keşif durumu."
msgid "Incorrect action condition event type."
msgstr "Yanlış eylem koşulu olay türü."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8507,11 +8526,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Yanlış eylem koşulu bağlantı noktası \"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Yanlış eylem durumunda vekil sunucu. Vekil sunucu yok veya ona erişemiyorsunuz."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8519,7 +8538,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Yanlış eylem durumunda tetikleyici önem derecesi."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Yanlış eylem durumunda tetikleyici. Tetikleyici yok veya ona erişemiyorsunuz."
@@ -8529,11 +8548,11 @@ msgstr "Yanlış eylem durumunda tür."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Yanlış eylem işlem eskalasyon adım değerleri."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8542,11 +8561,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Olay kaynağı \"%2$s\" için yanlış eylem işlem türü \"%1$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8846,8 +8865,8 @@ msgstr "Yanlış şablonlaştırılmış web senaryosu adım sayısı."
msgid "Incorrect trigger expression"
msgstr "Yanlış tetikleyici ifadesi"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Yanlış tetikleyici ifadesi."
@@ -9245,7 +9264,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Bir servisle ilgili bilgi. Durum ve başlangıç parametreleri olarak integer; görüntüleme ismi, yol ve kullanıcı parametreleri olarak string; açıklama parametresi olarak metin döndürür. Durumda 0 - çalışıyor, 1 - duraklatıldı, 2 - bekleme başlatma, 3 - bekleme duraklatma, 4 - bekleme devam ettirme, 5 - bekleme durdurma, 6 - durduruldu, 7 - bilinmeyen, 255 - böyle bir servis yok. Başlangıçta 0 - otomatik, 1 - otomatik gecikmeli, 2 - elle, 3 - devre dışı, 4 - bilinmeyen."
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9254,11 +9273,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Devralınan makrolar ve ana makine makroları"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9270,7 +9289,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Devralınan makrolar ve şablon makroları"
@@ -9290,7 +9309,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Ekle"
@@ -9349,8 +9368,8 @@ msgstr "\"%1$s\" IP'li arayüz, \"%2$s\" üzerinde \"DNS Kullan\" özelliğine s
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "\"%1$s\" IP'li arayüz boş DNS adına sahip olamaz."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9442,7 +9461,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "Geçersiz eylem koşulu: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9503,10 +9522,10 @@ msgstr "Geçersiz yöntem parametreleri."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9569,8 +9588,8 @@ msgstr "Geçersiz yöntem parametreleri."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9792,11 +9811,11 @@ msgstr "Geçersiz zaman periyodu."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Envanter"
@@ -9810,7 +9829,7 @@ msgid "Inventory field"
msgstr "envanter alanı"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "envanter modu"
@@ -9818,10 +9837,10 @@ msgstr "envanter modu"
msgid "Is online?"
msgstr "Çevrimiçi mi?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Yayımlayan"
@@ -9913,7 +9932,7 @@ msgstr[1] "Öğeler etkin"
msgid "Item in \"not supported\" state"
msgstr "\"Desteklenmeyen\" durumundaki öğe"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Öğe seçilmedi"
@@ -10366,17 +10385,17 @@ msgstr "Son ayın grafiği"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Sonuncu"
@@ -10453,8 +10472,8 @@ msgstr "Sol kırpma"
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10488,8 +10507,8 @@ msgstr "Çizgi türü"
msgid "Line width"
msgstr "Çizgi genişliği"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Bağlantı"
@@ -10512,16 +10531,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Bağlantı göstergeleri"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Şablonları bağlantıla"
@@ -10537,13 +10549,6 @@ msgstr "Şablonlara bağlantı"
msgid "Linked map"
msgstr "Bağlantılı harita"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10682,7 +10687,7 @@ msgstr "Eşleşmemiş SNMP trap'lerini sistem günlüğüne kaydet"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Oturum aç"
@@ -10764,16 +10769,16 @@ msgstr "\"%2$s\" üzerinde \"%1$s\" makrosu zaten var."
msgid "Macro \"%1$s\" already exists."
msgstr "\"%1$s\" makrosu halihazırda mevcut."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Makrolar"
@@ -10872,12 +10877,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Elle"
@@ -11020,16 +11025,16 @@ msgstr "DiÄŸerlerini iÅŸaretle"
msgid "Mark selected"
msgstr "Seçileni işaretle"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Maske"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11062,11 +11067,11 @@ msgstr "Ana öğe"
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11298,7 +11303,7 @@ msgstr ""
msgid "Middle"
msgstr "Orta"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11400,7 +11405,7 @@ msgstr "Grafik prototipi \"%1$s\" için eksik öğeler."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "\"%2$s\" ana makinesi için eksik anahtar \"%1$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11482,9 +11487,9 @@ msgstr "Pazartesi"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "Vekil sunucu tarafından gözlemlenen"
@@ -11503,6 +11508,7 @@ msgstr "Gözlemleme"
msgid "Monospace"
msgstr "Eş aralıklı"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "Ay"
@@ -11615,8 +11621,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11686,11 +11692,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11718,8 +11724,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11740,7 +11746,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12030,15 +12036,15 @@ msgstr "Hiçbir keşif kuralı ID'si verilmedi."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Åžifreleme yok"
@@ -12124,7 +12130,7 @@ msgstr "Hiçbir eşleşen bulunmadı"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12161,9 +12167,9 @@ msgstr "Sistem erişimi için izin yok."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12202,7 +12208,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12302,11 +12308,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12365,7 +12371,7 @@ msgid "No public key file specified."
msgstr "Hiçbir açık anahtar dosyası belirtilmemiş."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12386,7 +12392,7 @@ msgid "No target selected."
msgstr "Hiçbir hedef seçilmemiş."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12535,6 +12541,10 @@ msgstr "Bildirim raporu"
msgid "Notifications"
msgstr "Bildirimler"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12621,6 +12631,10 @@ msgstr "VMware hipervizörü üzerindeki işlemci sayısı,<url> - VMware servis
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "Durum değişikliği sayısı"
@@ -12796,7 +12810,7 @@ msgid "Off"
msgstr "Kapalı"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12843,7 +12857,7 @@ msgstr "Bir"
msgid "One time only"
msgstr "Yalnızca bir kere"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Bir kerelik aksama süresi"
@@ -12920,12 +12934,12 @@ msgstr "İşletim sistemi bilgileri. String döndürür"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12959,8 +12973,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Ä°ÅŸlemler"
@@ -12995,7 +13009,7 @@ msgstr "Ä°ÅŸlemler"
msgid "Operator"
msgstr "Ä°ÅŸlemci"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13035,19 +13049,19 @@ msgstr "Veya"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13077,10 +13091,10 @@ msgstr "Veya"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13343,10 +13357,10 @@ msgstr "SORUN"
msgid "PROBLEM event generation mode"
msgstr "PROBLEM olayı oluşturma kipi"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13359,19 +13373,19 @@ msgstr "PROBLEM olayı oluşturma kipi"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "PSK kimliÄŸi"
@@ -13423,12 +13437,12 @@ msgid "Parameters"
msgstr "Parametreler"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Üst keşfetme kuralları"
@@ -13483,13 +13497,13 @@ msgid "Passive"
msgstr "Pasif"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13497,7 +13511,7 @@ msgstr "Pasif"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13550,12 +13564,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Harici bağlantılar olmadan yapıştır"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13568,7 +13582,7 @@ msgstr "En üst bellek kullanımı: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Yüzde oranı"
@@ -13592,10 +13606,11 @@ msgstr "Yüzde çizgisi (sağ)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Bir DNS sorgusu gerçekleştirir. Gerekli bilgi türünü içeren karakter dizisini döndürür"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13603,7 +13618,9 @@ msgstr "Bir DNS sorgusu gerçekleştirir. Gerekli bilgi türünü içeren karakt
msgid "Period"
msgstr "Dönem"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13667,11 +13684,11 @@ msgstr "Sesi oynat"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Lütfen yapılandırma parametrelerini kontrol edin. Eğer hepsi doğruysa \"%1$s\" düğmesine basın veya yapılandırma parametrelerini değiştirmek için \"%2$s\" düğmesine basın."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13757,7 +13774,7 @@ msgstr "Gönderi türü"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13766,7 +13783,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Kurulum öncesi özeti"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13883,9 +13900,9 @@ msgstr "Özel"
msgid "Private key file"
msgstr "Özel anahtar dosyası"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Öncelik seviyesi"
@@ -14292,7 +14309,7 @@ msgstr "Kurtarma ifadesi"
msgid "Recovery expression syntax error."
msgstr "Kurtarma ifadesi sözdizimi hatası."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Kurtarma iÅŸlemleri"
@@ -14423,20 +14440,20 @@ msgstr "Uzak komut"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14445,10 +14462,10 @@ msgstr "Uzak komut"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14492,7 +14509,7 @@ msgstr "Uzak komut"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14575,14 +14592,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14595,8 +14612,8 @@ msgstr "DeÄŸiÅŸtir"
msgid "Replace dependencies"
msgstr "Bağımlılıkları değiştir"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14797,7 +14814,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Sonuç"
@@ -15329,7 +15346,7 @@ msgstr ""
msgid "Script"
msgstr "Betik"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "\"%1$s\" betiÄŸi zaten var."
@@ -15394,6 +15411,15 @@ msgstr "Arama şekil düzeni boş"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Ä°kinci Ä°KK cep telefonu"
@@ -15472,7 +15498,7 @@ msgstr "Parçacığı seç"
msgid "Selected"
msgstr "Seçilen"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Seçilen eylemler silindi"
@@ -15713,6 +15739,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16167,7 +16194,7 @@ msgstr "Ä°spanyolca (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Belirtilen betik mevcut değil veya eylem işlem komutu için üzerinde hakkınız yok."
@@ -16202,8 +16229,8 @@ msgstr "Standart öğeler"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16211,7 +16238,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "BaÅŸlama yeri"
@@ -16290,7 +16317,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16394,7 +16421,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "\"%1$s\" adına sahip adım halihazırda mevcut."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16448,12 +16475,12 @@ msgstr "Düz"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16474,10 +16501,10 @@ msgstr "Alt süzgeç"
msgid "Subject"
msgstr "Başlık"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Konu"
@@ -16671,7 +16698,7 @@ msgstr "Etiket deÄŸeri"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16687,13 +16714,13 @@ msgstr "Etiket deÄŸeri"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16710,7 +16737,7 @@ msgstr "Etiket deÄŸeri"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16720,7 +16747,7 @@ msgstr "Etiket deÄŸeri"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16756,14 +16783,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Åžablon"
@@ -16807,7 +16832,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Åžablon silindi"
@@ -16819,11 +16844,11 @@ msgstr "Åžablon grubu"
msgid "Template linkage"
msgstr "Şablon bağlantısı"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Şablon makroları"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Şablon adı"
@@ -16858,13 +16883,12 @@ msgstr "\"%1$s\" ile aynı görünür adlı şablon halihazırda mevcut."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16873,10 +16897,12 @@ msgstr "\"%1$s\" ile aynı görünür adlı şablon halihazırda mevcut."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16887,7 +16913,7 @@ msgstr "Åžablonlar"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "\"%1$s\" şablonlarının \"%2$s\" ana makinelerinden bağlantıları kaldırıldı."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -17101,7 +17127,7 @@ msgstr "Tema"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17139,7 +17165,7 @@ msgstr "Bu sene"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Alt sınır"
@@ -17172,15 +17198,15 @@ msgstr ""
msgid "Till"
msgstr "Kadar"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17217,13 +17243,13 @@ msgstr ""
msgid "Time period"
msgstr "Zaman dönemi"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17915,9 +17941,9 @@ msgstr "Birim"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Bilinmeyen"
@@ -17935,7 +17961,7 @@ msgid "Unknown error"
msgstr "Bilinmeyen hata"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Bilinmeyen ana makine öğesi, seçilen ana makinede böyle bir öğe yok"
@@ -17967,16 +17993,16 @@ msgstr "Bilinmeyen değer türü"
msgid "Unlimited"
msgstr "Sınırsız"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Bağlantıyı kaldır"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Bağlantıyı kaldır ve temizle"
@@ -18072,10 +18098,10 @@ msgstr "Açık"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18084,16 +18110,16 @@ msgstr "Açık"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18122,7 +18148,7 @@ msgstr "Varolanları güncelle"
msgid "Update interval"
msgstr "Güncelleme zaman aralığı"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18149,7 +18175,7 @@ msgstr "Karşıya yükle"
msgid "Upper level maps"
msgstr "Daha üst seviye haritalar"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18335,7 +18361,7 @@ msgstr[1] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18471,15 +18497,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Kullanıcı adı"
@@ -18793,11 +18819,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18871,14 +18897,14 @@ msgstr "\"%1$s\" deÄŸer eÅŸlemesi zaten var."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "DeÄŸer eÅŸlemesi"
@@ -18921,7 +18947,7 @@ msgstr "DeÄŸer: veri yok"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19021,7 +19047,7 @@ msgstr "Bayt cinsinden veya toplam yüzdesi olarak sanal alan boyutu. Bayt için
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Görünen isim"
@@ -19047,7 +19073,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Uyarı"
@@ -19155,6 +19181,10 @@ msgstr "Pts"
msgid "Wednesday"
msgstr "Çarşamba"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19427,7 +19457,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Yıl"
@@ -19487,7 +19518,7 @@ msgstr "\"%1$s\" olarak oturum açtınız."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Web sunucu üzerinde yerelleştirme ayarları yapılmamış olan bazı diller seçilemeyecektir."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Giriş yapmadınız"
@@ -19728,11 +19759,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr "bir zaman birimi bekleniyor"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19827,7 +19858,7 @@ msgstr "çift sayıda onaltılık karakter bekleniyor"
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19871,11 +19902,11 @@ msgstr "Kırmızı olarak"
msgid "ascending"
msgstr "artan"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19889,11 +19920,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19915,39 +19946,47 @@ msgstr ""
msgid "avg"
msgstr "ort"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19962,7 +20001,7 @@ msgstr "yanıp sönme"
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20004,7 +20043,7 @@ msgstr "deÄŸiÅŸtirilemez"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20092,23 +20131,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20135,7 +20174,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20150,15 +20189,15 @@ msgstr "yapılandır"
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20166,11 +20205,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20183,15 +20222,15 @@ msgstr "g"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20209,7 +20248,7 @@ msgstr "gün"
msgid "default"
msgstr "öntanımlı"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20286,7 +20325,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20309,11 +20348,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20329,7 +20368,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20343,15 +20382,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr "ilk parametre bekleniyor"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20359,7 +20398,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20433,7 +20472,7 @@ msgstr "içinde"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20442,11 +20481,11 @@ msgstr ""
msgid "including subgroups"
msgstr "alt gruplar dahil"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20465,7 +20504,7 @@ msgstr "yanlış eleman sayısı"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20483,7 +20522,7 @@ msgstr "\"%1$s\" yakınında yanlış sözdizimi"
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20543,7 +20582,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20565,6 +20604,16 @@ msgstr "geçersiz düzenli ifade"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20606,7 +20655,7 @@ msgstr ""
msgid "key is empty"
msgstr "anahtar boÅŸ"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20622,7 +20671,7 @@ msgctxt "week of month"
msgid "last"
msgstr "son"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20630,11 +20679,11 @@ msgstr ""
msgid "left"
msgstr "sol"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20642,23 +20691,23 @@ msgstr ""
msgid "list of characters"
msgstr "karakter listesi"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20666,7 +20715,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "düşük seviye keşif kuralı"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20698,11 +20747,11 @@ msgstr "makro boÅŸ"
msgid "macro(s)"
msgstr "makro(lar)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20738,7 +20787,7 @@ msgstr "maks"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20752,7 +20801,7 @@ msgstr "maksimum bağımlı öğe sayısına ulaşıldı"
msgid "maximum number of dependency levels reached"
msgstr "maksimum bağımlılık düzeyi sayısına ulaşıldı"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20769,7 +20818,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20784,15 +20833,15 @@ msgstr "minimum uzunluk %1$s karakter"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20874,7 +20923,7 @@ msgstr "ad"
msgid "new"
msgstr "yeni"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "yeni"
@@ -20908,7 +20957,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20929,7 +20978,7 @@ msgstr "içinde değil"
msgid "not selected"
msgstr "seçilen yok"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -21016,15 +21065,15 @@ msgstr ""
msgid "pattern"
msgstr "desen"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21032,15 +21081,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21089,11 +21138,11 @@ msgstr ""
msgid "regular expression"
msgstr "düzenli ifade"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21117,15 +21166,15 @@ msgstr ""
msgid "right"
msgstr "saÄŸ"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21216,23 +21265,23 @@ msgstr "simge haritalarını göster"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21240,11 +21289,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21252,11 +21301,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21284,7 +21333,7 @@ msgstr ""
msgid "tag"
msgstr "etiket"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21318,7 +21367,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21365,31 +21414,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21415,11 +21468,11 @@ msgstr "tetikleyici prototipi başka bir şablona veya ana makineye taşınamaz"
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "bağlantılara sahip tetikleyici başka bir şablona veya ana makineye taşınamaz"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21476,7 +21529,7 @@ msgstr "beklenmedik makro sonu"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21519,7 +21572,7 @@ msgstr "beklenmedik deÄŸer \"%1$s\""
msgid "unknown"
msgstr "bilinmiyor"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21718,11 +21771,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/uk/LC_MESSAGES/frontend.po b/ui/locale/uk/LC_MESSAGES/frontend.po
index 5a8255493df..2ad04e7291d 100644
--- a/ui/locale/uk/LC_MESSAGES/frontend.po
+++ b/ui/locale/uk/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2016-02-09 16:27+0300\n"
"Last-Translator: Oleksii <oleksii.zagorskyi@zabbix.com>\n"
"Language-Team: Zabbix translation team\n"
@@ -319,10 +319,10 @@ msgstr "(0 - викориÑтовувати Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ñ–Ñ—)"
msgid "(Only super admins can create groups)"
msgstr "(Тільки Ñупер адмініÑтратори можуть Ñтворювати групи)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(без прокÑÑ–)"
@@ -476,7 +476,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -545,7 +545,7 @@ msgstr "Підтверджені ВИРІШЕÐІ події"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -564,11 +564,11 @@ msgstr "Підтверджені ВИРІШЕÐІ події"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -580,24 +580,24 @@ msgstr "Підтверджені ВИРІШЕÐІ події"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -615,7 +615,7 @@ msgstr "Підтверджені ВИРІШЕÐІ події"
msgid "Action"
msgstr "ДіÑ"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Ð”Ñ–Ñ \"%1$s\" вже Ñ–Ñнує."
@@ -625,7 +625,7 @@ msgstr "Ð”Ñ–Ñ \"%1$s\" вже Ñ–Ñнує."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Дію додано"
@@ -634,18 +634,18 @@ msgstr "Дію додано"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Дію видалено"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Дію дезактивовано"
msgstr[1] "Дії дезактивовано"
msgstr[2] "Дії дезактивовано"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Дію активовано"
@@ -665,7 +665,7 @@ msgstr "Журнал дій"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Дію оновлено"
@@ -712,7 +712,7 @@ msgid "Active till"
msgstr "Ðктивно до"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -771,14 +771,14 @@ msgstr "Ðктивно до"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -794,10 +794,10 @@ msgstr "Ðктивно до"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -809,9 +809,9 @@ msgstr "Ðктивно до"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -829,7 +829,7 @@ msgstr "Ðктивно до"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -874,7 +874,7 @@ msgstr "Додати підлеглий елемент"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -899,8 +899,8 @@ msgstr "Додати кілька карт"
msgid "Add new data set"
msgstr "Додати новий набір даних"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -913,7 +913,7 @@ msgstr "Додати нове заміщеннÑ"
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1047,7 +1047,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1063,6 +1063,10 @@ msgstr ""
msgid "Alert message"
msgstr "ÐŸÐ¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñ‚Ñ€Ð¸Ð²Ð¾Ð³Ð¸"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "ÐліаÑ"
@@ -1381,7 +1385,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "Принаймні одна Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð¼Ð°Ñ” Ñ–Ñнувати."
@@ -1461,9 +1465,9 @@ msgstr ""
msgid "Authentication"
msgstr "ÐутентифікаціÑ"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Ðлгоритм аутентифікації"
@@ -1524,12 +1528,12 @@ msgstr "Опції авто-вхід та авто-вихід неможливо
msgid "Auto-logout"
msgstr "Ðвто-вихід"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Ðвтоматично"
@@ -1644,12 +1648,12 @@ msgstr "Ім'Ñ Ð´Ð»Ñ Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ (BindDN)"
msgid "Bind password"
msgstr "Пароль Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ (Bind password)"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1855,7 +1859,7 @@ msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ не чиÑловий елемент д
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ не чиÑловий елемент даних \"%1$s\" до прототипу графіка \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñ‚Ð¸ дію"
@@ -2158,7 +2162,7 @@ msgstr[2] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ внутрішнього кориÑтувача Zabbix \"%1$s\", Ñпробуйте відключити цього кориÑтувача."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ дію"
@@ -2336,12 +2340,12 @@ msgstr[0] "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñкрипт"
msgstr[1] "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñкрипти"
msgstr[2] "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñкрипти"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ Ñкрипт. Скрипт \"%1$s\" викориÑтовуєтьÑÑ Ð² операції дії \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ вибрані дії"
@@ -2359,7 +2363,7 @@ msgstr[2] "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ поÑлугу"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸ шаблон"
@@ -2450,7 +2454,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Ðе вдалоÑÑ Ð´ÐµÐ·Ð°ÐºÑ‚Ð¸Ð²ÑƒÐ²Ð°Ñ‚Ð¸ дію"
@@ -2539,7 +2543,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Ðе вдалоÑÑ Ð°ÐºÑ‚Ð¸Ð²ÑƒÐ²Ð°Ñ‚Ð¸ дію"
@@ -2779,7 +2783,7 @@ msgstr[0] "Ðе вдалоÑÑ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ шаблон \"%1$s\", пÑ
msgstr[1] "Ðе вдалоÑÑ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ шаблон \"%1$s\", приєднані шаблони \"%2$s\" не Ñ–Ñнують."
msgstr[2] "Ðе вдалоÑÑ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ шаблон \"%1$s\", приєднані шаблони \"%2$s\" не Ñ–Ñнують."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Ðе вдалоÑÑ Ð²Ñтавити вираз тригера"
@@ -2960,7 +2964,7 @@ msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´'єднати шаблон."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ \"%1$s\" Ð´Ð»Ñ Ð´Ñ–Ñ— \"%2$s\"."
@@ -3026,7 +3030,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ уÑпадкований із шаблону веб-Ñценарій \"%1$s\": %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ дію"
@@ -3087,7 +3091,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ групи Ð´Ð»Ñ Ð²Ð¸Ñвленого вузла мережі \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ вузел мережі"
@@ -3192,9 +3196,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñкрипт"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3221,7 +3225,7 @@ msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ уÑпадкований із шабÐ
msgid "Cannot update template"
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ шаблон"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr "Ðе вдалоÑÑ Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ шаблони"
@@ -3309,14 +3313,14 @@ msgstr "Ловить вÑÑ– SNMP трапи, Ñкі не були піймані
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Сертіфикат"
@@ -3334,10 +3338,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Змінити"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3377,9 +3381,9 @@ msgstr "МіÑтить Ñ€Ñдок Ñимволів"
msgid "Character string not included"
msgstr "Ðе міÑтить Ñ€Ñдок Ñимволів"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3395,7 +3399,7 @@ msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ шаÑÑ–. Повертає текÑÑ‚"
msgid "Check already exists."
msgstr "Перевірка вже Ñ–Ñнує."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "Перевірте чаÑтину виразу починаючи з \"%1$s\"."
@@ -3517,8 +3521,8 @@ msgstr "ОчиÑтити Ñ–Ñторію"
msgid "Clear history and trends"
msgstr "ОчиÑтити Ñ–Ñторію та динаміку змін"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "ОчиÑтити при від'єднанні"
@@ -3545,16 +3549,16 @@ msgstr "Годинник"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3683,7 +3687,7 @@ msgstr "СтиÑненнÑ"
msgid "Concurrent sessions"
msgstr "ОдночаÑні ÑеÑÑ–Ñ—"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3955,13 +3959,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "З'єднаннÑ"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ñ–Ð´ вузла мережі"
@@ -3969,9 +3973,9 @@ msgstr "З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð²Ñ–Ð´ вузла мережі"
msgid "Connections from proxy"
msgstr "З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· прокÑÑ–"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ вузла мережі"
@@ -4142,10 +4146,10 @@ msgstr "Правило корелÑції"
msgid "Correlation updated"
msgstr "КорелÑцію оновлено"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "КількіÑÑ‚ÑŒ"
@@ -4235,7 +4239,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4437,7 +4441,7 @@ msgid "Current value"
msgstr "Поточне значеннÑ"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "КориÑтувацьке"
@@ -4681,7 +4685,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4754,11 +4758,11 @@ msgstr "Дата Ð·Ð°ÐºÑ–Ð½Ñ‡ÐµÐ½Ð½Ñ Ð³Ð°Ñ€Ð°Ð½Ñ‚Ñ–Ñ— HW"
msgid "Date HW purchased"
msgstr "Дата Ð¿Ñ€Ð¸Ð´Ð±Ð°Ð½Ð½Ñ HW"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "День"
@@ -4799,8 +4803,8 @@ msgstr "Гру"
msgid "December"
msgstr "Грудень"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4810,7 +4814,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4941,7 +4945,7 @@ msgstr "Видалити"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "Видалити та очиÑтити"
@@ -4950,11 +4954,11 @@ msgstr "Видалити та очиÑтити"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "Видалити та очиÑтити вибрані шаблони? (УВÐГÐ: вÑÑ– приєднані вузли мережі буде очищено!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "Видалити та очиÑтити шаблон? (УВÐГÐ: вÑÑ– приєднані вузли мережі буде очищено!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "Видалити поточну дію?"
@@ -5087,7 +5091,7 @@ msgstr "Видалити вибрані групи?"
msgid "Delete selected host groups?"
msgstr "Видалити вибрані групи вузлів мережі?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "Видалити вибраний прототип вузлів мережі?"
@@ -5195,7 +5199,7 @@ msgstr "Видалити вибраних кориÑтувачів?"
msgid "Delete selected web scenarios?"
msgstr "Видалити вибрані веб Ñценарії?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "Видалити шаблон?"
@@ -5256,7 +5260,7 @@ msgstr ""
msgid "Dependencies"
msgstr "ЗалежноÑÑ‚Ñ–"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "ЗалежніÑÑ‚ÑŒ"
@@ -5264,7 +5268,7 @@ msgstr "ЗалежніÑÑ‚ÑŒ"
msgid "Dependent item"
msgstr "Залежний елемент даних"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5275,7 +5279,7 @@ msgid "Deployment status"
msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5290,16 +5294,16 @@ msgstr "Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñ€Ð¾Ð·Ð³Ð¾Ñ€Ñ‚Ð°Ð½Ð½Ñ"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5311,10 +5315,10 @@ msgstr "ОпиÑ"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Деталі"
@@ -5323,6 +5327,14 @@ msgstr "Деталі"
msgid "Details of web scenario"
msgstr "Деталі про веб Ñценарій"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "ПриÑтрій"
@@ -5445,7 +5457,7 @@ msgstr "Дезактивувати вибрані веб Ñценарії?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5472,17 +5484,17 @@ msgstr "Дезактивувати вибрані веб Ñценарії?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Дезактивовано"
@@ -5507,7 +5519,7 @@ msgstr "Відкинути значеннÑ"
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5724,7 +5736,7 @@ msgstr "Показати Ñтекований графік"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5741,7 +5753,7 @@ msgstr "Відображено від %1$s до %2$s з %3$s знайдених"
msgid "Displaying options"
msgstr "Опції відображеннÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5823,7 +5835,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Завантажити конфігураційний файл"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5887,7 +5899,7 @@ msgstr "Дублікат userid \"%1$s\" у кориÑтувачів Ð´Ð»Ñ ÐºÐ°
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "ТриваліÑÑ‚ÑŒ"
@@ -5917,14 +5929,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6180,7 +6192,7 @@ msgstr "Ðктивувати трапи"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6218,13 +6230,13 @@ msgstr "Ðктивувати трапи"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6240,11 +6252,11 @@ msgstr "Ðктивовано"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "ШифруваннÑ"
@@ -6320,6 +6332,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Помилка: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "ПодіÑ"
@@ -6889,8 +6905,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Перша"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "ÐпрокÑимаціÑ"
@@ -7002,12 +7018,12 @@ msgid "Full"
msgstr "Повне"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Клонувати повніÑÑ‚ÑŽ"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "ФункціÑ"
@@ -7023,7 +7039,7 @@ msgstr "GSM модем"
msgid "GUI"
msgstr "Веб інтерфейÑ"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "ДоÑтуп до GUI відключено."
@@ -7374,7 +7390,7 @@ msgstr "Ðазва групи"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Прототип групи не може бути заÑнований на виÑвленій групі вузлів мережі \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "Прототипи груп"
@@ -7387,12 +7403,11 @@ msgid "Grouping by"
msgstr "Згруповано по"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "Групи"
@@ -7611,7 +7626,7 @@ msgstr "ОчиÑтка журналу може забрати багато чаÑ
msgid "History data selection"
msgstr "Вибір даних Ñ–Ñторії"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7642,7 +7657,7 @@ msgid "Horizontal align"
msgstr "Ð’Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ горизонталі"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7651,7 +7666,7 @@ msgstr "Ð’Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ горизонталі"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7662,7 +7677,7 @@ msgstr "Ð’Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ горизонталі"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7791,7 +7806,7 @@ msgid "Host group label type"
msgstr "Тип Ñрлика до групи вузлів мережі"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7810,8 +7825,8 @@ msgstr "Група вузлів мережі з ID \"%1$s\" недоÑтупна
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7861,7 +7876,7 @@ msgstr "ОглÑд інвентарних даних вузла мережі"
msgid "Host label type"
msgstr "Тип Ñрлика до вузла мережі"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "МакроÑи вузла мережі"
@@ -7873,7 +7888,7 @@ msgstr "Метадані вузла мережі"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Ім'Ñ Ð²ÑƒÐ·Ð»Ð° мережі"
@@ -7910,7 +7925,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Прототип вузлів мережі видалено"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7934,7 +7949,7 @@ msgstr "Прототип вузлів мережі з видимим іменеÐ
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "Прототипи вузлів мережі"
@@ -7959,7 +7974,7 @@ msgstr "Ð§Ð°Ñ Ð²ÑƒÐ·Ð»Ð° мережі"
msgid "Host update failed."
msgstr "Помилка при оновленні вузла мережі."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Вузел мережі оновлено"
@@ -8036,6 +8051,10 @@ msgstr "Ð Ð¾Ð·Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð²ÑƒÐ·Ð»Ñ–Ð²"
msgid "Hosts updated"
msgstr "Вузли мережі оновлено"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Годин"
@@ -8105,15 +8124,15 @@ msgstr "Діапазон IP адреÑ"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "Діапазон IP \"%1$s\" перевищує ліміт Ð°Ð´Ñ€ÐµÑ \"%2$s\""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8347,7 +8366,7 @@ msgstr "Картинки"
msgid "Images for all maps will be updated!"
msgstr "Картинки Ð´Ð»Ñ Ð²ÑÑ–Ñ… карт мереж буде оновлено!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Ðегайно"
@@ -8429,7 +8448,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "ÐедоÑтупне обÑлуговуваннÑ"
@@ -8441,11 +8460,11 @@ msgstr "ÐедоÑтупна карта мережі"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "ÐедоÑтупний шаблон"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "ÐедоÑтупний тригер"
@@ -8560,7 +8579,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Ðекоректна перевірка виÑÐ²Ð»ÐµÐ½Ð½Ñ Ð² умові дії."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Ðекоректна перевірка виÑÐ²Ð»ÐµÐ½Ð½Ñ Ð² умові дії. Перевірка виÑÐ²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ Ñ–Ñнує або у Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” прав доÑтупу до неї."
@@ -8568,7 +8587,7 @@ msgstr "Ðекоректна перевірка виÑÐ²Ð»ÐµÐ½Ð½Ñ Ð² умові
msgid "Incorrect action condition discovery object."
msgstr "Ðекоректний об'єкт виÑÐ²Ð»ÐµÐ½Ð½Ñ Ð² умові дії."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Ðекоректна правило виÑÐ²Ð»ÐµÐ½Ð½Ñ Ð² умові дії. Правило виÑÐ²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ Ñ–Ñнує або у Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” прав доÑтупу до нього."
@@ -8580,15 +8599,15 @@ msgstr "Ðекоректний Ñтан виÑÐ²Ð»ÐµÐ½Ð½Ñ Ð² умові дії.
msgid "Incorrect action condition event type."
msgstr "Ðекоректний тип події в умові дії."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8597,11 +8616,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Ðекоректний порт \"%1$s\" в умові дії."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Ðекоректний прокÑÑ– в умові дії. ПрокÑÑ– не Ñ–Ñнує або у Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” прав доÑтупу до нього."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8609,7 +8628,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Ðекоректна важливіÑÑ‚ÑŒ тригера в умові дії."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Ðекоректний тригер в умові дії. Тригер не Ñ–Ñнує або у Ð²Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” прав доÑтупу до нього."
@@ -8619,11 +8638,11 @@ msgstr "Ðекоректний тип умови дії."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "Ðекоректні Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÑ€Ð¾ÐºÑƒ еÑкалації Ð´Ð»Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ— дії."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8632,11 +8651,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Ðекоректний тип операції дії \"%1$s\" Ð´Ð»Ñ Ð´Ð¶ÐµÑ€ÐµÐ»Ð° події \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8936,8 +8955,8 @@ msgstr "Ðекоректна кількіÑÑ‚ÑŒ кроків шаблонногÐ
msgid "Incorrect trigger expression"
msgstr "Ðекоректний вираз тригера"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Ðекоректний вираз тригера."
@@ -9335,7 +9354,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ ÑервіÑ. Повертає ціле чиÑло Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð² state, startup; Ñ€Ñдок - Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð² displayname, path, user; текÑÑ‚ - Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° description; ОÑобливоÑÑ‚Ñ– Ð´Ð»Ñ state: 0 - запущений, 1 - призупинений, 2 - запуÑкаєтьÑÑ, 3 - призупинÑєтьÑÑ, 4 - відновлюєтьÑÑ, 5 - зупинÑєтьÑÑ, 6 - зупинений, 7 - невідомо, 255 - ÑÐµÑ€Ð²Ñ–Ñ Ð²Ñ–Ð´Ñутній; ОÑобливоÑÑ‚Ñ– Ð´Ð»Ñ startup: 0 - автоматичний, 1 - автоматичний з затримкою, 2 - вручну, 3 - відімкнений, 4 - невідомо"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9344,11 +9363,11 @@ msgstr ""
msgid "Inherited"
msgstr "УÑпадковано"
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "МакроÑи вузла мережі та уÑпадковані"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9360,7 +9379,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "УÑпадковані та макроÑи із шаблонів"
@@ -9380,7 +9399,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Ð’Ñтавити"
@@ -9439,8 +9458,8 @@ msgstr "У інтерфейÑу з IP адреÑою \"%1$s\" не може бу
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "У інтерфейÑу з IP адреÑою \"%1$s\" не може бути пуÑте DNS ім'Ñ."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9532,7 +9551,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "Ðеправильна умова дії: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9593,10 +9612,10 @@ msgstr "Ðеправильні параметри методу."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9659,8 +9678,8 @@ msgstr "Ðеправильні параметри методу."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9882,11 +9901,11 @@ msgstr "Ðеправильний період чаÑу."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "ІнвентаризаціÑ"
@@ -9900,7 +9919,7 @@ msgid "Inventory field"
msgstr "Поле інвентарних даних"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "Режим інвентарних даних"
@@ -9908,10 +9927,10 @@ msgstr "Режим інвентарних даних"
msgid "Is online?"
msgstr "Ð’ ÑиÑтемі?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Видавець"
@@ -10006,7 +10025,7 @@ msgstr[2] "Елементи даних активовано"
msgid "Item in \"not supported\" state"
msgstr "Елемент даних в Ñтані \"не підтримуєтьÑÑ\""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Елемент даних не вибрано"
@@ -10466,17 +10485,17 @@ msgstr "Графік за оÑтанній міÑÑць"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "За оÑтанні"
@@ -10553,8 +10572,8 @@ msgstr "Обрізати зліва"
msgid "Legend"
msgstr "Легенда"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10588,8 +10607,8 @@ msgstr "Тип лінії"
msgid "Line width"
msgstr "Товщина лінії"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Лінк"
@@ -10612,16 +10631,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Індикатори лінка"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Приєднати шаблони"
@@ -10637,13 +10649,6 @@ msgstr "Приєднати до шаблонів"
msgid "Linked map"
msgstr "Пов'Ñзана карта"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10782,7 +10787,7 @@ msgstr "ЗапиÑувати не Ñпівпадаючі SNMP трапи"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Вхід в ÑиÑтему"
@@ -10864,16 +10869,16 @@ msgstr "ÐœÐ°ÐºÑ€Ð¾Ñ \"%1$s\" вже Ñ–Ñнує в \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "ÐœÐ°ÐºÑ€Ð¾Ñ \"%1$s\" вже Ñ–Ñнує."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "МакроÑи"
@@ -10972,12 +10977,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "Вручну"
@@ -11120,16 +11125,16 @@ msgstr "Ðе помічати тільки відібрані"
msgid "Mark selected"
msgstr "Помітити тільки відібрані"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "МаÑка"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -11162,11 +11167,11 @@ msgstr "Головний елемент даних"
msgid "Matches regular expression"
msgstr "Відповідає регулÑрному виразу"
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11402,7 +11407,7 @@ msgstr ""
msgid "Middle"
msgstr "ПоÑередині"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11505,7 +11510,7 @@ msgstr "ВідÑутні елементи даних Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñ‚Ð¾Ñ‚Ð¸Ð¿Ñƒ Ð
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "ВідÑутній ключ \"%1$s\" Ð´Ð»Ñ Ð²ÑƒÐ·Ð»Ð° мережі \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11591,9 +11596,9 @@ msgstr "Понеділок"
msgid "Monitored by"
msgstr "СпоÑÑ‚ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ·"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "СпоÑтерігаєтьÑÑ Ñ‡ÐµÑ€ÐµÐ· прокÑÑ–"
@@ -11612,6 +11617,7 @@ msgstr "Моніторинг"
msgid "Monospace"
msgstr "Моноширинний"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "МіÑÑць"
@@ -11724,8 +11730,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11795,11 +11801,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11827,8 +11833,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11849,7 +11855,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -12139,15 +12145,15 @@ msgstr "ID правил виÑÐ²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ вказано."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Без шифруваннÑ"
@@ -12233,7 +12239,7 @@ msgstr "ВідповідноÑтей не знайдено"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12270,9 +12276,9 @@ msgstr "Ðемає прав доÑтупу до ÑиÑтеми."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12311,7 +12317,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12411,11 +12417,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12474,7 +12480,7 @@ msgid "No public key file specified."
msgstr "Файл публічного ключа не вказано."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12495,7 +12501,7 @@ msgid "No target selected."
msgstr "Ціль не обрано."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12644,6 +12650,10 @@ msgstr "Звіт про повідомленнÑ"
msgid "Notifications"
msgstr "ПовідомленнÑ"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12730,6 +12740,10 @@ msgstr "КількіÑÑ‚ÑŒ процеÑорів віртуальної машиÐ
msgid "Number of rows"
msgstr "КількіÑÑ‚ÑŒ Ñ€Ñдків"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "КількіÑÑ‚ÑŒ змін Ñтану"
@@ -12905,7 +12919,7 @@ msgid "Off"
msgstr "Вимкн"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12952,7 +12966,7 @@ msgstr "Одна"
msgid "One time only"
msgstr "Одноразово"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Однократна недоÑтупніÑÑ‚ÑŒ"
@@ -13030,12 +13044,12 @@ msgstr "Ð†Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ñ–Ñ Ð¿Ñ€Ð¾ операційну ÑиÑтему. ПовÐ
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -13069,8 +13083,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "Операції"
@@ -13105,7 +13119,7 @@ msgstr "Операції"
msgid "Operator"
msgstr "Оператор"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -13145,19 +13159,19 @@ msgstr "Ðбо"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -13187,10 +13201,10 @@ msgstr "Ðбо"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13453,10 +13467,10 @@ msgstr "ПРОБЛЕМÐ"
msgid "PROBLEM event generation mode"
msgstr "Режим генерації подій ПРОБЛЕМÐ"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13469,19 +13483,19 @@ msgstr "Режим генерації подій ПРОБЛЕМÐ"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "Ідентифікатор PSK"
@@ -13533,12 +13547,12 @@ msgid "Parameters"
msgstr "Параметри"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "БатьківÑькі правила виÑвленнÑ"
@@ -13593,13 +13607,13 @@ msgid "Passive"
msgstr "ПаÑивний"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13607,7 +13621,7 @@ msgstr "ПаÑивний"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13660,12 +13674,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Ð’Ñтавити без зовнішніх зв'Ñзків"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "ПризупинÑти операції Ð´Ð»Ñ Ð¿Ð¾Ð´Ð°Ð²Ð»ÐµÐ½Ð¸Ñ… проблем"
@@ -13678,7 +13692,7 @@ msgstr "Пікове викориÑÑ‚Ð°Ð½Ð½Ñ Ð¿Ð°Ð¼'ÑÑ‚Ñ–: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "ВідÑотки"
@@ -13702,10 +13716,11 @@ msgstr "Процентна Ð»Ñ–Ð½Ñ–Ñ (Ñправа)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Виконує DNS запит. Повертає Ñ€Ñдок Ñимволів з необхідним типом інформації"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13713,7 +13728,9 @@ msgstr "Виконує DNS запит. Повертає Ñ€Ñдок ÑимволÑ
msgid "Period"
msgstr "Період"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13777,11 +13794,11 @@ msgstr "Програвати звуковий Ñигнал"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Будь-лаÑка, перевірте параметри конфігурації. Якщо вÑе вірно, то натиÑніть кнопку \"%1$s\" а Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð¸ параметрів конфігурації натиÑніть кнопку \"%2$s\"."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13867,7 +13884,7 @@ msgstr "Тип Post"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13876,7 +13893,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Ð£Ð·Ð°Ð³Ð°Ð»ÑŒÐ½ÐµÐ½Ð½Ñ Ñ–Ð½ÑталÑції"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13993,9 +14010,9 @@ msgstr "Приватний"
msgid "Private key file"
msgstr "Файл приватного ключа"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "Рівень привілеїв"
@@ -14403,7 +14420,7 @@ msgstr "Вираз Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ"
msgid "Recovery expression syntax error."
msgstr "СинтакÑична помилка у виразі Ð´Ð»Ñ Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Операції відновленнÑ"
@@ -14535,20 +14552,20 @@ msgstr "Віддалена команда"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14557,10 +14574,10 @@ msgstr "Віддалена команда"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14604,7 +14621,7 @@ msgstr "Віддалена команда"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14687,14 +14704,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14707,8 +14724,8 @@ msgstr "Замінити"
msgid "Replace dependencies"
msgstr "Замінити залежноÑÑ‚Ñ–"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14909,7 +14926,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "Результат"
@@ -15444,7 +15461,7 @@ msgstr "Межі"
msgid "Script"
msgstr "Скрипт"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Скрипт \"%1$s\" уже Ñ–Ñнує."
@@ -15510,6 +15527,15 @@ msgstr "Шаблон пошуку пуÑтий"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "ДругорÑдний мобільний Ð´Ð»Ñ ÐºÐ¾Ð½Ñ‚Ð°ÐºÑ‚Ñƒ"
@@ -15588,7 +15614,7 @@ msgstr "Виберіть віджет"
msgid "Selected"
msgstr "Відібрані"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "Вибрані дії видалено"
@@ -15830,6 +15856,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16283,7 +16310,7 @@ msgstr "ІÑпанÑька (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Вказаний Ñкрипт не Ñ–Ñнує або ви не маєте до нього доÑтупу Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ операції дії."
@@ -16318,8 +16345,8 @@ msgstr "Стандартні елементи даних"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16327,7 +16354,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "Початок в"
@@ -16406,7 +16433,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16510,7 +16537,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "Крок з іменем \"%1$s\" вже Ñ–Ñнує."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16564,12 +16591,12 @@ msgstr "Straight"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16590,10 +16617,10 @@ msgstr "Субфільтр"
msgid "Subject"
msgstr "Тема"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Суб'єкт"
@@ -16787,7 +16814,7 @@ msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÐµÐ³Ñƒ"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16803,13 +16830,13 @@ msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÐµÐ³Ñƒ"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16826,7 +16853,7 @@ msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÐµÐ³Ñƒ"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16836,7 +16863,7 @@ msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚ÐµÐ³Ñƒ"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16872,14 +16899,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Шаблон"
@@ -16923,7 +16948,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Шаблон видалено"
@@ -16935,11 +16960,11 @@ msgstr "Група шаблону"
msgid "Template linkage"
msgstr "Зв'Ñзки з шаблонами"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "МакроÑи з шаблону"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Ім'Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ñƒ"
@@ -16974,13 +16999,12 @@ msgstr "Шаблон із цим Ñамим видимим ім'Ñм \"%1$s\" в
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16989,10 +17013,12 @@ msgstr "Шаблон із цим Ñамим видимим ім'Ñм \"%1$s\" в
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -17003,7 +17029,7 @@ msgstr "Шаблони"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Шаблони \"%1$s\" від'єднано від вузлів мережі \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr "Шаблони оновлено"
@@ -17219,7 +17245,7 @@ msgstr "Тема інтерфейÑу"
msgid "This day last week"
msgstr "Цей день попереднього тижнÑ"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17257,7 +17283,7 @@ msgstr "Цей рік"
msgid "This year so far"
msgstr "Цей рік по нині"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Межа"
@@ -17290,15 +17316,15 @@ msgstr ""
msgid "Till"
msgstr "До"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17335,13 +17361,13 @@ msgstr ""
msgid "Time period"
msgstr "Період чаÑу"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -18037,9 +18063,9 @@ msgstr "ÐžÐ´Ð¸Ð½Ð¸Ñ†Ñ Ð²Ð¸Ð¼Ñ–Ñ€Ñƒ"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Ðевідомо"
@@ -18057,7 +18083,7 @@ msgid "Unknown error"
msgstr "Ðевідома помилка"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Ðевідомий елемент даних вузла мережі, немає цього елемента в обраному вузлі"
@@ -18089,16 +18115,16 @@ msgstr "Ðевідомий тип"
msgid "Unlimited"
msgstr "Ðеобмежено"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Від'єднати"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Від'єднати та очиÑтити"
@@ -18195,10 +18221,10 @@ msgstr "ДоÑтупний"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -18207,16 +18233,16 @@ msgstr "ДоÑтупний"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18245,7 +18271,7 @@ msgstr "Оновити Ñ–Ñнуючі"
msgid "Update interval"
msgstr "Інтервал оновленнÑ"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "Операції оновленнÑ"
@@ -18272,7 +18298,7 @@ msgstr "Завантажити"
msgid "Upper level maps"
msgstr "Карти верхнього рівнÑ"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18461,7 +18487,7 @@ msgstr[2] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18599,15 +18625,15 @@ msgid "User/Recipient"
msgstr "КориÑтувач/Отримувач"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача"
@@ -18921,11 +18947,11 @@ msgstr "ВалідаціÑ"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18999,14 +19025,14 @@ msgstr "ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ \"%1$s\" вже Ñ–Ñнує."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð½Ð°Ñ‡ÐµÐ½ÑŒ"
@@ -19049,7 +19075,7 @@ msgstr "ЗначеннÑ: немає даних"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -19149,7 +19175,7 @@ msgstr "Розмір віртуального проÑтору в байтах Ð
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Видиме ім'Ñ"
@@ -19175,7 +19201,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "ПопередженнÑ"
@@ -19285,6 +19311,10 @@ msgstr "Сер"
msgid "Wednesday"
msgstr "Середа"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19557,7 +19587,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Рік"
@@ -19617,7 +19648,7 @@ msgstr "Ви увійшли під іменем \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "Ви не можете вибрати деÑкі з мов, тому що Ñ—Ñ… локалі не вÑтановлено на веб-Ñервері."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Ви не увійшли в ÑиÑтему"
@@ -19858,11 +19889,11 @@ msgstr "очікуєтьÑÑ Ð¿ÐµÑ€Ñ–Ð¾Ð´ чаÑу"
msgid "a time unit is expected"
msgstr "очікуєтьÑÑ Ð¾Ð´Ð¸Ð½Ð¸Ñ†Ñ Ñ‡Ð°Ñу"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19957,7 +19988,7 @@ msgstr "очікуєтьÑÑ Ð¿Ð°Ñ€Ð½Ð° кількіÑÑ‚ÑŒ шіÑтнадцÑÑ‚Ð
msgid "an explicit time is expected"
msgstr "очікувавÑÑ Ñ‡Ñ–Ñ‚ÐºÐ¸Ð¹ чаÑ"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -20001,11 +20032,11 @@ msgstr "червоним"
msgid "ascending"
msgstr "за зроÑтаннÑм"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -20019,11 +20050,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr "принаймні одне Ð·Ð°Ð¼Ñ–Ñ‰ÐµÐ½Ð½Ñ Ð¼Ð°Ñ” бути вказано"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -20045,39 +20076,47 @@ msgstr ""
msgid "avg"
msgstr "Ñер."
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - Середнє Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° період Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -20092,7 +20131,7 @@ msgstr "миганнÑ"
msgid "both username and password should be either present or empty"
msgstr "Ñк ім'Ñ ÐºÐ¾Ñ€Ð¸Ñтувача, так Ñ– пароль мають або бути вказані або залишатиÑÑŒ пуÑтими"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -20134,7 +20173,7 @@ msgstr "неможливо змінити"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -20222,23 +20261,23 @@ msgstr "неможливо виконати запит Scroll API, дані мо
msgid "cannot update property for templated discovery rule"
msgstr "неможливо оновити влаÑтивіÑÑ‚ÑŒ Ð´Ð»Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð½Ð¾Ð³Ð¾ правила виÑвленнÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - Ð Ñ–Ð·Ð½Ð¸Ñ†Ñ Ð¼Ñ–Ð¶ оÑтаннім та попереднім значеннÑм"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20265,7 +20304,7 @@ msgstr ""
msgid "comma-separated list"
msgstr "ÑпиÑок, розділений комами"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20280,15 +20319,15 @@ msgstr "налаштувати"
msgid "contains"
msgstr "міÑтить"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20296,11 +20335,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - КількіÑÑ‚ÑŒ уÑпішно отриманих значень V (Ñкі задовільнÑÑŽÑ‚ÑŒ оператор О) за період Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20313,15 +20352,15 @@ msgstr "д"
msgid "d.M"
msgstr "d M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - Поточна дата"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - День міÑÑцÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - День тижнÑ"
@@ -20339,7 +20378,7 @@ msgstr "днів"
msgid "default"
msgstr "по замовчуванню"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20416,7 +20455,7 @@ msgstr ""
msgid "does not match"
msgstr "не Ñпівпадає"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20439,11 +20478,11 @@ msgstr "Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¸"
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20459,7 +20498,7 @@ msgstr "не вдалоÑÑ Ð¿Ñ€Ð¾Ð°Ð½Ð°Ð»Ñ–Ð·ÑƒÐ²Ð°Ñ‚Ð¸ JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20473,15 +20512,15 @@ msgstr "перший"
msgid "first parameter is expected"
msgstr "очікуєтьÑÑ Ð¿ÐµÑ€ÑˆÐ¸Ð¹ параметр"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - Прогноз Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· t Ñекунд на оÑнові періоду Т"
@@ -20489,7 +20528,7 @@ msgstr "forecast() - Прогноз Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‡ÐµÑ€ÐµÐ· t Ñекунд Ð
msgid "fourth"
msgstr "четвертий"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime() - Ð Ñ–Ð·Ð½Ð¸Ñ†Ñ Ð¼Ñ–Ð¶ значеннÑм елементу даних (Ñк штамп чаÑу) та штампом чаÑу Zabbix Ñервера Ñ” меншою за або дорівнює T Ñекунд (1 - Ñ–Ñтина, 0 - фальш)"
@@ -20563,7 +20602,7 @@ msgstr "в"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20572,11 +20611,11 @@ msgstr ""
msgid "including subgroups"
msgstr "включаючи Ñубгрупи"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20595,7 +20634,7 @@ msgstr "некоректна кількіÑÑ‚ÑŒ елементів"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20613,7 +20652,7 @@ msgstr "некоректний ÑинтакÑÐ¸Ñ Ð±Ñ–Ð»Ñ \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20673,7 +20712,7 @@ msgstr "некоректне ім'Ñ Ð³Ñ€ÑƒÐ¿Ð¸ вузлів мережі"
msgid "invalid host name"
msgstr "некоректне ім'Ñ Ð²ÑƒÐ·Ð»Ð° мережі"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20695,6 +20734,16 @@ msgstr "помилковий регулÑрний вираз"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20736,7 +20785,7 @@ msgstr "маÑка елементу даних"
msgid "key is empty"
msgstr "ключ пуÑтий"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20752,7 +20801,7 @@ msgctxt "week of month"
msgid "last"
msgstr "оÑÑ‚."
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - ОÑтаннє (найбільш недавнє) Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¢"
@@ -20760,11 +20809,11 @@ msgstr "last() - ОÑтаннє (найбільш недавнє) значенн
msgid "left"
msgstr "зліва"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20772,23 +20821,23 @@ msgstr ""
msgid "list of characters"
msgstr "ÑпиÑок Ñимволів"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20796,7 +20845,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "правило низькорівневого виÑвленнÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20828,11 +20877,11 @@ msgstr "Ð¼Ð°ÐºÑ€Ð¾Ñ Ð¿ÑƒÑтий"
msgid "macro(s)"
msgstr "макроÑ(и)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20868,7 +20917,7 @@ msgstr "макÑ."
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - МакÑимальне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° період Т"
@@ -20882,7 +20931,7 @@ msgstr "доÑÑгнуто макÑимальну кількіÑÑ‚ÑŒ залежÐ
msgid "maximum number of dependency levels reached"
msgstr "доÑÑгнуто макÑимальну кількіÑÑ‚ÑŒ рівнів залежноÑÑ‚Ñ–"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20899,7 +20948,7 @@ msgstr ""
msgid "min"
msgstr "мін."
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "max() - Мінімальне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð·Ð° період Т"
@@ -20914,15 +20963,15 @@ msgstr "мінімальна довжина %1$s Ñимволів"
msgid "mm"
msgstr "мм"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -21004,7 +21053,7 @@ msgstr "назва"
msgid "new"
msgstr "новий"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "новий"
@@ -21038,7 +21087,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -21059,7 +21108,7 @@ msgstr "не в"
msgid "not selected"
msgstr "не обрано"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now() - КількіÑÑ‚ÑŒ Ñекунд починаючи з Epoch"
@@ -21146,15 +21195,15 @@ msgstr ""
msgid "pattern"
msgstr "шаблон"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile() - Процентне P за період Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -21162,15 +21211,15 @@ msgstr ""
msgid "problem pattern"
msgstr "маÑка проблеми"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -21219,11 +21268,11 @@ msgstr ""
msgid "regular expression"
msgstr "регулÑрний вираз"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -21247,15 +21296,15 @@ msgstr ""
msgid "right"
msgstr "Ñправа"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21346,23 +21395,23 @@ msgstr "показати Ð¿Ñ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ–ÐºÐ¾Ð½Ð¾Ðº"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21370,11 +21419,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21382,11 +21431,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum() - Сума значень за період Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21414,7 +21463,7 @@ msgstr "наданий обліковий Ð·Ð°Ð¿Ð¸Ñ Ð½Ðµ унікальний"
msgid "tag"
msgstr "тег"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21448,7 +21497,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21495,31 +21544,35 @@ msgstr ""
msgid "time shift"
msgstr "зÑув чаÑу"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - Поточний чаÑ"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - Ð§Ð°Ñ Ð´Ð¾ÑÑÐ³Ð½ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ€Ð¾Ð³Ñƒ, вирахуваний на оÑнові періоду Т"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21545,11 +21598,11 @@ msgstr "прототип тригера неможливо переміÑтитÐ
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "тригера зв зв'Ñзками неможливо переміÑтити в другий шаблон або вузел мережі"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21606,7 +21659,7 @@ msgstr "неочікуваний кінець макроÑу"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21649,7 +21702,7 @@ msgstr "неочікуване Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ \"%1$s\""
msgid "unknown"
msgstr "невідомо"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21850,11 +21903,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/vi/LC_MESSAGES/frontend.po b/ui/locale/vi/LC_MESSAGES/frontend.po
index 66b18da8285..45a4917a832 100644
--- a/ui/locale/vi/LC_MESSAGES/frontend.po
+++ b/ui/locale/vi/LC_MESSAGES/frontend.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2021-03-19 18:15+0300\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -285,10 +285,10 @@ msgstr "(0 - hoạt động mặc định)"
msgid "(Only super admins can create groups)"
msgstr "(chỉ có nhóm super admins mới có thể tạo nhóm)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(không proxy)"
@@ -436,7 +436,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -505,7 +505,7 @@ msgstr " Sự kiện được ghi nhận giải quyết"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -524,11 +524,11 @@ msgstr " Sự kiện được ghi nhận giải quyết"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -540,24 +540,24 @@ msgstr " Sự kiện được ghi nhận giải quyết"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -575,7 +575,7 @@ msgstr " Sự kiện được ghi nhận giải quyết"
msgid "Action"
msgstr "Hành động"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "Hành động \"%1$s\" đã tồn tại."
@@ -585,7 +585,7 @@ msgstr "Hành động \"%1$s\" đã tồn tại."
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "Action được thêm vào"
@@ -594,16 +594,16 @@ msgstr "Action được thêm vào"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "Hành động đã được xóa"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "Hành động đã vô hiệu hóa"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "Hành động đã bật"
@@ -621,7 +621,7 @@ msgstr "Bản ghi hoạt động"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "Hành động đã cập nhật"
@@ -668,7 +668,7 @@ msgid "Active till"
msgstr "KiÌch hoaÌ£t"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -727,14 +727,14 @@ msgstr "KiÌch hoaÌ£t"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -750,10 +750,10 @@ msgstr "KiÌch hoaÌ£t"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -765,9 +765,9 @@ msgstr "KiÌch hoaÌ£t"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -785,7 +785,7 @@ msgstr "KiÌch hoaÌ£t"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -830,7 +830,7 @@ msgstr "Thêm phần tử con"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -855,8 +855,8 @@ msgstr "Thêm nhiá»u sÆ¡ đồ "
msgid "Add new data set"
msgstr "Äặt lại dữ liệu má»›i"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -869,7 +869,7 @@ msgstr "Ghi đè"
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1003,7 +1003,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1019,6 +1019,10 @@ msgstr ""
msgid "Alert message"
msgstr "Tin nhắn cảnh báo"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "Bí danh"
@@ -1337,7 +1341,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "Ãt nhất má»™t thao tác phải tồn tại."
@@ -1417,9 +1421,9 @@ msgstr ""
msgid "Authentication"
msgstr "XaÌc thÆ°Ì£c"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "Thuật toaÌn xaÌc thÆ°Ì£c"
@@ -1480,12 +1484,12 @@ msgstr "Tùy chá»n đăng nhập tá»± Ä‘á»™ng hoặc đăng xuất tá»± Ä‘á»™ng
msgid "Auto-logout"
msgstr "Tự động đăng xuất"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "Tự động"
@@ -1600,12 +1604,12 @@ msgstr "Tổ hợp DN"
msgid "Bind password"
msgstr "Tổ hợp mật khẩu"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1811,7 +1815,7 @@ msgstr "Không thể thêm một item phi sÃ´Ì \"%1$s\" vaÌ€o biểu đồ
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "Không thể thêm một item phi sÃ´Ì \"%1$s\" vaÌ€o kiểu biểu đồ \"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "Không thể thêm hành động"
@@ -2104,7 +2108,7 @@ msgstr[0] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "Không thể xoÌa ngÆ°Æ¡Ì€i duÌ€ng zabbix nội bộ \"%1$s\", thử vô hiệu hoÌa ngÆ°Æ¡Ì€i duÌ€ng naÌ€o Ä‘oÌ."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "Không thể xoÌa haÌ€nh động"
@@ -2262,12 +2266,12 @@ msgid "Cannot delete script"
msgid_plural "Cannot delete scripts"
msgstr[0] "Không thể xoÌa tập lệnh"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "Không thể xoÌa caÌc tập lệnh. Tập lệnh \"%1$s\" Ä‘Æ°Æ¡Ì£c sử duÌ£ng trong haÌ€nh động thao taÌc \"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "Không thể xoÌa caÌc haÌ€nh động Ä‘Æ°Æ¡Ì£c lÆ°Ì£a choÌ£n"
@@ -2283,7 +2287,7 @@ msgstr[0] "Không thể xoÌa diÌ£ch vuÌ£"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "Không thể xoÌa template"
@@ -2366,7 +2370,7 @@ msgid "Cannot disable API token"
msgid_plural "Cannot disable API tokens"
msgstr[0] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "Không thể vô hiệu hoÌa haÌ€nh độngKhông thể vô hiệu hoÌa caÌc haÌ€nh động"
@@ -2433,7 +2437,7 @@ msgid "Cannot enable API token"
msgid_plural "Cannot enable API tokens"
msgstr[0] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "Không thể kiÌch hoaÌ£t haÌ€nh độngKhông thể kiÌch hoaÌ£t caÌc haÌ€nh động"
@@ -2651,7 +2655,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
msgstr[0] "Không thể nhập template \"%1$s\", template được liên kết \"%2$s\" không tồn tại."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "Không thể cheÌ€n biểu thÆ°Ìc trigger"
@@ -2828,7 +2832,7 @@ msgstr "Không thể kết nối đến mẫu."
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "Không thể cập nhật \"%1$s\" cho hành động \"%2$s\"."
@@ -2894,7 +2898,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "Không thể cập nhật một mẫu web scenario \"%1$s\": %2$s."
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "Không thể cập nhật hành động"
@@ -2953,7 +2957,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "Không thể cập nhật caÌc nhoÌm cho host Ä‘Æ°Æ¡Ì£c phaÌt hiện \"%1$s\"."
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "Không thể cập nhật host"
@@ -3054,9 +3058,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "Không thể cập nhật script"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3083,7 +3087,7 @@ msgstr "Không thể cập nhật bước cho một mẫu web scenario \"%1$s\":
msgid "Cannot update template"
msgstr "Không thể cập nhật template"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3167,14 +3171,14 @@ msgstr "Chá»n tất cả các trap SNMP không bị chá»n bởi bất kỳ ite
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "Chứng nhận"
@@ -3192,10 +3196,10 @@ msgctxt "verb"
msgid "Change"
msgstr "Thay đổi"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3235,9 +3239,9 @@ msgstr "Chuỗi kyÌ tÆ°Ì£ bao gồm"
msgid "Character string not included"
msgstr "Chuỗi kyÌ tÆ°Ì£ không bao gồm"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3253,7 +3257,7 @@ msgstr "Thông tin Chassis. Trả vỠkiểu string"
msgid "Check already exists."
msgstr "Kiểm tra đã tồn tại."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "ThaÌ€nh phần biểu thÆ°Ìc kiểm tra băÌt đầu tÆ°Ì€ \"%1$s\"."
@@ -3375,8 +3379,8 @@ msgstr "Xóa lịch sử"
msgid "Clear history and trends"
msgstr "XoÌa liÌ£ch sử vaÌ€ phÆ°Æ¡ng hÆ°Æ¡Ìng."
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "XoÌa khi không liên kêÌt"
@@ -3403,16 +3407,16 @@ msgstr "Äồng hồ"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3541,7 +3545,7 @@ msgstr "Nén"
msgid "Concurrent sessions"
msgstr "Các phiên làm việc đồng thá»i"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3813,13 +3817,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "Kết nối"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "Kết nối từ máy chủ"
@@ -3827,9 +3831,9 @@ msgstr "Kết nối từ máy chủ"
msgid "Connections from proxy"
msgstr "Kết nối từ proxy"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "Kết nối đến máy chủ"
@@ -3994,10 +3998,10 @@ msgstr "Quy tắc liên kết"
msgid "Correlation updated"
msgstr "Liên kết được cập nhật"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "ÄêÌm"
@@ -4087,7 +4091,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4289,7 +4293,7 @@ msgid "Current value"
msgstr "GiaÌ triÌ£ hiện taÌ£i"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "Tá»± chá»n"
@@ -4531,7 +4535,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4604,11 +4608,11 @@ msgstr "NgaÌ€y HW bảo triÌ€ hêÌt haÌ£n"
msgid "Date HW purchased"
msgstr "Ngày HW đã mua"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "Ngày"
@@ -4649,8 +4653,8 @@ msgstr "Dec"
msgid "December"
msgstr "ThaÌng 12"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4660,7 +4664,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4791,7 +4795,7 @@ msgstr "XoÌa"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "XoÌa vaÌ€ xoÌa saÌ£ch"
@@ -4800,11 +4804,11 @@ msgstr "XoÌa vaÌ€ xoÌa saÌ£ch"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "XoÌa vaÌ€ xoÌa hoaÌ€n toaÌ€n caÌc template Ä‘Æ°Æ¡Ì£c choÌ£n hay không? (Cảnh baÌo: tâÌt cả caÌc liên kêÌt đêÌn host sẽ biÌ£ xoÌa bỏ hoaÌ€n toaÌ€n!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "XoÌa vaÌ€ xoÌa bỏ hoaÌ€n toaÌ€n template hay không? (Cảnh baÌo: tâÌt cả caÌc liên kêÌt đêÌn caÌc host sẽ biÌ£ xoÌa bỏ hoaÌ€n toaÌ€n!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "XoÌa haÌ€nh động hiện taÌ£i?"
@@ -4937,7 +4941,7 @@ msgstr "XoÌa caÌc nhoÌm Ä‘Æ°Æ¡Ì£c choÌ£n?"
msgid "Delete selected host groups?"
msgstr "XoÌa caÌc nhoÌm host Ä‘Æ°Æ¡Ì£c choÌ£n?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "XoÌa kiểu host Ä‘Æ°Æ¡Ì£c choÌ£n?"
@@ -5045,7 +5049,7 @@ msgstr "XoÌa caÌc ngÆ°Æ¡Ì€i duÌ€ng Ä‘Æ°Æ¡Ì£c choÌ£n?"
msgid "Delete selected web scenarios?"
msgstr "Xóa web scenario được chá»n?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "XoÌa template?"
@@ -5106,7 +5110,7 @@ msgstr ""
msgid "Dependencies"
msgstr "Quan hệ phụ thuộc"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "Phụ thuộc"
@@ -5114,7 +5118,7 @@ msgstr "Phụ thuộc"
msgid "Dependent item"
msgstr "Item phụ thuộc"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5125,7 +5129,7 @@ msgid "Deployment status"
msgstr "TraÌ£ng thaÌi triển khai"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5140,16 +5144,16 @@ msgstr "TraÌ£ng thaÌi triển khai"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5161,10 +5165,10 @@ msgstr "Mô tả"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "Chi tiêÌt"
@@ -5173,6 +5177,14 @@ msgstr "Chi tiêÌt"
msgid "Details of web scenario"
msgstr "Chi tiết của web scenario"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "ThiêÌt biÌ£"
@@ -5295,7 +5307,7 @@ msgstr "Vô hiệu hóa web scenario đã chá»n?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5322,17 +5334,17 @@ msgstr "Vô hiệu hóa web scenario đã chá»n?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "Äã vô hiệu hoÌa"
@@ -5357,7 +5369,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5568,7 +5580,7 @@ msgstr "Hiển thị sơ đồ xếp chồng"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5585,7 +5597,7 @@ msgstr "Hiển thị %1$s đến %2$s của %3$s được tìm thấy"
msgid "Displaying options"
msgstr "Hiển thị tùy chá»n"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5667,7 +5679,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "Tải xuống tệp tin cấu hình"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5731,7 +5743,7 @@ msgstr "Tạo bản sao id ngÆ°á»i dùng \"%1$s\" trong ngÆ°á»i dùng cho sÆ¡
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "Khoảng thời gian"
@@ -5761,14 +5773,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6024,7 +6036,7 @@ msgstr "Kích hoạt trap"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6062,13 +6074,13 @@ msgstr "Kích hoạt trap"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6084,11 +6096,11 @@ msgstr "Äã kiÌch hoaÌ£t"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "Mã hóa"
@@ -6164,6 +6176,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "Lỗi: \"%1$s\"."
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "Sự kiện"
@@ -6731,8 +6747,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "Äầu tiên"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "Phù hợp"
@@ -6844,12 +6860,12 @@ msgid "Full"
msgstr "Full"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "Nhân bản đầy đủ"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "Hàm"
@@ -6865,7 +6881,7 @@ msgstr "Bộ điều giải GSM"
msgid "GUI"
msgstr "GUI"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "Truy cập GUI biÌ£ vô hiệu hoÌa."
@@ -7212,7 +7228,7 @@ msgstr "Tên nhoÌm"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "Kiểu nhoÌm không thể dÆ°Ì£a trên một nhoÌm host Ä‘Æ°Æ¡Ì£c phaÌt hiện \"%1$s\"."
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "CaÌc kiểu nhoÌm"
@@ -7225,12 +7241,11 @@ msgid "Grouping by"
msgstr "Gộp nhoÌm theo"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "CaÌc nhoÌm"
@@ -7449,7 +7464,7 @@ msgstr "XoÌa liÌ£ch sử coÌ thể mâÌt một thÆ¡Ì€i gian daÌ€i. TiêÌp
msgid "History data selection"
msgstr "Lá»±a chá»n dữ liệu lịch sá»­"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7480,7 +7495,7 @@ msgid "Horizontal align"
msgstr "SăÌp xêÌp theo chiều ngang"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7489,7 +7504,7 @@ msgstr "SăÌp xêÌp theo chiều ngang"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7500,7 +7515,7 @@ msgstr "SăÌp xêÌp theo chiều ngang"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7623,7 +7638,7 @@ msgid "Host group label type"
msgstr "Kiểu nhãn nhoÌm host"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7642,8 +7657,8 @@ msgstr "Nhóm máy chủ với ID \"%1$s\" không sẵn sàng."
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7693,7 +7708,7 @@ msgstr "Tổng quan về host lưu trữ"
msgid "Host label type"
msgstr "Kiểu nhãn host"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "Máy chủ macro"
@@ -7705,7 +7720,7 @@ msgstr "Dữ liệu đặc tả host"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "Tên host"
@@ -7742,7 +7757,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "Kiểu host biÌ£ xoÌa"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7764,7 +7779,7 @@ msgstr "Kiểu host vÆ¡Ìi tên hiển thiÌ£ \"%1$s\" Ä‘ã tồn taÌ£i trong
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "CaÌc kiểu host"
@@ -7789,7 +7804,7 @@ msgstr "Thời gian của host"
msgid "Host update failed."
msgstr "Host cập nhật thâÌt baÌ£i."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "Host đã cập nhật"
@@ -7866,6 +7881,10 @@ msgstr "ViÌ£ triÌ caÌc host"
msgid "Hosts updated"
msgstr "CaÌc host Ä‘ã cập nhật"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "Giờ"
@@ -7935,15 +7954,15 @@ msgstr "Dải IP"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "Dải IP \"%1$s\" vượt quá giới hạn địa chỉ \"%2$s\""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8173,7 +8192,7 @@ msgstr "CaÌc hiÌ€nh ảnh"
msgid "Images for all maps will be updated!"
msgstr "CaÌc hiÌ€nh ảnh cho tâÌt cả bản đồ sẽ Ä‘Æ°Æ¡Ì£c cập nhật!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "Ngay lập tÆ°Ìc"
@@ -8255,7 +8274,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "Bảo trì không thể tiếp cận"
@@ -8267,11 +8286,11 @@ msgstr "Sơ đồ không thể tiếp cận"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "Mẫu không thể tiếp cận"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "Trigger không thể tiếp cận"
@@ -8386,7 +8405,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "Äiều kiện kiểm tra phaÌt hiện action không chiÌnh xaÌc."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "Äiều kiện kiểm tra phaÌt hiện action không chiÌnh xaÌc. Kiểm tra phaÌt hiện không tồn taÌ£i hoặc baÌ£n không coÌ quyền truy cập vaÌ€o noÌ."
@@ -8394,7 +8413,7 @@ msgstr "Äiều kiện kiểm tra phaÌt hiện action không chiÌnh xaÌc.
msgid "Incorrect action condition discovery object."
msgstr "Äiều kiện đôÌi tÆ°Æ¡Ì£ng phaÌt hiện action không chiÌnh xaÌc."
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "Äiều kiện quy tăÌc phaÌt hiện action không chiÌnh xaÌc. Quy tăÌc phaÌt hiện không tồn taÌ£i hoặc baÌ£n không coÌ quyền truy cập vaÌ€o noÌ."
@@ -8406,15 +8425,15 @@ msgstr "Äiều kiện traÌ£ng thaÌi phaÌt hiện action không chiÌnh xaÌ
msgid "Incorrect action condition event type."
msgstr "Äiều kiện kiểu sÆ°Ì£ kiện action không chiÌnh xaÌc."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8423,11 +8442,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "Äiều kiện cổng action \"%1$s\" không chiÌnh xaÌc."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "Äiều kiện proxy action không chiÌnh xaÌc. Proxy không tồn taÌ£i hoặc baÌ£n không coÌ quyền truy cập vaÌ€o noÌ."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8435,7 +8454,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "Äiều kiện mÆ°Ìc độ quan troÌ£ng của trigger action không chiÌnh xaÌc."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "Äiều kiện trigger action không chiÌnh xaÌc. Trigger không tồn taÌ£i hoặc baÌ£n không coÌ quyền truy cập vaÌ€o chuÌng."
@@ -8445,11 +8464,11 @@ msgstr "Kiểu Ä‘iều kiện action không chiÌnh xaÌc."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "BÆ°Æ¡Ìc thao taÌc caÌc giaÌ triÌ£ tiêÌp theo không chiÌnh xaÌc."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8458,11 +8477,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "Loại thao tác hoạt động không chính xác \"%1$s\" cho nguồn sự kiện \"%2$s\"."
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8762,8 +8781,8 @@ msgstr "Bước web scenario mẫu không chính xác."
msgid "Incorrect trigger expression"
msgstr "Biểu thÆ°Ìc trigger không chiÌnh xaÌc"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "Biểu thÆ°Ìc trigger không chiÌnh xaÌc."
@@ -9161,7 +9180,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "Thông tin vá» má»™t dịch vụ. Trả vá» số nguyên vá»›i tham số là trạng thái, khởi Ä‘á»™ng; string - vá»›i tham số là tên hiển thị, Ä‘Æ°á»ng dẫn, ngÆ°á»i dùng; text - vá»›i tham số nhÆ° mô tả; Cụ thể cho trạng thái: 0 - Ä‘ang chạy, 1 - tạm dừng, 2 - bắt đầu chá» xá»­ lý, 3 - tạm dừng chá» xá»­ lý, 4 - tiếp tục chá» xá»­ lý, 5 - dừng chá» xá»­ lý, 6 - dừng, 7 - không xác định, 255 - không có dịch vụ; Cụ thể khởi Ä‘á»™ng: 0 - tá»± Ä‘á»™ng, 1 - tá»± Ä‘á»™ng bị trì hoãn, 2 - thủ công, 3 - bị vô hiệu hóa, 4 - không xác định"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9170,11 +9189,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "Kế thừa và máy chủ macros"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9186,7 +9205,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "Kế thừa và macros mẫu"
@@ -9206,7 +9225,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "Chèn"
@@ -9265,8 +9284,8 @@ msgstr "Interface vÆ¡Ìi IP \"%1$s\" không thể coÌ tên DNS để trôÌng
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "Interface đôÌi vÆ¡Ìi IP \"%1$s\" không thể coÌ tên DNS để trôÌng."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9358,7 +9377,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "Äiá»u kiện hoạt Ä‘á»™ng không hợp lệ: %1$s."
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9419,10 +9438,10 @@ msgstr "PhÆ°Æ¡ng phaÌp tham sÃ´Ì không hÆ¡Ì£p lệ."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9485,8 +9504,8 @@ msgstr "PhÆ°Æ¡ng phaÌp tham sÃ´Ì không hÆ¡Ì£p lệ."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9708,11 +9727,11 @@ msgstr "Khoảng thá»i gian không hợp lệ."
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "Kiểm kê"
@@ -9726,7 +9745,7 @@ msgid "Inventory field"
msgstr "Trường kiểm kê"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "ChÃªÌ Ä‘Ã´Ì£ kiểm kê"
@@ -9734,10 +9753,10 @@ msgstr "ChÃªÌ Ä‘Ã´Ì£ kiểm kê"
msgid "Is online?"
msgstr "CoÌ trÆ°Ì£c tuyêÌn hay không?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "Tổ chức phát hành"
@@ -9826,7 +9845,7 @@ msgstr[0] "Item Ä‘ã Ä‘Æ°Æ¡Ì£c kiÌch hoaÌ£tCaÌc item Ä‘ã Ä‘Æ°Æ¡Ì£c kiÌch h
msgid "Item in \"not supported\" state"
msgstr "Item trong traÌ£ng thaÌi \"không Ä‘Æ°Æ¡Ì£c hỗ trÆ¡Ì£\""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "Item không được lựa chọn"
@@ -10272,17 +10291,17 @@ msgstr "Äồ thiÌ£ thaÌng cuôÌi cuÌ€ng"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Lần cuôÌi cuÌ€ng của"
@@ -10359,8 +10378,8 @@ msgstr "Cắt trái"
msgid "Legend"
msgstr "Lịch sử"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10394,8 +10413,8 @@ msgstr "Loại Ä‘Æ°á»ng"
msgid "Line width"
msgstr "Äá»™ rá»™ng Ä‘Æ°á»ng"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "Liên kêÌt"
@@ -10418,16 +10437,9 @@ msgstr ""
msgid "Link indicators"
msgstr "Chỉ sÃ´Ì liên kêÌt"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "Liên kêÌt caÌc template"
@@ -10443,13 +10455,6 @@ msgstr "Liên kêÌt đêÌn caÌc template"
msgid "Linked map"
msgstr "Sơ đồ được kết nối"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10588,7 +10593,7 @@ msgstr "Log không khÆ¡Ìp vÆ¡Ìi SNMP traps"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "Äăng nhập"
@@ -10670,16 +10675,16 @@ msgstr "Macro \"%1$s\" đã tồn tại trên \"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "Macro \"%1$s\" đã tồn tại."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "Macros"
@@ -10778,12 +10783,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "HÆ°Æ¡Ìng dẫn"
@@ -10926,16 +10931,16 @@ msgstr "ÄaÌnh dâÌu khaÌc"
msgid "Mark selected"
msgstr "ÄaÌnh dâÌu Ä‘Æ°Æ¡Ì£c lÆ°Ì£a choÌ£n"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "Mặt nạ"
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -10968,11 +10973,11 @@ msgstr "item chủ"
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11200,7 +11205,7 @@ msgstr ""
msgid "Middle"
msgstr "Giữa"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11301,7 +11306,7 @@ msgstr "ThiêÌu caÌc item cho kiểu đồ thiÌ£ \"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "ThiêÌu key \"%1$s\" cho host \"%2$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11379,9 +11384,9 @@ msgstr "ThÆ°Ì 2"
msgid "Monitored by"
msgstr "Theo dõi bởi"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "GiaÌm saÌt bằng proxy"
@@ -11400,6 +11405,7 @@ msgstr "Äang theo dõi"
msgid "Monospace"
msgstr "Không gian nhá»"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "ThaÌng"
@@ -11512,8 +11518,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11583,11 +11589,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11615,8 +11621,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11637,7 +11643,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -11927,15 +11933,15 @@ msgstr "Không coÌ quy tăÌc phaÌt hiện caÌc ID cho."
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "Không mã hóa"
@@ -12021,7 +12027,7 @@ msgstr "Không khÆ¡Ìp vÆ¡Ìi kêÌt quả naÌ€o "
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12058,9 +12064,9 @@ msgstr "Không coÌ quyền truy cập hệ thôÌng."
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12099,7 +12105,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12199,11 +12205,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12262,7 +12268,7 @@ msgid "No public key file specified."
msgstr "Không quy Ä‘iÌ£nh Ä‘Æ°Æ¡Ì£c khoÌa tập tin công khai."
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12283,7 +12289,7 @@ msgid "No target selected."
msgstr "Không coÌ muÌ£c tiêu naÌ€o Ä‘Æ°Æ¡Ì£c choÌ£n."
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12432,6 +12438,10 @@ msgstr "Thông baÌo baÌo caÌo"
msgid "Notifications"
msgstr "Thông baÌo"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12518,6 +12528,10 @@ msgstr "SÃ´Ì lÆ°Æ¡Ì£ng bộ xử lyÌ trên maÌy ảo VMware, <url> - DiÌ£ch
msgid "Number of rows"
msgstr "Số lượng hàng"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "SÃ´Ì traÌ£ng thaÌi thay đổi"
@@ -12693,7 +12707,7 @@ msgid "Off"
msgstr "Off"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12740,7 +12754,7 @@ msgstr "Má»™t"
msgid "One time only"
msgstr "Một lần duy nhâÌt"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "Một lần downtime"
@@ -12816,12 +12830,12 @@ msgstr "Thông tin hệ Ä‘iá»u hành. Trả vá» kiểu string"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12855,8 +12869,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "CaÌc thao taÌc"
@@ -12891,7 +12905,7 @@ msgstr "CaÌc thao taÌc"
msgid "Operator"
msgstr "NgÆ°Æ¡Ì€i thao taÌc"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -12931,19 +12945,19 @@ msgstr "Hoặc"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -12973,10 +12987,10 @@ msgstr "Hoặc"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13239,10 +13253,10 @@ msgstr "PROBLEM"
msgid "PROBLEM event generation mode"
msgstr "Chế độ tạo sự kiện PROBLEM"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13255,19 +13269,19 @@ msgstr "Chế độ tạo sự kiện PROBLEM"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "PSK"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "Danh tính PSK"
@@ -13319,12 +13333,12 @@ msgid "Parameters"
msgstr "Tham số"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "Quy tăÌc phaÌt hiện gôÌc"
@@ -13379,13 +13393,13 @@ msgid "Passive"
msgstr "Thụ động"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13393,7 +13407,7 @@ msgstr "Thụ động"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13446,12 +13460,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "Dán mà không cần liên kết bên ngoài"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr "Tạm dừng hoạt động cho các vấn đỠbị hạn chế"
@@ -13464,7 +13478,7 @@ msgstr "Cách sử dụng bộ nhớ lúc cao điểm: %1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "Phần trăm"
@@ -13488,10 +13502,11 @@ msgstr "ÄÆ°Æ¡Ì€ng phần trăm (phải)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "Thực hiện một truy vấn DNS. Trả vỠchuỗi ký tự với loại thông tin cần thiết"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13499,7 +13514,9 @@ msgstr "Thực hiện một truy vấn DNS. Trả vỠchuỗi ký tự với lo
msgid "Period"
msgstr "Chu kỳ"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13563,11 +13580,11 @@ msgstr "PhaÌt âm thanh"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "Vui lòng kiểm tra các thông số cấu hình. Nếu tất cả Ä‘á»u chính xác, nhấn nút \"%1$s\" hoặc nút \"%2$s\" để thay đổi các tham số cấu hình."
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13653,7 +13670,7 @@ msgstr "Loại thư"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13662,7 +13679,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "Tóm tắt chuẩn bị cài đặt"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13779,9 +13796,9 @@ msgstr "Riêng"
msgid "Private key file"
msgstr "Key file riêng"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "CâÌp đặc quyền"
@@ -14187,7 +14204,7 @@ msgstr "Biểu thức phục hồi"
msgid "Recovery expression syntax error."
msgstr "Phục hồi lỗi cú pháp biểu thức."
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "Phục hồi hoạt động"
@@ -14317,20 +14334,20 @@ msgstr "Lệnh từ xa"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14339,10 +14356,10 @@ msgstr "Lệnh từ xa"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14386,7 +14403,7 @@ msgstr "Lệnh từ xa"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14469,14 +14486,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14489,8 +14506,8 @@ msgstr "Thay thêÌ"
msgid "Replace dependencies"
msgstr "Thay thÃªÌ quan hệ phuÌ£ thuộc"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14691,7 +14708,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "KêÌt quả"
@@ -15220,7 +15237,7 @@ msgstr "Phạm vi"
msgid "Script"
msgstr "Script"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "Script \"%1$s\" đã tồn tại."
@@ -15284,6 +15301,15 @@ msgstr "TiÌ€m kiêÌm mẫu laÌ€ trôÌng"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "Ô POC thÆ°Ì hai"
@@ -15362,7 +15388,7 @@ msgstr "Chá»n ô Ä‘iá»u khiển"
msgid "Selected"
msgstr "Äã choÌ£n"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "CaÌc action Ä‘ã choÌ£n biÌ£ xoÌa"
@@ -15602,6 +15628,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16055,7 +16082,7 @@ msgstr "Spanish (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "Tập lệnh Ä‘Æ°Æ¡Ì£c chỉ Ä‘iÌ£nh không tồn taÌ£i hoặc baÌ£n không coÌ quyền truy cập vaÌ€o noÌ cho thao taÌc lệnh hoaÌ£t động."
@@ -16090,8 +16117,8 @@ msgstr "CaÌc item chuẩn"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16099,7 +16126,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "BăÌt đầu"
@@ -16178,7 +16205,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16282,7 +16309,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "BÆ°Æ¡Ìc coÌ tên \"%1$s\" Ä‘ã tồn taÌ£i."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16336,12 +16363,12 @@ msgstr "Thẳng"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16362,10 +16389,10 @@ msgstr "Bá»™ lá»c con"
msgid "Subject"
msgstr "ÄôÌi tÆ°Æ¡Ì£ng"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "Chủ Ä‘á»"
@@ -16559,7 +16586,7 @@ msgstr "Thẻ giá trị"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16575,13 +16602,13 @@ msgstr "Thẻ giá trị"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16598,7 +16625,7 @@ msgstr "Thẻ giá trị"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16608,7 +16635,7 @@ msgstr "Thẻ giá trị"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16644,14 +16671,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "Template"
@@ -16695,7 +16720,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "Template Ä‘ã biÌ£ xoÌa"
@@ -16707,11 +16732,11 @@ msgstr "NhoÌm template"
msgid "Template linkage"
msgstr "Liên kêÌt template"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "Macro mẫu"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "Tên template"
@@ -16746,13 +16771,12 @@ msgstr "Template vÆ¡Ìi cuÌ€ng tên hiển thiÌ£ \"%1$s\" Ä‘ã tồn taÌ£i. "
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16761,10 +16785,12 @@ msgstr "Template vÆ¡Ìi cuÌ€ng tên hiển thiÌ£ \"%1$s\" Ä‘ã tồn taÌ£i. "
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16775,7 +16801,7 @@ msgstr "Templates"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "Template \"%1$s\" không liên kêÌt tÆ°Ì€ caÌc host \"%2$s\"."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -16987,7 +17013,7 @@ msgstr "Giao diện"
msgid "This day last week"
msgstr "Ngày cuối tuần"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17025,7 +17051,7 @@ msgstr "Năm này"
msgid "This year so far"
msgstr "Năm này cho đến nay"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "Ngưỡng"
@@ -17058,15 +17084,15 @@ msgstr ""
msgid "Till"
msgstr "Cho tÆ¡Ìi"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17103,13 +17129,13 @@ msgstr ""
msgid "Time period"
msgstr "Chu kỳ thời gian"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17797,9 +17823,9 @@ msgstr "ÄÆ¡n viÌ£"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "Không rõ"
@@ -17817,7 +17843,7 @@ msgid "Unknown error"
msgstr "Lỗi không rõ"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "Host item không rõ, không coÌ item trong host Ä‘Æ°Æ¡Ì£c lÆ°Ì£a choÌ£n"
@@ -17849,16 +17875,16 @@ msgstr "Kiểu giaÌ triÌ£ không rõ"
msgid "Unlimited"
msgstr "Không giới hạn"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "Hủy liên kêÌt"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "Hủy liên kêÌt vaÌ€ xoÌa"
@@ -17953,10 +17979,10 @@ msgstr "Up"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -17965,16 +17991,16 @@ msgstr "Up"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18003,7 +18029,7 @@ msgstr "Cập nhật đã tồn tại"
msgid "Update interval"
msgstr "Khoảng thời gian cập nhật"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "Cập nhật thao tác"
@@ -18030,7 +18056,7 @@ msgstr "Tải lên"
msgid "Upper level maps"
msgstr "CaÌc bản đồ ở mÆ°Ìc cao hÆ¡n"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18213,7 +18239,7 @@ msgstr[0] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18347,15 +18373,15 @@ msgid "User/Recipient"
msgstr "NgÆ°á»i dùng/NgÆ°á»i nhận"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "Tên người dùng"
@@ -18669,11 +18695,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18747,14 +18773,14 @@ msgstr "GiaÌ triÌ£ bản đồ \"%1$s\" Ä‘ã tồn taÌ£i."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "Lập giaÌ triÌ£ bản đồ"
@@ -18797,7 +18823,7 @@ msgstr "GiaÌ triÌ£: không coÌ dữ liệu"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -18897,7 +18923,7 @@ msgstr "Kích thước không gian ảo tính bằng byte hoặc theo tỷ lệ
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "Tên hiển thị"
@@ -18923,7 +18949,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "Cảnh baÌo"
@@ -19029,6 +19055,10 @@ msgstr "ThÆ°Ì 4"
msgid "Wednesday"
msgstr "ThÆ°Ì tÆ°"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19301,7 +19331,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "Năm"
@@ -19361,7 +19392,7 @@ msgstr "Bạn vừa đăng nhập vào \"%1$s\"."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "BaÌ£n không thể choÌ£n một sÃ´Ì trong caÌc ngôn ngữ, bởi viÌ€ Ä‘iÌ£a chỉ của chuÌng không Ä‘Æ°Æ¡Ì£c caÌ€i đặt trên web maÌy chủ."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "Bạn không đăng nhập"
@@ -19602,11 +19633,11 @@ msgstr "má»™t khoảng thá»i gian dá»± kiến"
msgid "a time unit is expected"
msgstr "má»™t Ä‘Æ¡n vị thá»i gian dá»± kiến"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19701,7 +19732,7 @@ msgstr "một số lượng chẵn các ký tự thập lục phân được mon
msgid "an explicit time is expected"
msgstr "má»™t thá»i gian rõ ràng được dá»± kiến"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19745,11 +19776,11 @@ msgstr "as Red"
msgid "ascending"
msgstr "tăng dần"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19763,11 +19794,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr "ít nhất má»™t tùy chá»n ghi đè phải được chỉ định"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19789,39 +19820,47 @@ msgstr ""
msgid "avg"
msgstr "avg"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg () - Giá trị trung bình của má»™t khoảng thá»i gian T"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19836,7 +19875,7 @@ msgstr "Nhấp nháy"
msgid "both username and password should be either present or empty"
msgstr "cả tên ngÆ°á»i dùng và mật khẩu Ä‘á»u phải có hoặc trống"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19878,7 +19917,7 @@ msgstr "Không thể thay đổi"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -19966,23 +20005,23 @@ msgstr "không thể thá»±c hiện yêu cầu API, dữ liệu có thể bị cá
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "thay đổi() - Sự khác biệt giữa giá trị cuối cùng và giá trị trước đó"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20009,7 +20048,7 @@ msgstr ""
msgid "comma-separated list"
msgstr "danh sách được phân tách bằng dấu phẩy"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20024,15 +20063,15 @@ msgstr "cấu hình"
msgid "contains"
msgstr "bao gồm"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20040,11 +20079,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "Count () - Số lượng giá trị được truy xuất thành công V (đáp ứng toán tử O) cho giai đoạn T"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20057,15 +20096,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - ngày hiện tại"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - Ngày của tháng"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek () - Ngày trong tuần"
@@ -20083,7 +20122,7 @@ msgstr "Ngày"
msgid "default"
msgstr "Mặc định"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20160,7 +20199,7 @@ msgstr ""
msgid "does not match"
msgstr "Không khớp"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20183,11 +20222,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20203,7 +20242,7 @@ msgstr "thất bại trong việc phân tích JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20217,15 +20256,15 @@ msgstr "đầu tiên"
msgid "first parameter is expected"
msgstr "tham số đầu tiên được mong đợi"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "dá»± báo () - Dá»± báo cho t giây tiếp theo dá»±a trên khoảng thá»i gian T"
@@ -20233,7 +20272,7 @@ msgstr "dự báo () - Dự báo cho t giây tiếp theo dựa trên khoảng th
msgid "fourth"
msgstr "Thứ tư"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime () - Chênh lệch giữa giá trị item (dÆ°á»›i dạng dấu thá»i gian) và dấu thá»i gian của máy chủ Zabbix nhá» hÆ¡n hoặc bằng T giây (1 - đúng, 0 - sai)"
@@ -20307,7 +20346,7 @@ msgstr "in"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20316,11 +20355,11 @@ msgstr ""
msgid "including subgroups"
msgstr "bao gồm các nhóm nhá»"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20339,7 +20378,7 @@ msgstr "số phần tử không chính xác"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20357,7 +20396,7 @@ msgstr "CuÌ phaÌp không chiÌnh xaÌc khoảng \"%1$s\""
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20417,7 +20456,7 @@ msgstr "tên máy chủ không hợp lệ"
msgid "invalid host name"
msgstr "Tên máy chủ không hợp lệ"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20439,6 +20478,16 @@ msgstr "Biểu thức chính quy không hợp lệ"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20480,7 +20529,7 @@ msgstr "item mẫu"
msgid "key is empty"
msgstr "Không coÌ key"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20496,7 +20545,7 @@ msgctxt "week of month"
msgid "last"
msgstr "CuôÌi cuÌ€ng"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - Giá trị T cuối cùng (gần đây nhất)"
@@ -20504,11 +20553,11 @@ msgstr "last() - Giá trị T cuối cùng (gần đây nhất)"
msgid "left"
msgstr "bên trái"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20516,23 +20565,23 @@ msgstr ""
msgid "list of characters"
msgstr "Danh sách kí tự"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20540,7 +20589,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "Quy tăÌc phaÌt hiện low-level"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20572,11 +20621,11 @@ msgstr "macro trống"
msgid "macro(s)"
msgstr "macro(s)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20612,7 +20661,7 @@ msgstr "max"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - Giá trị tối đa cho giai đoạn T"
@@ -20626,7 +20675,7 @@ msgstr "số lượng phụ thuộc tối đa đạt đến"
msgid "maximum number of dependency levels reached"
msgstr "số lượng mức độ phụ thuộc tối đa đạt được"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20643,7 +20692,7 @@ msgstr ""
msgid "min"
msgstr "min"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min () - Giá trị tối thiểu cho giai đoạn T"
@@ -20658,15 +20707,15 @@ msgstr "độ dài tối thiểu là ký tự %1$s"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20748,7 +20797,7 @@ msgstr "tên"
msgid "new"
msgstr "new"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "new"
@@ -20782,7 +20831,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20803,7 +20852,7 @@ msgstr "not in"
msgid "not selected"
msgstr "Không được chọn"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now () - Số giây kể từ Epoch"
@@ -20890,15 +20939,15 @@ msgstr ""
msgid "pattern"
msgstr "Mẫu"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "Percile () - Phần trăm P của giai đoạn T"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -20906,15 +20955,15 @@ msgstr ""
msgid "problem pattern"
msgstr "Mẫu vấn Ä‘á»"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -20963,11 +21012,11 @@ msgstr ""
msgid "regular expression"
msgstr "biểu thức chính quy"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -20991,15 +21040,15 @@ msgstr ""
msgid "right"
msgstr "Bên phải "
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21090,23 +21139,23 @@ msgstr "ThiêÌt lập biểu tÆ°Æ¡Ì£ng bản đồ hiển thiÌ£"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21114,11 +21163,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21126,11 +21175,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "tổng() - Tổng giá trị của má»™t khoảng thá»i gian T"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21158,7 +21207,7 @@ msgstr "thông tin được cung cấp không phải là duy nhất"
msgid "tag"
msgstr "thẻ"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21192,7 +21241,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21239,31 +21288,35 @@ msgstr ""
msgid "time shift"
msgstr "thay đổi thá»i gian"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - thá»i gian hiện tại"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft () - Thá»i gian để đạt ngưỡng Æ°á»›c tính dá»±a trên khoảng thá»i gian T"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21289,11 +21342,11 @@ msgstr "mẫu trigger không thể được chuyển sang mẫu hoặc máy chá»
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "trigger với các liên kết không thể được chuyển đến một mẫu hoặc máy chủ khác"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21350,7 +21403,7 @@ msgstr "kết thúc bất ngỠcủa macro"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21393,7 +21446,7 @@ msgstr "Giá trị bất ngỠ\"%1$s\""
msgid "unknown"
msgstr "Không rõ"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21590,11 +21643,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/zh_CN/LC_MESSAGES/frontend.po b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
index 0e3a62e5d2a..c6c9de03012 100644
--- a/ui/locale/zh_CN/LC_MESSAGES/frontend.po
+++ b/ui/locale/zh_CN/LC_MESSAGES/frontend.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2016-05-11 02:08+0300\n"
"Last-Translator: 岂几 <tom3000@126.com>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -291,10 +291,10 @@ msgstr "(0 - 使用默认)"
msgid "(Only super admins can create groups)"
msgstr "(åªæœ‰è¶…级管ç†å‘˜èƒ½åˆ›å»ºç¾¤ç»„)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(æ— agent代ç†ç¨‹åº)"
@@ -442,7 +442,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -511,7 +511,7 @@ msgstr "确认已解决的事件"
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -530,11 +530,11 @@ msgstr "确认已解决的事件"
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -546,24 +546,24 @@ msgstr "确认已解决的事件"
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -581,7 +581,7 @@ msgstr "确认已解决的事件"
msgid "Action"
msgstr "动作"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "动作 \"%1$s\" å·²ç»å­˜åœ¨ã€‚"
@@ -591,7 +591,7 @@ msgstr "动作 \"%1$s\" å·²ç»å­˜åœ¨ã€‚"
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "动作已添加"
@@ -600,16 +600,16 @@ msgstr "动作已添加"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "动作已删除"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "激活 ç¦ç”¨æ¿€æ´» ç¦ç”¨"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "激活 å¯ç”¨æ¿€æ´» å¯ç”¨"
@@ -627,7 +627,7 @@ msgstr "动作日志"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "动作已更新"
@@ -674,7 +674,7 @@ msgid "Active till"
msgstr "å¯ç”¨ç›´åˆ°"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -733,14 +733,14 @@ msgstr "å¯ç”¨ç›´åˆ°"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -756,10 +756,10 @@ msgstr "å¯ç”¨ç›´åˆ°"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -771,9 +771,9 @@ msgstr "å¯ç”¨ç›´åˆ°"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -791,7 +791,7 @@ msgstr "å¯ç”¨ç›´åˆ°"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -836,7 +836,7 @@ msgstr "添加å­èŠ‚点元素"
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -861,8 +861,8 @@ msgstr "添加多个拓扑图"
msgid "Add new data set"
msgstr "添加新数æ®é›†"
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -875,7 +875,7 @@ msgstr "添加新的覆盖"
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1009,7 +1009,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1025,6 +1025,10 @@ msgstr ""
msgid "Alert message"
msgstr "告警消æ¯"
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "别å"
@@ -1339,7 +1343,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr "必须至少设置一个执行内容。"
@@ -1419,9 +1423,9 @@ msgstr ""
msgid "Authentication"
msgstr "认è¯"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "认è¯ç®—法"
@@ -1482,12 +1486,12 @@ msgstr "自动登录和自动注销功能ä¸èƒ½åŒæ—¶ä½¿ç”¨ã€‚"
msgid "Auto-logout"
msgstr "自动注销"
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "自动地"
@@ -1602,12 +1606,12 @@ msgstr "绑定 DN"
msgid "Bind password"
msgstr "绑定密ç "
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1813,7 +1817,7 @@ msgstr "ä¸èƒ½æ·»åŠ ä¸€ä¸ªéžæ•°å­—监控项 \"%1$s\" 到图表 \"%2$s\"."
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr "ä¸å¯ä»¥æ·»åŠ ä¸€ä¸ªéžæ•°å€¼åž‹çš„监控项目 \"%1$s\"到数æ®å›¾æ¨¡æ¿\"%2$s\"."
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "无法添加æ“作"
@@ -2106,7 +2110,7 @@ msgstr[0] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "无法删除Zabbix内部用户 \"%1$s\", 试试åœç”¨è¿™ä¸ªç”¨æˆ·."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "无法删除动作"
@@ -2260,12 +2264,12 @@ msgid "Cannot delete script"
msgid_plural "Cannot delete scripts"
msgstr[0] "无法删除脚本"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "无法删除脚本. 脚本 \"%1$s\" 用于动作æ“作 \"%2$s\"。"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "无法删除所选的动作"
@@ -2281,7 +2285,7 @@ msgstr[0] "无法删除æœåŠ¡"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "无法删除模æ¿"
@@ -2364,7 +2368,7 @@ msgid "Cannot disable API token"
msgid_plural "Cannot disable API tokens"
msgstr[0] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "无法ç¦ç”¨åŠ¨ä½œ"
@@ -2431,7 +2435,7 @@ msgid "Cannot enable API token"
msgid_plural "Cannot enable API tokens"
msgstr[0] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "无法å¯ç”¨åŠ¨ä½œ"
@@ -2649,7 +2653,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
msgstr[0] "æ— æ³•å¯¼å…¥æ¨¡æ¿ \"%1$s\",被关è”的模æ¿\"%2$s\"ä¸å­˜åœ¨."
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "ä¸èƒ½æ’入触å‘器表达å¼"
@@ -2826,7 +2830,7 @@ msgstr "无法断开与模æ¿çš„连接。"
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr "ä¸èƒ½å¯¹åŠ¨ä½œ\"%2$s\"æ›´æ–°\"%1$s\"."
@@ -2892,7 +2896,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr "无法更新模æ¿web场景 \"%1$s\": %2$s 。"
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "无法更新动作"
@@ -2951,7 +2955,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr "对于被自动å‘现的主机\"%1$s\"无法更新其主机组"
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "无法更新主机"
@@ -3052,9 +3056,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "无法更新脚本"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3081,7 +3085,7 @@ msgstr "无法更新模æ¿åŒ–Web场景的步骤 \"%1$s\": %2$s。"
msgid "Cannot update template"
msgstr "无法更新模æ¿"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3165,14 +3169,14 @@ msgstr "采集所有SNMP traps规则以外的snmptrap[]"
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr "è¯ä¹¦"
@@ -3190,10 +3194,10 @@ msgctxt "verb"
msgid "Change"
msgstr "更改"
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3233,9 +3237,9 @@ msgstr "字符串已包å«"
msgid "Character string not included"
msgstr "字符串未包å«"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3251,7 +3255,7 @@ msgstr "机架信æ¯ã€‚返回字符串"
msgid "Check already exists."
msgstr "检查已存在."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "检查开始于\"%1$s\"的表达å¼éƒ¨ä»½."
@@ -3373,8 +3377,8 @@ msgstr "清除历å²"
msgid "Clear history and trends"
msgstr "清除历å²å’Œè¶‹åŠ¿"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "清除当无链接时"
@@ -3401,16 +3405,16 @@ msgstr "时钟"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3539,7 +3543,7 @@ msgstr "压缩"
msgid "Concurrent sessions"
msgstr "并å‘会è¯"
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3811,13 +3815,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr "链接"
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr "从主机连接"
@@ -3825,9 +3829,9 @@ msgstr "从主机连接"
msgid "Connections from proxy"
msgstr "从代ç†è¿žæŽ¥"
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr "连接主机"
@@ -3992,10 +3996,10 @@ msgstr "å…³è”规则"
msgid "Correlation updated"
msgstr "å…³è”项已更新"
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "计数"
@@ -4085,7 +4089,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4287,7 +4291,7 @@ msgid "Current value"
msgstr "当å‰å€¼"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr "习惯"
@@ -4529,7 +4533,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4602,11 +4606,11 @@ msgstr "硬件维修过期日期"
msgid "Date HW purchased"
msgstr "硬件购买日期"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "æ—¥"
@@ -4647,8 +4651,8 @@ msgstr "å二"
msgid "December"
msgstr "å二"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4658,7 +4662,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4789,7 +4793,7 @@ msgstr "删除"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "删除并清除"
@@ -4798,11 +4802,11 @@ msgstr "删除并清除"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "删除并清除所选的模� (警告: 所有链接的主机将被清除!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "删除并清除模� (警告: 所有链接的主机将被清除!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "删除目å‰çš„动作?"
@@ -4935,7 +4939,7 @@ msgstr "删除所选的群组?"
msgid "Delete selected host groups?"
msgstr "删除所选的主机群组?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr "删除所选定的主机模�"
@@ -5043,7 +5047,7 @@ msgstr "删除所选的用户?"
msgid "Delete selected web scenarios?"
msgstr "删除所选的 web 场景?"
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "删除模�"
@@ -5104,7 +5108,7 @@ msgstr ""
msgid "Dependencies"
msgstr "ä¾èµ–关系"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "ä¾èµ–"
@@ -5112,7 +5116,7 @@ msgstr "ä¾èµ–"
msgid "Dependent item"
msgstr "相关项目"
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5123,7 +5127,7 @@ msgid "Deployment status"
msgstr "部署状æ€"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5138,16 +5142,16 @@ msgstr "部署状æ€"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5159,10 +5163,10 @@ msgstr "æè¿°"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "细节"
@@ -5171,6 +5175,14 @@ msgstr "细节"
msgid "Details of web scenario"
msgstr "网络方案详细信æ¯"
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "设备"
@@ -5293,7 +5305,7 @@ msgstr "ç¦ç”¨æ‰€é€‰å®šçš„web场景?"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5320,17 +5332,17 @@ msgstr "ç¦ç”¨æ‰€é€‰å®šçš„web场景?"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "åœç”¨çš„"
@@ -5355,7 +5367,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5566,7 +5578,7 @@ msgstr "显示堆å æ•°æ®å›¾"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5583,7 +5595,7 @@ msgstr "在 %3$s ä¸­æ‰“å° %1$s 到 %2$s "
msgid "Displaying options"
msgstr "显示选项"
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5665,7 +5677,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr "下载é…置文件"
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5729,7 +5741,7 @@ msgstr "用户ID \"%1$s\" 与 \"%2$s\" 冲çª"
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "æŒç»­æ—¶é—´"
@@ -5759,14 +5771,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6022,7 +6034,7 @@ msgstr "å¯ç”¨trapping"
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6060,13 +6072,13 @@ msgstr "å¯ç”¨trapping"
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6082,11 +6094,11 @@ msgstr "å·²å¯ç”¨"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr "加密"
@@ -6162,6 +6174,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "错误: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "事件"
@@ -6729,8 +6745,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "首"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr "适åˆ"
@@ -6843,12 +6859,12 @@ msgid "Full"
msgstr "填满"
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "全克隆"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "功能"
@@ -6864,7 +6880,7 @@ msgstr "GSM 调制解调器"
msgid "GUI"
msgstr "ç•Œé¢è®¾ç½®"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "图形化界é¢å·²ç»è¢«ç¦ç”¨ã€‚"
@@ -7211,7 +7227,7 @@ msgstr "组å"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr "组模æ¿ä¸å¯ä»¥åŸºäºŽä¸€ä¸ªå·²ç»è¢«è‡ªåŠ¨å‘现的主机组\"%1$s\""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr "组模æ¿"
@@ -7225,12 +7241,11 @@ msgid "Grouping by"
msgstr "群组化之于"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "群组"
@@ -7450,7 +7465,7 @@ msgstr "历å²æ¸…除å¯èƒ½ä¼šå¾ˆä¹…。继续å—?"
msgid "History data selection"
msgstr "选择历å²æ•°æ®"
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7481,7 +7496,7 @@ msgid "Horizontal align"
msgstr "横å‘对é½"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7490,7 +7505,7 @@ msgstr "横å‘对é½"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7501,7 +7516,7 @@ msgstr "横å‘对é½"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7624,7 +7639,7 @@ msgid "Host group label type"
msgstr "主机群组标签类型"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7643,8 +7658,8 @@ msgstr "ID为 \"%1$s\" 主机组ä¸å¯ç”¨ã€‚"
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7694,7 +7709,7 @@ msgstr "主机资产记录概览"
msgid "Host label type"
msgstr "主机标签类型"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr "主机å®"
@@ -7706,7 +7721,7 @@ msgstr "主机元数æ®"
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "主机å称"
@@ -7743,7 +7758,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr "主机模æ¿å·²åˆ é™¤"
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7765,7 +7780,7 @@ msgstr "显示å称为\"%1$s\"的主机模æ¿å·²å­˜åœ¨äºŽè‡ªåŠ¨å‘现规则\"%2
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr "主机模æ¿"
@@ -7790,7 +7805,7 @@ msgstr "主机时间"
msgid "Host update failed."
msgstr "主机更新失败."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "主机已更新"
@@ -7867,6 +7882,10 @@ msgstr "主机ä½ç½®"
msgid "Hosts updated"
msgstr "主机已更新"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "æ—¶"
@@ -7936,15 +7955,15 @@ msgstr "IP范围"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr "IP范围 \"%1$s\" 超出 \"%2$s\" 地å€é™åˆ¶"
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8174,7 +8193,7 @@ msgstr "图片"
msgid "Images for all maps will be updated!"
msgstr "所有拓扑图都将被更新!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "ç«‹å³åœ°"
@@ -8256,7 +8275,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr "无法访问的维护"
@@ -8268,11 +8287,11 @@ msgstr "无法访问的拓扑图"
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr "无法访问的模æ¿"
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr "无法访问的触å‘器"
@@ -8387,7 +8406,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "探索检查存在错误的动作情况."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "探索检查存在错误的动作情况. 探索检查ä¸å­˜åœ¨æˆ–您没有访问æƒ."
@@ -8395,7 +8414,7 @@ msgstr "探索检查存在错误的动作情况. 探索检查ä¸å­˜åœ¨æˆ–您没æ
msgid "Incorrect action condition discovery object."
msgstr "ä¸æ­£ç¡®çš„动作æ¡ä»¶å‘现对象。"
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "ä¸æ­£ç¡®çš„动作æ¡ä»¶è‡ªåŠ¨å‘现规则. 自动å‘现规则ä¸å­˜åœ¨æˆ–您ä¸èƒ½è®¿é—®å®ƒ."
@@ -8407,15 +8426,15 @@ msgstr "错误的动作æ¡ä»¶æŽ¢ç´¢çŠ¶æ€."
msgid "Incorrect action condition event type."
msgstr "错误的动作æ¡ä»¶æ—¶é—´ç±»åž‹."
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8424,11 +8443,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr "错误的动作æ¡ä»¶ç«¯å£\"%1$s\"."
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "ä¸æ­£ç¡®çš„动作æ¡ä»¶agent代ç†ç¨‹åº. agent代ç†ç¨‹åºä¸å­˜åœ¨æˆ–您没有存å–æƒ."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8436,7 +8455,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr "错误的æ“作æ¡ä»¶è§¦å‘器严é‡æ€§."
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "错误的动作æ¡ä»¶è§¦å‘器. 触å‘器ä¸å­˜åœ¨æˆ–您没有访问æƒ."
@@ -8446,11 +8465,11 @@ msgstr "错误的动作æ¡ä»¶ç±»åž‹."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "错误的动作æ“作å‡çº§æ­¥éª¤å€¼."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8459,11 +8478,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr "åœ¨äº‹ä»¶æº \"%2$s\" 中有错误的动作类型 \"%1$s\" "
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8763,8 +8782,8 @@ msgstr "模æ¿Web方案步骤计数ä¸æ­£ç¡®ã€‚"
msgid "Incorrect trigger expression"
msgstr "错误的触å‘器表达å¼"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "错误的触å‘器表达å¼."
@@ -9162,7 +9181,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr "有关æœåŠ¡çš„ä¿¡æ¯ã€‚返回整数字段表示状æ€ï¼Œå¯åŠ¨çŠ¶æ€ï¼›å­—符串 - 以字段作为显示å,路径,用户; 文本 - 使用字段作为æè¿°ï¼› 状æ€ç ï¼š0 - è¿è¡Œï¼Œ1 - æš‚åœï¼Œ2 - å¯åŠ¨æŒ‚起,3 - æš‚åœæŒ‚起,4 - 继续挂起,5 - åœæ­¢æŒ‚起,6 - åœæ­¢ï¼Œ7 - 未知,255 - 没有这个æœåŠ¡ï¼›å¯åŠ¨ç ï¼š0 - 自动,1 - 自动延迟,2 - 手动, 3 - ç¦ç”¨ï¼Œ4 - 未知"
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9171,11 +9190,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr "继承以åŠä¸»æœº å®"
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9187,7 +9206,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr "继承模æ¿çš„å®"
@@ -9207,7 +9226,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "æ’å…¥"
@@ -9266,8 +9285,8 @@ msgstr "当\"%2$s\"上有 \"Use DNS\"属性, IP为\"%1$s\"的接å£ä¸èƒ½æœ‰ç©ºç
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "IP为\"%1$s\"的接å£ä¸èƒ½æœ‰ç©ºç™½çš„DNSå称."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9359,7 +9378,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr "无效的动作æ¡ä»¶ï¼š%1$s。"
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9420,10 +9439,10 @@ msgstr "无效的方法å‚æ•°."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9486,8 +9505,8 @@ msgstr "无效的方法å‚æ•°."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9709,11 +9728,11 @@ msgstr "无效的时间段"
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "资产记录"
@@ -9727,7 +9746,7 @@ msgid "Inventory field"
msgstr "资产纪录æ ä½"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "资产纪录模å¼"
@@ -9735,10 +9754,10 @@ msgstr "资产纪录模å¼"
msgid "Is online?"
msgstr "是å¦åœ¨çº¿?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr "å‘行者"
@@ -9827,7 +9846,7 @@ msgstr[0] "监控项目已å¯ç”¨"
msgid "Item in \"not supported\" state"
msgstr "监控项在“ä¸æ”¯æŒâ€çš„状æ€"
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr "项目未被选择"
@@ -10273,17 +10292,17 @@ msgstr "上月图形"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "最åŽä¸€ä¸ª"
@@ -10361,8 +10380,8 @@ msgstr "修整左边"
msgid "Legend"
msgstr "图例"
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10396,8 +10415,8 @@ msgstr "线类型"
msgid "Line width"
msgstr "线高度"
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "链接"
@@ -10420,16 +10439,9 @@ msgstr ""
msgid "Link indicators"
msgstr "链接指示器"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "模æ¿é“¾æŽ¥"
@@ -10445,13 +10457,6 @@ msgstr "链接到模æ¿"
msgid "Linked map"
msgstr "拓扑图链接"
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10590,7 +10595,7 @@ msgstr "日志与SNMP采集器ä¸ç¬¦"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "登录"
@@ -10672,16 +10677,16 @@ msgstr "å®\"%1$s\"已存在于\"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "å®\"%1$s\"已存在."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "å®"
@@ -10780,12 +10785,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "手动的"
@@ -10928,16 +10933,16 @@ msgstr "标记其他"
msgid "Mark selected"
msgstr "标记所选"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr "掩ç "
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -10970,11 +10975,11 @@ msgstr "主è¦é¡¹"
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11202,7 +11207,7 @@ msgstr ""
msgid "Middle"
msgstr "居中"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11303,7 +11308,7 @@ msgstr "缺少图原型项\"%1$s\"."
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "缺少主机\"%2$s\"的键值 \"%1$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11381,9 +11386,9 @@ msgstr "周一"
msgid "Monitored by"
msgstr "è¦ç›‘控什么"
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "ç”±agent代ç†ç¨‹åºç›‘测"
@@ -11402,6 +11407,7 @@ msgstr "监测"
msgid "Monospace"
msgstr "等宽字体"
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "月"
@@ -11514,8 +11520,8 @@ msgstr "NTLM"
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11585,11 +11591,11 @@ msgstr "NTLM"
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11617,8 +11623,8 @@ msgstr "NTLM"
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11639,7 +11645,7 @@ msgstr "NTLM"
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -11929,15 +11935,15 @@ msgstr "没有所称的自动å‘现规则ID"
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr "éžåŠ å¯†"
@@ -12023,7 +12029,7 @@ msgstr "没有找到匹é…"
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12060,9 +12066,9 @@ msgstr "没有系统访问æƒé™ã€‚"
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12101,7 +12107,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12201,11 +12207,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12264,7 +12270,7 @@ msgid "No public key file specified."
msgstr "没有指定的公钥文件"
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12285,7 +12291,7 @@ msgid "No target selected."
msgstr "没有已选的目标"
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12434,6 +12440,10 @@ msgstr "警报汇总"
msgid "Notifications"
msgstr "警报"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12520,6 +12530,10 @@ msgstr "VMware 虚拟机的处ç†å™¨æ•°é‡,<url>-VMwareæœåŠ¡URL,<uuid>-VMware è
msgid "Number of rows"
msgstr "行数"
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "状æ€æ”¹å˜æ¬¡æ•°"
@@ -12695,7 +12709,7 @@ msgid "Off"
msgstr "å…³"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12742,7 +12756,7 @@ msgstr "壹"
msgid "One time only"
msgstr "一次性"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr "å•æ¬¡åœæœº"
@@ -12818,12 +12832,12 @@ msgstr "æ“作系统信æ¯ã€‚返回字符串"
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12857,8 +12871,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "æ“作"
@@ -12893,7 +12907,7 @@ msgstr "æ“作"
msgid "Operator"
msgstr "æ“作者"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -12933,19 +12947,19 @@ msgstr "或"
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -12975,10 +12989,10 @@ msgstr "或"
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13241,10 +13255,10 @@ msgstr "问题"
msgid "PROBLEM event generation mode"
msgstr "问题事件生æˆæ¨¡å¼"
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13257,19 +13271,19 @@ msgstr "问题事件生æˆæ¨¡å¼"
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr "共享密钥(PSK)"
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr "共享密钥一致性"
@@ -13321,12 +13335,12 @@ msgid "Parameters"
msgstr "å‚æ•°"
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "上层探索规则"
@@ -13381,13 +13395,13 @@ msgid "Passive"
msgstr "被动å¼"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13395,7 +13409,7 @@ msgstr "被动å¼"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13448,12 +13462,12 @@ msgstr ""
msgid "Paste without external links"
msgstr "粘贴无外部链接"
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
#, fuzzy
msgid "Pause operations for suppressed problems"
msgstr "æš‚åœæ“作以制止问题"
@@ -13467,7 +13481,7 @@ msgstr "峰值内存使用é‡ï¼š%1$s"
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr "百分比"
@@ -13491,10 +13505,11 @@ msgstr "百分比线(å³)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr "执行DNS查询。返回字符串信æ¯"
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13502,7 +13517,9 @@ msgstr "执行DNS查询。返回字符串信æ¯"
msgid "Period"
msgstr "期间"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13566,11 +13583,11 @@ msgstr "播放声音"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr "请检查é…ç½®å‚数。如果无误请按%1$s\" ,如果需è¦ä¿®æ”¹è¯·æŒ‰ \"%2$s\" "
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13656,7 +13673,7 @@ msgstr "å‘布类型"
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13665,7 +13682,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr "安装å‰æ±‡æ€»"
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13782,9 +13799,9 @@ msgstr "Private(ç§äººçš„)"
msgid "Private key file"
msgstr "ç§é’¥æ–‡ä»¶"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "优先æƒå±‚级"
@@ -14190,7 +14207,7 @@ msgstr "æ¢å¤è¡¨è¾¾å¼"
msgid "Recovery expression syntax error."
msgstr "æ¢å¤è¡¨è¾¾å¼è¯­æ³•é”™è¯¯ã€‚"
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr "æ¢å¤æ“作"
@@ -14320,20 +14337,20 @@ msgstr "远程命令"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14342,10 +14359,10 @@ msgstr "远程命令"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14389,7 +14406,7 @@ msgstr "远程命令"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14472,14 +14489,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14492,8 +14509,8 @@ msgstr "替æ¢"
msgid "Replace dependencies"
msgstr "替æ¢ä¾èµ–关系"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14696,7 +14713,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "结果"
@@ -15226,7 +15243,7 @@ msgstr "范围"
msgid "Script"
msgstr "脚本"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr "脚本\"%1$s\"å·²ç»å­˜åœ¨."
@@ -15290,6 +15307,15 @@ msgstr "查找å¼æ ·ä¸ºç©º"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "第二个POC手机å·ç "
@@ -15368,7 +15394,7 @@ msgstr "选择构件"
msgid "Selected"
msgstr "选择的"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "所选的动作已删除"
@@ -15608,6 +15634,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16061,7 +16088,7 @@ msgstr "西ç­ç‰™è¯­ (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "指定的脚本ä¸å­˜åœ¨æˆ–您没有对æ“作命令的æƒé™."
@@ -16096,8 +16123,8 @@ msgstr "标准检测器"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16105,7 +16132,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "开始于"
@@ -16184,7 +16211,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16288,7 +16315,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr "å字为\"%1$s\"的步骤已ç»å­˜åœ¨."
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16342,12 +16369,12 @@ msgstr "Straight"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16368,10 +16395,10 @@ msgstr "过滤器"
msgid "Subject"
msgstr "主题"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr "主体"
@@ -16565,7 +16592,7 @@ msgstr "标记值"
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16581,13 +16608,13 @@ msgstr "标记值"
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16604,7 +16631,7 @@ msgstr "标记值"
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16614,7 +16641,7 @@ msgstr "标记值"
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16650,14 +16677,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "模æ¿"
@@ -16701,7 +16726,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "模æ¿å·²åˆ é™¤"
@@ -16713,11 +16738,11 @@ msgstr "模æ¿ç¾¤ç»„"
msgid "Template linkage"
msgstr "模æ¿é—´çš„å…³è”"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr "æ¨¡æ¿ å®"
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "模版å称"
@@ -16752,13 +16777,12 @@ msgstr "拥有相åŒæ˜¾ç¤ºå称\"%1$s\"的模æ¿å·²ç»å­˜åœ¨."
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16767,10 +16791,12 @@ msgstr "拥有相åŒæ˜¾ç¤ºå称\"%1$s\"的模æ¿å·²ç»å­˜åœ¨."
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16781,7 +16807,7 @@ msgstr "模æ¿"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "模æ¿\"%1$s\"自主机\"%2$s\"æ–­è¿ž."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -16993,7 +17019,7 @@ msgstr "主题"
msgid "This day last week"
msgstr "上周的这一天"
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17031,7 +17057,7 @@ msgstr "本年"
msgid "This year so far"
msgstr "今年到目å‰ä¸ºæ­¢"
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr "阀值"
@@ -17064,15 +17090,15 @@ msgstr ""
msgid "Till"
msgstr "直到"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17110,13 +17136,13 @@ msgstr ""
msgid "Time period"
msgstr "时间期间"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17804,9 +17830,9 @@ msgstr "å•ä½"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "未知的"
@@ -17824,7 +17850,7 @@ msgid "Unknown error"
msgstr "未知错误"
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "未知的主机监控项, 在所选的主机中没有这样的监控项"
@@ -17856,16 +17882,16 @@ msgstr "未知的值类型"
msgid "Unlimited"
msgstr "æ— é™"
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "å–消链接"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "å–消链接并清ç†"
@@ -17960,10 +17986,10 @@ msgstr "上"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -17972,16 +17998,16 @@ msgstr "上"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18010,7 +18036,7 @@ msgstr "更新现有的"
msgid "Update interval"
msgstr "æ›´æ–°é—´éš”"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr "æ›´æ–°æ“作"
@@ -18037,7 +18063,7 @@ msgstr "上传"
msgid "Upper level maps"
msgstr "上层拓扑图"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18220,7 +18246,7 @@ msgstr[0] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18354,15 +18380,15 @@ msgid "User/Recipient"
msgstr "用户/接å—者"
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "用户å称"
@@ -18676,11 +18702,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18754,14 +18780,14 @@ msgstr "值映射 \"%1$s\"已存在."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "值映射"
@@ -18804,7 +18830,7 @@ msgstr "值: æ— æ•°æ®"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -18904,7 +18930,7 @@ msgstr "虚拟空间大å°ï¼ˆä»¥å­—节计)或百分比(总计)。 返回æ•
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "å¯è§çš„å称"
@@ -18930,7 +18956,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "警告"
@@ -19036,6 +19062,10 @@ msgstr "三"
msgid "Wednesday"
msgstr "周三"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19308,7 +19338,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr "YYYY-MM-DDThh:mm:ssZ"
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "å¹´"
@@ -19368,7 +19399,7 @@ msgstr "\"%1$s\" 欢迎登入."
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "您无法选择æŸäº›è¯­è¨€, 因为这些语言并未安装在webæœåŠ¡å™¨ä¸Šã€‚"
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr "您还没有登录。"
@@ -19609,11 +19640,11 @@ msgstr "预计时间范围"
msgid "a time unit is expected"
msgstr "预设时间å•ä½"
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19708,7 +19739,7 @@ msgstr "预设会出现å¶æ•°ä¸ªå六进制字符"
msgid "an explicit time is expected"
msgstr "需è¦ä¸€ä¸ªæ˜Žç¡®çš„时间"
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19752,11 +19783,11 @@ msgstr "æˆçº¢"
msgid "ascending"
msgstr "上一层"
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19770,11 +19801,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr "至少选定一个覆盖选项"
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19796,39 +19827,47 @@ msgstr ""
msgid "avg"
msgstr "å¹³å‡"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr "avg() - 周期 T 内的平å‡å€¼"
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19843,7 +19882,7 @@ msgstr "é—ªçƒ"
msgid "both username and password should be either present or empty"
msgstr "用户å和密ç éƒ½åº”该存在或为空"
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19885,7 +19924,7 @@ msgstr "ä¸èƒ½å˜æ›´"
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -19973,23 +20012,23 @@ msgstr "无法执行 Scroll API 请求,数æ®å¯èƒ½ä¼šè¢«æˆªæ–­"
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr "change() - 最新值和å‰ä¸€ä¸ªå€¼çš„差异"
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20016,7 +20055,7 @@ msgstr ""
msgid "comma-separated list"
msgstr "以逗å·åˆ†éš”的列表"
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20031,15 +20070,15 @@ msgstr "é…ç½®"
msgid "contains"
msgstr "包å«"
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20047,11 +20086,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr "count() - 对于周期 T,æˆåŠŸæ£€ç´¢çš„值 V(其满足è¿ç®—符 O)的数é‡"
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20064,15 +20103,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr "date() - 当å‰æ—¥æœŸ"
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr "dayofmonth() - 当å‰æ˜¯æœ¬æœˆçš„第几天"
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr "dayofweek() - 当å‰æ˜¯æœ¬å‘¨çš„第几天"
@@ -20090,7 +20129,7 @@ msgstr "æ—¥"
msgid "default"
msgstr "默认的"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20167,7 +20206,7 @@ msgstr ""
msgid "does not match"
msgstr "ä¸åŒ¹é…"
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20190,11 +20229,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20210,7 +20249,7 @@ msgstr "æ— æ³•è§£æž JSON"
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20224,15 +20263,15 @@ msgstr "第一"
msgid "first parameter is expected"
msgstr "第一个å‚数是预设的"
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr "forecast() - 基于周期 T 预测下一个 t 秒"
@@ -20240,7 +20279,7 @@ msgstr "forecast() - 基于周期 T 预测下一个 t 秒"
msgid "fourth"
msgstr "第四"
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr "fuzzytime() - 监控项值的时间戳和 Zabbix æœåŠ¡å™¨æ—¶é—´æˆ³ä¹‹é—´çš„差异å°äºŽæˆ–等于 T 秒(1 - true,0 - false)"
@@ -20314,7 +20353,7 @@ msgstr "在"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20323,11 +20362,11 @@ msgstr ""
msgid "including subgroups"
msgstr "包括å­ç»„"
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20346,7 +20385,7 @@ msgstr "错误的元素"
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20364,7 +20403,7 @@ msgstr "\"%1$s\"附近语法错误"
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20424,7 +20463,7 @@ msgstr "无效的主机群组å称"
msgid "invalid host name"
msgstr "无效的主机å称"
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20446,6 +20485,16 @@ msgstr "无效的正则表达å¼"
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20487,7 +20536,7 @@ msgstr "监控项模å¼"
msgid "key is empty"
msgstr "关键字为空"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20503,7 +20552,7 @@ msgctxt "week of month"
msgid "last"
msgstr "最新"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr "last() - 最åŽï¼ˆæœ€è¿‘)的 T 值"
@@ -20511,11 +20560,11 @@ msgstr "last() - 最åŽï¼ˆæœ€è¿‘)的 T 值"
msgid "left"
msgstr "å·¦"
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20523,23 +20572,23 @@ msgstr ""
msgid "list of characters"
msgstr "字符列表"
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20547,7 +20596,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "底层å‘现规则"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20579,11 +20628,11 @@ msgstr "å®æ˜¯ç©ºçš„"
msgid "macro(s)"
msgstr "å®(s)"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20619,7 +20668,7 @@ msgstr "最大"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr "max() - 周期 T 内的最大值"
@@ -20633,7 +20682,7 @@ msgstr "达到最大ä¾èµ–项数"
msgid "maximum number of dependency levels reached"
msgstr "达到最大数é‡çš„ä¾èµ–关系"
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20650,7 +20699,7 @@ msgstr ""
msgid "min"
msgstr "最å°"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr "min() - 周期 T 内的最å°å€¼"
@@ -20665,15 +20714,15 @@ msgstr "最å°é•¿åº¦ä¸º %1$s 个字符"
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20755,7 +20804,7 @@ msgstr "åå­—"
msgid "new"
msgstr "æ–°"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "æ–°"
@@ -20789,7 +20838,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20810,7 +20859,7 @@ msgstr "éžåœ¨"
msgid "not selected"
msgstr "éžæ‰€é€‰çš„"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr "now() - UNIX 时间"
@@ -20897,15 +20946,15 @@ msgstr ""
msgid "pattern"
msgstr "模å¼"
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr "percentile() - 周期 T 内的百分ä½æ•° P"
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -20913,15 +20962,15 @@ msgstr ""
msgid "problem pattern"
msgstr "问题模å¼"
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -20970,11 +21019,11 @@ msgstr ""
msgid "regular expression"
msgstr "正则表达å¼"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -20998,15 +21047,15 @@ msgstr ""
msgid "right"
msgstr "正确"
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21097,23 +21146,23 @@ msgstr "展示图标映射"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21121,11 +21170,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21133,11 +21182,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr "sum() - 周期 T 内的值之和"
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21165,7 +21214,7 @@ msgstr "æ供的凭æ®ä¸æ˜¯å”¯ä¸€çš„"
msgid "tag"
msgstr "标记"
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21199,7 +21248,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21246,31 +21295,35 @@ msgstr ""
msgid "time shift"
msgstr "时间å移"
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr "time() - 当å‰æ—¶é—´"
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr "timeleft() - 基于周期 T 内达到阈值的时间估计"
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21296,11 +21349,11 @@ msgstr "触å‘器原型无法移动到å¦å¤–一个模æ¿æˆ–者主机"
msgid "trigger with linkages cannot be moved to another template or host"
msgstr "触å‘器原型以åŠå…³è”项无法移动到å¦å¤–一个模æ¿æˆ–者主机"
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21357,7 +21410,7 @@ msgstr "å®çš„结æŸæ˜¯ä¸æ­£ç¡®"
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21400,7 +21453,7 @@ msgstr "\"%1$s\" 值异常"
msgid "unknown"
msgstr "未知的"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21597,11 +21650,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/locale/zh_TW/LC_MESSAGES/frontend.po b/ui/locale/zh_TW/LC_MESSAGES/frontend.po
index 672627a7bc5..6ecd35746a6 100644
--- a/ui/locale/zh_TW/LC_MESSAGES/frontend.po
+++ b/ui/locale/zh_TW/LC_MESSAGES/frontend.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Zabbix 4.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-12 19:55+0200\n"
+"POT-Creation-Date: 2021-12-03 19:55+0200\n"
"PO-Revision-Date: 2012-11-06 09:39+0300\n"
"Last-Translator: Yaochiu <brian.huang@primillet.com>\n"
"Language-Team: Zabbix <info@zabbix.com>\n"
@@ -288,10 +288,10 @@ msgstr ""
msgid "(Only super admins can create groups)"
msgstr "(åªæœ‰è¶…級管ç†å“¡å¯ä»¥æ–°å¢žç¾¤çµ„)"
-#: app/partials/configuration.host.edit.html.php:161
+#: app/partials/configuration.host.edit.html.php:275
#: app/views/popup.itemtestedit.view.php:241
-#: app/views/popup.massupdate.host.php:85
-#: include/views/configuration.host.prototype.edit.php:132
+#: app/views/popup.massupdate.host.php:122
+#: include/views/configuration.host.prototype.edit.php:280
msgid "(no proxy)"
msgstr "(無系統代ç†ç¨‹å¼)"
@@ -439,7 +439,7 @@ msgstr ""
msgid "API tokens"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:339
+#: app/controllers/CControllerPopupTriggerExpr.php:370
msgid "Abscissa"
msgstr ""
@@ -508,7 +508,7 @@ msgstr ""
#: app/controllers/CControllerAuditLogList.php:209
#: app/partials/administration.usergroup.tagfilters.html.php:29
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:41
#: app/partials/configuration.valuemap.php:35
#: app/partials/massupdate.valuemaps.tab.php:47
@@ -527,11 +527,11 @@ msgstr ""
#: app/views/popup.dashboard.share.edit.php:32
#: app/views/popup.dashboard.share.edit.php:53
#: app/views/popup.lldoperation.php:117 app/views/popup.lldoperation.php:268
-#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:207
+#: app/views/popup.lldoverride.php:101 app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:228
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:145
@@ -543,24 +543,24 @@ msgstr ""
#: include/actions.inc.php:1921
#: include/views/administration.auditacts.list.php:64
#: include/views/configuration.action.edit.php:59
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
-#: include/views/configuration.action.edit.php:478
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
+#: include/views/configuration.action.edit.php:483
#: include/views/configuration.graph.edit.php:380
#: include/views/configuration.host.discovery.edit.php:134
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.host.discovery.edit.php:742
#: include/views/configuration.host.discovery.edit.php:914
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.httpconf.edit.php:209
#: include/views/configuration.item.edit.php:193
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:178
#: include/views/configuration.item.prototype.edit.php:714
#: include/views/configuration.maintenance.edit.php:45
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.trigger.prototype.edit.php:199
#: include/views/configuration.trigger.prototype.edit.php:394
#: include/views/configuration.trigger.prototype.edit.php:567
@@ -578,7 +578,7 @@ msgstr ""
msgid "Action"
msgstr "動作"
-#: include/classes/api/services/CAction.php:2678
+#: include/classes/api/services/CAction.php:2688
#, c-format
msgid "Action \"%1$s\" already exists."
msgstr "回應作業 \"%1$s\" 已存在。"
@@ -588,7 +588,7 @@ msgstr "回應作業 \"%1$s\" 已存在。"
msgid "Action \"%2$s\" is not available for user role \"%1$s\"."
msgstr ""
-#: actionconf.php:279
+#: actionconf.php:285
msgid "Action added"
msgstr "動作已新增"
@@ -597,16 +597,16 @@ msgstr "動作已新增"
msgid "Action class %1$s must extend %2$s class."
msgstr ""
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Action deleted"
msgstr "動作已刪除"
-#: actionconf.php:469
+#: actionconf.php:475
msgid "Action disabled"
msgid_plural "Actions disabled"
msgstr[0] "åœç”¨å›žæ‡‰ä½œæ¥­"
-#: actionconf.php:468
+#: actionconf.php:474
msgid "Action enabled"
msgid_plural "Actions enabled"
msgstr[0] "啟用回應作業"
@@ -624,7 +624,7 @@ msgstr "回應作業日誌"
msgid "Action operation"
msgstr ""
-#: actionconf.php:271
+#: actionconf.php:277
msgid "Action updated"
msgstr "動作已更新"
@@ -671,7 +671,7 @@ msgid "Active till"
msgstr "作用中直到"
#: app/controllers/CControllerAuditLogList.php:194
-#: app/partials/configuration.host.edit.html.php:133
+#: app/partials/configuration.host.edit.html.php:248
#: app/partials/configuration.tags.tab.php:120
#: app/partials/configuration.valuemap.php:40
#: app/partials/hostmacros.inherited.list.html.php:185
@@ -730,14 +730,14 @@ msgstr "作用中直到"
#: app/views/popup.lldoperation.php:290 app/views/popup.lldoverride.php:176
#: app/views/popup.lldoverride.php:201 app/views/popup.lldoverride.php:220
#: app/views/popup.maintenance.period.php:189
-#: app/views/popup.massupdate.host.php:50
-#: app/views/popup.massupdate.host.php:201
+#: app/views/popup.massupdate.host.php:87
+#: app/views/popup.massupdate.host.php:197
#: app/views/popup.massupdate.item.php:124
#: app/views/popup.massupdate.item.php:270
#: app/views/popup.massupdate.item.php:480
#: app/views/popup.massupdate.service.php:44
-#: app/views/popup.massupdate.template.php:52
-#: app/views/popup.massupdate.template.php:134
+#: app/views/popup.massupdate.template.php:92
+#: app/views/popup.massupdate.template.php:126
#: app/views/popup.massupdate.trigger.php:78
#: app/views/popup.massupdate.trigger.php:125 app/views/popup.media.php:52
#: app/views/popup.media.php:127 app/views/popup.mediatype.message.php:104
@@ -753,10 +753,10 @@ msgstr "作用中直到"
#: include/classes/helpers/CTagFilterFieldHelper.php:92
#: include/classes/widgets/CWidgetHelper.php:545 include/forms.inc.php:1481
#: include/forms.inc.php:2045 include/views/configuration.action.edit.php:133
-#: include/views/configuration.action.edit.php:302
-#: include/views/configuration.action.edit.php:386
-#: include/views/configuration.action.edit.php:462
-#: include/views/configuration.action.edit.php:501
+#: include/views/configuration.action.edit.php:295
+#: include/views/configuration.action.edit.php:379
+#: include/views/configuration.action.edit.php:455
+#: include/views/configuration.action.edit.php:506
#: include/views/configuration.graph.edit.php:423
#: include/views/configuration.graph.edit.php:518
#: include/views/configuration.host.discovery.edit.php:162
@@ -768,9 +768,9 @@ msgstr "作用中直到"
#: include/views/configuration.host.discovery.edit.php:919
#: include/views/configuration.host.discovery.edit.php:981
#: include/views/configuration.hostgroups.edit.php:55
-#: include/views/configuration.host.prototype.edit.php:110
-#: include/views/configuration.host.prototype.edit.php:189
-#: include/views/configuration.host.prototype.edit.php:432
+#: include/views/configuration.host.prototype.edit.php:216
+#: include/views/configuration.host.prototype.edit.php:256
+#: include/views/configuration.host.prototype.edit.php:430
#: include/views/configuration.httpconf.edit.php:120
#: include/views/configuration.httpconf.edit.php:138
#: include/views/configuration.httpconf.edit.php:215
@@ -788,7 +788,7 @@ msgstr "作用中直到"
#: include/views/configuration.maintenance.edit.php:86
#: include/views/configuration.maintenance.edit.php:200
#: include/views/configuration.maintenance.edit.php:275
-#: include/views/configuration.template.edit.php:253
+#: include/views/configuration.template.edit.php:234
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:148
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -833,7 +833,7 @@ msgstr ""
msgid "Add child service"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:509
+#: app/views/js/popup.service.edit.js.php:508
msgid "Add child services"
msgstr ""
@@ -858,8 +858,8 @@ msgstr ""
msgid "Add new data set"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:141
-#: include/views/configuration.host.prototype.edit.php:118
+#: app/partials/configuration.host.edit.html.php:256
+#: include/views/configuration.host.prototype.edit.php:264
msgid "Add new interface"
msgstr ""
@@ -872,7 +872,7 @@ msgstr ""
msgid "Add page"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:539 jsLoader.php:414
+#: app/views/js/popup.service.edit.js.php:538 jsLoader.php:414
msgid "Add parent services"
msgstr ""
@@ -1006,7 +1006,7 @@ msgstr ""
msgid "Aggregate"
msgstr ""
-#: app/views/popup.triggerexpr.php:108
+#: app/views/popup.triggerexpr.php:109
msgid "Aggregate functions"
msgstr ""
@@ -1022,6 +1022,10 @@ msgstr ""
msgid "Alert message"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1115
+msgid "Algorithm"
+msgstr ""
+
#: include/hosts.inc.php:114
msgid "Alias"
msgstr "別å"
@@ -1336,7 +1340,7 @@ msgstr ""
msgid "At least one operation must be selected."
msgstr ""
-#: include/views/configuration.action.edit.php:511
+#: include/views/configuration.action.edit.php:516
msgid "At least one operation must exist."
msgstr ""
@@ -1416,9 +1420,9 @@ msgstr ""
msgid "Authentication"
msgstr "èªè­‰"
-#: app/partials/configuration.host.edit.html.php:311
-#: app/views/popup.massupdate.host.php:151
-#: include/views/configuration.host.prototype.edit.php:309
+#: app/partials/configuration.host.edit.html.php:306
+#: app/views/popup.massupdate.host.php:150
+#: include/views/configuration.host.prototype.edit.php:303
msgid "Authentication algorithm"
msgstr "èªè­‰æ³•å‰‡"
@@ -1479,12 +1483,12 @@ msgstr ""
msgid "Auto-logout"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:365
+#: app/partials/configuration.host.edit.html.php:360
#: app/partials/popup.operations.php:228
#: app/views/administration.miscconfig.edit.php:61
#: app/views/popup.lldoperation.php:282
-#: app/views/popup.massupdate.host.php:189 include/hosts.inc.php:1128
-#: include/views/configuration.host.prototype.edit.php:358
+#: app/views/popup.massupdate.host.php:185 include/hosts.inc.php:1128
+#: include/views/configuration.host.prototype.edit.php:362
msgid "Automatic"
msgstr "自動地"
@@ -1599,12 +1603,12 @@ msgstr "Bind DN"
msgid "Bind password"
msgstr "Bind密碼"
-#: app/controllers/CControllerPopupTriggerExpr.php:397
-#: app/controllers/CControllerPopupTriggerExpr.php:430
+#: app/controllers/CControllerPopupTriggerExpr.php:428
+#: app/controllers/CControllerPopupTriggerExpr.php:461
msgid "Bits to shift"
msgstr ""
-#: app/views/popup.triggerexpr.php:109
+#: app/views/popup.triggerexpr.php:110
msgid "Bitwise functions"
msgstr ""
@@ -1810,7 +1814,7 @@ msgstr ""
msgid "Cannot add a non-numeric item \"%1$s\" to graph prototype \"%2$s\"."
msgstr ""
-#: actionconf.php:280
+#: actionconf.php:286
msgid "Cannot add action"
msgstr "無法新增æ“作"
@@ -2103,7 +2107,7 @@ msgstr[0] ""
msgid "Cannot delete Zabbix internal user \"%1$s\", try disabling that user."
msgstr "無法刪除Zabbix內部用戶 \"%1$s\", 試試åœç”¨é‚£ç”¨æˆ¶."
-#: actionconf.php:301
+#: actionconf.php:307
msgid "Cannot delete action"
msgstr "無法删除動作"
@@ -2257,12 +2261,12 @@ msgid "Cannot delete script"
msgid_plural "Cannot delete scripts"
msgstr[0] "無法删除脚本"
-#: include/classes/api/services/CScript.php:875
+#: include/classes/api/services/CScript.php:877
#, c-format
msgid "Cannot delete scripts. Script \"%1$s\" is used in action operation \"%2$s\"."
msgstr "無法刪除腳本. 腳本 \"%1$s\" 用於動作æ“作\"%2$s\"."
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Cannot delete selected actions"
msgstr "無法刪除所é¸çš„動作"
@@ -2278,7 +2282,7 @@ msgstr[0] "無法删除æœå‹™"
msgid "Cannot delete service \"%1$s\": %2$s."
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Cannot delete template"
msgstr "無法刪除模æ¿"
@@ -2361,7 +2365,7 @@ msgid "Cannot disable API token"
msgid_plural "Cannot disable API tokens"
msgstr[0] ""
-#: actionconf.php:477
+#: actionconf.php:483
msgid "Cannot disable action"
msgid_plural "Cannot disable actions"
msgstr[0] "無法åœç”¨å›žæ‡‰"
@@ -2429,7 +2433,7 @@ msgid "Cannot enable API token"
msgid_plural "Cannot enable API tokens"
msgstr[0] ""
-#: actionconf.php:476
+#: actionconf.php:482
msgid "Cannot enable action"
msgid_plural "Cannot enable actions"
msgstr[0] "無法啟用回應作業"
@@ -2648,7 +2652,7 @@ msgid "Cannot import template \"%1$s\", linked template \"%2$s\" does not exist.
msgid_plural "Cannot import template \"%1$s\", linked templates \"%2$s\" do not exist."
msgstr[0] ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1486
+#: app/controllers/CControllerPopupTriggerExpr.php:1583
msgid "Cannot insert trigger expression"
msgstr "無法æ’入觸發器表示å¼"
@@ -2825,7 +2829,7 @@ msgstr ""
msgid "Cannot unlink trigger \"%1$s\", it has items from template that is left linked to host."
msgstr ""
-#: include/classes/api/services/CAction.php:2626
+#: include/classes/api/services/CAction.php:2636
#, c-format
msgid "Cannot update \"%1$s\" for action \"%2$s\"."
msgstr ""
@@ -2891,7 +2895,7 @@ msgstr ""
msgid "Cannot update a templated web scenario \"%1$s\": %2$s."
msgstr ""
-#: actionconf.php:272
+#: actionconf.php:278
msgid "Cannot update action"
msgstr "無法更新æ“作"
@@ -2950,7 +2954,7 @@ msgid "Cannot update groups for discovered host \"%1$s\"."
msgstr ""
#: app/controllers/CControllerHostUpdate.php:34
-#: app/controllers/CControllerHostUpdate.php:148
+#: app/controllers/CControllerHostUpdate.php:153
msgid "Cannot update host"
msgstr "無法更新主機"
@@ -3051,9 +3055,9 @@ msgstr ""
msgid "Cannot update script"
msgstr "無法更新脚本"
-#: include/classes/api/services/CScript.php:417
-#: include/classes/api/services/CScript.php:430
-#: include/classes/api/services/CScript.php:443
+#: include/classes/api/services/CScript.php:419
+#: include/classes/api/services/CScript.php:432
+#: include/classes/api/services/CScript.php:445
#, c-format
msgid "Cannot update script scope. Script \"%1$s\" is used in action \"%2$s\"."
msgstr ""
@@ -3080,7 +3084,7 @@ msgstr ""
msgid "Cannot update template"
msgstr "無法更新模æ¿"
-#: app/controllers/CControllerPopupMassupdateTemplate.php:341
+#: app/controllers/CControllerPopupMassupdateTemplate.php:343
msgid "Cannot update templates"
msgstr ""
@@ -3164,14 +3168,14 @@ msgstr ""
msgid "Center"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:438
-#: app/partials/configuration.host.edit.html.php:457
+#: app/partials/configuration.host.edit.html.php:433
+#: app/partials/configuration.host.edit.html.php:452
#: app/views/administration.proxy.edit.php:97
#: app/views/administration.proxy.edit.php:105
-#: app/views/popup.massupdate.host.php:239
-#: app/views/popup.massupdate.host.php:255
-#: include/views/configuration.host.prototype.edit.php:371
-#: include/views/configuration.host.prototype.edit.php:387
+#: app/views/popup.massupdate.host.php:234
+#: app/views/popup.massupdate.host.php:250
+#: include/views/configuration.host.prototype.edit.php:375
+#: include/views/configuration.host.prototype.edit.php:391
msgid "Certificate"
msgstr ""
@@ -3189,10 +3193,10 @@ msgctxt "verb"
msgid "Change"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:469
+#: app/partials/configuration.host.edit.html.php:464
#: app/views/administration.autoreg.edit.php:80
#: app/views/administration.proxy.edit.php:126
-#: include/views/configuration.host.prototype.edit.php:392
+#: include/views/configuration.host.prototype.edit.php:396
msgid "Change PSK"
msgstr ""
@@ -3232,9 +3236,9 @@ msgstr "字元字串已包å«"
msgid "Character string not included"
msgstr "字元字串未包å«"
-#: app/controllers/CControllerPopupTriggerExpr.php:728
-#: app/controllers/CControllerPopupTriggerExpr.php:921
-#: app/controllers/CControllerPopupTriggerExpr.php:1052
+#: app/controllers/CControllerPopupTriggerExpr.php:759
+#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:1140
msgid "Chars"
msgstr ""
@@ -3250,7 +3254,7 @@ msgstr ""
msgid "Check already exists."
msgstr "檢查已存在."
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:542
#, c-format
msgid "Check expression part starting from \"%1$s\"."
msgstr "檢查開始於\"%1$s\"的表示å¼éƒ¨ä»½."
@@ -3372,8 +3376,8 @@ msgstr ""
msgid "Clear history and trends"
msgstr "清除歷å²å’Œè¶¨å‹¢"
-#: app/views/popup.massupdate.host.php:136
-#: app/views/popup.massupdate.template.php:114
+#: app/views/popup.massupdate.host.php:70
+#: app/views/popup.massupdate.template.php:73
msgid "Clear when unlinking"
msgstr "清除當無連çµæ™‚"
@@ -3400,16 +3404,16 @@ msgstr "Clock"
#: app/views/configuration.discovery.edit.php:154
#: app/views/configuration.host.edit.php:43 app/views/popup.host.edit.php:68
#: app/views/popup.service.edit.php:388
-#: include/views/configuration.action.edit.php:490
+#: include/views/configuration.action.edit.php:495
#: include/views/configuration.graph.edit.php:510
#: include/views/configuration.host.discovery.edit.php:960
#: include/views/configuration.hostgroups.edit.php:62
-#: include/views/configuration.host.prototype.edit.php:424
+#: include/views/configuration.host.prototype.edit.php:419
#: include/views/configuration.httpconf.edit.php:254
#: include/views/configuration.item.edit.php:1015
#: include/views/configuration.item.prototype.edit.php:901
#: include/views/configuration.maintenance.edit.php:266
-#: include/views/configuration.template.edit.php:238
+#: include/views/configuration.template.edit.php:219
#: include/views/configuration.trigger.prototype.edit.php:655
#: include/views/configuration.triggers.edit.php:648
#: include/views/monitoring.sysmap.edit.php:421 jsLoader.php:352
@@ -3538,7 +3542,7 @@ msgstr ""
msgid "Concurrent sessions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1509
+#: app/controllers/CControllerPopupTriggerExpr.php:1606
#: app/views/popup.lldoperation.php:59 app/views/popup.lldoverride.php:195
#: app/views/popup.service.statusrule.edit.php:48
msgid "Condition"
@@ -3810,13 +3814,13 @@ msgstr ""
msgid "Connection will not be encrypted because it uses a socket file (on Unix) or shared memory (Windows)."
msgstr ""
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.massupdate.host.php:277
msgid "Connections"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:444
-#: app/views/popup.massupdate.host.php:243
-#: include/views/configuration.host.prototype.edit.php:375
+#: app/partials/configuration.host.edit.html.php:439
+#: app/views/popup.massupdate.host.php:238
+#: include/views/configuration.host.prototype.edit.php:379
msgid "Connections from host"
msgstr ""
@@ -3824,9 +3828,9 @@ msgstr ""
msgid "Connections from proxy"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:433
-#: app/views/popup.massupdate.host.php:235
-#: include/views/configuration.host.prototype.edit.php:367
+#: app/partials/configuration.host.edit.html.php:428
+#: app/views/popup.massupdate.host.php:230
+#: include/views/configuration.host.prototype.edit.php:371
msgid "Connections to host"
msgstr ""
@@ -3990,10 +3994,10 @@ msgstr ""
msgid "Correlation updated"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:51
-#: app/controllers/CControllerPopupTriggerExpr.php:674
-#: app/controllers/CControllerPopupTriggerExpr.php:864
+#: app/controllers/CControllerPopupTriggerExpr.php:52
+#: app/controllers/CControllerPopupTriggerExpr.php:705
#: app/controllers/CControllerPopupTriggerExpr.php:895
+#: app/controllers/CControllerPopupTriggerExpr.php:926
msgid "Count"
msgstr "計數"
@@ -4083,7 +4087,7 @@ msgid "Create discovery rule (select template first)"
msgstr ""
#: app/views/popup.lldoperation.php:80 app/views/popup.massupdate.item.php:325
-#: include/views/configuration.host.prototype.edit.php:138
+#: include/views/configuration.host.prototype.edit.php:286
#: include/views/configuration.host.prototype.list.php:61
#: include/views/configuration.host.prototype.list.php:187
#: include/views/configuration.item.prototype.edit.php:847
@@ -4285,7 +4289,7 @@ msgid "Current value"
msgstr "ç›®å‰çš„值"
#: app/views/administration.mediatype.edit.php:327
-#: include/views/configuration.host.prototype.edit.php:104
+#: include/views/configuration.host.prototype.edit.php:250
msgid "Custom"
msgstr ""
@@ -4527,7 +4531,7 @@ msgid "Database TLS key file"
msgstr ""
#: app/partials/administration.system.info.php:121
-msgid "Database history $info_tables upgraded"
+msgid "Database history tables upgraded"
msgstr ""
#: app/partials/administration.system.info.php:129
@@ -4600,11 +4604,11 @@ msgstr "硬體維修éŽæœŸæ—¥æœŸ"
msgid "Date HW purchased"
msgstr "硬體購買日期"
-#: app/views/popup.triggerexpr.php:110
+#: app/views/popup.triggerexpr.php:111
msgid "Date and time functions"
msgstr ""
-#: report4.php:175
+#: app/controllers/CControllerPopupTriggerExpr.php:119 report4.php:175
msgid "Day"
msgstr "æ—¥"
@@ -4645,8 +4649,8 @@ msgstr "å二"
msgid "December"
msgstr "å二"
-#: app/controllers/CControllerPopupTriggerExpr.php:908
-#: app/controllers/CControllerPopupTriggerExpr.php:1065
+#: app/controllers/CControllerPopupTriggerExpr.php:939
+#: app/controllers/CControllerPopupTriggerExpr.php:1153
msgid "Decimal places"
msgstr ""
@@ -4656,7 +4660,7 @@ msgstr ""
#: app/views/administration.iconmap.edit.php:108
#: include/classes/widgets/forms/CWidgetForm.php:54 include/hosts.inc.php:31
-#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:229
+#: include/hosts.inc.php:1233 include/views/configuration.action.edit.php:222
#: include/views/inventory.host.view.php:81
#: include/views/js/monitoring.sysmaps.js.php:145
#: include/views/js/monitoring.sysmaps.js.php:263
@@ -4787,7 +4791,7 @@ msgstr "删除"
msgid "Delete all elements that are not present in the import file?"
msgstr ""
-#: include/views/configuration.template.edit.php:243
+#: include/views/configuration.template.edit.php:224
#: include/views/configuration.template.list.php:285
msgid "Delete and clear"
msgstr "刪除並清除"
@@ -4796,11 +4800,11 @@ msgstr "刪除並清除"
msgid "Delete and clear selected templates? (Warning: all linked hosts will be cleared!)"
msgstr "刪除並清除所é¸çš„模æ¿? (警告: 所有連çµçš„主機將被清除!)"
-#: include/views/configuration.template.edit.php:244
+#: include/views/configuration.template.edit.php:225
msgid "Delete and clear template? (Warning: all linked hosts will be cleared!)"
msgstr "刪除並清除模æ¿? (警告: 所有連çµçš„主機將被清除!)"
-#: include/views/configuration.action.edit.php:492
+#: include/views/configuration.action.edit.php:497
msgid "Delete current action?"
msgstr "刪除目å‰çš„動作?"
@@ -4933,7 +4937,7 @@ msgstr "删除所é¸çš„群組?"
msgid "Delete selected host groups?"
msgstr "刪除所é¸çš„主機群組?"
-#: include/views/configuration.host.prototype.edit.php:416
+#: include/views/configuration.host.prototype.edit.php:421
msgid "Delete selected host prototype?"
msgstr ""
@@ -5041,7 +5045,7 @@ msgstr "删除所é¸çš„用戶?"
msgid "Delete selected web scenarios?"
msgstr ""
-#: include/views/configuration.template.edit.php:240
+#: include/views/configuration.template.edit.php:221
msgid "Delete template?"
msgstr "刪除模�"
@@ -5102,7 +5106,7 @@ msgstr ""
msgid "Dependencies"
msgstr "相ä¾é—œä¿‚"
-#: include/triggers.inc.php:2397
+#: include/triggers.inc.php:2402
msgid "Dependent"
msgstr "相ä¾"
@@ -5110,7 +5114,7 @@ msgstr "相ä¾"
msgid "Dependent item"
msgstr ""
-#: app/views/popup.generic.php:278 include/triggers.inc.php:2397
+#: app/views/popup.generic.php:278 include/triggers.inc.php:2402
#: include/views/configuration.trigger.prototype.list.php:92
#: include/views/configuration.triggers.list.php:238
msgid "Depends on"
@@ -5121,7 +5125,7 @@ msgid "Deployment status"
msgstr "佈署狀態"
#: app/controllers/CControllerAuditLogList.php:286
-#: app/partials/configuration.host.edit.html.php:147
+#: app/partials/configuration.host.edit.html.php:261
#: app/partials/hostmacros.list.html.php:37
#: app/partials/massupdate.macros.tab.php:29
#: app/partials/scheduledreport.formgrid.html.php:191
@@ -5136,16 +5140,16 @@ msgstr "佈署狀態"
#: app/views/administration.user.token.edit.php:51
#: app/views/administration.user.token.view.php:54
#: app/views/configuration.correlation.edit.php:134
-#: app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.host.php:112
#: app/views/popup.massupdate.item.php:466
-#: app/views/popup.massupdate.template.php:75
+#: app/views/popup.massupdate.template.php:115
#: app/views/popup.triggerwizard.php:134 include/events.inc.php:264
#: include/views/configuration.host.discovery.edit.php:701
#: include/views/configuration.item.edit.php:961
#: include/views/configuration.item.prototype.edit.php:839
#: include/views/configuration.maintenance.edit.php:252
#: include/views/configuration.maintenance.list.php:90
-#: include/views/configuration.template.edit.php:110
+#: include/views/configuration.template.edit.php:170
#: include/views/configuration.trigger.prototype.edit.php:531
#: include/views/configuration.triggers.edit.php:558
#: include/views/inventory.host.view.php:129
@@ -5157,10 +5161,10 @@ msgstr "æè¿°"
#: app/views/js/reports.auditlog.list.js.php:153
#: app/views/reports.auditlog.list.php:96
#: app/views/reports.auditlog.list.php:129 include/func.inc.php:1601
-#: include/views/configuration.action.edit.php:175
-#: include/views/configuration.action.edit.php:179
-#: include/views/configuration.action.edit.php:319
-#: include/views/configuration.action.edit.php:407
+#: include/views/configuration.action.edit.php:168
+#: include/views/configuration.action.edit.php:172
+#: include/views/configuration.action.edit.php:312
+#: include/views/configuration.action.edit.php:400
#: include/views/inventory.host.view.php:257
msgid "Details"
msgstr "細節"
@@ -5169,6 +5173,14 @@ msgstr "細節"
msgid "Details of web scenario"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:1100
+msgid "Detection period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1110
+msgid "Deviations"
+msgstr ""
+
#: include/actions.inc.php:76
msgid "Device"
msgstr "è£ç½®"
@@ -5291,7 +5303,7 @@ msgstr "åœç”¨é¸å–的網é æª¢æ¸¬ï¼Ÿ"
#: app/partials/administration.system.info.php:188
#: app/partials/configuration.filter.items.php:188
-#: app/partials/configuration.host.edit.html.php:363
+#: app/partials/configuration.host.edit.html.php:358
#: app/partials/monitoring.host.filter.php:129
#: app/partials/monitoring.host.view.html.php:102
#: app/partials/scheduledreport.table.html.php:80
@@ -5318,17 +5330,17 @@ msgstr "åœç”¨é¸å–的網é æª¢æ¸¬ï¼Ÿ"
#: app/views/configuration.discovery.list.php:57
#: app/views/configuration.host.list.php:280
#: app/views/popup.lldoperation.php:280
-#: app/views/popup.massupdate.host.php:102
-#: app/views/popup.massupdate.host.php:187
+#: app/views/popup.massupdate.host.php:141
+#: app/views/popup.massupdate.host.php:183
#: app/views/reports.scheduledreport.list.php:62 include/discovery.inc.php:108
#: include/hosts.inc.php:1126 include/html.inc.php:284
#: include/httptest.inc.php:48 include/items.inc.php:138
#: include/items.inc.php:141 include/items.inc.php:185
-#: include/maps.inc.php:325 include/triggers.inc.php:1870
+#: include/maps.inc.php:325 include/triggers.inc.php:1875
#: include/users.inc.php:84 include/views/configuration.action.list.php:77
#: include/views/configuration.action.list.php:129
#: include/views/configuration.host.discovery.list.php:167
-#: include/views/configuration.host.prototype.edit.php:356
+#: include/views/configuration.host.prototype.edit.php:360
#: include/views/js/monitoring.sysmaps.js.php:290
msgid "Disabled"
msgstr "åœç”¨çš„"
@@ -5353,7 +5365,7 @@ msgstr ""
#: app/views/popup.lldoperation.php:92 app/views/popup.massupdate.item.php:334
#: include/views/configuration.graph.edit.php:468
#: include/views/configuration.graph.list.php:138
-#: include/views/configuration.host.prototype.edit.php:142
+#: include/views/configuration.host.prototype.edit.php:290
#: include/views/configuration.host.prototype.list.php:62
#: include/views/configuration.item.prototype.edit.php:851
#: include/views/configuration.item.prototype.list.php:66
@@ -5564,7 +5576,7 @@ msgstr "顯示é‡ç–Šåœ–表"
#: app/controllers/CControllerHintboxActionlist.php:93
#: app/views/administration.queue.details.php:85
-#: app/views/js/popup.service.edit.js.php:484 app/views/search.php:187
+#: app/views/js/popup.service.edit.js.php:483 app/views/search.php:187
#: app/views/search.php:272 app/views/search.php:371
#: include/actions.inc.php:1724 include/actions.inc.php:1796
#: include/classes/helpers/CPagerHelper.php:147 jsLoader.php:398
@@ -5581,7 +5593,7 @@ msgstr ""
msgid "Displaying options"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:780
+#: app/controllers/CControllerPopupTriggerExpr.php:811
msgid "Division denominator"
msgstr ""
@@ -5663,7 +5675,7 @@ msgstr ""
msgid "Download the configuration file"
msgstr ""
-#: app/views/js/popup.service.edit.js.php:234
+#: app/views/js/popup.service.edit.js.php:233
#: app/views/popup.service.time.edit.php:46
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Downtime"
@@ -5727,7 +5739,7 @@ msgstr ""
#: include/classes/screens/CScreenProblem.php:867
#: include/classes/screens/CScreenProblem.php:892
#: include/classes/screens/CScreenProblem.php:1161 include/events.inc.php:289
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Duration"
msgstr "æŒçºŒæ™‚é–“"
@@ -5757,14 +5769,14 @@ msgstr ""
#: app/views/administration.user.edit.php:355
#: app/views/js/administration.mediatype.edit.js.php:50
#: app/views/js/configuration.discovery.edit.js.php:33
-#: app/views/js/popup.service.edit.js.php:198
-#: app/views/js/popup.service.edit.js.php:222
+#: app/views/js/popup.service.edit.js.php:197
+#: app/views/js/popup.service.edit.js.php:221
#: app/views/monitoring.service.list.edit.php:142
#: app/views/monitoring.service.list.php:114
-#: include/views/configuration.action.edit.php:246
-#: include/views/configuration.action.edit.php:274
-#: include/views/configuration.action.edit.php:358
-#: include/views/configuration.action.edit.php:436
+#: include/views/configuration.action.edit.php:239
+#: include/views/configuration.action.edit.php:267
+#: include/views/configuration.action.edit.php:351
+#: include/views/configuration.action.edit.php:429
#: include/views/configuration.maintenance.edit.php:68
#: include/views/configuration.trigger.prototype.edit.php:111
#: include/views/configuration.trigger.prototype.edit.php:305
@@ -6020,7 +6032,7 @@ msgstr ""
#: app/partials/administration.system.info.php:181
#: app/partials/configuration.filter.items.php:187
-#: app/partials/configuration.host.edit.html.php:165
+#: app/partials/configuration.host.edit.html.php:279
#: app/partials/monitoring.host.filter.php:128
#: app/partials/monitoring.host.view.html.php:101
#: app/partials/scheduledreport.formgrid.html.php:201
@@ -6058,13 +6070,13 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:130
#: app/views/configuration.discovery.list.php:56
#: app/views/configuration.host.list.php:272
-#: app/views/popup.massupdate.host.php:101 app/views/popup.media.php:89
+#: app/views/popup.massupdate.host.php:140 app/views/popup.media.php:89
#: app/views/popup.triggerwizard.php:137
#: app/views/reports.scheduledreport.list.php:61 include/discovery.inc.php:107
#: include/html.inc.php:280 include/httptest.inc.php:47
#: include/items.inc.php:138 include/items.inc.php:141
#: include/items.inc.php:182 include/triggers.inc.php:999
-#: include/triggers.inc.php:1867
+#: include/triggers.inc.php:1872
#: include/views/configuration.action.edit.php:147
#: include/views/configuration.action.list.php:76
#: include/views/configuration.action.list.php:137
@@ -6080,11 +6092,11 @@ msgstr "已啟用"
msgid "Encrypt"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:533
+#: app/partials/configuration.host.edit.html.php:527
#: app/views/administration.proxy.edit.php:143
#: app/views/administration.proxy.list.php:78
-#: app/views/popup.massupdate.host.php:302
-#: include/views/configuration.host.prototype.edit.php:409
+#: app/views/popup.massupdate.host.php:296
+#: include/views/configuration.host.prototype.edit.php:413
msgid "Encryption"
msgstr ""
@@ -6160,6 +6172,10 @@ msgstr ""
msgid "Error: %1$s"
msgstr "錯誤: %1$s"
+#: app/controllers/CControllerPopupTriggerExpr.php:1090
+msgid "Evaluation period"
+msgstr ""
+
#: include/events.inc.php:180
msgid "Event"
msgstr "事件"
@@ -6727,8 +6743,8 @@ msgctxt "page navigation"
msgid "First"
msgstr "首"
-#: app/controllers/CControllerPopupTriggerExpr.php:237
-#: app/controllers/CControllerPopupTriggerExpr.php:266
+#: app/controllers/CControllerPopupTriggerExpr.php:268
+#: app/controllers/CControllerPopupTriggerExpr.php:297
msgid "Fit"
msgstr ""
@@ -6840,12 +6856,12 @@ msgid "Full"
msgstr ""
#: app/views/configuration.host.edit.php:46 app/views/popup.host.edit.php:75
-#: include/views/configuration.template.edit.php:239
+#: include/views/configuration.template.edit.php:220
#: include/views/monitoring.sysmap.edit.php:422
msgid "Full clone"
msgstr "全克隆"
-#: app/views/popup.triggerexpr.php:132
+#: app/views/popup.triggerexpr.php:133
#: include/views/configuration.graph.edit.php:366
msgid "Function"
msgstr "功能"
@@ -6861,7 +6877,7 @@ msgstr "GSM Modem"
msgid "GUI"
msgstr "圖形化使用者介é¢"
-#: include/classes/user/CWebUser.php:63 index_sso.php:245
+#: include/classes/user/CWebUser.php:63 index_sso.php:260
msgid "GUI access disabled."
msgstr "圖形化使用者介é¢å­˜å–å·²åœç”¨"
@@ -7209,7 +7225,7 @@ msgstr "群組å稱"
msgid "Group prototype cannot be based on a discovered host group \"%1$s\"."
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:197
+#: include/views/configuration.host.prototype.edit.php:207
msgid "Group prototypes"
msgstr ""
@@ -7222,12 +7238,11 @@ msgid "Grouping by"
msgstr "群組化之於"
#: app/controllers/CControllerPopupImportCompare.php:164
-#: app/partials/configuration.host.edit.html.php:105
+#: app/partials/configuration.host.edit.html.php:218
#: app/views/administration.user.edit.php:84
#: app/views/administration.user.list.php:110 app/views/popup.import.php:29
-#: include/views/configuration.host.prototype.edit.php:163
-#: include/views/configuration.host.prototype.edit.php:199
-#: include/views/configuration.template.edit.php:91
+#: include/views/configuration.host.prototype.edit.php:183
+#: include/views/configuration.template.edit.php:150
msgid "Groups"
msgstr "群組"
@@ -7446,7 +7461,7 @@ msgstr "æ­·å²æ¸…除å¯èƒ½æœƒå¾ˆä¹…?繼續嗎?"
msgid "History data selection"
msgstr ""
-#: app/views/popup.triggerexpr.php:111
+#: app/views/popup.triggerexpr.php:112
msgid "History functions"
msgstr ""
@@ -7477,7 +7492,7 @@ msgid "Horizontal align"
msgstr "横å‘å°é½Š"
#: app/controllers/CControllerAuditLogList.php:219
-#: app/partials/configuration.host.edit.html.php:527
+#: app/partials/configuration.host.edit.html.php:522
#: app/partials/monitoring.latest.view.html.php:40
#: app/partials/popup.operations.php:175
#: app/views/administration.queue.details.php:47
@@ -7486,7 +7501,7 @@ msgstr "横å‘å°é½Š"
#: app/views/monitoring.dashboard.view.php:82
#: app/views/monitoring.widget.problems.view.php:58
#: app/views/popup.generic.php:81 app/views/popup.host.edit.php:97
-#: app/views/popup.massupdate.host.php:290 app/views/search.php:33
+#: app/views/popup.massupdate.host.php:285 app/views/search.php:33
#: include/actions.inc.php:50 include/blocks.inc.php:577
#: include/classes/screens/CScreenHttpTest.php:112
#: include/classes/screens/CScreenProblem.php:863
@@ -7497,7 +7512,7 @@ msgstr "横å‘å°é½Š"
#: include/hostgroups.inc.php:248 include/maps.inc.php:24
#: include/triggers.inc.php:956 include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
-#: include/views/configuration.host.prototype.edit.php:148
+#: include/views/configuration.host.prototype.edit.php:296
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:82
#: include/views/configuration.triggers.list.php:189
@@ -7621,7 +7636,7 @@ msgid "Host group label type"
msgstr "主機群組標示類型"
#: include/classes/api/services/CDashboardGeneral.php:555
-#: include/classes/api/services/CScript.php:812
+#: include/classes/api/services/CScript.php:814
#: include/classes/api/services/CSettings.php:247
#: include/classes/api/services/CUserGroup.php:444
#, c-format
@@ -7640,8 +7655,8 @@ msgstr ""
#: app/views/monitoring.web.view.php:50
#: app/views/popup.condition.common.php:101
#: app/views/popup.condition.common.php:282
-#: app/views/popup.massupdate.host.php:46
-#: app/views/popup.massupdate.template.php:48 app/views/search.php:270
+#: app/views/popup.massupdate.host.php:83
+#: app/views/popup.massupdate.template.php:88 app/views/search.php:270
#: hostinventoriesoverview.php:159 include/classes/helpers/CMenuHelper.php:141
#: include/classes/helpers/CRoleHelper.php:357
#: include/classes/widgets/forms/CWidgetFormDataOver.php:33
@@ -7691,7 +7706,7 @@ msgstr "主機資產記錄概覽"
msgid "Host label type"
msgstr "主機標示類型"
-#: app/partials/configuration.host.edit.html.php:346
+#: app/partials/configuration.host.edit.html.php:341
msgid "Host macros"
msgstr ""
@@ -7703,7 +7718,7 @@ msgstr ""
#: app/views/configuration.discovery.edit.php:106
#: app/views/configuration.discovery.edit.php:122 host_prototypes.php:37
#: include/actions.inc.php:47
-#: include/views/configuration.host.prototype.edit.php:70
+#: include/views/configuration.host.prototype.edit.php:65
#: include/views/inventory.host.view.php:50
msgid "Host name"
msgstr "主機å稱"
@@ -7740,7 +7755,7 @@ msgstr ""
msgid "Host prototype deleted"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:341
+#: include/views/configuration.host.prototype.edit.php:334
msgid "Host prototype macros"
msgstr ""
@@ -7762,7 +7777,7 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:176
#: include/html.inc.php:483
#: include/views/configuration.host.discovery.list.php:307
-#: include/views/configuration.host.prototype.edit.php:34
+#: include/views/configuration.host.prototype.edit.php:33
#: include/views/configuration.host.prototype.list.php:27
msgid "Host prototypes"
msgstr ""
@@ -7787,7 +7802,7 @@ msgstr "主機時間"
msgid "Host update failed."
msgstr "主機更新失敗."
-#: app/controllers/CControllerHostUpdate.php:138
+#: app/controllers/CControllerHostUpdate.php:143
msgid "Host updated"
msgstr "主機已更新"
@@ -7864,6 +7879,10 @@ msgstr "主機ä½ç½®"
msgid "Hosts updated"
msgstr "主機已更新"
+#: app/controllers/CControllerPopupTriggerExpr.php:118
+msgid "Hour"
+msgstr ""
+
#: app/views/popup.maintenance.period.php:170
msgid "Hours"
msgstr "時"
@@ -7933,15 +7952,15 @@ msgstr "IP範åœ"
msgid "IP range \"%1$s\" exceeds \"%2$s\" address limit"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:529
+#: app/partials/configuration.host.edit.html.php:523
#: app/views/administration.script.edit.php:118
#: app/views/administration.script.list.php:140
#: app/views/monitoring.widget.hostavail.view.php:30
-#: app/views/popup.massupdate.host.php:292
+#: app/views/popup.massupdate.host.php:286
#: include/classes/widgets/views/widget.hostavail.form.view.php:49
#: include/hosts.inc.php:471 include/hosts.inc.php:1194
#: include/items.inc.php:350
-#: include/views/configuration.host.prototype.edit.php:324 jsLoader.php:318
+#: include/views/configuration.host.prototype.edit.php:320 jsLoader.php:318
msgid "IPMI"
msgstr "IPMI"
@@ -8171,7 +8190,7 @@ msgstr "圖片"
msgid "Images for all maps will be updated!"
msgstr "所有拓墣圖都將被更新!"
-#: include/views/configuration.action.edit.php:236
+#: include/views/configuration.action.edit.php:229
msgid "Immediately"
msgstr "ç«‹å³åœ°"
@@ -8253,7 +8272,7 @@ msgstr ""
#: app/partials/monitoring.host.view.html.php:89
#: app/views/configuration.host.list.php:267
#: include/classes/screens/CScreenProblem.php:386
-#: include/hostgroups.inc.php:293 include/triggers.inc.php:2022
+#: include/hostgroups.inc.php:293 include/triggers.inc.php:2027
#: include/views/inventory.host.view.php:42
msgid "Inaccessible maintenance"
msgstr ""
@@ -8265,11 +8284,11 @@ msgstr ""
#: httpconf.php:663 include/graphs.inc.php:274 include/hosts.inc.php:649
#: include/httptest.inc.php:222 include/items.inc.php:916
-#: include/triggers.inc.php:2161
+#: include/triggers.inc.php:2166
msgid "Inaccessible template"
msgstr ""
-#: include/triggers.inc.php:2367 include/triggers.inc.php:2375
+#: include/triggers.inc.php:2372 include/triggers.inc.php:2380
msgid "Inaccessible trigger"
msgstr ""
@@ -8384,7 +8403,7 @@ msgstr ""
msgid "Incorrect action condition discovery check."
msgstr "ä¸æ­£ç¢ºçš„動作æ¢ä»¶æŽ¢ç´¢æª¢æŸ¥."
-#: include/classes/api/services/CAction.php:3310
+#: include/classes/api/services/CAction.php:3320
msgid "Incorrect action condition discovery check. Discovery check does not exist or you have no access to it."
msgstr "ä¸æ­£ç¢ºçš„動作æ¢ä»¶æŽ¢ç´¢æª¢æŸ¥. 探索檢查ä¸å­˜åœ¨æˆ–您沒有存å–權."
@@ -8392,7 +8411,7 @@ msgstr "ä¸æ­£ç¢ºçš„動作æ¢ä»¶æŽ¢ç´¢æª¢æŸ¥. 探索檢查ä¸å­˜åœ¨æˆ–您沒有å
msgid "Incorrect action condition discovery object."
msgstr ""
-#: include/classes/api/services/CAction.php:3269
+#: include/classes/api/services/CAction.php:3279
msgid "Incorrect action condition discovery rule. Discovery rule does not exist or you have no access to it."
msgstr "ä¸æ­£ç¢ºçš„動作æ¢ä»¶æŽ¢ç´¢è¦å‰‡. 探索è¦å‰‡ä¸å­˜åœ¨æˆ–您沒有存å–權."
@@ -8404,15 +8423,15 @@ msgstr "ä¸æ­£ç¢ºçš„動作æ¢ä»¶æŽ¢ç´¢ç‹€æ…‹."
msgid "Incorrect action condition event type."
msgstr ""
-#: include/classes/api/services/CAction.php:2989
+#: include/classes/api/services/CAction.php:2999
msgid "Incorrect action condition or operation host group. Host group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3049
+#: include/classes/api/services/CAction.php:3059
msgid "Incorrect action condition or operation host. Host does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3187
+#: include/classes/api/services/CAction.php:3197
msgid "Incorrect action condition or operation template. Template does not exist or you have no access to it."
msgstr ""
@@ -8421,11 +8440,11 @@ msgstr ""
msgid "Incorrect action condition port \"%1$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3351
+#: include/classes/api/services/CAction.php:3361
msgid "Incorrect action condition proxy. Proxy does not exist or you have no access to it."
msgstr "ä¸æ­£ç¢ºçš„動作æ¢ä»¶ç³»çµ±ä»£ç†ç¨‹å¼. 系統代ç†ç¨‹å¼ä¸å­˜åœ¨æˆ–您沒有存å–權."
-#: include/classes/api/services/CAction.php:3391
+#: include/classes/api/services/CAction.php:3401
msgid "Incorrect action condition service. Service does not exist or you have no access to it."
msgstr ""
@@ -8433,7 +8452,7 @@ msgstr ""
msgid "Incorrect action condition trigger severity."
msgstr ""
-#: include/classes/api/services/CAction.php:3228
+#: include/classes/api/services/CAction.php:3238
msgid "Incorrect action condition trigger. Trigger does not exist or you have no access to it."
msgstr "ä¸æ­£ç¢ºçš„動作æ¢ä»¶è§¸ç™¼å™¨. 觸發器ä¸å­˜åœ¨æˆ–您沒有存å–權."
@@ -8443,11 +8462,11 @@ msgstr "ä¸æ­£ç¢ºçš„動作æ¢ä»¶é¡žåž‹."
#: app/controllers/CControllerActionOperationValidate.php:83
#: app/controllers/CControllerActionOperationValidate.php:89
-#: include/classes/api/services/CAction.php:2814
+#: include/classes/api/services/CAction.php:2824
msgid "Incorrect action operation escalation step values."
msgstr "ä¸æ­£ç¢ºçš„動作æ“作å‡ç´šæ­¥é©Ÿå€¼."
-#: include/classes/api/services/CAction.php:2889
+#: include/classes/api/services/CAction.php:2899
msgid "Incorrect action operation media type. Media type does not exist or you have no access to it."
msgstr ""
@@ -8456,11 +8475,11 @@ msgstr ""
msgid "Incorrect action operation type \"%1$s\" for event source \"%2$s\"."
msgstr ""
-#: include/classes/api/services/CAction.php:3135
+#: include/classes/api/services/CAction.php:3145
msgid "Incorrect action operation user group. User group does not exist or you have no access to it."
msgstr ""
-#: include/classes/api/services/CAction.php:3092
+#: include/classes/api/services/CAction.php:3102
msgid "Incorrect action operation user. User does not exist or you have no access to it."
msgstr ""
@@ -8760,8 +8779,8 @@ msgstr ""
msgid "Incorrect trigger expression"
msgstr "ä¸æ­£ç¢ºçš„觸發器表示å¼"
-#: include/classes/parsers/C10TriggerExpression.php:522
-#: include/classes/parsers/C10TriggerExpression.php:538
+#: include/classes/parsers/C10TriggerExpression.php:526
+#: include/classes/parsers/C10TriggerExpression.php:542
msgid "Incorrect trigger expression."
msgstr "ä¸æ­£ç¢ºçš„觸發器表示å¼."
@@ -9159,7 +9178,7 @@ msgstr ""
msgid "Information about a service. Returns integer with param as state, startup; string - with param as displayname, path, user; text - with param as description; Specifically for state: 0 - running, 1 - paused, 2 - start pending, 3 - pause pending, 4 - continue pending, 5 - stop pending, 6 - stopped, 7 - unknown, 255 - no such service; Specifically for startup: 0 - automatic, 1 - automatic delayed, 2 - manual, 3 - disabled, 4 - unknown"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:103
+#: include/views/configuration.host.prototype.edit.php:249
msgid "Inherit"
msgstr ""
@@ -9168,11 +9187,11 @@ msgstr ""
msgid "Inherited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:347
+#: app/partials/configuration.host.edit.html.php:342
msgid "Inherited and host macros"
msgstr ""
-#: include/views/configuration.host.prototype.edit.php:342
+#: include/views/configuration.host.prototype.edit.php:335
msgid "Inherited and host prototype macros"
msgstr ""
@@ -9184,7 +9203,7 @@ msgstr ""
msgid "Inherited and scenario tags"
msgstr ""
-#: include/views/configuration.template.edit.php:212
+#: include/views/configuration.template.edit.php:193
msgid "Inherited and template macros"
msgstr ""
@@ -9204,7 +9223,7 @@ msgstr ""
msgid "Initial view is ignored if the default view is set."
msgstr ""
-#: app/views/popup.triggerexpr.php:239
+#: app/views/popup.triggerexpr.php:258
msgid "Insert"
msgstr "æ’å…¥"
@@ -9263,8 +9282,8 @@ msgstr " 當\"%2$s\"上有 \"Use DNS\"屬性, IP為\"%1$s\"的介é¢ä¸èƒ½æœ‰ç©º
msgid "Interface with IP \"%1$s\" cannot have empty DNS name."
msgstr "IP為\"%1$s\"的介é¢ä¸èƒ½æœ‰ç©ºç™½çš„DNSå稱."
-#: app/partials/configuration.host.edit.html.php:128
-#: include/views/configuration.host.prototype.edit.php:100
+#: app/partials/configuration.host.edit.html.php:242
+#: include/views/configuration.host.prototype.edit.php:246
msgid "Interfaces"
msgstr ""
@@ -9356,7 +9375,7 @@ msgstr ""
msgid "Invalid action condition: %1$s."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1476
+#: app/controllers/CControllerPopupTriggerExpr.php:1573
#, c-format
msgid "Invalid condition: %1$s."
msgstr ""
@@ -9417,10 +9436,10 @@ msgstr "無效的方法åƒæ•¸."
#: app/controllers/CControllerDashboardUpdate.php:200
#: app/controllers/CControllerDashboardUpdate.php:212
#: app/controllers/CControllerPopupHttpStep.php:100
-#: include/classes/api/services/CAction.php:2705
-#: include/classes/api/services/CAction.php:2711
-#: include/classes/api/services/CAction.php:2722
-#: include/classes/api/services/CAction.php:2734
+#: include/classes/api/services/CAction.php:2715
+#: include/classes/api/services/CAction.php:2721
+#: include/classes/api/services/CAction.php:2732
+#: include/classes/api/services/CAction.php:2744
#: include/classes/api/services/CAutoregistration.php:157
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CAutoregistration.php:170
@@ -9483,8 +9502,8 @@ msgstr "無效的方法åƒæ•¸."
#: include/classes/api/services/CReport.php:582
#: include/classes/api/services/CReport.php:596
#: include/classes/api/services/CReport.php:602
-#: include/classes/api/services/CScript.php:902
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:904
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:665
#: include/classes/api/services/CTriggerGeneral.php:1773
@@ -9706,11 +9725,11 @@ msgstr ""
msgid "Invalid zoomparameter \"%1$s\": %2$s."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:532
-#: app/views/popup.massupdate.host.php:301
+#: app/partials/configuration.host.edit.html.php:526
+#: app/views/popup.massupdate.host.php:295
#: include/classes/helpers/CMenuHelper.php:94
#: include/classes/helpers/CRoleHelper.php:277
-#: include/views/configuration.host.prototype.edit.php:363 jsLoader.php:370
+#: include/views/configuration.host.prototype.edit.php:355 jsLoader.php:370
msgid "Inventory"
msgstr "資產記錄"
@@ -9724,7 +9743,7 @@ msgid "Inventory field"
msgstr "資產紀錄欄ä½"
#: app/partials/popup.operations.php:225
-#: app/views/popup.massupdate.host.php:184
+#: app/views/popup.massupdate.host.php:180
msgid "Inventory mode"
msgstr "資產紀錄模å¼"
@@ -9732,10 +9751,10 @@ msgstr "資產紀錄模å¼"
msgid "Is online?"
msgstr "是å¦åœ¨ç·š?"
-#: app/partials/configuration.host.edit.html.php:497
+#: app/partials/configuration.host.edit.html.php:492
#: app/views/administration.proxy.edit.php:135
-#: app/views/popup.massupdate.host.php:272
-#: include/views/configuration.host.prototype.edit.php:398
+#: app/views/popup.massupdate.host.php:267
+#: include/views/configuration.host.prototype.edit.php:402
msgid "Issuer"
msgstr ""
@@ -9824,7 +9843,7 @@ msgstr[0] ""
msgid "Item in \"not supported\" state"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1469
+#: app/controllers/CControllerPopupTriggerExpr.php:1566
msgid "Item not selected"
msgstr ""
@@ -10270,17 +10289,17 @@ msgstr "上月圖形"
msgid "Last name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:62
-#: app/controllers/CControllerPopupTriggerExpr.php:76
-#: app/controllers/CControllerPopupTriggerExpr.php:90
-#: app/controllers/CControllerPopupTriggerExpr.php:103
-#: app/controllers/CControllerPopupTriggerExpr.php:124
-#: app/controllers/CControllerPopupTriggerExpr.php:133
-#: app/controllers/CControllerPopupTriggerExpr.php:146
-#: app/controllers/CControllerPopupTriggerExpr.php:165
-#: app/controllers/CControllerPopupTriggerExpr.php:202
-#: app/controllers/CControllerPopupTriggerExpr.php:221
-#: app/controllers/CControllerPopupTriggerExpr.php:250
+#: app/controllers/CControllerPopupTriggerExpr.php:63
+#: app/controllers/CControllerPopupTriggerExpr.php:77
+#: app/controllers/CControllerPopupTriggerExpr.php:91
+#: app/controllers/CControllerPopupTriggerExpr.php:134
+#: app/controllers/CControllerPopupTriggerExpr.php:155
+#: app/controllers/CControllerPopupTriggerExpr.php:164
+#: app/controllers/CControllerPopupTriggerExpr.php:177
+#: app/controllers/CControllerPopupTriggerExpr.php:196
+#: app/controllers/CControllerPopupTriggerExpr.php:233
+#: app/controllers/CControllerPopupTriggerExpr.php:252
+#: app/controllers/CControllerPopupTriggerExpr.php:281
msgid "Last of"
msgstr "Last of"
@@ -10357,8 +10376,8 @@ msgstr ""
msgid "Legend"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:642
-#: app/controllers/CControllerPopupTriggerExpr.php:760
+#: app/controllers/CControllerPopupTriggerExpr.php:673
+#: app/controllers/CControllerPopupTriggerExpr.php:791
msgid "Length"
msgstr ""
@@ -10392,8 +10411,8 @@ msgstr ""
msgid "Line width"
msgstr ""
-#: app/views/popup.massupdate.host.php:112
-#: app/views/popup.massupdate.template.php:89
+#: app/views/popup.massupdate.host.php:46
+#: app/views/popup.massupdate.template.php:48
#: include/views/monitoring.sysmap.constructor.php:43
msgid "Link"
msgstr "連çµ"
@@ -10416,16 +10435,9 @@ msgstr ""
msgid "Link indicators"
msgstr "連çµæŒ‡ç¤ºå™¨"
-#: app/partials/configuration.host.edit.html.php:282
-#: include/views/configuration.host.prototype.edit.php:293
-#: include/views/configuration.template.edit.php:187
-msgid "Link new templates"
-msgstr ""
-
#: app/controllers/CControllerPopupLldOperation.php:143
-#: app/views/popup.lldoperation.php:238
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.template.php:120
+#: app/views/popup.lldoperation.php:238 app/views/popup.massupdate.host.php:75
+#: app/views/popup.massupdate.template.php:79
msgid "Link templates"
msgstr "模æ¿é€£çµ"
@@ -10441,13 +10453,6 @@ msgstr "連çµåˆ°æ¨¡æ¿"
msgid "Linked map"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:206
-#: app/partials/configuration.host.edit.html.php:274
-#: app/views/popup.massupdate.template.php:148
-#: include/views/configuration.host.prototype.edit.php:228
-#: include/views/configuration.host.prototype.edit.php:288
-#: include/views/configuration.template.edit.php:182
-#: include/views/configuration.template.edit.php:195
#: include/views/configuration.template.list.php:64
#: include/views/configuration.template.list.php:124
msgid "Linked templates"
@@ -10586,7 +10591,7 @@ msgstr "日誌與SNMPæ‰æ•å™¨ä¸ç¬¦"
#: app/controllers/CControllerAuditLogList.php:191
#: app/views/administration.authentication.edit.php:200
#: app/views/administration.user.list.php:112 include/func.inc.php:1523
-#: include/func.inc.php:1539 index_http.php:90 index_sso.php:265
+#: include/func.inc.php:1539 index_http.php:90 index_sso.php:280
msgid "Login"
msgstr "登入"
@@ -10668,16 +10673,16 @@ msgstr "巨集\"%1$s\"已存在於\"%2$s\"."
msgid "Macro \"%1$s\" already exists."
msgstr "巨集\"%1$s\"已存在."
-#: app/partials/configuration.host.edit.html.php:531
+#: app/partials/configuration.host.edit.html.php:525
#: app/partials/massupdate.macros.tab.php:120
#: app/views/administration.macros.edit.php:29
#: app/views/administration.macros.edit.php:96
#: app/views/popup.itemtestedit.view.php:307
-#: app/views/popup.massupdate.host.php:294
-#: app/views/popup.massupdate.template.php:153
+#: app/views/popup.massupdate.host.php:288
+#: app/views/popup.massupdate.template.php:144
#: include/classes/helpers/CMenuHelper.php:240 include/html.inc.php:893
-#: include/views/configuration.host.prototype.edit.php:338
-#: include/views/configuration.template.edit.php:208
+#: include/views/configuration.host.prototype.edit.php:331
+#: include/views/configuration.template.edit.php:189
msgid "Macros"
msgstr "巨集"
@@ -10776,12 +10781,12 @@ msgstr ""
msgid "Manage scheduled reports"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:364
+#: app/partials/configuration.host.edit.html.php:359
#: app/partials/popup.operations.php:227
#: app/views/administration.miscconfig.edit.php:60
#: app/views/popup.lldoperation.php:281
-#: app/views/popup.massupdate.host.php:188 include/hosts.inc.php:1127
-#: include/views/configuration.host.prototype.edit.php:357
+#: app/views/popup.massupdate.host.php:184 include/hosts.inc.php:1127
+#: include/views/configuration.host.prototype.edit.php:361
msgid "Manual"
msgstr "手動的"
@@ -10924,16 +10929,16 @@ msgstr "標記其他"
msgid "Mark selected"
msgstr "標記所é¸"
-#: app/controllers/CControllerPopupTriggerExpr.php:377
-#: app/controllers/CControllerPopupTriggerExpr.php:417
-#: app/controllers/CControllerPopupTriggerExpr.php:443
+#: app/controllers/CControllerPopupTriggerExpr.php:408
+#: app/controllers/CControllerPopupTriggerExpr.php:448
+#: app/controllers/CControllerPopupTriggerExpr.php:474
msgid "Mask"
msgstr ""
#: app/controllers/CControllerPopupMassupdateHost.php:471
#: app/controllers/CControllerPopupMassupdateItem.php:406
#: app/controllers/CControllerPopupMassupdateService.php:171
-#: app/controllers/CControllerPopupMassupdateTemplate.php:364
+#: app/controllers/CControllerPopupMassupdateTemplate.php:370
#: app/controllers/CControllerPopupMassupdateTrigger.php:235
#: app/partials/monitoring.service.list.edit.php:141
#: app/views/configuration.host.list.php:516
@@ -10966,11 +10971,11 @@ msgstr ""
msgid "Matches regular expression"
msgstr ""
-#: app/views/popup.triggerexpr.php:112
+#: app/views/popup.triggerexpr.php:113
msgid "Mathematical functions"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:364
+#: app/controllers/CControllerPopupTriggerExpr.php:395
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:134
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:136
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:206
@@ -11200,7 +11205,7 @@ msgstr ""
msgid "Middle"
msgstr "居中"
-#: app/controllers/CControllerPopupTriggerExpr.php:359
+#: app/controllers/CControllerPopupTriggerExpr.php:390
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:119
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:121
#: include/classes/widgets/forms/CWidgetFormSvgGraph.php:191
@@ -11301,7 +11306,7 @@ msgstr ""
msgid "Missing key \"%1$s\" for host \"%2$s\"."
msgstr "缺少主機\"%2$s\"çš„éµå€¼ \"%1$s\"."
-#: app/controllers/CControllerPopupTriggerExpr.php:242
+#: app/controllers/CControllerPopupTriggerExpr.php:273
#: app/views/administration.proxy.list.php:51
#: app/views/administration.proxy.list.php:77 report2.php:201
msgid "Mode"
@@ -11379,9 +11384,9 @@ msgstr "週一"
msgid "Monitored by"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:155
-#: app/views/popup.massupdate.host.php:90
-#: include/views/configuration.host.prototype.edit.php:135
+#: app/partials/configuration.host.edit.html.php:269
+#: app/views/popup.massupdate.host.php:129
+#: include/views/configuration.host.prototype.edit.php:277
msgid "Monitored by proxy"
msgstr "由系統代ç†ç¨‹å¼ç›£æ¸¬"
@@ -11400,6 +11405,7 @@ msgstr "監測中"
msgid "Monospace"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:121
#: app/views/popup.maintenance.period.php:104 report4.php:163
msgid "Month"
msgstr "月"
@@ -11512,8 +11518,8 @@ msgstr ""
#: app/controllers/CControllerPopupValueMapUpdate.php:70
#: app/partials/administration.ha.nodes.php:28
#: app/partials/configuration.filter.items.php:91
-#: app/partials/configuration.host.edit.html.php:177
-#: app/partials/configuration.host.edit.html.php:216
+#: app/partials/configuration.host.edit.html.php:110
+#: app/partials/configuration.host.edit.html.php:144
#: app/partials/configuration.tags.tab.php:39
#: app/partials/configuration.valuemap.php:29
#: app/partials/monitoring.host.filter.php:78
@@ -11583,11 +11589,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:324
#: app/views/popup.lldoperation.php:268 app/views/popup.lldoverride.php:47
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.massupdate.trigger.php:98
#: app/views/popup.service.edit.php:45 app/views/popup.service.edit.php:65
@@ -11615,8 +11621,8 @@ msgstr ""
#: include/views/configuration.host.discovery.list.php:193
#: include/views/configuration.hostgroups.list.php:46
#: include/views/configuration.hostgroups.list.php:64
-#: include/views/configuration.host.prototype.edit.php:208
-#: include/views/configuration.host.prototype.edit.php:240
+#: include/views/configuration.host.prototype.edit.php:87
+#: include/views/configuration.host.prototype.edit.php:118
#: include/views/configuration.host.prototype.list.php:59
#: include/views/configuration.httpconf.edit.php:69
#: include/views/configuration.httpconf.edit.php:117
@@ -11637,7 +11643,7 @@ msgstr ""
#: include/views/configuration.maintenance.edit.php:94
#: include/views/configuration.maintenance.list.php:60
#: include/views/configuration.maintenance.list.php:85
-#: include/views/configuration.template.edit.php:127
+#: include/views/configuration.template.edit.php:69
#: include/views/configuration.template.list.php:80
#: include/views/configuration.template.list.php:114
#: include/views/configuration.trigger.prototype.edit.php:70
@@ -11927,15 +11933,15 @@ msgstr "沒有所稱的探索è¦å‰‡ID"
msgid "No enabled modules found."
msgstr ""
-#: app/partials/configuration.host.edit.html.php:436
-#: app/partials/configuration.host.edit.html.php:449
+#: app/partials/configuration.host.edit.html.php:431
+#: app/partials/configuration.host.edit.html.php:444
#: app/views/administration.autoreg.edit.php:48
#: app/views/administration.proxy.edit.php:95
#: app/views/administration.proxy.edit.php:103
-#: app/views/popup.massupdate.host.php:237
-#: app/views/popup.massupdate.host.php:247
-#: include/views/configuration.host.prototype.edit.php:369
-#: include/views/configuration.host.prototype.edit.php:379
+#: app/views/popup.massupdate.host.php:232
+#: app/views/popup.massupdate.host.php:242
+#: include/views/configuration.host.prototype.edit.php:373
+#: include/views/configuration.host.prototype.edit.php:383
msgid "No encryption"
msgstr ""
@@ -12021,7 +12027,7 @@ msgstr ""
msgid "No new modules discovered"
msgstr ""
-#: include/classes/api/services/CAction.php:2769
+#: include/classes/api/services/CAction.php:2779
#, c-format
msgid "No operations defined for action \"%1$s\"."
msgstr ""
@@ -12058,9 +12064,9 @@ msgstr "沒有系統存å–的許å¯æ¬Š"
#: include/classes/api/services/CRole.php:137
#: include/classes/api/services/CRole.php:230
#: include/classes/api/services/CRole.php:345
-#: include/classes/api/services/CScript.php:240
-#: include/classes/api/services/CScript.php:316
-#: include/classes/api/services/CScript.php:825
+#: include/classes/api/services/CScript.php:242
+#: include/classes/api/services/CScript.php:318
+#: include/classes/api/services/CScript.php:827
#: include/classes/api/services/CSettings.php:136
#: include/classes/api/services/CUserGroup.php:176
#: include/classes/api/services/CUserGroup.php:260
@@ -12099,7 +12105,7 @@ msgstr ""
#: app/views/monitoring.widget.systeminfo.view.php:45 disc_prototypes.php:748
#: host_discovery.php:808 hostinventoriesoverview.php:73
#: include/classes/api/services/CAction.php:1516
-#: include/classes/api/services/CAction.php:2571
+#: include/classes/api/services/CAction.php:2577
#: include/classes/api/services/CConfiguration.php:78
#: include/classes/api/services/CCorrelation.php:497
#: include/classes/api/services/CCorrelation.php:653
@@ -12199,11 +12205,11 @@ msgstr ""
#: include/classes/api/services/CReport.php:909
#: include/classes/api/services/CRole.php:326
#: include/classes/api/services/CRole.php:363
-#: include/classes/api/services/CScript.php:375
-#: include/classes/api/services/CScript.php:860
-#: include/classes/api/services/CScript.php:920
-#: include/classes/api/services/CScript.php:937
-#: include/classes/api/services/CScript.php:949
+#: include/classes/api/services/CScript.php:377
+#: include/classes/api/services/CScript.php:862
+#: include/classes/api/services/CScript.php:922
+#: include/classes/api/services/CScript.php:939
+#: include/classes/api/services/CScript.php:951
#: include/classes/api/services/CService.php:398
#: include/classes/api/services/CService.php:467
#: include/classes/api/services/CService.php:947
@@ -12262,7 +12268,7 @@ msgid "No public key file specified."
msgstr "沒有指定的公開金鑰檔"
#: app/controllers/CControllerActionOperationValidate.php:110
-#: include/classes/api/services/CAction.php:2826
+#: include/classes/api/services/CAction.php:2836
msgid "No recipients specified for action operation message."
msgstr ""
@@ -12283,7 +12289,7 @@ msgid "No target selected."
msgstr "沒有已é¸çš„目標"
#: app/controllers/CControllerActionOperationValidate.php:142
-#: include/classes/api/services/CAction.php:2837
+#: include/classes/api/services/CAction.php:2847
msgid "No targets specified for action operation global script."
msgstr ""
@@ -12432,6 +12438,10 @@ msgstr "警報匯總"
msgid "Notifications"
msgstr "警報"
+#: actionconf.php:87 include/views/configuration.action.edit.php:475
+msgid "Notify about canceled escalations"
+msgstr ""
+
#: include/actions.inc.php:865 include/actions.inc.php:1038
#: include/actions.inc.php:1039
msgid "Notify all involved"
@@ -12518,6 +12528,10 @@ msgstr ""
msgid "Number of rows"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:126
+msgid "Number of seasons"
+msgstr ""
+
#: include/views/reports.toptriggers.php:86
msgid "Number of status changes"
msgstr "狀態改變次數"
@@ -12693,7 +12707,7 @@ msgid "Off"
msgstr "關"
#: app/views/administration.user.list.php:147
-#: app/views/js/popup.massupdate.js.php:415
+#: app/views/js/popup.massupdate.js.php:428
#: app/views/js/popup.mediatypetest.edit.js.php:114
#: app/views/js/popup.scriptexec.js.php:53
#: app/views/js/reports.auditlog.list.js.php:158
@@ -12740,7 +12754,7 @@ msgstr ""
msgid "One time only"
msgstr "一次性"
-#: app/views/js/popup.service.edit.js.php:236
+#: app/views/js/popup.service.edit.js.php:235
#: app/views/popup.service.time.edit.php:47
msgid "One-time downtime"
msgstr " 單次åœæ©Ÿ"
@@ -12816,12 +12830,12 @@ msgstr ""
msgid "Operation"
msgstr ""
-#: include/classes/api/services/CAction.php:2795
+#: include/classes/api/services/CAction.php:2805
#, c-format
msgid "Operation \"%1$s\" already exists for action \"%2$s\"."
msgstr ""
-#: actionconf.php:378
+#: actionconf.php:384
#, c-format
msgid "Operation \"%1$s\" already exists."
msgstr ""
@@ -12855,8 +12869,8 @@ msgstr ""
#: app/views/configuration.correlation.edit.php:140
#: app/views/configuration.correlation.list.php:77
#: app/views/popup.lldoverride.php:210
-#: include/views/configuration.action.edit.php:307
-#: include/views/configuration.action.edit.php:479
+#: include/views/configuration.action.edit.php:300
+#: include/views/configuration.action.edit.php:484
#: include/views/configuration.action.list.php:99
msgid "Operations"
msgstr "æ“作"
@@ -12891,7 +12905,7 @@ msgstr "æ“作"
msgid "Operator"
msgstr "æ“作者"
-#: app/views/popup.triggerexpr.php:113
+#: app/views/popup.triggerexpr.php:114
msgid "Operator functions"
msgstr ""
@@ -12931,19 +12945,19 @@ msgstr ""
#: app/views/popup.lldoperation.php:176 app/views/popup.lldoperation.php:184
#: app/views/popup.lldoperation.php:205 app/views/popup.lldoperation.php:226
#: app/views/popup.lldoperation.php:237 app/views/popup.lldoperation.php:261
-#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:45
-#: app/views/popup.massupdate.host.php:75
-#: app/views/popup.massupdate.host.php:90
-#: app/views/popup.massupdate.host.php:96
-#: app/views/popup.massupdate.host.php:140
-#: app/views/popup.massupdate.host.php:150
-#: app/views/popup.massupdate.host.php:159
-#: app/views/popup.massupdate.host.php:167
-#: app/views/popup.massupdate.host.php:174
-#: app/views/popup.massupdate.host.php:184
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:226
-#: app/views/popup.massupdate.host.php:282
+#: app/views/popup.lldoperation.php:275 app/views/popup.massupdate.host.php:74
+#: app/views/popup.massupdate.host.php:82
+#: app/views/popup.massupdate.host.php:112
+#: app/views/popup.massupdate.host.php:129
+#: app/views/popup.massupdate.host.php:135
+#: app/views/popup.massupdate.host.php:149
+#: app/views/popup.massupdate.host.php:157
+#: app/views/popup.massupdate.host.php:164
+#: app/views/popup.massupdate.host.php:170
+#: app/views/popup.massupdate.host.php:180
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:222
+#: app/views/popup.massupdate.host.php:277
#: app/views/popup.massupdate.item.php:47
#: app/views/popup.massupdate.item.php:59
#: app/views/popup.massupdate.item.php:79
@@ -12973,10 +12987,10 @@ msgstr ""
#: app/views/popup.massupdate.item.php:466
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:47
-#: app/views/popup.massupdate.template.php:75
-#: app/views/popup.massupdate.template.php:119
-#: app/views/popup.massupdate.template.php:131
+#: app/views/popup.massupdate.template.php:78
+#: app/views/popup.massupdate.template.php:87
+#: app/views/popup.massupdate.template.php:115
+#: app/views/popup.massupdate.template.php:123
#: app/views/popup.massupdate.trigger.php:52
#: app/views/popup.massupdate.trigger.php:60
#: app/views/popup.massupdate.trigger.php:75
@@ -13239,10 +13253,10 @@ msgstr "å•é¡Œ"
msgid "PROBLEM event generation mode"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:437
-#: app/partials/configuration.host.edit.html.php:453
-#: app/partials/configuration.host.edit.html.php:467
-#: app/partials/configuration.host.edit.html.php:488
+#: app/partials/configuration.host.edit.html.php:432
+#: app/partials/configuration.host.edit.html.php:448
+#: app/partials/configuration.host.edit.html.php:462
+#: app/partials/configuration.host.edit.html.php:483
#: app/views/administration.autoreg.edit.php:50
#: app/views/administration.autoreg.edit.php:67
#: app/views/administration.autoreg.edit.php:79
@@ -13255,19 +13269,19 @@ msgstr ""
#: app/views/configuration.host.list.php:378
#: app/views/configuration.host.list.php:395
#: app/views/configuration.host.list.php:398
-#: app/views/popup.massupdate.host.php:238
-#: app/views/popup.massupdate.host.php:251
-#: app/views/popup.massupdate.host.php:266
-#: include/views/configuration.host.prototype.edit.php:370
-#: include/views/configuration.host.prototype.edit.php:383
-#: include/views/configuration.host.prototype.edit.php:391
+#: app/views/popup.massupdate.host.php:233
+#: app/views/popup.massupdate.host.php:246
+#: app/views/popup.massupdate.host.php:261
+#: include/views/configuration.host.prototype.edit.php:374
+#: include/views/configuration.host.prototype.edit.php:387
+#: include/views/configuration.host.prototype.edit.php:395
msgid "PSK"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:478
+#: app/partials/configuration.host.edit.html.php:473
#: app/views/administration.autoreg.edit.php:56
#: app/views/administration.proxy.edit.php:110
-#: app/views/popup.massupdate.host.php:260
+#: app/views/popup.massupdate.host.php:255
msgid "PSK identity"
msgstr ""
@@ -13319,12 +13333,12 @@ msgid "Parameters"
msgstr ""
#: app/controllers/CControllerActionOperationValidate.php:76
-#: include/classes/api/services/CAction.php:2807
+#: include/classes/api/services/CAction.php:2817
msgid "Parameters \"esc_step_from\" and \"esc_step_to\" must be set together."
msgstr ""
#: include/views/configuration.host.discovery.edit.php:52
-#: include/views/configuration.host.prototype.edit.php:62
+#: include/views/configuration.host.prototype.edit.php:61
msgid "Parent discovery rules"
msgstr "上層探索è¦å‰‡"
@@ -13379,13 +13393,13 @@ msgid "Passive"
msgstr "被動å¼"
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: app/partials/configuration.host.edit.html.php:327
+#: app/partials/configuration.host.edit.html.php:322
#: app/views/administration.mediatype.edit.php:204
#: app/views/administration.script.edit.php:135
#: app/views/administration.script.edit.php:154
#: app/views/administration.user.edit.php:157
#: app/views/administration.user.edit.php:172
-#: app/views/popup.massupdate.host.php:174
+#: app/views/popup.massupdate.host.php:170
#: app/views/popup.massupdate.item.php:175
#: app/views/popup.massupdate.item.php:199 disc_prototypes.php:218
#: host_discovery.php:191 httpconf.php:74
@@ -13393,7 +13407,7 @@ msgstr "被動å¼"
#: include/views/configuration.host.discovery.edit.php:413
#: include/views/configuration.host.discovery.edit.php:554
#: include/views/configuration.host.discovery.edit.php:593
-#: include/views/configuration.host.prototype.edit.php:320
+#: include/views/configuration.host.prototype.edit.php:315
#: include/views/configuration.httpconf.edit.php:170
#: include/views/configuration.item.edit.php:480
#: include/views/configuration.item.edit.php:637
@@ -13446,12 +13460,12 @@ msgstr ""
msgid "Paste without external links"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:877
+#: app/controllers/CControllerPopupTriggerExpr.php:908
#: app/views/monitoring.charts.view.php:106
msgid "Pattern"
msgstr ""
-#: actionconf.php:82 include/views/configuration.action.edit.php:163
+#: actionconf.php:82 include/views/configuration.action.edit.php:471
msgid "Pause operations for suppressed problems"
msgstr ""
@@ -13464,7 +13478,7 @@ msgstr ""
msgid "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s), <url> - VMware service URL, <uuid> - VMware virtual machine host name"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:213
+#: app/controllers/CControllerPopupTriggerExpr.php:244
msgid "Percentage"
msgstr ""
@@ -13488,10 +13502,11 @@ msgstr "百分比線(å³)"
msgid "Performs a DNS query. Returns character string with the required type of information"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:104
#: app/partials/scheduledreport.formgrid.html.php:83
#: app/partials/scheduledreport.table.html.php:42
#: app/views/popup.lldoperation.php:116
-#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:181
+#: app/views/popup.massupdate.item.php:227 app/views/popup.triggerexpr.php:182
#: include/views/configuration.host.discovery.edit.php:632
#: include/views/configuration.item.edit.php:735
#: include/views/configuration.item.prototype.edit.php:714
@@ -13499,7 +13514,9 @@ msgstr ""
msgid "Period"
msgstr "期間"
-#: app/controllers/CControllerPopupTriggerExpr.php:95
+#: app/controllers/CControllerPopupTriggerExpr.php:96
+#: app/controllers/CControllerPopupTriggerExpr.php:109
+#: app/controllers/CControllerPopupTriggerExpr.php:1095
msgid "Period shift"
msgstr ""
@@ -13563,11 +13580,11 @@ msgstr "播放è²éŸ³"
msgid "Please check configuration parameters. If all is correct, press \"%1$s\" button, or \"%2$s\" button to change configuration parameters."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:401
+#: app/views/js/popup.massupdate.js.php:414
msgid "Please confirm that you want to remove all macros."
msgstr ""
-#: app/views/js/popup.massupdate.js.php:404
+#: app/views/js/popup.massupdate.js.php:417
msgid "Please confirm that you want to remove all value mappings."
msgstr ""
@@ -13653,7 +13670,7 @@ msgstr ""
msgid "Power usage , <url> - VMware service URL, <uuid> - VMware hypervisor host name, <max> - Maximum allowed power usage"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:832
+#: app/controllers/CControllerPopupTriggerExpr.php:863
msgid "Power value"
msgstr ""
@@ -13662,7 +13679,7 @@ msgstr ""
msgid "Pre-installation summary"
msgstr ""
-#: app/views/popup.triggerexpr.php:114
+#: app/views/popup.triggerexpr.php:115
msgid "Prediction functions"
msgstr ""
@@ -13779,9 +13796,9 @@ msgstr ""
msgid "Private key file"
msgstr "ç§æœ‰é‡‘鑰檔"
-#: app/partials/configuration.host.edit.html.php:315
-#: app/views/popup.massupdate.host.php:159
-#: include/views/configuration.host.prototype.edit.php:313
+#: app/partials/configuration.host.edit.html.php:310
+#: app/views/popup.massupdate.host.php:157
+#: include/views/configuration.host.prototype.edit.php:307
msgid "Privilege level"
msgstr "優先權層級"
@@ -14187,7 +14204,7 @@ msgstr ""
msgid "Recovery expression syntax error."
msgstr ""
-#: include/views/configuration.action.edit.php:393
+#: include/views/configuration.action.edit.php:386
msgid "Recovery operations"
msgstr ""
@@ -14317,20 +14334,20 @@ msgstr "é ç«¯å‘½ä»¤"
#: app/views/js/popup.massupdate.tmpl.js.php:59
#: app/views/js/popup.massupdate.tmpl.js.php:96
#: app/views/js/popup.massupdate.tmpl.js.php:108
-#: app/views/js/popup.service.edit.js.php:201
-#: app/views/js/popup.service.edit.js.php:225
-#: app/views/js/popup.service.edit.js.php:244
+#: app/views/js/popup.service.edit.js.php:200
+#: app/views/js/popup.service.edit.js.php:224
+#: app/views/js/popup.service.edit.js.php:243
#: app/views/popup.dashboard.share.edit.php:85
#: app/views/popup.dashboard.share.edit.php:106
#: app/views/popup.lldoperation.php:152 app/views/popup.lldoverride.php:158
-#: app/views/popup.massupdate.host.php:52
-#: app/views/popup.massupdate.host.php:203
+#: app/views/popup.massupdate.host.php:89
+#: app/views/popup.massupdate.host.php:199
#: app/views/popup.massupdate.item.php:137
#: app/views/popup.massupdate.item.php:263
#: app/views/popup.massupdate.item.php:482
#: app/views/popup.massupdate.service.php:46
-#: app/views/popup.massupdate.template.php:54
-#: app/views/popup.massupdate.template.php:136
+#: app/views/popup.massupdate.template.php:94
+#: app/views/popup.massupdate.template.php:128
#: app/views/popup.massupdate.trigger.php:80 app/views/popup.media.php:45
#: app/views/popup.media.php:110 app/views/popup.service.edit.php:98
#: app/views/popup.valuemap.edit.php:91
@@ -14339,10 +14356,10 @@ msgstr "é ç«¯å‘½ä»¤"
#: include/classes/widgets/CWidgetHelper.php:533
#: include/classes/widgets/CWidgetHelper.php:586 include/forms.inc.php:1461
#: include/forms.inc.php:2009 include/views/configuration.action.edit.php:97
-#: include/views/configuration.action.edit.php:256
-#: include/views/configuration.action.edit.php:284
-#: include/views/configuration.action.edit.php:368
-#: include/views/configuration.action.edit.php:446
+#: include/views/configuration.action.edit.php:249
+#: include/views/configuration.action.edit.php:277
+#: include/views/configuration.action.edit.php:361
+#: include/views/configuration.action.edit.php:439
#: include/views/configuration.host.discovery.edit.php:151
#: include/views/configuration.host.discovery.edit.php:196
#: include/views/configuration.host.discovery.edit.php:222
@@ -14386,7 +14403,7 @@ msgstr "é ç«¯å‘½ä»¤"
#: include/views/js/configuration.host.discovery.edit.overr.js.php:93
#: include/views/js/configuration.host.discovery.edit.overr.js.php:122
#: include/views/js/configuration.host.discovery.edit.overr.js.php:144
-#: include/views/js/configuration.host.prototype.edit.js.php:33
+#: include/views/js/configuration.host.prototype.edit.js.php:35
#: include/views/js/configuration.httpconf.edit.js.php:52
#: include/views/js/configuration.httpconf.edit.js.php:77
#: include/views/js/configuration.item.list.js.php:64
@@ -14469,14 +14486,14 @@ msgstr ""
msgid "Repeats"
msgstr ""
-#: app/views/popup.massupdate.host.php:51
-#: app/views/popup.massupdate.host.php:113
-#: app/views/popup.massupdate.host.php:202
+#: app/views/popup.massupdate.host.php:47
+#: app/views/popup.massupdate.host.php:88
+#: app/views/popup.massupdate.host.php:198
#: app/views/popup.massupdate.item.php:481
#: app/views/popup.massupdate.service.php:45
-#: app/views/popup.massupdate.template.php:53
-#: app/views/popup.massupdate.template.php:90
-#: app/views/popup.massupdate.template.php:135
+#: app/views/popup.massupdate.template.php:49
+#: app/views/popup.massupdate.template.php:93
+#: app/views/popup.massupdate.template.php:127
#: app/views/popup.massupdate.trigger.php:79 include/items.inc.php:1807
#: include/views/configuration.trigger.prototype.edit.php:169
#: include/views/configuration.trigger.prototype.edit.php:362
@@ -14489,8 +14506,8 @@ msgstr "å–代"
msgid "Replace dependencies"
msgstr "替æ›ç›¸ä¾é—œä¿‚"
-#: app/controllers/CControllerPopupTriggerExpr.php:647
-#: app/controllers/CControllerPopupTriggerExpr.php:882
+#: app/controllers/CControllerPopupTriggerExpr.php:678
+#: app/controllers/CControllerPopupTriggerExpr.php:913
msgid "Replacement"
msgstr ""
@@ -14691,7 +14708,7 @@ msgstr ""
#: app/views/popup.itemtestedit.view.php:325
#: app/views/popup.itemtestedit.view.php:365
#: app/views/popup.testtriggerexpr.php:49
-#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:217
+#: app/views/popup.testtriggerexpr.php:102 app/views/popup.triggerexpr.php:236
#: include/classes/debug/CProfiler.php:183
msgid "Result"
msgstr "çµæžœ"
@@ -15220,7 +15237,7 @@ msgstr ""
msgid "Script"
msgstr "脚本"
-#: include/classes/api/services/CScript.php:1346
+#: include/classes/api/services/CScript.php:1348
#, c-format
msgid "Script \"%1$s\" already exists."
msgstr ""
@@ -15284,6 +15301,15 @@ msgstr "æœå°‹å¼æ¨£æ˜¯ç©ºç™½"
msgid "Search type"
msgstr ""
+#: app/controllers/CControllerPopupTriggerExpr.php:114
+#: app/controllers/CControllerPopupTriggerExpr.php:1105
+msgid "Season"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1120
+msgid "Season deviation window"
+msgstr ""
+
#: include/hosts.inc.php:434
msgid "Secondary POC cell"
msgstr "第二個POC手機號碼"
@@ -15362,7 +15388,7 @@ msgstr ""
msgid "Selected"
msgstr "é¸æ“‡çš„"
-#: actionconf.php:488
+#: actionconf.php:494
msgid "Selected actions deleted"
msgstr "所é¸çš„動作已刪除"
@@ -15602,6 +15628,7 @@ msgid "Services updated"
msgstr ""
#: include/classes/core/ZBase.php:244 include/classes/core/ZBase.php:471
+#: index_sso.php:242 index_sso.php:249
msgid "Session initialization error."
msgstr ""
@@ -16055,7 +16082,7 @@ msgstr "西ç­ç‰™èªž (es_ES)"
msgid "Specified role was not found."
msgstr ""
-#: include/classes/api/services/CAction.php:2932
+#: include/classes/api/services/CAction.php:2942
msgid "Specified script does not exist or you do not have rights on it for action operation command."
msgstr "指定的腳本ä¸å­˜åœ¨æˆ–您沒有å°å‹•ä½œæ“作命令的此腳本的權é™."
@@ -16090,8 +16117,8 @@ msgstr "標準項目"
msgid "Standby"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:637
-#: app/controllers/CControllerPopupTriggerExpr.php:755
+#: app/controllers/CControllerPopupTriggerExpr.php:668
+#: app/controllers/CControllerPopupTriggerExpr.php:786
msgid "Start"
msgstr ""
@@ -16099,7 +16126,7 @@ msgstr ""
msgid "Start date"
msgstr ""
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
msgid "Start in"
msgstr "開始於"
@@ -16178,7 +16205,7 @@ msgstr ""
#: app/views/monitoring.service.list.php:79
#: app/views/monitoring.widget.actionlog.view.php:38
#: app/views/monitoring.widget.problems.view.php:56
-#: app/views/popup.massupdate.host.php:96
+#: app/views/popup.massupdate.host.php:135
#: app/views/popup.massupdate.item.php:325
#: app/views/popup.scheduledreport.subscription.php:114
#: app/views/popup.service.statusrule.edit.php:74
@@ -16282,7 +16309,7 @@ msgid "Step with name \"%1$s\" already exists."
msgstr ""
#: app/partials/popup.operations.php:51 httpconf.php:51
-#: include/views/configuration.action.edit.php:175
+#: include/views/configuration.action.edit.php:168
#: include/views/configuration.httpconf.edit.php:227
#: include/views/configuration.httpconf.edit.php:236
msgid "Steps"
@@ -16336,12 +16363,12 @@ msgstr "Straight"
msgid "Strict"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:497
+#: app/controllers/CControllerPopupTriggerExpr.php:528
#: include/triggers.inc.php:1596
msgid "String"
msgstr ""
-#: app/views/popup.triggerexpr.php:115
+#: app/views/popup.triggerexpr.php:116
msgid "String functions"
msgstr ""
@@ -16362,10 +16389,10 @@ msgstr ""
msgid "Subject"
msgstr "主旨"
-#: app/partials/configuration.host.edit.html.php:505
+#: app/partials/configuration.host.edit.html.php:500
#: app/views/administration.proxy.edit.php:138
-#: app/views/popup.massupdate.host.php:276
-#: include/views/configuration.host.prototype.edit.php:403
+#: app/views/popup.massupdate.host.php:271
+#: include/views/configuration.host.prototype.edit.php:407
msgctxt "encryption certificate"
msgid "Subject"
msgstr ""
@@ -16559,7 +16586,7 @@ msgstr ""
#: app/controllers/CControllerPopupLldOperation.php:138
#: app/partials/administration.usergroup.tagfilters.html.php:29
#: app/partials/configuration.filter.items.php:166
-#: app/partials/configuration.host.edit.html.php:530
+#: app/partials/configuration.host.edit.html.php:524
#: app/partials/monitoring.host.filter.php:133
#: app/partials/monitoring.host.view.html.php:32
#: app/partials/monitoring.latest.view.html.php:58
@@ -16575,13 +16602,13 @@ msgstr ""
#: app/views/monitoring.web.view.php:87
#: app/views/monitoring.widget.problems.view.php:68
#: app/views/popup.lldoperation.php:262
-#: app/views/popup.massupdate.host.php:198
-#: app/views/popup.massupdate.host.php:293
+#: app/views/popup.massupdate.host.php:194
+#: app/views/popup.massupdate.host.php:287
#: app/views/popup.massupdate.item.php:477
#: app/views/popup.massupdate.item.php:493
#: app/views/popup.massupdate.service.php:40
-#: app/views/popup.massupdate.template.php:131
-#: app/views/popup.massupdate.template.php:149
+#: app/views/popup.massupdate.template.php:123
+#: app/views/popup.massupdate.template.php:140
#: app/views/popup.massupdate.trigger.php:75
#: app/views/popup.massupdate.trigger.php:150
#: app/views/popup.service.edit.php:263 app/views/popup.service.edit.php:346
@@ -16598,7 +16625,7 @@ msgstr ""
#: include/classes/widgets/forms/CWidgetFormTrigOver.php:67
#: include/classes/widgets/forms/CWidgetFormWeb.php:61
#: include/events.inc.php:263 include/forms.inc.php:89
-#: include/views/configuration.host.prototype.edit.php:328
+#: include/views/configuration.host.prototype.edit.php:323
#: include/views/configuration.host.prototype.list.php:63
#: include/views/configuration.httpconf.edit.php:237
#: include/views/configuration.httpconf.list.php:77
@@ -16608,7 +16635,7 @@ msgstr ""
#: include/views/configuration.item.prototype.edit.php:861
#: include/views/configuration.item.prototype.list.php:67
#: include/views/configuration.maintenance.edit.php:247
-#: include/views/configuration.template.edit.php:198
+#: include/views/configuration.template.edit.php:179
#: include/views/configuration.template.list.php:83
#: include/views/configuration.template.list.php:126
#: include/views/configuration.trigger.prototype.edit.php:551
@@ -16644,14 +16671,12 @@ msgstr "Telnet"
#: app/controllers/CControllerAuditLogList.php:239
#: app/views/administration.mediatype.edit.php:280
-#: app/views/popup.massupdate.template.php:147 app/views/search.php:278
+#: app/views/popup.massupdate.template.php:139 app/views/search.php:278
#: include/actions.inc.php:49 include/forms.inc.php:529
#: include/views/configuration.graph.list.php:149
#: include/views/configuration.host.discovery.list.php:192
#: include/views/configuration.httpconf.list.php:130
#: include/views/configuration.item.list.php:83
-#: include/views/configuration.template.edit.php:46
-#: include/views/configuration.template.edit.php:118
#: include/views/configuration.triggers.list.php:190 report2.php:390
msgid "Template"
msgstr "模æ¿"
@@ -16695,7 +16720,7 @@ msgstr ""
msgid "Template dashboards"
msgstr ""
-#: templates.php:425 templates.php:439 templates.php:472
+#: templates.php:426 templates.php:440 templates.php:473
msgid "Template deleted"
msgstr "模æ¿å·²åˆªé™¤"
@@ -16707,11 +16732,11 @@ msgstr "模æ¿ç¾¤çµ„"
msgid "Template linkage"
msgstr "模æ¿é–“çš„é—œè¯"
-#: include/views/configuration.template.edit.php:211
+#: include/views/configuration.template.edit.php:192
msgid "Template macros"
msgstr ""
-#: include/views/configuration.template.edit.php:82 templates.php:41
+#: include/views/configuration.template.edit.php:54 templates.php:41
msgid "Template name"
msgstr "模版å稱"
@@ -16746,13 +16771,12 @@ msgstr ""
#: app/controllers/CControllerPopupImportCompare.php:132
#: app/controllers/CControllerPopupImportCompare.php:165
#: app/partials/configuration.filter.items.php:72
-#: app/partials/configuration.host.edit.html.php:528
+#: app/partials/configuration.host.edit.html.php:210
#: app/partials/popup.operations.php:212
#: app/views/configuration.host.list.php:81
#: app/views/configuration.host.list.php:191
#: app/views/popup.condition.common.php:357 app/views/popup.import.php:31
-#: app/views/popup.massupdate.host.php:291 app/views/search.php:223
-#: app/views/search.php:227 app/views/search.php:369
+#: app/views/search.php:223 app/views/search.php:227 app/views/search.php:369
#: include/classes/helpers/CMenuHelper.php:144
#: include/classes/helpers/CRoleHelper.php:358
#: include/views/configuration.copy.elements.php:63
@@ -16761,10 +16785,12 @@ msgstr ""
#: include/views/configuration.hostgroups.list.php:68
#: include/views/configuration.hostgroups.list.php:183
#: include/views/configuration.hostgroups.list.php:187
-#: include/views/configuration.host.prototype.edit.php:302
+#: include/views/configuration.host.prototype.edit.php:175
#: include/views/configuration.host.prototype.list.php:60
#: include/views/configuration.httpconf.list.php:50
#: include/views/configuration.template.edit.php:28
+#: include/views/configuration.template.edit.php:145
+#: include/views/configuration.template.edit.php:176
#: include/views/configuration.template.list.php:87
#: include/views/configuration.triggers.list.php:48
msgid "Templates"
@@ -16775,7 +16801,7 @@ msgstr "模æ¿"
msgid "Templates \"%1$s\" unlinked from hosts \"%2$s\"."
msgstr "模æ¿\"%1$s\"自主機\"%2$s\"斷連."
-#: app/controllers/CControllerPopupMassupdateTemplate.php:348
+#: app/controllers/CControllerPopupMassupdateTemplate.php:350
msgid "Templates updated"
msgstr ""
@@ -16987,7 +17013,7 @@ msgstr "背景主題"
msgid "This day last week"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:403
+#: app/partials/configuration.host.edit.html.php:398
#, c-format
msgid "This field is automatically populated by item \"%1$s\"."
msgstr ""
@@ -17025,7 +17051,7 @@ msgstr "本年"
msgid "This year so far"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:261
+#: app/controllers/CControllerPopupTriggerExpr.php:292
msgid "Threshold"
msgstr ""
@@ -17058,15 +17084,15 @@ msgstr ""
msgid "Till"
msgstr "直到"
-#: app/controllers/CControllerPopupTriggerExpr.php:50
-#: app/controllers/CControllerPopupTriggerExpr.php:232
+#: app/controllers/CControllerPopupTriggerExpr.php:51
+#: app/controllers/CControllerPopupTriggerExpr.php:263
#: app/views/hintbox.eventlist.php:61 app/views/hintbox.eventlist.php:67
#: app/views/monitoring.widget.actionlog.view.php:33
#: app/views/monitoring.widget.problems.view.php:38
#: app/views/popup.itemtestedit.view.php:270
#: app/views/popup.service.time.edit.php:70
#: app/views/popup.service.time.edit.php:98
-#: app/views/popup.triggerexpr.php:174 app/views/popup.triggerexpr.php:178
+#: app/views/popup.triggerexpr.php:175 app/views/popup.triggerexpr.php:179
#: app/views/reports.auditlog.list.php:89 include/actions.inc.php:1700
#: include/actions.inc.php:1754 include/actions.inc.php:1827
#: include/actions.inc.php:1921 include/actions.inc.php:1976
@@ -17103,13 +17129,13 @@ msgstr ""
msgid "Time period"
msgstr "時間期間"
-#: app/controllers/CControllerPopupTriggerExpr.php:68
-#: app/controllers/CControllerPopupTriggerExpr.php:82
-#: app/controllers/CControllerPopupTriggerExpr.php:152
-#: app/controllers/CControllerPopupTriggerExpr.php:171
-#: app/controllers/CControllerPopupTriggerExpr.php:208
-#: app/controllers/CControllerPopupTriggerExpr.php:227
-#: app/controllers/CControllerPopupTriggerExpr.php:256
+#: app/controllers/CControllerPopupTriggerExpr.php:69
+#: app/controllers/CControllerPopupTriggerExpr.php:83
+#: app/controllers/CControllerPopupTriggerExpr.php:183
+#: app/controllers/CControllerPopupTriggerExpr.php:202
+#: app/controllers/CControllerPopupTriggerExpr.php:239
+#: app/controllers/CControllerPopupTriggerExpr.php:258
+#: app/controllers/CControllerPopupTriggerExpr.php:287
#: include/classes/widgets/CWidgetHelper.php:784
#: include/classes/widgets/CWidgetHelper.php:860
#: include/classes/widgets/CWidgetHelper.php:1129
@@ -17797,9 +17823,9 @@ msgstr "å–®ä½"
#: include/items.inc.php:45 include/items.inc.php:110
#: include/items.inc.php:133 include/items.inc.php:167
#: include/maintenances.inc.php:33 include/maps.inc.php:39
-#: include/triggers.inc.php:83 include/triggers.inc.php:1867
+#: include/triggers.inc.php:83 include/triggers.inc.php:1872
#: include/users.inc.php:64 include/users.inc.php:87
-#: include/views/configuration.action.edit.php:233
+#: include/views/configuration.action.edit.php:226
#: include/views/configuration.triggers.list.php:77
msgid "Unknown"
msgstr "未知的"
@@ -17817,7 +17843,7 @@ msgid "Unknown error"
msgstr ""
#: app/controllers/CControllerPopupTestTriggerExpr.php:47
-#: app/controllers/CControllerPopupTriggerExpr.php:1258
+#: app/controllers/CControllerPopupTriggerExpr.php:1346
#: include/triggers.inc.php:1146
msgid "Unknown host item, no such item in selected host"
msgstr "未知的主機項目, 在所é¸çš„主機中沒有這樣的項目"
@@ -17849,16 +17875,16 @@ msgstr "未知的值類型"
msgid "Unlimited"
msgstr ""
-#: app/partials/configuration.host.edit.html.php:243
-#: app/views/popup.massupdate.host.php:114
-#: app/views/popup.massupdate.template.php:91
-#: include/views/configuration.host.prototype.edit.php:260
-#: include/views/configuration.template.edit.php:145
+#: app/partials/configuration.host.edit.html.php:171
+#: app/views/popup.massupdate.host.php:48
+#: app/views/popup.massupdate.template.php:50
+#: include/views/configuration.host.prototype.edit.php:147
+#: include/views/configuration.template.edit.php:110
msgid "Unlink"
msgstr "å–消關è¯"
-#: app/partials/configuration.host.edit.html.php:247
-#: include/views/configuration.template.edit.php:151
+#: app/partials/configuration.host.edit.html.php:175
+#: include/views/configuration.template.edit.php:114
msgid "Unlink and clear"
msgstr "å–消關è¯ä¸¦æ¸…ç†"
@@ -17953,10 +17979,10 @@ msgstr "上"
#: app/views/popup.dashboard.share.edit.php:155
#: app/views/popup.discovery.check.php:137 app/views/popup.host.edit.php:61
#: app/views/popup.httpstep.php:181 app/views/popup.lldoperation.php:290
-#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:323
+#: app/views/popup.lldoverride.php:220 app/views/popup.massupdate.host.php:317
#: app/views/popup.massupdate.item.php:511
#: app/views/popup.massupdate.service.php:67
-#: app/views/popup.massupdate.template.php:178
+#: app/views/popup.massupdate.template.php:169
#: app/views/popup.massupdate.trigger.php:165 app/views/popup.media.php:127
#: app/views/popup.mediatype.message.php:104
#: app/views/popup.scheduledreport.subscription.php:132
@@ -17965,16 +17991,16 @@ msgstr "上"
#: app/views/popup.service.time.edit.php:166
#: app/views/popup.triggerwizard.php:147 app/views/popup.valuemap.edit.php:126
#: include/classes/html/CTabFilter.php:94
-#: include/views/configuration.action.edit.php:489
+#: include/views/configuration.action.edit.php:494
#: include/views/configuration.graph.edit.php:494
#: include/views/configuration.host.discovery.edit.php:977
#: include/views/configuration.hostgroups.edit.php:61
-#: include/views/configuration.host.prototype.edit.php:422
+#: include/views/configuration.host.prototype.edit.php:417
#: include/views/configuration.httpconf.edit.php:271
#: include/views/configuration.item.edit.php:1041
#: include/views/configuration.item.prototype.edit.php:900
#: include/views/configuration.maintenance.edit.php:264
-#: include/views/configuration.template.edit.php:236
+#: include/views/configuration.template.edit.php:217
#: include/views/configuration.trigger.prototype.edit.php:654
#: include/views/configuration.triggers.edit.php:647
#: include/views/monitoring.sysmap.constructor.php:76
@@ -18003,7 +18029,7 @@ msgstr "æ›´æ–°ç¾æœ‰çš„"
msgid "Update interval"
msgstr "æ›´æ–°é–“éš”"
-#: include/views/configuration.action.edit.php:469
+#: include/views/configuration.action.edit.php:462
msgid "Update operations"
msgstr ""
@@ -18030,7 +18056,7 @@ msgstr "上傳"
msgid "Upper level maps"
msgstr "上層拓墣圖"
-#: app/views/js/popup.service.edit.js.php:232
+#: app/views/js/popup.service.edit.js.php:231
#: app/views/popup.service.time.edit.php:45
#: include/classes/screens/CScreenDiscovery.php:120
msgid "Uptime"
@@ -18213,7 +18239,7 @@ msgstr[0] ""
#: include/classes/api/services/CDashboard.php:482
#: include/classes/api/services/CReport.php:463
-#: include/classes/api/services/CScript.php:776
+#: include/classes/api/services/CScript.php:778
#: include/classes/api/services/CSettings.php:260
#: include/classes/api/services/CUser.php:741
#, c-format
@@ -18347,15 +18373,15 @@ msgid "User/Recipient"
msgstr ""
#: app/controllers/CControllerPopupGeneric.php:217
-#: app/partials/configuration.host.edit.html.php:319
+#: app/partials/configuration.host.edit.html.php:314
#: app/views/administration.mediatype.edit.php:94
#: app/views/administration.script.edit.php:139
#: app/views/administration.user.edit.php:65
#: app/views/administration.user.list.php:62
#: app/views/administration.user.list.php:106
-#: app/views/popup.massupdate.host.php:167 disc_prototypes.php:209
+#: app/views/popup.massupdate.host.php:164 disc_prototypes.php:209
#: host_discovery.php:182
-#: include/views/configuration.host.prototype.edit.php:317
+#: include/views/configuration.host.prototype.edit.php:311
#: include/views/general.login.php:70 index.php:32 items.php:210
msgid "Username"
msgstr "用戶å稱"
@@ -18669,11 +18695,11 @@ msgstr ""
#: app/views/popup.httpstep.php:96 app/views/popup.httpstep.php:120
#: app/views/popup.httpstep.php:139 app/views/popup.itemtestedit.view.php:262
#: app/views/popup.lldoperation.php:268
-#: app/views/popup.massupdate.host.php:207
+#: app/views/popup.massupdate.host.php:203
#: app/views/popup.massupdate.item.php:120
#: app/views/popup.massupdate.item.php:486
#: app/views/popup.massupdate.service.php:50
-#: app/views/popup.massupdate.template.php:140
+#: app/views/popup.massupdate.template.php:132
#: app/views/popup.massupdate.trigger.php:84
#: app/views/popup.service.edit.php:65 app/views/popup.service.edit.php:271
#: app/views/popup.testtriggerexpr.php:31 app/views/popup.valuemap.edit.php:51
@@ -18747,14 +18773,14 @@ msgstr "值å°æ‡‰ \"%1$s\"已存在."
#: app/controllers/CControllerPopupGeneric.php:357
#: app/controllers/CControllerPopupValueMapEdit.php:92
#: app/partials/configuration.filter.items.php:99
-#: app/partials/configuration.host.edit.html.php:536
+#: app/partials/configuration.host.edit.html.php:530
#: app/partials/massupdate.valuemaps.tab.php:90
-#: app/views/popup.massupdate.host.php:306
+#: app/views/popup.massupdate.host.php:300
#: app/views/popup.massupdate.item.php:351
-#: app/views/popup.massupdate.template.php:162
+#: app/views/popup.massupdate.template.php:153
#: include/views/configuration.item.edit.php:883
#: include/views/configuration.item.prototype.edit.php:800
-#: include/views/configuration.template.edit.php:223
+#: include/views/configuration.template.edit.php:204
msgid "Value mapping"
msgstr "值å°æ‡‰"
@@ -18797,7 +18823,7 @@ msgstr "值: 無資料"
msgid "Valuemap with ID \"%1$s\" is not available on \"%2$s\"."
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:624
+#: app/controllers/CControllerPopupTriggerExpr.php:655
#: app/views/monitoring.charts.view.php:56
#: include/views/monitoring.history.php:78
msgid "Values"
@@ -18897,7 +18923,7 @@ msgstr ""
#: app/partials/configuration.host.edit.html.php:98
#: app/views/configuration.discovery.edit.php:118
#: include/views/configuration.host.prototype.edit.php:76
-#: include/views/configuration.template.edit.php:88
+#: include/views/configuration.template.edit.php:61
#: include/views/inventory.host.view.php:53
msgid "Visible name"
msgstr "å¯è¦‹çš„å稱"
@@ -18923,7 +18949,7 @@ msgstr ""
#: app/controllers/CControllerPopupMediatypeTestSend.php:172
#: app/views/administration.trigdisplay.edit.php:118
-#: app/views/js/popup.massupdate.js.php:409 include/items.inc.php:33
+#: app/views/js/popup.massupdate.js.php:422 include/items.inc.php:33
#: include/views/general.warning.php:26 jsLoader.php:176
msgid "Warning"
msgstr "警告"
@@ -19029,6 +19055,10 @@ msgstr "三"
msgid "Wednesday"
msgstr "週三"
+#: app/controllers/CControllerPopupTriggerExpr.php:120
+msgid "Week"
+msgstr ""
+
#: app/partials/scheduledreport.formgrid.html.php:99
#: app/partials/scheduledreport.table.html.php:50
#: app/views/popup.maintenance.period.php:77 include/maintenances.inc.php:29
@@ -19301,7 +19331,8 @@ msgctxt "XML date and time format"
msgid "YYYY-MM-DDThh:mm:ssZ"
msgstr ""
-#: report4.php:116 report4.php:152
+#: app/controllers/CControllerPopupTriggerExpr.php:122 report4.php:116
+#: report4.php:152
msgid "Year"
msgstr "å¹´"
@@ -19361,7 +19392,7 @@ msgstr ""
msgid "You are not able to choose some of the languages, because locales for them are not installed on the web server."
msgstr "您無法é¸æ“‡æŸäº›èªžè¨€, 因為這些語系並未安è£æ–¼web伺æœå™¨ä¸Š."
-#: include/func.inc.php:1533 index_http.php:87 index_sso.php:262
+#: include/func.inc.php:1533 index_http.php:87 index_sso.php:277
msgid "You are not logged in"
msgstr ""
@@ -19602,11 +19633,11 @@ msgstr ""
msgid "a time unit is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:302
+#: app/controllers/CControllerPopupTriggerExpr.php:333
msgid "abs() - Absolute value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:308
+#: app/controllers/CControllerPopupTriggerExpr.php:339
msgid "acos() - The arccosine of a value as an angle, expressed in radians"
msgstr ""
@@ -19701,7 +19732,7 @@ msgstr ""
msgid "an explicit time is expected"
msgstr ""
-#: include/classes/api/services/CAction.php:2712
+#: include/classes/api/services/CAction.php:2722
#: include/classes/api/services/CCorrelation.php:730
msgid "an identifier is not defined in the formula"
msgstr ""
@@ -19745,11 +19776,11 @@ msgstr "æˆç´…"
msgid "ascending"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:315
+#: app/controllers/CControllerPopupTriggerExpr.php:346
msgid "ascii() - Returns the ASCII code of the leftmost character of the value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:322
+#: app/controllers/CControllerPopupTriggerExpr.php:353
msgid "asin() - The arcsine of a value as an angle, expressed in radians"
msgstr ""
@@ -19763,11 +19794,11 @@ msgstr ""
msgid "at least one override option must be specified"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:329
+#: app/controllers/CControllerPopupTriggerExpr.php:360
msgid "atan() - The arctangent of a value as an angle, expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:336
+#: app/controllers/CControllerPopupTriggerExpr.php:367
msgid "atan2() - The arctangent of the ordinate (exprue) and abscissa coordinates specified as an angle, expressed in radians"
msgstr ""
@@ -19789,39 +19820,47 @@ msgstr ""
msgid "avg"
msgstr "å¹³å‡"
-#: app/controllers/CControllerPopupTriggerExpr.php:349
+#: app/controllers/CControllerPopupTriggerExpr.php:380
msgid "avg() - Average value of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:356
+#: app/controllers/CControllerPopupTriggerExpr.php:1052
+msgid "baselinedev() - Returns the number of deviations between data periods in seasons and the last data period"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1059
+msgid "baselinewma() - Calculates baseline by averaging data periods in seasons"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:387
msgid "between() - Checks if a value belongs to the given range (1 - in range, 0 - otherwise)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:374
+#: app/controllers/CControllerPopupTriggerExpr.php:405
msgid "bitand() - Bitwise AND"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:387
+#: app/controllers/CControllerPopupTriggerExpr.php:418
msgid "bitlength() - Returns the length in bits"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:394
+#: app/controllers/CControllerPopupTriggerExpr.php:425
msgid "bitlshift() - Bitwise shift left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:407
+#: app/controllers/CControllerPopupTriggerExpr.php:438
msgid "bitnot() - Bitwise NOT"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:414
+#: app/controllers/CControllerPopupTriggerExpr.php:445
msgid "bitor() - Bitwise OR"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:427
+#: app/controllers/CControllerPopupTriggerExpr.php:458
msgid "bitrshift() - Bitwise shift right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:440
+#: app/controllers/CControllerPopupTriggerExpr.php:471
msgid "bitxor() - Bitwise exclusive OR"
msgstr ""
@@ -19836,7 +19875,7 @@ msgstr ""
msgid "both username and password should be either present or empty"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:453
+#: app/controllers/CControllerPopupTriggerExpr.php:484
msgid "bytelength() - Returns the length in bytes"
msgstr ""
@@ -19878,7 +19917,7 @@ msgstr ""
#: app/controllers/CControllerUsergroupTagfilterAdd.php:41
#: app/controllers/CControllerUsergroupTagfilterAdd.php:47
#: app/controllers/CControllerUserUpdateGeneral.php:111
-#: include/classes/api/services/CAction.php:2735
+#: include/classes/api/services/CAction.php:2745
#: include/classes/api/services/CAutoregistration.php:163
#: include/classes/api/services/CDiscoveryRule.php:1989
#: include/classes/api/services/CDRule.php:210
@@ -19966,23 +20005,23 @@ msgstr ""
msgid "cannot update property for templated discovery rule"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:460
+#: app/controllers/CControllerPopupTriggerExpr.php:491
msgid "cbrt() - Cube root"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:467
+#: app/controllers/CControllerPopupTriggerExpr.php:498
msgid "ceil() - Rounds up to the nearest greater integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:474
+#: app/controllers/CControllerPopupTriggerExpr.php:505
msgid "change() - Difference between last and previous value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:480
+#: app/controllers/CControllerPopupTriggerExpr.php:511
msgid "changecount() - Number of changes between adjacent values, Mode (all - all changes, inc - only increases, dec - only decreases)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:487
+#: app/controllers/CControllerPopupTriggerExpr.php:518
msgid "char() - Returns the character which represents the given ASCII code"
msgstr ""
@@ -20009,7 +20048,7 @@ msgstr ""
msgid "comma-separated list"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:494
+#: app/controllers/CControllerPopupTriggerExpr.php:525
msgid "concat() - Returns a string that is the result of concatenating value to string"
msgstr ""
@@ -20024,15 +20063,15 @@ msgstr ""
msgid "contains"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:507
+#: app/controllers/CControllerPopupTriggerExpr.php:538
msgid "cos() - The cosine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:514
+#: app/controllers/CControllerPopupTriggerExpr.php:545
msgid "cosh() - The hyperbolic cosine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:521
+#: app/controllers/CControllerPopupTriggerExpr.php:552
msgid "cot() - The cotangent of a value, where the value is an angle expressed in radians"
msgstr ""
@@ -20040,11 +20079,11 @@ msgstr ""
msgid "count"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:528
+#: app/controllers/CControllerPopupTriggerExpr.php:559
msgid "count() - Number of successfully retrieved values V (which fulfill operator O) for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:535
+#: app/controllers/CControllerPopupTriggerExpr.php:566
msgid "countunique() - The number of unique values"
msgstr ""
@@ -20057,15 +20096,15 @@ msgstr "d"
msgid "d.M"
msgstr "d.M"
-#: app/controllers/CControllerPopupTriggerExpr.php:542
+#: app/controllers/CControllerPopupTriggerExpr.php:573
msgid "date() - Current date"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:548
+#: app/controllers/CControllerPopupTriggerExpr.php:579
msgid "dayofmonth() - Day of month"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:554
+#: app/controllers/CControllerPopupTriggerExpr.php:585
msgid "dayofweek() - Day of week"
msgstr ""
@@ -20083,7 +20122,7 @@ msgstr "æ—¥"
msgid "default"
msgstr "é è¨­çš„"
-#: app/controllers/CControllerPopupTriggerExpr.php:560
+#: app/controllers/CControllerPopupTriggerExpr.php:591
msgid "degrees() - Converts a value from radians to degrees"
msgstr ""
@@ -20160,7 +20199,7 @@ msgstr ""
msgid "does not match"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:567
+#: app/controllers/CControllerPopupTriggerExpr.php:598
msgid "e() - Returns Euler's number"
msgstr ""
@@ -20183,11 +20222,11 @@ msgstr ""
msgid "exists"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:572
+#: app/controllers/CControllerPopupTriggerExpr.php:603
msgid "exp() - Euler's number at a power of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:579
+#: app/controllers/CControllerPopupTriggerExpr.php:610
msgid "expm1() - Euler's number at a power of a value minus 1"
msgstr ""
@@ -20203,7 +20242,7 @@ msgstr ""
msgid "file format is unsupported"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:586
+#: app/controllers/CControllerPopupTriggerExpr.php:617
msgid "find() - Check occurrence of pattern V (which fulfill operator O) for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20217,15 +20256,15 @@ msgstr ""
msgid "first parameter is expected"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:593
+#: app/controllers/CControllerPopupTriggerExpr.php:624
msgid "first() - The oldest value in the specified time interval"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:600
+#: app/controllers/CControllerPopupTriggerExpr.php:631
msgid "floor() - Rounds down to the nearest smaller integer"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:607
+#: app/controllers/CControllerPopupTriggerExpr.php:638
msgid "forecast() - Forecast for next t seconds based on period T"
msgstr ""
@@ -20233,7 +20272,7 @@ msgstr ""
msgid "fourth"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:614
+#: app/controllers/CControllerPopupTriggerExpr.php:645
msgid "fuzzytime() - Difference between item value (as timestamp) and Zabbix server timestamp is less than or equal to T seconds (1 - true, 0 - false)"
msgstr ""
@@ -20307,7 +20346,7 @@ msgstr "在"
msgid "in range"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:621
+#: app/controllers/CControllerPopupTriggerExpr.php:652
msgid "in() - Checks if a value equals to one of the listed values (1 - equals, 0 - otherwise)"
msgstr ""
@@ -20316,11 +20355,11 @@ msgstr ""
msgid "including subgroups"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:521
+#: include/classes/parsers/C10TriggerExpression.php:525
msgid "incorrect calculated item formula"
msgstr ""
-#: include/classes/parsers/C10TriggerExpression.php:537
+#: include/classes/parsers/C10TriggerExpression.php:541
#, c-format
msgid "incorrect calculated item formula starting from \"%1$s\""
msgstr ""
@@ -20339,7 +20378,7 @@ msgstr ""
msgid "incorrect expression starting from \"%1$s\""
msgstr ""
-#: include/classes/api/services/CAction.php:2705
+#: include/classes/api/services/CAction.php:2715
#: include/classes/api/services/CCorrelation.php:723
msgid "incorrect number of conditions"
msgstr ""
@@ -20357,7 +20396,7 @@ msgstr "接近 \"%1$s\\ 處語法錯誤"
msgid "incorrect usage of function \"%1$s\""
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:634
+#: app/controllers/CControllerPopupTriggerExpr.php:665
msgid "insert() - Inserts specified characters or spaces into a character string, beginning at a specified position in the string"
msgstr ""
@@ -20417,7 +20456,7 @@ msgstr ""
msgid "invalid host name"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:80
+#: include/classes/validators/CHistFunctionValidator.php:82
#: include/classes/validators/CMathFunctionValidator.php:86
#, c-format
msgid "invalid number of parameters in function \"%1$s\""
@@ -20439,6 +20478,16 @@ msgstr ""
msgid "invalid second parameter in function \"%1$s\""
msgstr ""
+#: include/classes/validators/CHistFunctionValidator.php:69
+#, c-format
+msgid "invalid seventh parameter in function \"%1$s\""
+msgstr ""
+
+#: include/classes/validators/CHistFunctionValidator.php:68
+#, c-format
+msgid "invalid sixth parameter in function \"%1$s\""
+msgstr ""
+
#: include/classes/validators/CHistFunctionValidator.php:65
#, c-format
msgid "invalid third parameter in function \"%1$s\""
@@ -20480,7 +20529,7 @@ msgstr ""
msgid "key is empty"
msgstr "éµå€¼ç‚ºç©ºç™½"
-#: app/controllers/CControllerPopupTriggerExpr.php:657
+#: app/controllers/CControllerPopupTriggerExpr.php:688
msgid "kurtosis() - Measures the \"tailedness\" of the probability distribution"
msgstr ""
@@ -20496,7 +20545,7 @@ msgctxt "week of month"
msgid "last"
msgstr "最新"
-#: app/controllers/CControllerPopupTriggerExpr.php:664
+#: app/controllers/CControllerPopupTriggerExpr.php:695
msgid "last() - Last (most recent) T value"
msgstr ""
@@ -20504,11 +20553,11 @@ msgstr ""
msgid "left"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:671
+#: app/controllers/CControllerPopupTriggerExpr.php:702
msgid "left() - Returns the leftmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:684
+#: app/controllers/CControllerPopupTriggerExpr.php:715
msgid "length() - Length of last (most recent) T value in characters"
msgstr ""
@@ -20516,23 +20565,23 @@ msgstr ""
msgid "list of characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:690
+#: app/controllers/CControllerPopupTriggerExpr.php:721
msgid "log() - Natural logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:697
+#: app/controllers/CControllerPopupTriggerExpr.php:728
msgid "log10() - Decimal logarithm"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:704
+#: app/controllers/CControllerPopupTriggerExpr.php:735
msgid "logeventid() - Event ID of last log entry matching regular expression V for period T (1 - match, 0 - no match)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:711
+#: app/controllers/CControllerPopupTriggerExpr.php:742
msgid "logseverity() - Log severity of the last log entry for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:718
+#: app/controllers/CControllerPopupTriggerExpr.php:749
msgid "logsource() - Log source of the last log entry matching parameter V for period T (1 - match, 0 - no match)"
msgstr ""
@@ -20540,7 +20589,7 @@ msgstr ""
msgid "low-level discovery rule"
msgstr "低階探索è¦å‰‡"
-#: app/controllers/CControllerPopupTriggerExpr.php:725
+#: app/controllers/CControllerPopupTriggerExpr.php:756
msgid "ltrim() - Remove specified characters from the beginning of a string"
msgstr ""
@@ -20572,11 +20621,11 @@ msgstr ""
msgid "macro(s)"
msgstr "巨集"
-#: app/controllers/CControllerPopupTriggerExpr.php:738
+#: app/controllers/CControllerPopupTriggerExpr.php:769
msgid "mad() - Median absolute deviation"
msgstr ""
-#: include/classes/validators/CHistFunctionValidator.php:91
+#: include/classes/validators/CHistFunctionValidator.php:93
#, c-format
msgid "mandatory parameter is missing in function \"%1$s\""
msgstr ""
@@ -20612,7 +20661,7 @@ msgstr "最大"
msgid "max period is less than time filter default period"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:745
+#: app/controllers/CControllerPopupTriggerExpr.php:776
msgid "max() - Maximum value for period T"
msgstr ""
@@ -20626,7 +20675,7 @@ msgstr ""
msgid "maximum number of dependency levels reached"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:752
+#: app/controllers/CControllerPopupTriggerExpr.php:783
msgid "mid() - Returns a substring beginning at the character position specified by start for N characters"
msgstr ""
@@ -20643,7 +20692,7 @@ msgstr ""
msgid "min"
msgstr "最å°"
-#: app/controllers/CControllerPopupTriggerExpr.php:770
+#: app/controllers/CControllerPopupTriggerExpr.php:801
msgid "min() - Minimum value for period T"
msgstr ""
@@ -20658,15 +20707,15 @@ msgstr ""
msgid "mm"
msgstr "mm"
-#: app/controllers/CControllerPopupTriggerExpr.php:777
+#: app/controllers/CControllerPopupTriggerExpr.php:808
msgid "mod() - Division remainder"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:790
+#: app/controllers/CControllerPopupTriggerExpr.php:821
msgid "monodec() - Check for continuous item value decrease (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:797
+#: app/controllers/CControllerPopupTriggerExpr.php:828
msgid "monoinc() - Check for continuous item value increase (1 - data is monotonic, 0 - otherwise), Mode (strict - require strict monotonicity)"
msgstr ""
@@ -20748,7 +20797,7 @@ msgstr ""
msgid "new"
msgstr "æ–°çš„"
-#: app/controllers/CControllerHostEdit.php:308 templates.php:626
+#: app/controllers/CControllerHostEdit.php:308 templates.php:627
msgctxt "new element in multiselect"
msgid "new"
msgstr "æ–°çš„"
@@ -20782,7 +20831,7 @@ msgstr ""
msgid "no permissions to unacknowledge problems"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:804
+#: app/controllers/CControllerPopupTriggerExpr.php:835
msgid "nodata() - No data received during period of time T (1 - true, 0 - false), Mode (strict - ignore proxy time delay in sending data)"
msgstr ""
@@ -20803,7 +20852,7 @@ msgstr "éžåœ¨"
msgid "not selected"
msgstr "éžæ‰€é¸çš„"
-#: app/controllers/CControllerPopupTriggerExpr.php:811
+#: app/controllers/CControllerPopupTriggerExpr.php:842
msgid "now() - Number of seconds since the Epoch"
msgstr ""
@@ -20890,15 +20939,15 @@ msgstr ""
msgid "pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:817
+#: app/controllers/CControllerPopupTriggerExpr.php:848
msgid "percentile() - Percentile P of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:824
+#: app/controllers/CControllerPopupTriggerExpr.php:855
msgid "pi() - Returns the Pi constant"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:829
+#: app/controllers/CControllerPopupTriggerExpr.php:860
msgid "power() - The power of a base value to a power value"
msgstr ""
@@ -20906,15 +20955,15 @@ msgstr ""
msgid "problem pattern"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:842
+#: app/controllers/CControllerPopupTriggerExpr.php:873
msgid "radians() - Converts a value from degrees to radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:849
+#: app/controllers/CControllerPopupTriggerExpr.php:880
msgid "rand() - A random integer value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:854
+#: app/controllers/CControllerPopupTriggerExpr.php:885
msgid "rate() - Returns per-second average rate for monotonically increasing counters"
msgstr ""
@@ -20963,11 +21012,11 @@ msgstr ""
msgid "regular expression"
msgstr "正則表示å¼"
-#: app/controllers/CControllerPopupTriggerExpr.php:861
+#: app/controllers/CControllerPopupTriggerExpr.php:892
msgid "repeat() - Returns a string composed of value repeated count times"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:874
+#: app/controllers/CControllerPopupTriggerExpr.php:905
msgid "replace() - Search value for occurrences of pattern, and replace with replacement"
msgstr ""
@@ -20991,15 +21040,15 @@ msgstr ""
msgid "right"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:892
+#: app/controllers/CControllerPopupTriggerExpr.php:923
msgid "right() - Returns the rightmost count characters"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:905
+#: app/controllers/CControllerPopupTriggerExpr.php:936
msgid "round() - Rounds a value to decimal places"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:918
+#: app/controllers/CControllerPopupTriggerExpr.php:949
msgid "rtrim() - Removes specified characters from the end of a string"
msgstr ""
@@ -21090,23 +21139,23 @@ msgstr "展示圖示å°æ‡‰"
msgid "sign in as guest"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:931
+#: app/controllers/CControllerPopupTriggerExpr.php:962
msgid "signum() - Returns -1 if a value is negative, 0 if a value is zero, 1 if a value is positive"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:938
+#: app/controllers/CControllerPopupTriggerExpr.php:969
msgid "sin() - The sine of a value, where the value is an angle expressed in radians"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:945
+#: app/controllers/CControllerPopupTriggerExpr.php:976
msgid "sinh() - The hyperbolic sine of a value"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:952
+#: app/controllers/CControllerPopupTriggerExpr.php:983
msgid "skewness() - Measures the asymmetry of the probability distribution"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:959
+#: app/controllers/CControllerPopupTriggerExpr.php:990
msgid "sqrt() - Square root of a value"
msgstr ""
@@ -21114,11 +21163,11 @@ msgstr ""
msgid "standalone server"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:966
+#: app/controllers/CControllerPopupTriggerExpr.php:997
msgid "stddevpop() - Population standard deviation"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:973
+#: app/controllers/CControllerPopupTriggerExpr.php:1004
msgid "stddevsamp() - Sample standard deviation"
msgstr ""
@@ -21126,11 +21175,11 @@ msgstr ""
msgid "sum"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:980
+#: app/controllers/CControllerPopupTriggerExpr.php:1011
msgid "sum() - Sum of values of a period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:987
+#: app/controllers/CControllerPopupTriggerExpr.php:1018
msgid "sumofsquares() - The sum of squares"
msgstr ""
@@ -21158,7 +21207,7 @@ msgstr ""
msgid "tag"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:994
+#: app/controllers/CControllerPopupTriggerExpr.php:1025
msgid "tan() - The tangent of a value"
msgstr ""
@@ -21192,7 +21241,7 @@ msgstr ""
#: include/classes/api/services/CReport.php:195
#: include/classes/api/services/CReport.php:577
#: include/classes/api/services/CReport.php:583
-#: include/classes/api/services/CScript.php:902
+#: include/classes/api/services/CScript.php:904
#: include/classes/api/services/CTemplate.php:451
#: include/classes/api/services/CValueMap.php:578
#: include/classes/helpers/CDashboardHelper.php:369
@@ -21239,31 +21288,35 @@ msgstr ""
msgid "time shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1001
+#: app/controllers/CControllerPopupTriggerExpr.php:1032
msgid "time() - Current time"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1007
+#: app/controllers/CControllerPopupTriggerExpr.php:1038
msgid "timeleft() - Time to reach threshold estimated based on period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1014
+#: app/controllers/CControllerPopupTriggerExpr.php:1045
msgid "trendavg() - Average value of a period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1021
+#: app/controllers/CControllerPopupTriggerExpr.php:1066
msgid "trendcount() - Number of successfully retrieved values for period T"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1028
+#: app/controllers/CControllerPopupTriggerExpr.php:1073
msgid "trendmax() - Maximum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1035
+#: app/controllers/CControllerPopupTriggerExpr.php:1080
msgid "trendmin() - Minimum value for period T with exact period shift"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1042
+#: app/controllers/CControllerPopupTriggerExpr.php:1087
+msgid "trendstl() - Anomaly detection for period T"
+msgstr ""
+
+#: app/controllers/CControllerPopupTriggerExpr.php:1130
msgid "trendsum() - Sum of values of a period T with exact period shift"
msgstr ""
@@ -21289,11 +21342,11 @@ msgstr ""
msgid "trigger with linkages cannot be moved to another template or host"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1049
+#: app/controllers/CControllerPopupTriggerExpr.php:1137
msgid "trim() - Remove specified characters from the beginning and the end of a string"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1062
+#: app/controllers/CControllerPopupTriggerExpr.php:1150
msgid "truncate() - Truncates a value to decimal places"
msgstr ""
@@ -21350,7 +21403,7 @@ msgstr ""
#: include/classes/api/services/CHttpTest.php:539
#: include/classes/api/services/CItemGeneral.php:604
#: include/classes/api/services/CItemGeneral.php:616
-#: include/classes/api/services/CScript.php:908
+#: include/classes/api/services/CScript.php:910
#: include/classes/api/services/CTemplate.php:668
#: include/classes/api/services/CTriggerGeneral.php:666
#: include/classes/api/services/CValueMap.php:432
@@ -21393,7 +21446,7 @@ msgstr ""
msgid "unknown"
msgstr "未知的"
-#: include/classes/validators/CHistFunctionValidator.php:71
+#: include/classes/validators/CHistFunctionValidator.php:73
#: include/classes/validators/CMathFunctionValidator.php:55
#, c-format
msgid "unknown function \"%1$s\""
@@ -21590,11 +21643,11 @@ msgstr ""
msgid "value of third parameter must be one of %1$s"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1075
+#: app/controllers/CControllerPopupTriggerExpr.php:1163
msgid "varpop() - Population variance"
msgstr ""
-#: app/controllers/CControllerPopupTriggerExpr.php:1082
+#: app/controllers/CControllerPopupTriggerExpr.php:1170
msgid "varsamp() - Sample variance"
msgstr ""
diff --git a/ui/templates.php b/ui/templates.php
index cc87817a190..1762fb96f7c 100644
--- a/ui/templates.php
+++ b/ui/templates.php
@@ -192,15 +192,15 @@ elseif (hasRequest('add') || hasRequest('update')) {
try {
DBstart();
- $templateId = getRequest('templateid', 0);
+ $input_templateid = getRequest('templateid', 0);
$cloneTemplateId = 0;
if (getRequest('form') === 'full_clone') {
- $cloneTemplateId = $templateId;
- $templateId = 0;
+ $cloneTemplateId = $input_templateid;
+ $input_templateid = 0;
}
- if ($templateId == 0) {
+ if ($input_templateid == 0) {
$messageSuccess = _('Template added');
$messageFailed = _('Cannot add template');
}
@@ -237,13 +237,9 @@ elseif (hasRequest('add') || hasRequest('update')) {
$templates[] = ['templateid' => $templateid];
}
- $templatesClear = getRequest('clear_templates', []);
- $templatesClear = zbx_toObject($templatesClear, 'templateid');
- $templateName = getRequest('template_name', '');
-
// create / update template
$template = [
- 'host' => $templateName,
+ 'host' => getRequest('template_name', ''),
'name' => getRequest('visiblename', ''),
'groups' => zbx_toObject($groups, 'groupid'),
'templates' => $templates,
@@ -252,19 +248,24 @@ elseif (hasRequest('add') || hasRequest('update')) {
'description' => getRequest('description', '')
];
- if ($templateId == 0) {
+ if ($input_templateid == 0) {
$result = API::Template()->create($template);
if ($result) {
- $templateId = reset($result['templateids']);
+ $input_templateid = reset($result['templateids']);
}
else {
throw new Exception();
}
}
else {
- $template['templateid'] = $templateId;
- $template['templates_clear'] = $templatesClear;
+ $templates_clear = array_diff(
+ getRequest('clear_templates', []),
+ getRequest('add_templates', [])
+ );
+
+ $template['templateid'] = $input_templateid;
+ $template['templates_clear'] = zbx_toObject($templates_clear, 'templateid');
$result = API::Template()->update($template);
@@ -287,7 +288,7 @@ elseif (hasRequest('add') || hasRequest('update')) {
else if (hasRequest('update')) {
$del_valuemapids = API::ValueMap()->get([
'output' => [],
- 'hostids' => $templateId,
+ 'hostids' => $input_templateid,
'preservekeys' => true
]);
}
@@ -298,7 +299,7 @@ elseif (hasRequest('add') || hasRequest('update')) {
unset($del_valuemapids[$valuemap['valuemapid']]);
}
else {
- $ins_valuemaps[] = $valuemap + ['hostid' => $templateId];
+ $ins_valuemaps[] = $valuemap + ['hostid' => $input_templateid];
}
}
@@ -321,11 +322,11 @@ elseif (hasRequest('add') || hasRequest('update')) {
* First copy web scenarios with web items, so that later regular items can use web item as their master
* item.
*/
- if (!copyHttpTests($cloneTemplateId, $templateId)) {
+ if (!copyHttpTests($cloneTemplateId, $input_templateid)) {
throw new Exception();
}
- if (!copyItems($cloneTemplateId, $templateId)) {
+ if (!copyItems($cloneTemplateId, $input_templateid)) {
throw new Exception();
}
@@ -338,7 +339,7 @@ elseif (hasRequest('add') || hasRequest('update')) {
if ($dbTriggers) {
$result &= copyTriggersToHosts(zbx_objectValues($dbTriggers, 'triggerid'),
- $templateId, $cloneTemplateId);
+ $input_templateid, $cloneTemplateId);
if (!$result) {
throw new Exception();
@@ -353,7 +354,7 @@ elseif (hasRequest('add') || hasRequest('update')) {
]);
foreach ($dbGraphs as $dbGraph) {
- copyGraphToHost($dbGraph['graphid'], $templateId);
+ copyGraphToHost($dbGraph['graphid'], $input_templateid);
}
// copy discovery rules
@@ -366,7 +367,7 @@ elseif (hasRequest('add') || hasRequest('update')) {
if ($dbDiscoveryRules) {
$result &= API::DiscoveryRule()->copy([
'discoveryids' => zbx_objectValues($dbDiscoveryRules, 'itemid'),
- 'hostids' => [$templateId]
+ 'hostids' => [$input_templateid]
]);
if (!$result) {
@@ -383,7 +384,7 @@ elseif (hasRequest('add') || hasRequest('update')) {
]);
if ($db_template_dashboards) {
- $db_template_dashboards = CDashboardHelper::prepareForClone($db_template_dashboards, $templateId);
+ $db_template_dashboards = CDashboardHelper::prepareForClone($db_template_dashboards, $input_templateid);
if (!API::TemplateDashboard()->create($db_template_dashboards)) {
throw new Exception();
@@ -643,6 +644,29 @@ if (hasRequest('form')) {
'add_templates' => array_map('strval', array_keys($data['add_templates']))
];
+ $data['template_name'] = getRequest('template_name', '');
+ $data['visible_name'] = getRequest('visiblename', '');
+
+ $templateids = getRequest('templates', []);
+ $clear_templates = getRequest('clear_templates', []);
+
+ if ($data['templateid'] != 0 && !hasRequest('form_refresh')) {
+ $data['template_name'] = $data['dbTemplate']['host'];
+ $data['visible_name'] = $data['dbTemplate']['name'];
+
+ // Display empty visible name if equal to host name.
+ if ($data['visible_name'] === $data['template_name']) {
+ $data['visible_name'] = '';
+ }
+
+ $templateids = $data['original_templates'];
+ }
+
+ $clear_templates = array_intersect($clear_templates, array_keys($data['original_templates']));
+ $clear_templates = array_diff($clear_templates, array_keys($templateids));
+
+ $data['clear_templates'] = $clear_templates;
+
$view = new CView('configuration.template.edit', $data);
}
else {
diff --git a/ui/tests/include/CIntegrationTest.php b/ui/tests/include/CIntegrationTest.php
index 5c0cc60d471..52460262579 100644
--- a/ui/tests/include/CIntegrationTest.php
+++ b/ui/tests/include/CIntegrationTest.php
@@ -811,7 +811,7 @@ class CIntegrationTest extends CAPITest {
protected static function getPidPath($component) {
self::validateComponent($component);
- return self::getConfigurationValue($component, 'PidFile', '/tmp/zabbix_'.$component.'.log');
+ return self::getConfigurationValue($component, 'PidFile', '/tmp/zabbix_'.$component.'.pid');
}
/**
diff --git a/ui/tests/include/web/elements/CDashboardElement.php b/ui/tests/include/web/elements/CDashboardElement.php
index d3155658017..09907b68fe2 100644
--- a/ui/tests/include/web/elements/CDashboardElement.php
+++ b/ui/tests/include/web/elements/CDashboardElement.php
@@ -252,4 +252,18 @@ class CDashboardElement extends CElement {
throw new \Exception('Dashboard is'.($editable ? ' not' : '').' in editing mode.');
}
}
+
+ /**
+ * Open page adding form.
+ * Dashboard should be in editing mode.
+ *
+ * @return COverlayDialogElement
+ */
+ public function addPage() {
+ $this->checkIfEditable();
+ $this->getControls()->query('id:dashboard-add')->one()->click();
+ $this->query('xpath://ul[@role="menu"]')->asPopupMenu()->one()->select('Add page');
+
+ return $this;
+ }
}
diff --git a/ui/tests/include/web/elements/CMessageElement.php b/ui/tests/include/web/elements/CMessageElement.php
index 82d954e69cd..fc2aa6e0223 100644
--- a/ui/tests/include/web/elements/CMessageElement.php
+++ b/ui/tests/include/web/elements/CMessageElement.php
@@ -50,6 +50,16 @@ class CMessageElement extends CElement {
}
/**
+ * Check if message is warning.
+ *
+ * @return boolean
+ */
+ public function isWarning() {
+ return in_array('msg-warning', explode(' ', $this->getAttribute('class')));
+ }
+
+
+ /**
* Get message title.
*
* @return string
diff --git a/ui/tests/integration/IntegrationTests.php b/ui/tests/integration/IntegrationTests.php
index 5e5c9cfa882..2d91cc6ed4f 100644
--- a/ui/tests/integration/IntegrationTests.php
+++ b/ui/tests/integration/IntegrationTests.php
@@ -34,6 +34,8 @@ require_once dirname(__FILE__).'/testExpressionTriggerMacros.php';
require_once dirname(__FILE__).'/testAgentItems.php';
require_once dirname(__FILE__).'/testItemRate.php';
require_once dirname(__FILE__).'/testHistoryValueDuplicates.php';
+require_once dirname(__FILE__).'/testUserParametersReload.php';
+require_once dirname(__FILE__).'/testTriggerState.php';
class IntegrationTests {
public static function suite() {
@@ -54,6 +56,8 @@ class IntegrationTests {
$suite->addTestSuite('testAgentItems');
$suite->addTestSuite('testItemRate');
$suite->addTestSuite('testHistoryValueDuplicates');
+ $suite->addTestSuite('testUserParametersReload');
+ $suite->addTestSuite('testTriggerState');
return $suite;
}
diff --git a/ui/tests/integration/testEscalations.php b/ui/tests/integration/testEscalations.php
index b3fdb092675..382d5f9a53d 100644
--- a/ui/tests/integration/testEscalations.php
+++ b/ui/tests/integration/testEscalations.php
@@ -505,7 +505,7 @@ class testEscalations extends CIntegrationTest {
'actionids' => [self::$trigger_actionid],
'sortfield' => 'alertid'
], 5, 2);
- $esc_msg = 'NOTE: Escalation cancelled';
+ $esc_msg = 'NOTE: Escalation canceled';
$this->assertArrayHasKey(1, $response['result']);
$this->assertEquals(0, strncmp($esc_msg, $response['result'][1]['message'], strlen($esc_msg)));
@@ -519,6 +519,57 @@ class testEscalations extends CIntegrationTest {
$this->reloadConfigurationCache();
$this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 0);
+
+ // test ability to disable notifications about cancelled escalations
+ $response = $this->call('action.update', [
+ 'actionid' => self::$trigger_actionid,
+ 'notify_if_canceled' => 0
+ ]);
+ $this->assertArrayHasKey('actionids', $response['result']);
+ $this->assertArrayHasKey(0, $response['result']['actionids']);
+
+ $this->reloadConfigurationCache();
+
+ $this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 10);
+
+ $response = $this->call('trigger.update', [
+ 'triggerid' => self::$triggerid,
+ 'status' => 1
+ ]);
+
+ $this->assertArrayHasKey('triggerids', $response['result']);
+ $this->assertEquals(1, count($response['result']['triggerids']));
+
+ $this->reloadConfigurationCache();
+
+ $this->waitForLogLineToBePresent(self::COMPONENT_SERVER, 'End of escalation_cancel()', true, 120);
+
+ $response = $this->callUntilDataIsPresent('alert.get', [
+ 'actionids' => [self::$trigger_actionid],
+ 'sortfield' => 'alertid',
+ 'sortorder' => 'DESC'
+ ], 5, 2);
+ $this->assertArrayHasKey(0, $response['result']);
+ $this->assertNotEquals(0, strncmp($esc_msg, $response['result'][0]['message'], strlen($esc_msg)));
+
+ // revert to defaults, restore trigger status and value
+ $response = $this->call('action.update', [
+ 'actionid' => self::$trigger_actionid,
+ 'notify_if_canceled' => 1
+ ]);
+ $this->assertArrayHasKey('actionids', $response['result']);
+ $this->assertArrayHasKey(0, $response['result']['actionids']);
+
+ $response = $this->call('trigger.update', [
+ 'triggerid' => self::$triggerid,
+ 'status' => 0
+ ]);
+ $this->assertArrayHasKey('triggerids', $response['result']);
+ $this->assertEquals(1, count($response['result']['triggerids']));
+
+ $this->reloadConfigurationCache();
+
+ $this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 0);
}
/**
diff --git a/ui/tests/integration/testTriggerState.php b/ui/tests/integration/testTriggerState.php
new file mode 100644
index 00000000000..86b9e02e815
--- /dev/null
+++ b/ui/tests/integration/testTriggerState.php
@@ -0,0 +1,168 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../include/CIntegrationTest.php';
+
+/**
+ * Test suite to check if trigger state is updated properly
+ * when item state toggles between normal and unsupported
+ *
+ * @required-components server
+ * @backup history
+ * @hosts test
+ */
+class testTriggerState extends CIntegrationTest {
+
+ private static $hostid;
+ private static $triggerid;
+
+ const TRAPPER_ITEM_NAME = 'trap';
+ const HOST_NAME = 'test';
+
+ /**
+ * @inheritdoc
+ */
+ public function prepareData() {
+ // Create host "test"
+ $response = $this->call('host.create', [
+ 'host' => self::HOST_NAME,
+ 'interfaces' => [
+ [
+ 'type' => 1,
+ 'main' => 1,
+ 'useip' => 1,
+ 'ip' => '127.0.0.1',
+ 'dns' => '',
+ 'port' => $this->getConfigurationValue(self::COMPONENT_AGENT, 'ListenPort')
+ ]
+ ],
+ 'groups' => [
+ [
+ 'groupid' => 4
+ ]
+ ]
+ ]);
+
+ $this->assertArrayHasKey('hostids', $response['result']);
+ $this->assertArrayHasKey(0, $response['result']['hostids']);
+ self::$hostid = $response['result']['hostids'][0];
+
+ // Get host interface ids.
+ $response = $this->call('host.get', [
+ 'output' => ['host'],
+ 'hostids' => [self::$hostid],
+ 'selectInterfaces' => ['interfaceid']
+ ]);
+
+ $this->assertArrayHasKey(0, $response['result']);
+ $this->assertArrayHasKey('interfaces', $response['result'][0]);
+ $this->assertArrayHasKey(0, $response['result'][0]['interfaces']);
+
+ // Create trapper item
+ $response = $this->call('item.create', [
+ 'hostid' => self::$hostid,
+ 'name' => self::TRAPPER_ITEM_NAME,
+ 'key_' => self::TRAPPER_ITEM_NAME,
+ 'type' => ITEM_TYPE_TRAPPER,
+ 'value_type' => ITEM_VALUE_TYPE_UINT64
+ ]);
+ $this->assertArrayHasKey('itemids', $response['result']);
+ $this->assertEquals(1, count($response['result']['itemids']));
+
+ // Create trigger
+ $response = $this->call('trigger.create', [
+ 'description' => 'Trapper received 1',
+ 'expression' => 'last(/'.self::HOST_NAME.'/'.self::TRAPPER_ITEM_NAME.')=1'
+ ]);
+ $this->assertArrayHasKey('triggerids', $response['result']);
+ $this->assertEquals(1, count($response['result']['triggerids']));
+ self::$triggerid = $response['result']['triggerids'][0];
+
+ return true;
+ }
+
+ private function validateTriggerParams($expected_state, $expected_value) {
+ $response = $this->call('trigger.get', [
+ 'triggerids' => [self::$triggerid]
+ ]);
+
+ $this->assertArrayHasKey(0, $response['result']);
+ $this->assertEquals($expected_state, $response['result'][0]['state']);
+ $this->assertEquals($expected_value, $response['result'][0]['value']);
+ }
+
+ private function recoverTrigger() {
+ $this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 0);
+ $this->validateTriggerParams(TRIGGER_STATE_NORMAL, TRIGGER_VALUE_FALSE);
+ }
+
+ private function fireTrigger() {
+ $this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 1);
+ $this->validateTriggerParams(TRIGGER_STATE_NORMAL, TRIGGER_VALUE_TRUE);
+ }
+
+ /**
+ * Scenario description:
+ * 1. trigger state is NORMAL, trigger value is OK
+ * fire trigger
+ * expect trigger state to be NORMAL and trigger value to be PROBLEM
+ *
+ * 2. send unsupported value type
+ * expect trigger state to be UNKNOWN and trigger value to be PROBLEM
+ *
+ * 3. recover trigger
+ * expect trigger state to be NORMAL and trigger value to be OK
+ *
+ */
+ public function testTriggerState_checkScenario1() {
+ // Reload configuration cache before sending values
+ $this->reloadConfigurationCache();
+
+ // Send first value
+ $this->recoverTrigger();
+
+ $this->fireTrigger();
+
+ $this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 'a');
+ $this->validateTriggerParams(TRIGGER_STATE_UNKNOWN, TRIGGER_VALUE_TRUE);
+
+ $this->recoverTrigger();
+ }
+
+ /**
+ * Scenario description:
+ * 1. trigger state is NORMAL, trigger value is OK
+ * send unsupported value type
+ * expect trigger state to be UNKNOWN and trigger value to be OK
+ *
+ * 2. fire trigger
+ * expect trigger state to be NORMAL and trigger value to be PROBLEM
+ *
+ * @depends testTriggerState_checkScenario1
+ */
+ public function testTriggerState_checkScenario2() {
+ $this->sendSenderValue(self::HOST_NAME, self::TRAPPER_ITEM_NAME, 'a');
+ $this->validateTriggerParams(TRIGGER_STATE_UNKNOWN, TRIGGER_VALUE_FALSE);
+
+ $this->fireTrigger();
+ }
+
+}
+
diff --git a/ui/tests/integration/testUserParametersReload.php b/ui/tests/integration/testUserParametersReload.php
new file mode 100644
index 00000000000..2e838b9970d
--- /dev/null
+++ b/ui/tests/integration/testUserParametersReload.php
@@ -0,0 +1,297 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../include/CIntegrationTest.php';
+
+
+/**
+ * Test suite for user parameters reload
+ *
+ * @required-components server, agent, agent2
+ * @configurationDataProvider serverConfigurationProvider, agentConfigurationProvider
+ * @backup items, history_str
+ * @hosts agentd, agent2
+ */
+class testUserParametersReload extends CIntegrationTest {
+
+ const USER_PARAM_RELOAD_DELAY = 10;
+
+ const ITEM_NAME_01 = 'usrprm01';
+ const ITEM_NAME_02 = 'usrprm02';
+
+ private static $hostids = [];
+ private static $itemids = [];
+
+ // List of items to check.
+ private static $items = [
+ [
+ 'key' => self::ITEM_NAME_01,
+ 'component' => self::COMPONENT_AGENT
+ ],
+ [
+ 'key' => self::ITEM_NAME_02,
+ 'component' => self::COMPONENT_AGENT
+ ],
+ [
+ 'key' => self::ITEM_NAME_01,
+ 'component' => self::COMPONENT_AGENT2
+ ],
+ [
+ 'key' => self::ITEM_NAME_02,
+ 'component' => self::COMPONENT_AGENT2
+ ]
+ ];
+
+ /**
+ * @inheritdoc
+ */
+ public function prepareData() {
+ // Create host "agentd" and "agent2".
+ $hosts = [];
+ foreach ([self::COMPONENT_AGENT => self::AGENT_PORT_SUFFIX, self::COMPONENT_AGENT2 => 53] as $component => $port) {
+ $hosts[] = [
+ 'host' => $component,
+ 'interfaces' => [
+ [
+ 'type' => 1,
+ 'main' => 1,
+ 'useip' => 1,
+ 'ip' => '127.0.0.1',
+ 'dns' => '',
+ 'port' => PHPUNIT_PORT_PREFIX.$port
+ ]
+ ],
+ 'groups' => [
+ [
+ 'groupid' => 4
+ ]
+ ],
+ 'status' => HOST_STATUS_NOT_MONITORED
+ ];
+ }
+
+ $response = $this->call('host.create', $hosts);
+ $this->assertArrayHasKey('hostids', $response['result']);
+
+ foreach ([self::COMPONENT_AGENT, self::COMPONENT_AGENT2] as $i => $name) {
+ $this->assertArrayHasKey($i, $response['result']['hostids']);
+ self::$hostids[$name] = $response['result']['hostids'][$i];
+ }
+
+ // Get host interface ids.
+ $response = $this->call('host.get', [
+ 'output' => ['host'],
+ 'hostids' => array_values(self::$hostids),
+ 'selectInterfaces' => ['interfaceid']
+ ]);
+
+ $interfaceids = [];
+ foreach ($response['result'] as $host) {
+ $interfaceids[$host['host']] = $host['interfaces'][0]['interfaceid'];
+ }
+
+ // Create items.
+ $items = [];
+ foreach (self::$items as $item) {
+ $data = [
+ 'name' => $item['key'],
+ 'key_' => $item['key'],
+ 'type' => ITEM_TYPE_ZABBIX,
+ 'value_type' => ITEM_VALUE_TYPE_STR,
+ 'delay' => '1s'
+ ];
+
+ $items[] = array_merge($data, [
+ 'hostid' => self::$hostids[$item['component']],
+ 'interfaceid' => $interfaceids[$item['component']]
+ ]);
+ }
+
+ $response = $this->call('item.create', $items);
+ $this->assertArrayHasKey('itemids', $response['result']);
+ $this->assertEquals(count($items), count($response['result']['itemids']));
+
+ // Get item IDs
+ $itemids = $response['result']['itemids'];
+ foreach (self::$items as $i => $value) {
+ $name = $value['key'];
+ self::$itemids[$value['component'].':'.$name] = $itemids[$i];
+ }
+
+ return true;
+ }
+
+ /**
+ * Component configuration provider.
+ *
+ * @return array
+ */
+ public function serverConfigurationProvider() {
+ return [
+ self::COMPONENT_SERVER => [
+ 'UnreachablePeriod' => 25,
+ 'UnavailableDelay' => 15,
+ 'UnreachableDelay' => 5
+ ]
+ ];
+ }
+
+ /**
+ * Component configuration provider for agent related tests.
+ *
+ * @return array
+ */
+ public function agentConfigurationProvider() {
+ return [
+ self::COMPONENT_AGENT => [
+ 'Hostname' => self::COMPONENT_AGENT,
+ 'UserParameter' => self::ITEM_NAME_01.',echo 01'
+ ],
+ self::COMPONENT_AGENT2 => [
+ 'Hostname' => self::COMPONENT_AGENT2,
+ 'ListenPort' => PHPUNIT_PORT_PREFIX.'53',
+ 'Plugins.Uptime.Capacity' => '10',
+ 'UserParameter' => self::ITEM_NAME_01.',echo 01'
+ ]
+ ];
+ }
+
+ /**
+ * Check reloaded user parameters (usrprm01 only)
+ */
+ public function testUserParametersReload_singleParam() {
+ $config = [
+ self::COMPONENT_AGENT => [
+ 'UserParameter' => self::ITEM_NAME_01.',echo 01'
+ ],
+ self::COMPONENT_AGENT2 => [
+ 'UserParameter' => self::ITEM_NAME_01.',echo 01'
+ ]
+ ];
+
+ $this->executeUserParamReload($config);
+
+ foreach ([self::COMPONENT_AGENT, self::COMPONENT_AGENT2] as $component) {
+ $this->checkItemState($component.':'.self::ITEM_NAME_01, ITEM_STATE_NORMAL);
+ $this->checkItemState($component.':'.self::ITEM_NAME_02, ITEM_STATE_NOTSUPPORTED);
+ }
+ }
+
+ /**
+ * Check reloaded user parameters (usrprm01 and usrprm01)
+ */
+ public function testUserParametersReload_multipleParams() {
+ // Currently multiple identical configuration parameters are not allowed, so use include instead
+ $config = [
+ self::COMPONENT_AGENT => [
+ 'UserParameter' => self::ITEM_NAME_01.',echo 01',
+ 'Include' => PHPUNIT_CONFIG_DIR.self::COMPONENT_AGENT.'_usrprm.conf'
+ ],
+ self::COMPONENT_AGENT2 => [
+ 'UserParameter' => self::ITEM_NAME_01.',echo 01',
+ 'Include' => PHPUNIT_CONFIG_DIR.self::COMPONENT_AGENT2.'_usrprm.conf'
+ ]
+ ];
+
+ foreach ([self::COMPONENT_AGENT, self::COMPONENT_AGENT2] as $component) {
+ if (file_put_contents(PHPUNIT_CONFIG_DIR.'/'.$component.'_usrprm.conf', 'UserParameter='.self::ITEM_NAME_02.',echo 02') === false) {
+ throw new Exception('Failed to create include configuration file');
+ }
+ }
+
+ $this->executeUserParamReload($config);
+
+ foreach ([self::COMPONENT_AGENT, self::COMPONENT_AGENT2] as $component) {
+ $this->checkItemState($component.':'.self::ITEM_NAME_01, ITEM_STATE_NORMAL);
+ $this->checkItemState($component.':'.self::ITEM_NAME_02, ITEM_STATE_NORMAL);
+ $this->assertTrue(@unlink(PHPUNIT_CONFIG_DIR.'/'.$component.'_usrprm.conf'));
+ }
+ }
+
+ /**
+ * Check reloaded user parameters (no user parameters)
+ */
+ public function testUserParametersReload_noParams() {
+ $this->executeUserParamReload();
+
+ foreach ([self::COMPONENT_AGENT, self::COMPONENT_AGENT2] as $component) {
+ $this->checkItemState($component.':'.self::ITEM_NAME_01, ITEM_STATE_NOTSUPPORTED);
+ $this->checkItemState($component.':'.self::ITEM_NAME_02, ITEM_STATE_NOTSUPPORTED);
+ }
+ }
+
+ /**
+ * Update configuration file and reload user parameters.
+ *
+ * @param array $config user parameters
+ */
+ public function executeUserParamReload($config = null) {
+ $def_config = self::getDefaultComponentConfiguration();
+
+ foreach ([self::COMPONENT_AGENT, self::COMPONENT_AGENT2] as $component) {
+ if ($config !== null) {
+ $config[$component] = array_merge($config[$component], $def_config[$component]);
+ }
+ else {
+ $config = $def_config;
+ }
+ $this->prepareComponentConfiguration($component, $config);
+ $this->reloadUserParameters($component);
+ }
+
+ sleep(self::USER_PARAM_RELOAD_DELAY);
+ }
+
+ /**
+ * Reload user parameters.
+ *
+ * @static
+ *
+ * @param string $component component
+ */
+ public static function reloadUserParameters($component) {
+ $return = null;
+ $output = null;
+ $suffix = ' -R userparameter_reload > /dev/null 2>&1';
+
+ exec(PHPUNIT_BINARY_DIR.'zabbix_'.$component.$suffix, $output, $return);
+
+ if ($return !== 0) {
+ throw new Exception('Failed to reload user parameters');
+ }
+
+ return $output;
+ }
+
+ /**
+ * Check item state.
+ *
+ * @param string $name item name
+ * @param integer $state item state
+ */
+ public function checkItemState($name, $state) {
+ $response = $this->call('item.get', [
+ 'itemids' => self::$itemids[$name],
+ 'output' => ['state']
+ ]);
+
+ $this->assertEquals($state, $response['result'][0]['state'], 'User parameter failed to reload, item name: '.$name);
+ }
+}
diff --git a/ui/tests/selenium/SeleniumTests.php b/ui/tests/selenium/SeleniumTests.php
index e12c7280f3c..4a3c0374cd2 100644
--- a/ui/tests/selenium/SeleniumTests.php
+++ b/ui/tests/selenium/SeleniumTests.php
@@ -64,10 +64,6 @@ require_once dirname(__FILE__).'/testPageQueueDetails.php';
require_once dirname(__FILE__).'/testPageQueueOverview.php';
require_once dirname(__FILE__).'/testPageQueueOverviewByProxy.php';
*/
-require_once dirname(__FILE__).'/testPageReportsActionLog.php';
-require_once dirname(__FILE__).'/testPageReportsAudit.php';
-require_once dirname(__FILE__).'/testPageReportsNotifications.php';
-require_once dirname(__FILE__).'/testPageReportsTriggerTop.php';
require_once dirname(__FILE__).'/testPageSearch.php';
require_once dirname(__FILE__).'/testPageStatusOfZabbix.php';
require_once dirname(__FILE__).'/testPageTemplates.php';
@@ -100,7 +96,9 @@ require_once dirname(__FILE__).'/testFormFilterHosts.php';
require_once dirname(__FILE__).'/testFormFilterProblems.php';
require_once dirname(__FILE__).'/testFormGraph.php';
require_once dirname(__FILE__).'/testFormGraphPrototype.php';
-require_once dirname(__FILE__).'/testFormHost.php';
+require_once dirname(__FILE__).'/hosts/testFormHostConfiguration.php';
+require_once dirname(__FILE__).'/hosts/testFormHostMonitoring.php';
+require_once dirname(__FILE__).'/hosts/testFormHostStandalone.php';
require_once dirname(__FILE__).'/testFormHostGroup.php';
require_once dirname(__FILE__).'/testFormHostLinkTemplates.php';
require_once dirname(__FILE__).'/testFormHostPrototype.php';
@@ -180,11 +178,18 @@ require_once dirname(__FILE__).'/dashboard/testDashboardDynamicItemWidgets.php';
require_once dirname(__FILE__).'/dashboard/testDashboardGraphWidget.php';
require_once dirname(__FILE__).'/dashboard/testDashboardHostAvailabilityWidget.php';
require_once dirname(__FILE__).'/dashboard/testDashboardProblemsBySeverityWidget.php';
+require_once dirname(__FILE__).'/dashboard/testDashboardSystemInformationWidget.php';
+require_once dirname(__FILE__).'/dashboard/testDashboardPages.php';
require_once dirname(__FILE__).'/dashboard/testFormTemplateDashboards.php';
require_once dirname(__FILE__).'/dashboard/testPageTemplateDashboards.php';
-require_once dirname(__FILE__).'/scheduledReports/testFormScheduledReport.php';
-require_once dirname(__FILE__).'/scheduledReports/testPageScheduledReport.php';
-require_once dirname(__FILE__).'/scheduledReports/testScheduledReportPermissions.php';
+require_once dirname(__FILE__).'/reports/testPageReportsActionLog.php';
+require_once dirname(__FILE__).'/reports/testPageReportsAudit.php';
+require_once dirname(__FILE__).'/reports/testPageReportsNotifications.php';
+require_once dirname(__FILE__).'/reports/testPageReportsSystemInformation.php';
+require_once dirname(__FILE__).'/reports/testPageReportsTriggerTop.php';
+require_once dirname(__FILE__).'/reports/testFormScheduledReport.php';
+require_once dirname(__FILE__).'/reports/testPageScheduledReport.php';
+require_once dirname(__FILE__).'/reports/testScheduledReportPermissions.php';
require_once dirname(__FILE__).'/testSID.php';
class SeleniumTests {
@@ -239,6 +244,7 @@ class SeleniumTests {
$suite->addTestSuite('testPageReportsActionLog');
$suite->addTestSuite('testPageReportsAudit');
$suite->addTestSuite('testPageReportsNotifications');
+ $suite->addTestSuite('testPageReportsSystemInformation');
$suite->addTestSuite('testPageReportsTriggerTop');
$suite->addTestSuite('testPageSearch');
$suite->addTestSuite('testPageStatusOfZabbix');
@@ -273,7 +279,9 @@ class SeleniumTests {
$suite->addTestSuite('testFormFilterProblems');
$suite->addTestSuite('testFormGraph');
$suite->addTestSuite('testFormGraphPrototype');
- $suite->addTestSuite('testFormHost');
+ $suite->addTestSuite('testFormHostConfiguration');
+ $suite->addTestSuite('testFormHostMonitoring');
+ $suite->addTestSuite('testFormHostStandalone');
$suite->addTestSuite('testFormHostGroup');
$suite->addTestSuite('testFormHostLinkTemplates');
$suite->addTestSuite('testFormHostPrototype');
@@ -353,6 +361,8 @@ class SeleniumTests {
$suite->addTestSuite('testDashboardGraphWidget');
$suite->addTestSuite('testDashboardHostAvailabilityWidget');
$suite->addTestSuite('testDashboardProblemsBySeverityWidget');
+ $suite->addTestSuite('testDashboardSystemInformationWidget');
+ $suite->addTestSuite('testDashboardPages');
$suite->addTestSuite('testFormTemplateDashboards');
$suite->addTestSuite('testPageTemplateDashboards');
$suite->addTestSuite('testFormScheduledReport');
diff --git a/ui/tests/selenium/behaviors/CMessageBehavior.php b/ui/tests/selenium/behaviors/CMessageBehavior.php
index 5d0ca0b7021..98afb6239b8 100644
--- a/ui/tests/selenium/behaviors/CMessageBehavior.php
+++ b/ui/tests/selenium/behaviors/CMessageBehavior.php
@@ -35,7 +35,16 @@ class CMessageBehavior extends CBehavior {
public function assertMessage($expected, $title = null, $details = null) {
$message = CMessageElement::find()->waitUntilVisible()->one();
- $this->test->assertTrue(($expected === TEST_GOOD) ? $message->isGood() : $message->isBad());
+ if ($expected === TEST_GOOD) {
+ $message->isGood();
+ }
+ elseif ($expected === TEST_BAD) {
+ $message->isBad();
+ }
+ else {
+ $message->isWarning();
+ }
+
if ($title !== null) {
$this->test->assertEquals($title, $message->getTitle(), 'Message title and the expected title do not match.');
}
diff --git a/ui/tests/selenium/common/testCalculatedFormula.php b/ui/tests/selenium/common/testCalculatedFormula.php
index 6472550e36d..e670fef90f2 100644
--- a/ui/tests/selenium/common/testCalculatedFormula.php
+++ b/ui/tests/selenium/common/testCalculatedFormula.php
@@ -137,6 +137,67 @@ class testCalculatedFormula extends CWebTest {
'formula' => "change(//trap[1])"
]
],
+ // changecount() function.
+ [
+ [
+ 'formula' => 'changecount(/host/key,10)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,#5:now-5h)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,#10)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,5,)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,#10,"all")'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,#10,"dec")'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,#10,"inc")'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,5s)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,5m)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,5h)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,5d)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'changecount(/host/key,5w)'
+ ]
+ ],
// count() function.
[
[
@@ -745,6 +806,127 @@ class testCalculatedFormula extends CWebTest {
'formula' => 'trendmin(/host/key,"3600:{$USERMACRO}-3600")'
]
],
+ // trendstl() function.
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,300h,7200s)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,300h,120m)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347d:now/h,3600s,12h,)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,60m,12h,)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/m-5m,347h,12h)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h-1h,347h,12h)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/d-2d,347h,12h)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/w-3w,347h,12h)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/y-3y,347h,12h)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347w:now/h,347h,12h,)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,347h,12h,,)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/m,347h,12h,,,)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/d,347h,2h)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/M,347h,1d)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/w,347h,1w)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/y,347h,12h,2)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,347h,12h,2,)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,347h,12h,2,"mad")'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,347h,12h,2,"stddevpop")'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,347h,12h,2,"stddevsamp")'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,347h,12h,2,"mad",7)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,347h,12h,2,,7)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,347h:now/h,347h,12h,,,7)'
+ ]
+ ],
+ [
+ [
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12w,2.1234)'
+ ]
+ ],
// trendsum() function.
[
[
@@ -901,6 +1083,63 @@ class testCalculatedFormula extends CWebTest {
'error' => 'Invalid parameter "/1/params": invalid number of parameters in function "change".'
]
],
+ // changecount() function validation.
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'changecount(/host/key,#5,"")',
+ 'error' => 'Invalid parameter "/1/params": invalid third parameter in function "changecount".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'changecount(/host/key,#5,"something")',
+ 'error' => 'Invalid parameter "/1/params": invalid third parameter in function "changecount".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'changecount(/host/key,#5,"all",)',
+ 'error' => 'Invalid parameter "/1/params": invalid number of parameters in function "changecount".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'changecount(/host/key,7,all)',
+ 'error' => 'Invalid parameter "/1/params": incorrect expression starting from "changecount(/host/key,7,all)".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'changecount(/host/key,5M)',
+ 'error' => 'Invalid parameter "/1/params": invalid second parameter in function "changecount".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'changecount(/host/key,5y)',
+ 'error' => 'Invalid parameter "/1/params": invalid second parameter in function "changecount".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'changecount(5w)',
+ 'error' => 'Invalid parameter "/1/params": incorrect usage of function "changecount".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'changecount(,5w)',
+ 'error' => 'Invalid parameter "/1/params": incorrect expression starting from "changecount(,5w)".'
+ ]
+ ],
// count() function validation.
[
[
@@ -1884,6 +2123,161 @@ class testCalculatedFormula extends CWebTest {
'error' => 'Invalid parameter "/1/params": incorrect expression starting from "trendmin(/host/item,-1h)".'
]
],
+ // trendstl() function validation.
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item)',
+ 'error' => 'Invalid parameter "/1/params": mandatory parameter is missing in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h)',
+ 'error' => 'Invalid parameter "/1/params": invalid second parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,:now/h,20h,12h,2)',
+ 'error' => 'Invalid parameter "/1/params": incorrect expression starting from "trendstl(/host/item,:now/h,20h,12h,2)".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20.15h,12h,2)',
+ 'error' => 'Invalid parameter "/1/params": invalid third parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,347h:now/h,5m,3h)',
+ 'error' => 'Invalid parameter "/1/params": invalid third parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,347h:now/h,70s,3h)',
+ 'error' => 'Invalid parameter "/1/params": invalid third parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20M,12h,2)',
+ 'error' => 'Invalid parameter "/1/params": invalid third parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20y,12h,2)',
+ 'error' => 'Invalid parameter "/1/params": invalid third parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,347h:now/h,20h,3m)',
+ 'error' => 'Invalid parameter "/1/params": invalid fourth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,347h:now/h,20h,58s)',
+ 'error' => 'Invalid parameter "/1/params": invalid fourth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12.23h,2)',
+ 'error' => 'Invalid parameter "/1/params": invalid fourth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,1h)',
+ 'error' => 'Invalid parameter "/1/params": invalid fourth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12M,2)',
+ 'error' => 'Invalid parameter "/1/params": invalid fourth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12y,2)',
+ 'error' => 'Invalid parameter "/1/params": invalid fourth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12w,0.5)',
+ 'error' => 'Invalid parameter "/1/params": invalid fifth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12w,2.12345)',
+ 'error' => 'Invalid parameter "/1/params": invalid fifth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12h,0)',
+ 'error' => 'Invalid parameter "/1/params": invalid fifth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12h,-3)',
+ 'error' => 'Invalid parameter "/1/params": invalid fifth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12w,2,"")',
+ 'error' => 'Invalid parameter "/1/params": invalid sixth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12h,2,"bad")',
+ 'error' => 'Invalid parameter "/1/params": invalid sixth parameter in function "trendstl".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12w,2,"mad)',
+ 'error' => 'Invalid parameter "/1/params": incorrect expression starting from "trendstl(/host/item,20h:now/h,20h,12w,2,"mad)".'
+ ]
+ ],
+ [
+ [
+ 'expected' => TEST_BAD,
+ 'formula' => 'trendstl(/host/item,20h:now/h,20h,12w,2,"mad",3)',
+ 'error' => 'Invalid parameter "/1/params": invalid seventh parameter in function "trendstl".'
+ ]
+ ],
// trendsum() function validation.
[
[
diff --git a/ui/tests/selenium/testFormHost.php b/ui/tests/selenium/common/testFormHost.php
index 7cff2c886af..ce313b13812 100644
--- a/ui/tests/selenium/testFormHost.php
+++ b/ui/tests/selenium/common/testFormHost.php
@@ -18,18 +18,40 @@
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**/
-require_once dirname(__FILE__).'/../include/CWebTest.php';
-require_once dirname(__FILE__).'/behaviors/CMessageBehavior.php';
-require_once dirname(__FILE__).'/../include/helpers/CDataHelper.php';
+require_once dirname(__FILE__).'/../../include/CWebTest.php';
+require_once dirname(__FILE__).'/../behaviors/CMessageBehavior.php';
+require_once dirname(__FILE__).'/../../include/helpers/CDataHelper.php';
/**
- * @backup hosts
- *
- * @onBefore prepareUpdateData
+ * Base class for Host form tests.
*/
class testFormHost extends CWebTest {
/**
+ * Attach Behaviors to the test.
+ *
+ * @return array
+ */
+ public function getBehaviors() {
+ return ['class' => CMessageBehavior::class];
+ }
+
+ /**
+ * Link to page for opening host form.
+ */
+ public $link;
+
+ /**
+ * Flag for host form opened by direct link.
+ */
+ public $standalone = false;
+
+ /**
+ * Flag for form opened from Monitoring -> Hosts section.
+ */
+ public $monitoring = false;
+
+ /**
* SQL query to get host and host interfaces tables to compare hash values.
*/
private $hosts_sql = 'SELECT * FROM hosts h INNER JOIN interface i ON h.hostid=i.hostid ORDER BY h.hostid, i.interfaceid';
@@ -63,13 +85,13 @@ class testFormHost extends CWebTest {
'ip' => '127.0.0.1',
'dns' => '',
'Connect to' => 'IP',
- 'port' => '10050'
+ 'port' => 10050
],
'SNMP' => [
'ip' => '127.0.0.1',
'dns' => '',
'Connect to' => 'IP',
- 'port' => '161',
+ 'port' => 161,
'SNMP version' => 'SNMPv2',
'SNMP community' => '{$SNMP_COMMUNITY}',
'Use bulk requests' => true
@@ -78,25 +100,16 @@ class testFormHost extends CWebTest {
'ip' => '127.0.0.1',
'dns' => '',
'Connect to' => 'IP',
- 'port' => '12345'
+ 'port' => 12345
],
'IPMI' => [
'ip' => '127.0.0.1',
'dns' => '',
'Connect to' => 'IP',
- 'port' => '623'
+ 'port' => 623
]
];
- /**
- * Attach Behaviors to the test.
- *
- * @return array
- */
- public function getBehaviors() {
- return ['class' => CMessageBehavior::class];
- }
-
public static function prepareUpdateData() {
$interfaces = [
[
@@ -113,10 +126,10 @@ class testFormHost extends CWebTest {
'useip' => 1,
'ip' => '127.2.2.2',
'dns' => '',
- 'port' => '122',
+ 'port' => 122,
'details' => [
- 'version' => '1',
- 'bulk' => '0',
+ 'version' => 1,
+ 'bulk' => 0,
'community' => 'zabbix'
]
],
@@ -126,7 +139,7 @@ class testFormHost extends CWebTest {
'useip' => 0,
'ip' => '',
'dns' => 'selenium.test',
- 'port' => '30053'
+ 'port' => 30053
],
[
'type' => 4,
@@ -134,7 +147,7 @@ class testFormHost extends CWebTest {
'useip' => 1,
'ip' => '127.4.4.4',
'dns' => '',
- 'port' => '426'
+ 'port' => 426
]
];
@@ -193,19 +206,22 @@ class testFormHost extends CWebTest {
self::$itemids = $result['itemids'];
}
- public function testFormHost_Layout() {
- $hostname = 'testFormHost with items';
- $this->page->login()->open('zabbix.php?action=host.list')->waitUntilReady();
- $this->query('xpath://table[@class="list-table"]')->asTable()->one()->findRow('Name', $hostname)->getColumn('Name')
- ->query('link', $hostname)->waitUntilClickable()->one()->click();
- $form = COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
+ /**
+ * Test for checking host form layout.
+ */
+ public function checkHostLayout() {
+ $host = 'testFormHost with items';
+ $hostid = CDBHelper::getValue('SELECT hostid FROM hosts WHERE name='.zbx_dbstr($host));
+
+ $form = $this->openForm(($this->standalone ? $this->link.$hostid : $this->link), $host);
- // Check tabs available in the form
- $tabs = ['Host', 'Templates', 'IPMI', 'Tags', 'Macros', 'Inventory', 'Encryption', 'Value mapping'];
+ // Check tabs available in the form.
+ $tabs = ['Host', 'IPMI', 'Tags', 'Macros', 'Inventory', 'Encryption', 'Value mapping'];
$this->assertEquals(count($tabs), $form->query('xpath:.//li[@role="tab"]')->all()->count());
foreach ($tabs as $tab) {
- $this->assertTrue($form->query("xpath:.//li[@role='tab']//a[text()=".CXPathHelper::escapeQuotes($tab).
- "]")->one()->isValid());
+ $this->assertTrue($form->query("xpath:.//li[@role='tab']//a[text()=".CXPathHelper::escapeQuotes($tab)."]")
+ ->one()->isValid()
+ );
}
// Host form fields maxlength attribute.
@@ -214,7 +230,9 @@ class testFormHost extends CWebTest {
}
$interfaces_form = $form->getFieldContainer('Interfaces')->asHostInterfaceElement();
- $this->assertEquals(['', 'Type', 'IP address', 'DNS name', 'Connect to', 'Port', 'Default'], $interfaces_form->getHeadersText());
+ $this->assertEquals(['', 'Type', 'IP address', 'DNS name', 'Connect to', 'Port', 'Default'],
+ $interfaces_form->getHeadersText()
+ );
foreach ($interfaces_form->getRows() as $i => $row) {
$enabled = ($i !== 0 && $i !== 2);
@@ -224,7 +242,8 @@ class testFormHost extends CWebTest {
// Interface fields maxlength attribute.
foreach (['IP address' => 64, 'DNS name' => 255, 'Port' => 64] as $field => $maxlength) {
$this->assertEquals($maxlength, $interfaces_form->getRow(0)->getColumn($field)
- ->query('tag:input')->one()->getAttribute('maxlength'));
+ ->query('tag:input')->one()->getAttribute('maxlength')
+ );
}
// Click the "expand" icon (in the 0th column) for the SNMP interface (1th row).
@@ -245,14 +264,17 @@ class testFormHost extends CWebTest {
$select = ($field === 'authNoPriv') ? 'Security level' : 'SNMP version';
$snmp_form->fill([$select => $field]);
$this->assertEquals($labels, array_values($snmp_form->getLabels()
- ->filter(new CElementFilter(CElementFilter::VISIBLE))->asText()));
+ ->filter(new CElementFilter(CElementFilter::VISIBLE))->asText())
+ );
$this->assertFalse($snmp_form->query('xpath:.//label[text()="Use bulk requests"]')->one()
- ->asCheckbox()->isChecked());
+ ->asCheckbox()->isChecked()
+ );
}
// Close host form popup to avoid unexpected alert in further cases.
- COverlayDialogElement::find()->one()->close();
- COverlayDialogElement::ensureNotPresent();
+ if (!$this->standalone) {
+ COverlayDialogElement::find()->one()->close();
+ }
}
public static function getCreateData() {
@@ -261,7 +283,7 @@ class testFormHost extends CWebTest {
[
[
'expected' => TEST_BAD,
- 'error' => ['Incorrect value for field "host": cannot be empty.', 'Field "groups" is mandatory.']
+ 'error' => ['Field "groups" is mandatory.', 'Incorrect value for field "host": cannot be empty.']
]
],
[
@@ -731,17 +753,26 @@ class testFormHost extends CWebTest {
}
/**
- * @dataProvider getCreateData
+ * Test for checking new host creation form.
+ *
+ * @param array $data data provider
*/
- public function testFormHost_Create($data) {
+ public function checkHostCreate($data) {
if ($data['expected'] === TEST_BAD) {
$old_hash = CDBHelper::getHash($this->hosts_sql);
$interface_old_hash = CDBHelper::getHash($this->interface_snmp_sql);
}
- $this->page->login()->open('zabbix.php?action=host.list')->waitUntilReady();
- $this->query('button:Create host')->one()->waitUntilClickable()->click();
- $form = COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
+ $this->page->login()->open($this->link)->waitUntilReady();
+
+ if ($this->standalone) {
+ $form = $this->query('id:host-form')->asForm()->waitUntilReady()->one();
+ }
+ else {
+ $this->query('button:Create host')->one()->waitUntilClickable()->click();
+ $form = COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
+ }
+
$form->fill(CTestArrayHelper::get($data, 'host_fields', []));
// Set name for field "Default".
@@ -754,12 +785,11 @@ class testFormHost extends CWebTest {
switch ($data['expected']) {
case TEST_GOOD:
$this->assertMessage(TEST_GOOD, 'Host added');
+ $this->page->assertTitle($this->monitoring ? 'Hosts' : 'Configuration of hosts');
// Check host fields.
$host = CTestArrayHelper::get($data, 'host_fields.Visible name', $data['host_fields']['Host name']);
- $this->query('xpath://table[@class="list-table"]')->asTable()->one()->findRow('Name', $host)
- ->getColumn('Name')->query('link', $host)->waitUntilClickable()->one()->click();
- $form = COverlayDialogElement::find()->asForm()->one()->waitUntilReady();
+ $form = $this->filterAndSelectHost($host);
$form->checkValue($data['host_fields']);
foreach ($interfaces as &$interface) {
@@ -782,22 +812,25 @@ class testFormHost extends CWebTest {
// Check interfaces field values.
$form->getFieldContainer('Interfaces')->asHostInterfaceElement(['names' => $names])
->checkValue($data['interfaces']);
+
+ COverlayDialogElement::find()->one()->close();
break;
case TEST_BAD:
$this->assertEquals($old_hash, CDBHelper::getHash($this->hosts_sql));
$this->assertEquals($interface_old_hash, CDBHelper::getHash($this->interface_snmp_sql));
$this->assertMessage(TEST_BAD, CTestArrayHelper::get($data, 'error_title', 'Cannot add host'), $data['error']);
+
+ if (!$this->standalone) {
+ COverlayDialogElement::find()->one()->close();
+ }
break;
}
-
- COverlayDialogElement::find()->one()->close();
- COverlayDialogElement::ensureNotPresent();
}
- public static function getUpdateData() {
+ public static function getValidationUpdateData() {
return [
- // Host form validation
+ // Host form validation.
[
[
'expected' => TEST_BAD,
@@ -1088,7 +1121,12 @@ class testFormHost extends CWebTest {
'error_title' => 'Cannot update host',
'error' => 'Incorrect arguments passed to function.'
]
- ],
+ ]
+ ];
+ }
+
+ public static function getUpdateData() {
+ return [
// Successful host form update.
// Add default interface values.
[
@@ -1294,11 +1332,11 @@ class testFormHost extends CWebTest {
}
/**
- * @backup hosts
+ * Test for checking existing host update form.
*
- * @dataProvider getUpdateData
+ * @param array $data data provider
*/
- public function testFormHost_Update($data) {
+ public function checkHostUpdate($data) {
if ($data['expected'] === TEST_BAD) {
$host_old_hash = CDBHelper::getHash($this->hosts_sql);
$interface_old_hash = CDBHelper::getHash($this->interface_snmp_sql);
@@ -1355,11 +1393,10 @@ class testFormHost extends CWebTest {
]
];
- $hostname = 'testFormHost_Update Visible name';
- $this->page->login()->open('zabbix.php?action=host.list')->waitUntilReady();
- $this->query('xpath://table[@class="list-table"]')->asTable()->one()->findRow('Name', $hostname)->getColumn('Name')
- ->query('link', $hostname)->waitUntilClickable()->one()->click();
- $form = COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
+ $host = 'testFormHost_Update Visible name';
+ $hostid = CDBHelper::getValue('SELECT hostid FROM hosts WHERE name='.zbx_dbstr($host));
+
+ $form = $this->openForm(($this->standalone ? $this->link.$hostid : $this->link), $host);
$form->fill(CTestArrayHelper::get($data, 'host_fields', []));
// Set name for field "Default".
@@ -1371,16 +1408,11 @@ class testFormHost extends CWebTest {
switch ($data['expected']) {
case TEST_GOOD:
$this->assertMessage(TEST_GOOD, 'Host updated');
+ $host = (CTestArrayHelper::get($data, 'host_fields.Visible name') === "")
+ ? CTestArrayHelper::get($data, 'host_fields.Host name', 'testFormHost_Update')
+ : CTestArrayHelper::get($data, 'host_fields.Visible name', 'testFormHost_Update Visible name');
- if (CTestArrayHelper::get($data, 'host_fields.Visible name') === "") {
- $host = CTestArrayHelper::get($data, 'host_fields.Host name', 'testFormHost_Update');
- }
- else {
- $host = CTestArrayHelper::get($data, 'host_fields.Visible name', 'testFormHost_Update Visible name');
- }
- $this->query('xpath://table[@class="list-table"]')->asTable()->one()->findRow('Name', $host)
- ->getColumn('Name')->query('link', $host)->waitUntilClickable()->one()->click();
- $form = COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
+ $form = $this->filterAndSelectHost($host);
// Update or add new source data from host data.
foreach (CTestArrayHelper::get($data, 'host_fields', []) as $key => $value) {
@@ -1459,6 +1491,8 @@ class testFormHost extends CWebTest {
// Check interfaces field values.
$form->getFieldContainer('Interfaces')->asHostInterfaceElement(['names' => $names])
->checkValue($source['interfaces']);
+
+ COverlayDialogElement::find()->one()->close();
break;
case TEST_BAD:
@@ -1467,68 +1501,26 @@ class testFormHost extends CWebTest {
$error_title = CTestArrayHelper::get($data, 'error_title', 'Cannot update host');
$this->assertMessage(TEST_BAD, $error_title, $data['error']);
- break;
- }
- COverlayDialogElement::find()->one()->close();
- COverlayDialogElement::ensureNotPresent();
- }
-
- /**
- * Check host fields data with data in DB.
- *
- * @param array $data data provider with fields values
- */
- private function assertDatabaseFields($data) {
- $db_default = [
- 'name' => $data['host_fields']['Host name'],
- 'description' => '',
- 'status' => 0
- ];
- $db_host = CDBHelper::getRow('SELECT hostid, host, name, description, status FROM hosts WHERE host='.
- zbx_dbstr($data['host_fields']['Host name']));
-
- if (CTestArrayHelper::get($data, 'host_fields.Visible name') === "") {
- $data['host_fields']['Visible name'] = $data['host_fields']['Host name'];
- }
- $fields = ['Host name' => 'host', 'Visible name' => 'name', 'Description' => 'description', 'Enabled' => 'status'];
- foreach ($fields as $ui_field => $db_field) {
- if (array_key_exists($ui_field, $data['host_fields'])) {
- if ($ui_field === 'Enabled') {
- $data['host_fields'][$ui_field] = ($data['host_fields'][$ui_field] === false)
- ? HOST_STATUS_NOT_MONITORED
- : HOST_STATUS_MONITORED;
+ if (!$this->standalone) {
+ COverlayDialogElement::find()->one()->close();
}
- $this->assertEquals($data['host_fields'][$ui_field], $db_host[$db_field]);
- }
- else {
- $this->assertEquals($db_default[$db_field], $db_host[$db_field]);
- }
+ break;
}
-
- // Check interfaces amount in DB.
- $db_interfaces = CDBHelper::getCount('SELECT NULL FROM interface WHERE hostid='.$db_host['hostid']);
- $this->assertEquals(count($data['interfaces']), $db_interfaces);
}
/**
* Update the host without any changes and check host and interfaces hashes.
*/
- public function testFormHost_SimpleUpdate() {
- $host = 'testFormHost_Update';
+ public function checkHostSimpleUpdate() {
$host_old_hash = CDBHelper::getHash($this->hosts_sql);
$interface_old_hash = CDBHelper::getHash($this->interface_snmp_sql);
- $this->page->login()->open('zabbix.php?action=host.list')->waitUntilReady();
- $this->query('button:Reset')->one()->click();
- $filter = $this->query('name:zbx_filter')->asForm()->waitUntilReady()->one();
- $filter->fill(['Name' => $host]);
- $filter->query('button:Apply')->one()->waitUntilClickable()->click();
-
- $this->query('xpath://table[@class="list-table"]')->asTable()->one()->findRow('Name', $host, true)
- ->getColumn('Name')->query('tag:a')->waitUntilClickable()->one()->click();
- $form = COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
+ $host = 'testFormHost_Update';
+ $visible_name = 'testFormHost_Update Visible name';
+ $hostid = CDBHelper::getValue('SELECT hostid FROM hosts WHERE host='.zbx_dbstr($host));
+ $form = $this->openForm(($this->standalone ? $this->link.$hostid : $this->link), $visible_name);
$this->page->waitUntilReady();
$form->submit();
$this->assertMessage(TEST_GOOD, 'Host updated');
@@ -1576,69 +1568,77 @@ class testFormHost extends CWebTest {
}
/**
- * @dataProvider getCloneData
- */
- public function testFormHost_Clone($data) {
- $this->cloneHost($data);
-
- // Check that items isn't cloned from original host.
- $hostid = CDBHelper::getValue('SELECT hostid FROM hosts WHERE host='.zbx_dbstr($data['host_fields']['Host name']));
- $this->assertEquals(0, CDBHelper::getCount('SELECT null FROM items WHERE hostid='.$hostid));
- }
-
- /**
- * @dataProvider getCloneData
- */
- public function testFormHost_FullClone($data) {
- $this->cloneHost($data, true);
-
- // Check that items cloned from original host.
- $hostid = CDBHelper::getValue('SELECT hostid FROM hosts WHERE host='.zbx_dbstr($data['host_fields']['Host name']));
- $this->assertEquals(3, CDBHelper::getCount('SELECT null FROM items WHERE hostid='.$hostid));
- }
-
- /**
* Clone or Full clone a host and compare the data with the original host.
*
- * @param type $data data provider with fields values
- * @param type $full_clone type of cloning
+ * @param array $data data provider with fields values
+ * @param string $button Clone or Full clone
*/
- private function cloneHost($data, $full_clone = false) {
- $name = 'testFormHost with items';
- $type = $full_clone ? 'Full clone' : 'Clone';
+ public function cloneHost($data, $button = 'Clone') {
+ $host = 'testFormHost with items';
+ $hostid = CDBHelper::getValue('SELECT hostid FROM hosts WHERE host='.zbx_dbstr($host));
- $this->page->login()->open('zabbix.php?action=host.list')->waitUntilReady();
- $this->query('button:Reset')->one()->click();
- $filter = $this->query('name:zbx_filter')->asForm()->waitUntilReady()->one();
- $filter->fill(['Name' => $name]);
- $filter->query('button:Apply')->waitUntilClickable()->one()->click();
-
- $this->query('xpath://table[@class="list-table"]')->asTable()->one()->findRow('Name', $name)
- ->getColumn('Name')->query('tag:a')->waitUntilClickable()->one()->click();
- $form = COverlayDialogElement::find()->asForm()->waitUntilVisible()->one();
+ $form = $this->openForm(($this->standalone ? 'zabbix.php?action=host.edit&hostid='.$hostid : $this->link), $host);
// Get values from form.
$form->fill(CTestArrayHelper::get($data, 'host_fields', []));
$original = $form->getFields()->asValues();
// Clone host.
- $this->query('button', $type)->waitUntilClickable()->one()->click();
- $cloned_form = COverlayDialogElement::find()->asForm()->waitUntilPresent()->one();
+ $this->query('button', $button)->waitUntilClickable()->one()->click();
+
+ $cloned_form = (!$this->standalone)
+ ? COverlayDialogElement::find()->asForm()->waitUntilPresent()->one()
+ : $this->query('id:host-form')->asForm()->waitUntilReady()->one();
+
$cloned_form->submit();
$this->page->waitUntilReady();
$this->assertMessage(TEST_GOOD, 'Host added');
- $this->query('button:Reset')->one()->click();
// Check the values of the original host with the cloned host.
- $this->query('link', $data['host_fields']['Host name'])->waitUntilClickable()->one()->forceClick();
- $saved_form = COverlayDialogElement::find()->asForm()->waitUntilReady()->one();
- $saved_form->checkValue($original);
+ $this->filterAndSelectHost($data['host_fields']['Host name'])->checkValue($original);
COverlayDialogElement::find()->one()->close();
- COverlayDialogElement::ensureNotPresent();
}
- public static function getСancelData() {
+ /**
+ * Check host fields data with data in DB.
+ *
+ * @param array $data data provider with fields values
+ */
+ private function assertDatabaseFields($data) {
+ $db_default = [
+ 'name' => $data['host_fields']['Host name'],
+ 'description' => '',
+ 'status' => 0
+ ];
+ $db_host = CDBHelper::getRow('SELECT hostid, host, name, description, status FROM hosts WHERE host='.
+ zbx_dbstr($data['host_fields']['Host name'])
+ );
+
+ if (CTestArrayHelper::get($data, 'host_fields.Visible name') === "") {
+ $data['host_fields']['Visible name'] = $data['host_fields']['Host name'];
+ }
+ $fields = ['Host name' => 'host', 'Visible name' => 'name', 'Description' => 'description', 'Enabled' => 'status'];
+ foreach ($fields as $ui_field => $db_field) {
+ if (array_key_exists($ui_field, $data['host_fields'])) {
+ if ($ui_field === 'Enabled') {
+ $data['host_fields'][$ui_field] = ($data['host_fields'][$ui_field] === false)
+ ? HOST_STATUS_NOT_MONITORED
+ : HOST_STATUS_MONITORED;
+ }
+ $this->assertEquals($data['host_fields'][$ui_field], $db_host[$db_field]);
+ }
+ else {
+ $this->assertEquals($db_default[$db_field], $db_host[$db_field]);
+ }
+ }
+
+ // Check interfaces amount in DB.
+ $db_interfaces = CDBHelper::getCount('SELECT NULL FROM interface WHERE hostid='.$db_host['hostid']);
+ $this->assertEquals(count($data['interfaces']), $db_interfaces);
+ }
+
+ public static function getCancelData() {
return [
[
[
@@ -1669,13 +1669,18 @@ class testFormHost extends CWebTest {
}
/**
- * @dataProvider getСancelData
+ * Test for checking host actions cancelling.
+ *
+ * @param array $data data provider with fields values
*/
- public function testFormHost_Cancel($data) {
+ public function checkCancel($data) {
$host_old_hash = CDBHelper::getHash($this->hosts_sql);
$interface_old_hash = CDBHelper::getHash($this->interface_snmp_sql);
- $name = 'testFormHost with items';
- $new_name = microtime(true).' Cancel '.$name;
+
+ $host = 'testFormHost with items';
+ $hostid = CDBHelper::getValue('SELECT hostid FROM hosts WHERE host='.zbx_dbstr($host));
+ $new_name = microtime(true).' Cancel '.$host;
+
$interface = [
[
'action' => USER_ACTION_ADD,
@@ -1690,24 +1695,29 @@ class testFormHost extends CWebTest {
];
if ($data['action'] === 'Add') {
- $this->page->login()->open('zabbix.php?action=host.list')->waitUntilReady();
- $this->query('button:Create host')->one()->waitUntilClickable()->click();
+ $this->page->login()->open($this->link)->waitUntilReady();
+
+ if (!$this->standalone) {
+ $this->query('button:Create host')->one()->waitUntilClickable()->click();
+ $form = COverlayDialogElement::find()->waitUntilReady()->one()->asForm();
+ }
+ else {
+ $form = $this->query('id:host-form')->asForm()->waitUntilReady()->one();
+ }
}
else {
- $this->page->login()->open('zabbix.php?action=host.list')->waitUntilReady();
- $this->query('xpath://table[@class="list-table"]')->asTable()->one()->findRow('Name', $name)->getColumn('Name')
- ->query('link', $name)->waitUntilClickable()->one()->click();
+ $form = $this->openForm(($this->standalone ? 'zabbix.php?action=host.edit&hostid='.$hostid : $this->link), $host);
}
+ $form_type = ($this->standalone) ? $form : COverlayDialogElement::find()->waitUntilReady()->one();
+
// Change the host data to make sure that the changes are not saved to the database after cancellation.
- $dialog = COverlayDialogElement::find()->waitUntilReady()->one();
- $form = $dialog->asForm();
$form->fill(['Host name' => $new_name]);
$interfaces_form = $form->getFieldContainer('Interfaces')->asHostInterfaceElement(['names' => ['1' => 'default']]);
$interfaces_form->fill($interface);
if (in_array($data['action'], ['Clone', 'Full clone', 'Delete'])) {
- $dialog->query('button', $data['action'])->one()->click();
+ $form_type->query('button', $data['action'])->one()->click();
}
if ($data['action'] === 'Delete') {
$this->page->dismissAlert();
@@ -1717,18 +1727,22 @@ class testFormHost extends CWebTest {
// Check that the host creation page is open after cloning or full cloning.
if ($data['action'] === 'Clone' || $data['action'] === 'Full clone') {
- $dialog->invalidate();
- $id = CDBHelper::getValue('SELECT hostid FROM hosts WHERE host='.zbx_dbstr($name));
+ $form_type->invalidate();
+ $id = CDBHelper::getValue('SELECT hostid FROM hosts WHERE host='.zbx_dbstr($host));
$action = ($data['action'] === 'Clone') ? 'clone' : 'full_clone';
$expected_url = PHPUNIT_URL.'zabbix.php?action=host.edit&hostid='.$id.'&'.$action.'=1';
$this->assertEquals($expected_url, $this->page->getCurrentUrl());
- $this->assertFalse($dialog->query('xpath:.//ul['.CXPathHelper::fromClass('filter-breadcrumb').']')->one(false)->isValid());
- $this->assertFalse($dialog->query('button', ['Update', 'Clone', 'Full clone', 'Delete'])->one(false)->isValid());
- $this->assertTrue($dialog->query('button', ['Add', 'Cancel'])->one(false)->isValid());
+ $this->assertFalse($form_type->query("xpath:.//ul[".CXPathHelper::fromClass('filter-breadcrumb')."]")
+ ->one(false)->isValid()
+ );
+ $this->assertFalse($form_type->query('button', ['Update', 'Clone', 'Full clone', 'Delete'])->one(false)
+ ->isValid()
+ );
+ $this->assertTrue($form_type->query('button', ['Add', 'Cancel'])->one(false)->isValid());
}
- $dialog->query('button:Cancel')->waitUntilClickable()->one()->click();
+ $form_type->query('button:Cancel')->waitUntilClickable()->one()->click();
// Check invariability of host data in the database.
$this->assertEquals($host_old_hash, CDBHelper::getHash($this->hosts_sql));
@@ -1756,10 +1770,13 @@ class testFormHost extends CWebTest {
}
/**
- * @dataProvider getDeleteData
+ * Test for checking host deleting.
+ *
+ * @param array $data data provider with fields values
*/
- public function testFormHost_Delete($data) {
+ public function checkDelete($data) {
$hostid = CDBHelper::getValue('SELECT hostid FROM hosts WHERE host='.zbx_dbstr($data['name']));
+
if ($data['expected'] === TEST_BAD) {
$old_hash = CDBHelper::getHash($this->hosts_sql);
}
@@ -1769,25 +1786,26 @@ class testFormHost extends CWebTest {
$ids = array_column($interfaceids, 'interfaceid');
}
- $this->page->login()->open('zabbix.php?action=host.list')->waitUntilReady();
- $this->query('xpath://table[@class="list-table"]')->asTable()->one()->findRow('Name', $data['name'])
- ->getColumn('Name')->query('link', $data['name'])->waitUntilClickable()->one()->click();
- $dialog = COverlayDialogElement::find()->waitUntilReady()->one();
- $dialog->query('button:Delete')->waitUntilClickable()->one()->click();
+ $form = $this->openForm(($this->standalone ? $this->link.$hostid : $this->link), $data['name']);
+ $form_type = ($this->standalone) ? $form : COverlayDialogElement::find()->waitUntilReady()->one();
+ $form_type->query('button:Delete')->waitUntilClickable()->one()->click();
$this->page->acceptAlert();
$this->page->waitUntilReady();
switch ($data['expected']) {
case TEST_GOOD:
$this->assertMessage(TEST_GOOD, 'Host deleted');
+
// Check if all host records have been deleted.
- $tables=['hosts', 'interface', 'items', 'hostmacro', 'hosts_groups', 'hosts_templates',
- 'maintenances_hosts', 'host_inventory'];
+ $tables = ['hosts', 'interface', 'items', 'hostmacro', 'hosts_groups', 'hosts_templates',
+ 'maintenances_hosts', 'host_inventory'];
+
foreach ($tables as $table) {
$this->assertEquals(0, CDBHelper::getCount('SELECT null FROM '.$table.' WHERE hostid='.$hostid));
}
$this->assertEquals(0, CDBHelper::getCount('SELECT null FROM interface_snmp'.
- ' WHERE interfaceid IN ('.CDBHelper::escape($ids).')'));
+ ' WHERE interfaceid IN ('.CDBHelper::escape($ids).')')
+ );
break;
case TEST_BAD:
@@ -1795,4 +1813,55 @@ class testFormHost extends CWebTest {
$this->assertMessage(TEST_BAD, 'Cannot delete host', $data['error']);
}
}
+
+ /**
+ * Function for opening host form.
+ *
+ * @param string $url url of page where host form is opened
+ * @param string $host host name to be opened
+ */
+ private function openForm($url, $host) {
+ $this->page->login()->open($url)->waitUntilReady();
+
+ return ($this->standalone)
+ ? $this->query('id:host-form')->asForm()->waitUntilReady()->one()
+ : $this->filterAndSelectHost($host);
+ }
+
+ /**
+ * Function for filtering necessary host on page.
+ *
+ * @param string $host host name to be filtered
+ *
+ * @return CFormElement
+ */
+ public function filterAndSelectHost($host) {
+ $this->query('button:Reset')->one()->click();
+ $this->query('name:zbx_filter')->asForm()->waitUntilReady()->one()->fill(['Name' => $host]);
+ $this->query('button:Apply')->one()->waitUntilClickable()->click();
+ $this->page->waitUntilReady();
+
+ $host_link = $this->query('xpath://table[@class="list-table"]')->asTable()->one()->waitUntilVisible()
+ ->findRow('Name', $host)->getColumn('Name')->query('tag:a')->waitUntilClickable();
+
+ if ($this->monitoring) {
+ $host_link->asPopupButton()->one()->select('Configuration');
+ }
+ else {
+ $host_link->one()->click();
+ }
+
+ return COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
+ }
+
+ /**
+ * Function for selecting and counting items on particular host.
+ *
+ * @param boolean $host name of host
+ * @param string $count expected items count
+ */
+ public function assertItemsDBCount($host, $count) {
+ $sql = 'SELECT null FROM items WHERE hostid IN (SELECT hostid FROM hosts WHERE host='.zbx_dbstr($host).')';
+ $this->assertEquals($count, CDBHelper::getCount($sql));
+ }
}
diff --git a/ui/tests/selenium/common/testFormMacros.php b/ui/tests/selenium/common/testFormMacros.php
index cebf3411815..03ada1fd1a3 100644
--- a/ui/tests/selenium/common/testFormMacros.php
+++ b/ui/tests/selenium/common/testFormMacros.php
@@ -535,10 +535,6 @@ abstract class testFormMacros extends CWebTest {
$name = $is_prototype ? $data['Name'].' {#KEY}' : $data['Name'];
$form->fill([(($host_type === 'template') ? 'Template name' : 'Host name') => $name]);
-
- if ($is_prototype) {
- $form->selectTab('Groups');
- }
$form->fill(['Groups' => 'Zabbix servers']);
}
@@ -689,7 +685,6 @@ abstract class testFormMacros extends CWebTest {
$form = $this->query('name:'.$form_type.'Form')->waitUntilPresent()->asForm()->one();
$name = 'Host prototype with edited global {#MACRO} '.time();
$form->fill(['Host name' => $name]);
- $form->selectTab('Groups');
$form->fill(['Groups' => 'Zabbix servers']);
}
else {
diff --git a/ui/tests/selenium/common/testFormTags.php b/ui/tests/selenium/common/testFormTags.php
index 26ec7fa63a8..8c890a2b917 100644
--- a/ui/tests/selenium/common/testFormTags.php
+++ b/ui/tests/selenium/common/testFormTags.php
@@ -286,7 +286,6 @@ class testFormTags extends CWebTest {
if ($object === 'host prototype') {
$data['name'] = $data['name'].' {#KEY}';
$form->fill(['Host name' => $data['name']]);
- $form->selectTab('Groups');
$form->fill(['Groups' => 'Zabbix servers']);
}
elseif ($object === 'web scenario') {
diff --git a/ui/tests/selenium/common/testSystemInformation.php b/ui/tests/selenium/common/testSystemInformation.php
new file mode 100644
index 00000000000..4cf42eb848b
--- /dev/null
+++ b/ui/tests/selenium/common/testSystemInformation.php
@@ -0,0 +1,227 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../../include/CWebTest.php';
+require_once dirname(__FILE__).'/../../include/helpers/CDataHelper.php';
+
+class testSystemInformation extends CWebTest {
+
+ const FAILOVER_DELAY = 8;
+
+ public static $active_lastaccess;
+ public static $update_timestamp;
+ public static $standby_lastaccess;
+ public static $stopped_lastaccess;
+ public static $unavailable_lastaccess;
+ public static $standalone_lastaccess;
+
+ public static $skip_fields;
+
+ /**
+ * Function inserts HA cluster data into ha_node table.
+ */
+ public static function prepareHANodeData() {
+ global $DB;
+ self::$active_lastaccess = time();
+ self::$standby_lastaccess = self::$active_lastaccess - 1;
+ self::$stopped_lastaccess = self::$active_lastaccess - 240;
+ self::$unavailable_lastaccess = self::$active_lastaccess - 180105;
+ self::$standalone_lastaccess = self::$active_lastaccess - 20;
+
+ $nodes = [
+ [
+ 'ha_nodeid' => 'ckv2kclpg0001pt7pseinx5is',
+ 'name' => 'Standby node',
+ 'address' => '192.168.133.195',
+ 'port' => 10055,
+ 'lastaccess' => self::$standby_lastaccess,
+ 'status' => 0,
+ 'ha_sessionid' => 'ckv6hh1730000q17pci1gocjy'
+ ],
+ [
+ 'ha_nodeid' => 'ckv2kfmqj0001pipjf0g4pr20',
+ 'name' => 'Stopped node',
+ 'address' => '192.168.133.192',
+ 'port' => 10025,
+ 'lastaccess' => self::$stopped_lastaccess,
+ 'status' => 1,
+ 'ha_sessionid' => 'ckv6gyurt0000vfpjp7b8nad4'
+ ],
+ [
+ 'ha_nodeid' => 'ckvaw8yny0001l07pm1bk14y5',
+ 'name' => 'Unavailable node',
+ 'address' => '192.168.133.206',
+ 'port' => 10051,
+ 'lastaccess' => self::$unavailable_lastaccess,
+ 'status' => 2,
+ 'ha_sessionid' => 'ckvaw8yie0000kr7pzk6nd5ok'
+ ],
+ [
+ 'ha_nodeid' => 'ckvaw9wlf0001tn7psxgh3wfo',
+ 'name' => 'Active node',
+ 'address' => $DB['SERVER'],
+ 'port' => $DB['PORT'],
+ 'lastaccess' => self::$active_lastaccess,
+ 'status' => 3,
+ 'ha_sessionid' => 'ckvaw9wjo0000td7p8j66e74x'
+ ],
+ [
+ 'ha_nodeid' => 'ckvawe0t00001h57pcotna8nz',
+ 'name' => '',
+ 'address' => '192.168.133.100',
+ 'port' => 10051,
+ 'lastaccess' => self::$standalone_lastaccess,
+ 'status' => 0,
+ 'ha_sessionid' => 'ckvawe0rx0000gv7pi74mzlqp'
+ ]
+ ];
+
+ // Insert HA cluster data into ha_node table.
+ foreach ($nodes as $node) {
+ DBexecute('INSERT INTO ha_node (ha_nodeid, name, address, port, lastaccess, status, ha_sessionid) '.
+ 'VALUES ('.zbx_dbstr($node['ha_nodeid']).', '.zbx_dbstr($node['name']).', '.zbx_dbstr($node['address']).
+ ', '.$node['port'].', '.$node['lastaccess'].', '.$node['status'].', '.zbx_dbstr($node['ha_sessionid']).');'
+ );
+ }
+
+ // Update Zabbix frontend config to make sure that the address of the active node is shown correctly in tests.
+ $file_name = dirname(__FILE__).'/../../../conf/zabbix.conf.php';
+ $config = strtr(file_get_contents($file_name), ['$ZBX_SERVER ' => '// $ZBX_SERVER ', '$ZBX_SERVER_PORT' => '// $ZBX_SERVER_PORT']);
+ file_put_contents($file_name, $config);
+
+ // Get the time when config is updated - it is needed to know how long to wait until update of Zabbix server status.
+ self::$update_timestamp = time();
+ }
+
+ // Change failover delay not to wait too long for server to update its status.
+ public static function changeFailoverDelay() {
+ DBexecute('UPDATE config SET ha_failover_delay='.self::FAILOVER_DELAY);
+ }
+
+ /**
+ * Function that checks how a running HA cluster info is displayed in system information widget or report.
+ *
+ * @param integer $dashboardid id of the dashboard that the widgets are located in.
+ */
+ public function assertEnabledHACluster($dashboardid = null) {
+ global $DB;
+ self::$skip_fields = [];
+ $url = (!$dashboardid) ? 'zabbix.php?action=report.status' : 'zabbix.php?action=dashboard.view&dashboardid='.$dashboardid;
+ // Wait for frontend to get the new config from updated zabbix.conf.php file.
+ sleep((int) ini_get('opcache.revalidate_freq') + 1);
+ $this->page->login()->open($url);
+
+ // Not waiting for page to load to minimise the possibility of difference between the time in report and in constant.
+ $current_time = time();
+ $this->page->waitUntilReady();
+
+ if (!$dashboardid) {
+ $nodes_table = $this->query('xpath://table[@class="list-table sticky-header sticky-footer"]')->asTable()->one();
+ $server_address = $this->query('xpath://th[text()="Zabbix server is running"]/../td[2]')->one();
+ }
+ else {
+ $dashboard = CDashboardElement::find()->waitUntilReady()->one();
+ $nodes_table = $dashboard->getWidget('High availability nodes view')->query('xpath:.//table')->asTable()->one();
+ $server_address = $dashboard->getWidget('System stats view')->query('xpath:.//tbody/tr[1]/td[2]')->one();
+ }
+
+ // Define expected absolute timestamps for calculating the lastaccess value.
+ $nodes = [
+ 'Active node' => self::$active_lastaccess,
+ 'Unavailable node' => self::$unavailable_lastaccess,
+ 'Stopped node' => self::$stopped_lastaccess,
+ 'Standby node' => self::$standby_lastaccess,
+ '<standalone server>' => self::$standalone_lastaccess
+ ];
+
+ /**
+ * The below foreach cycle compares lastaccess as time difference for each node in the widget or part of report
+ * that displays the list of nodes and excludes corresponding element from screenshot.
+ */
+ foreach ($nodes as $name => $lastaccess_db) {
+ $row = $nodes_table->findRow('Name', $name);
+ $last_seen = $row->getColumn('Last access');
+ // Converting unix timestamp difference into difference in time units and comparing with lastaccess from report.
+ $lastaccess_expected = convertUnitsS($current_time - $lastaccess_db);
+ $lastaccess_actual = $last_seen->getText();
+ /**
+ * In case if the actual last access doesn't coincide with expected check that the difference is only 1s.
+ * This is required because a second might have passed from defining $current_time and loading the page.
+ */
+ if ($lastaccess_expected !== $lastaccess_actual) {
+ $this->assertEquals(convertUnitsS($current_time - $lastaccess_db - 1), $lastaccess_actual);
+ }
+
+ self::$skip_fields[] = $last_seen;
+
+ // Check Zabbix server address and port for each record in the HA cluster nodes table.
+ if ($name === 'Active node') {
+ self::$skip_fields[] = $row->getColumn('Address');
+ $this->assertEquals($DB['SERVER'].':'.$DB['PORT'], $row->getColumn('Address')->getText());
+ }
+ }
+
+ /**
+ * Check and hide the active Zabbix server address in widget that is working in System stats mode or in the part
+ * of the report that displays the overall system statistics.
+ */
+ $this->assertEquals($DB['SERVER'].':'.$DB['PORT'], $server_address->getText());
+ self::$skip_fields[] = $server_address;
+
+ // Hide the footer of the report as it contains Zabbix version.
+ if (!$dashboardid) {
+ self::$skip_fields[] = $this->query('xpath://footer')->one();
+ }
+
+ // Check and hide the text of messages, because they contain ip addresses of the current host.
+ $error_text = [
+ 'Connection to Zabbix server "'.$DB['SERVER'].'" failed. Possible reasons:',
+ '1. Incorrect server IP/DNS in the "zabbix.conf.php";',
+ '2. Incorrect DNS server configuration.',
+ 'Failed to parse address "'.$DB['SERVER'].'"'
+ ];
+ $messages = CMessageElement::find()->all();
+ foreach ($messages as $message) {
+ $this->assertEquals($error_text, $message->getLines()->asText());
+ self::$skip_fields[] = $message;
+ }
+ }
+
+ /**
+ * Function checks that Zabbix server status is updated after failover delay passes and frontend config is re-validated.
+ *
+ * @param integer $dashboardid id of the dashboard that the widgets are located in.
+ */
+ public function assertServerStatusAfterFailover($dashboardid = null) {
+ $url = (!$dashboardid) ? 'zabbix.php?action=report.status' : 'zabbix.php?action=dashboard.view&dashboardid='.$dashboardid;
+ $this->page->login()->open($url)->waitUntilReady();
+ $table = $this->query('xpath://table[@class="list-table sticky-header"]')->asTable()->waitUntilVisible()->one();
+
+ // Check that before failover delay passes frontend thinks that Zabbix server is running.
+ $this->assertEquals('Yes', $table->findRow('Parameter', 'Zabbix server is running')->getColumn(0)->getText());
+
+ // Wait for failover delay to pass.
+ sleep(self::$update_timestamp + self::FAILOVER_DELAY - time());
+
+ // Check that after failover delay passes frontend re-validates Zabbix server status.
+ $this->page->refresh();
+ $this->assertEquals('No', $table->findRow('Parameter', 'Zabbix server is running')->getColumn(0)->getText());
+ }
+}
diff --git a/ui/tests/selenium/dashboard/testDashboardPages.php b/ui/tests/selenium/dashboard/testDashboardPages.php
new file mode 100644
index 00000000000..2b82fb56b6c
--- /dev/null
+++ b/ui/tests/selenium/dashboard/testDashboardPages.php
@@ -0,0 +1,731 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../../include/CWebTest.php';
+require_once dirname(__FILE__).'/../../include/helpers/CDataHelper.php';
+require_once dirname(__FILE__).'/../behaviors/CMessageBehavior.php';
+
+/**
+ * @backup dashboard
+ *
+ * @onBefore prepareDashboardData
+ */
+class testDashboardPages extends CWebTest {
+
+ /**
+ * Next page button in dashboard.
+ *
+ * @var string
+ */
+ const NEXT_BUTTON = 'xpath://button[@class="dashboard-next-page btn-iterator-page-next"]';
+
+ /**
+ * Previous page button in dashboard.
+ *
+ * @var string
+ */
+ const PREVIOUS_BUTTON = 'xpath://button[@class="dashboard-previous-page btn-iterator-page-previous"]';
+
+ /**
+ * Attach MessageBehavior to the test.
+ */
+ public function getBehaviors() {
+ return [CMessageBehavior::class];
+ }
+
+ /**
+ * Id of dashboard by name.
+ *
+ * @var integer
+ */
+ protected static $ids;
+
+ /**
+ * Create new dashboards for autotest.
+ */
+ public function prepareDashboardData() {
+ $response = CDataHelper::call('dashboard.create', [
+ [
+ 'name' => 'Dashboard for layout',
+ 'display_period' => 30,
+ 'auto_start' => 1,
+ 'pages' => [
+ [
+ 'name' => 'First_page_name',
+ 'widgets' => [
+ [
+ 'name' => 'First page clock',
+ 'type' => 'clock',
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 5,
+ 'height' => 5,
+ 'view_mode' => 0
+ ]
+ ]
+ ],
+ [
+ 'name' => 'second_page_name',
+ 'widgets' => [
+ [
+ 'name' => 'Second page clock',
+ 'type' => 'clock',
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 5,
+ 'height' => 5,
+ 'view_mode' => 0
+ ]
+ ]
+ ]
+ ]
+ ],
+ [
+ 'name' => 'Dashboard for copy',
+ 'display_period' => 30,
+ 'auto_start' => 1,
+ 'pages' => [
+ [
+ 'name' => 'first_page_copy',
+ 'widgets' => [
+ [
+ 'name' => 'First page clock 1',
+ 'type' => 'clock',
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 5,
+ 'height' => 5,
+ 'view_mode' => 0
+ ],
+ [
+ 'type' => 'graph',
+ 'name' => 'Graph (classic) widget',
+ 'x' => 5,
+ 'y' => 4,
+ 'width' => 8,
+ 'height' => 4,
+ 'fields' => [
+ [
+ 'type' => 0,
+ 'name' => 'source_type',
+ 'value' => 1
+ ],
+ [
+ 'type' => 4,
+ 'name' => 'itemid',
+ 'value' => 40041
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]
+ ],
+ [
+ 'name' => 'Dashboard for kiosk',
+ 'display_period' => 30,
+ 'auto_start' => 1,
+ 'pages' => [
+ [
+ 'name' => 'first_page_kiosk',
+ 'widgets' => [
+ [
+ 'name' => 'First page kiosk',
+ 'type' => 'clock',
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 5,
+ 'height' => 5,
+ 'view_mode' => 0
+ ]
+ ]
+ ],
+ [
+ 'name' => 'second_page_kiosk',
+ 'widgets' => [
+ [
+ 'name' => 'Second page kiosk',
+ 'type' => 'clock',
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 5,
+ 'height' => 5,
+ 'view_mode' => 0
+ ]
+ ]
+ ],
+ [
+ 'name' => 'third_page_kiosk',
+ 'widgets' => [
+ [
+ 'name' => 'Third page kiosk',
+ 'type' => 'clock',
+ 'x' => 0,
+ 'y' => 0,
+ 'width' => 5,
+ 'height' => 5,
+ 'view_mode' => 0
+ ]
+ ]
+ ]
+ ]
+ ],
+ [
+ 'name' => 'Dashboard for page creation',
+ 'display_period' => 30,
+ 'auto_start' => 1,
+ 'pages' => [
+ [
+ 'name' => 'first_page_creation'
+ ]
+ ]
+ ],
+ [
+ 'name' => 'Dashboard for page delete',
+ 'display_period' => 30,
+ 'auto_start' => 1,
+ 'pages' => [[],[],[]]
+ ],
+ [
+ 'name' => 'Dashboard for pages empty name',
+ 'display_period' => 30,
+ 'auto_start' => 1,
+ 'pages' => [[]]
+ ],
+ [
+ 'name' => 'Dashboard for limit check and navigation',
+ 'display_period' => 30,
+ 'auto_start' => 1,
+ 'pages' => [[], [], [], [], [], [], [], [], [], [],[], [], [], [], [], [], [], [], [], [],[], [], [], [],
+ [],[], [], [], [], [],[], [], [], [], [], [], [], [], [], [],[], [], [], [], [], [], [], [], [], []]
+ ],
+ [
+ 'name' => 'Dashboard for paste',
+ 'display_period' => 30,
+ 'auto_start' => 1,
+ 'pages' => [[]]
+ ],
+ [
+ 'name' => 'Dashboard for page navigation',
+ 'display_period' => 30,
+ 'auto_start' => 1,
+ 'pages' => [
+ [
+ 'name' => 'long_name_to_check_navigation_1'
+ ],
+ [
+ 'name' => 'long_name_to_check_navigation_2'
+ ],
+ [
+ 'name' => 'long_name_to_check_navigation_3'
+ ],
+ [
+ 'name' => 'long_name_to_check_navigation_4'
+ ],
+ [
+ 'name' => 'long_name_to_check_navigation_5'
+ ],
+ [
+ 'name' => 'long_name_to_check_navigation_6'
+ ],
+ [
+ 'name' => 'long_name_to_check_navigation_7'
+ ],
+ [
+ 'name' => 'long_name_to_check_navigation_8'
+ ]
+ ]
+ ]
+ ]);
+ $this->assertArrayHasKey('dashboardids', $response);
+ self::$ids = CDataHelper::getIds('name');
+ }
+
+ /**
+ * Check layout of objects related to dashboard page.
+ */
+ public function testDashboardPages_Layout() {
+ $this->page->login()->open('zabbix.php?action=dashboard.view&new=1')->waitUntilReady();
+ $dialog = COverlayDialogElement::find()->waitUntilVisible()->one();
+ $properties_form = $dialog->query('name:dashboard_properties_form')->asForm()->one();
+ $properties_form->fill(['Name' => 'Dashboard creation']);
+ $properties_form->submit();
+ $this->page->waitUntilReady();
+
+ // Check popup-menu options.
+ $this->query('id:dashboard-add')->one()->click();
+ $add_menu = CPopupMenuElement::find()->waitUntilVisible()->one();
+
+ // Check add page form.
+ $add_menu->select('Add page');
+ $this->checkPageProperties();
+
+ // Check page popup-menu options in edit mode.
+ $page_menu = $this->getPageMenu('Page 1');
+ $page_menu->hasTitles('ACTIONS');
+ $page_popup_items = [
+ 'Copy' => true,
+ 'Delete' => false,
+ 'Properties' => true
+ ];
+ foreach ($page_popup_items as $item => $enabled) {
+ $this->assertTrue($page_menu->getItem($item)->isEnabled($enabled));
+ }
+
+ // Check page properties in edit mode.
+ $page_menu->select('Properties');
+ $this->checkPageProperties();
+ $this->query('id:dashboard-cancel')->one()->click();
+ $this->page->acceptAlert();
+ $this->page->waitUntilReady();
+
+ // Check Stop/Start slideshow.
+ $this->page->open('zabbix.php?action=dashboard.view&dashboardid='.self::$ids['Dashboard for layout'])->waitUntilReady();
+ foreach (['Stop', 'Start'] as $status) {
+ $this->assertTrue($this->query('xpath://button/span[contains(@class, "slideshow-state") and text()="'.
+ $status.' slideshow"]')->one()->isDisplayed()
+ );
+ $this->query('xpath://button[contains(@class, "slideshow-state")]')->one()->click();
+ }
+
+ // Check page popup-menu options in created dashboard.
+ $this->getPageMenu('First_page_name');
+ $page_menu->hasTitles('ACTIONS');
+ $this->assertEquals(['Copy', 'Properties'], $page_menu->getItems()->asText());
+
+ // Check page properties in created dashboard.
+ $page_menu->select('Properties');
+ $this->checkPageProperties();
+ }
+
+ /**
+ * Copy dashboard page to same dashboard and another one.
+ */
+ public function testDashboardPages_CopyPastePage() {
+ $query_pageid = 'SELECT dashboard_pageid FROM dashboard_page WHERE dashboardid=';
+ $query_widgets = 'SELECT type, name, x, y, width, height, view_mode FROM widget WHERE dashboard_pageid=';
+ $query_widgetid = 'SELECT widgetid FROM widget WHERE dashboard_pageid=';
+ $query_widgetfields = 'SELECT type, name, value_int, value_str, value_groupid FROM widget_field WHERE widgetid=';
+
+ foreach ([self::$ids['Dashboard for copy'], self::$ids['Dashboard for paste']] as $dashboardid) {
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$ids['Dashboard for copy'])
+ ->waitUntilReady();
+ $dashboard = CDashboardElement::find()->one();
+
+ // Save hash and copy first page.
+ $dashboard->edit();
+ $this->page->waitUntilReady();
+ $this->selectPageAction('first_page_copy', 'Copy');
+ $first_pageid = CDBHelper::getValue($query_pageid.zbx_dbstr(self::$ids['Dashboard for copy']).' ORDER BY dashboard_pageid DESC');
+ $first_page_widgets = CDBHelper::getHash($query_widgets.zbx_dbstr($first_pageid));
+ $graph_widgetid = CDBHelper::getValue($query_widgetid.zbx_dbstr($first_pageid).' ORDER BY widgetid DESC');
+ $widgetfield_hash = CDBHelper::getHash($query_widgetfields.zbx_dbstr($graph_widgetid));
+
+ // Open another dashboard to paste copied page.
+ if ($dashboardid === self::$ids['Dashboard for paste']) {
+ $this->page->open('zabbix.php?action=dashboard.view&dashboardid='.$dashboardid)->waitUntilReady();
+ $dashboard->edit();
+ $this->page->waitUntilReady();
+ }
+
+ // Save dashboard page names before copy and paste page.
+ $titles_before = $this->getPagesTitles();
+ $this->query('id:dashboard-add')->one()->click();
+ CPopupMenuElement::find()->waitUntilVisible()->one()->select('Paste page');
+ $dashboard->waitUntilReady();
+
+ // Copied page added.
+ $titles_before[] = 'first_page_copy';
+
+ // Assert that new page added.
+ $this->assertEquals($titles_before, $this->getPagesTitles());
+ $dashboard->save();
+ $this->page->waitUntilReady();
+
+ // Check and compare widgets of copied page.
+ $pasted_pageid = CDBHelper::getValue($query_pageid.zbx_dbstr($dashboardid).' ORDER BY dashboard_pageid DESC');
+ $this->assertEquals($first_page_widgets, CDBHelper::getHash($query_widgets.zbx_dbstr($pasted_pageid)));
+ $pasted_graph_widgetid = CDBHelper::getValue($query_widgetid.zbx_dbstr($pasted_pageid).' ORDER BY widgetid DESC');
+ $this->assertEquals($widgetfield_hash, CDBHelper::getHash($query_widgetfields.zbx_dbstr($pasted_graph_widgetid)));
+ }
+ }
+
+ public static function getCreateData() {
+ return [
+ // #0 Simple name.
+ [
+ [
+ 'fields' => [
+ 'Name' => 'Simple name',
+ 'Page display period' => '10 seconds'
+ ]
+ ]
+ ],
+ // #1 Symbols.
+ [
+ [
+ 'fields' => [
+ 'Name' => '#!@#$%^&*()_+',
+ 'Page display period' => '30 seconds'
+ ]
+ ]
+ ],
+ // #2 Trimming leading and trailing spaces.
+ [
+ [
+ 'fields' => [
+ 'Name' => ' trimmed name ',
+ 'Page display period' => '1 minute'
+ ],
+ 'trim' => true
+ ]
+ ],
+ // #3 Long name.
+ [
+ [
+ 'fields' => [
+ 'Name' => 'long_name_here_long_name_here_long_name_here_long_name_here_long_name_here',
+ 'Page display period' => '2 minutes'
+ ]
+ ]
+ ],
+ // #4 Duplicate name.
+ [
+ [
+ 'fields' => [
+ 'Name' => 'first_page_creation',
+ 'Page display period' => '10 minutes'
+ ],
+ 'duplicate' => true
+ ]
+ ],
+ // #5 cyrillic.
+ [
+ [
+ 'fields' => [
+ 'Name' => 'кириллица',
+ 'Page display period' => '30 minutes'
+ ]
+ ]
+ ],
+ // #6 ASCII symbols.
+ [
+ [
+ 'fields' => [
+ 'Name' => '♥♥♥♥♥♥♥',
+ 'Page display period' => '1 hour'
+ ]
+ ]
+ ]
+ ];
+ }
+
+ /**
+ * Add new pages with different names to dashboard.
+ *
+ * @dataProvider getCreateData
+ */
+ public function testDashboardPages_Create($data) {
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$ids['Dashboard for page creation'])
+ ->waitUntilReady();
+ $dashboard = CDashboardElement::find()->one();
+ $dashboard->edit();
+ $dashboard->addPage();
+ $page_dialog = COverlayDialogElement::find()->waitUntilReady()->one();
+ $page_dialog->query('name:dashboard_page_properties_form')->asForm()->one()->fill($data['fields'])->submit();
+ $dashboard->waitUntilReady();
+
+ $title = $data['fields']['Name'];
+ if (CTestArrayHelper::get($data, 'trim', false)) {
+ $title = trim($data['fields']['Name']);
+ }
+
+ $this->assertTrue(in_array($title, $this->getPagesTitles(), true));
+ $dashboard->save();
+ $this->page->waitUntilReady();
+ $this->assertMessage(TEST_GOOD, 'Dashboard updated');
+
+
+ $next_page = $this->query(self::NEXT_BUTTON)->one();
+ $tab = $this->query('class:selected-tab')->one();
+ while ($next_page->isClickable()) {
+ $next_page->click();
+ $tab->waitUntilAttributesNotPresent(['class' => 'selected-tab']);
+ $tab->reload();
+ }
+
+ $index = CTestArrayHelper::get($data, 'duplicate', false) ? 2 : 1;
+ $this->selectPageAction($title, 'Properties', $index);
+ COverlayDialogElement::find()->waitUntilReady()->one();
+ $page_form = $page_dialog->query('name:dashboard_page_properties_form')->asForm()->one();
+ $page_form->checkValue(['Name' => $title, 'Page display period' => $data['fields']['Page display period']]);
+ }
+
+ /**
+ * Check displayed error message adding more than 50 pages.
+ */
+ public function testDashboardPages_MaximumPageError() {
+ $sql = 'SELECT * FROM dashboard_page WHERE dashboardid ='.zbx_dbstr(self::$ids['Dashboard for limit check and navigation']);
+ $hash = CDBHelper::getHash($sql);
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$ids['Dashboard for limit check and navigation'])
+ ->waitUntilReady();
+ $dashboard = CDashboardElement::find()->one();
+ $dashboard->edit()->addPage();
+ $this->assertMessage(TEST_BAD, 'Cannot add dashboard page: maximum number of 50 dashboard pages has been added.');
+ $dashboard->save();
+ $this->assertMessage(TEST_GOOD, 'Dashboard updated');
+ $this->assertEquals(CDBHelper::getHash($sql), $hash);
+ }
+
+ /**
+ * Switch pages using next/previous arrow buttons.
+ */
+ public function testDashboardPages_Navigation() {
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$ids['Dashboard for page navigation'])
+ ->waitUntilReady();
+ $next_page = $this->query(self::NEXT_BUTTON)->one();
+ $previous_page = $this->query(self::PREVIOUS_BUTTON)->one();
+
+ // Check selected page.
+ $this->assertEquals('long_name_to_check_navigation_1', $this->query('xpath://li/div[@class="selected-tab"]')->one()->getText());
+
+ // Navigate on dashboard.
+ foreach ([$next_page, $previous_page] as $navigation) {
+ while ($navigation->isClickable()) {
+ $navigation->click();
+ }
+
+ if ($navigation === $next_page) {
+ $this->assertTrue($next_page->isEnabled(false));
+ $this->assertTrue($previous_page->isEnabled());
+ $this->assertEquals('long_name_to_check_navigation_8',
+ $this->query('xpath://li/div[@class="selected-tab"]')->one()->getText()
+ );
+ }
+ }
+
+ $this->assertTrue($next_page->isEnabled());
+ $this->assertTrue($previous_page->isEnabled(false));
+ }
+
+ /**
+ * Delete pages.
+ */
+ public function testDashboardPages_Delete() {
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$ids['Dashboard for page delete'])
+ ->waitUntilReady();
+ $this->assertEquals(['Page 1', 'Page 2', 'Page 3'], $this->getPagesTitles());
+ $dashboard = CDashboardElement::find()->one();
+ $dashboard->edit();
+
+ // Remove second page. All three pages are without names. Their name, should be changed according page amount.
+ $this->selectPageAction('Page 2', 'Delete');
+ $this->assertEquals(['Page 1', 'Page 3'], $this->getPagesTitles());
+ $dashboard->save();
+ $this->assertEquals(['Page 1', 'Page 2'], $this->getPagesTitles());
+ $dashboard->edit();
+ $this->selectPageAction('Page 2', 'Delete');
+ $this->assertEquals(['Page 1'], $this->getPagesTitles());
+
+ // Check that Delete option is disabled when one page left.
+ $page_menu = $this->getPageMenu('Page 1');
+ $this->assertTrue($page_menu->query('xpath:.//a[@aria-label="Actions, Delete"]')->one()->isEnabled(false));
+ $dashboard->save();
+ $this->assertEquals(['Page 1'], $this->getPagesTitles());
+ }
+
+ /**
+ * Check default page names adding new pages.
+ */
+ public function testDashboardPages_EmptyPagesName() {
+ // Check that first page do not has any name.
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$ids['Dashboard for pages empty name'])
+ ->waitUntilReady();
+ $dashboard = CDashboardElement::find()->one();
+ $dashboard->edit();
+ $this->assertEquals(['Page 1'], $this->getPagesTitles());
+ $this->selectPageAction('Page 1', 'Properties');
+ $page_dialog = COverlayDialogElement::find()->waitUntilReady()->one();
+ $page_dialog->query('name:dashboard_page_properties_form')->asForm()->one()->checkValue(['Name' => '']);
+ $page_dialog->query('button:Cancel')->one()->click();
+
+ // Check popup-menu options and add page with name.
+ foreach(['not_page_number', ''] as $page_name) {
+ $dashboard->addPage();
+ COverlayDialogElement::find()->waitUntilReady()->one();
+
+ $form = $page_dialog->query('name:dashboard_page_properties_form')->asForm()->one();
+ if ($page_name === 'not_page_number') {
+ $form->fill(['Name' => 'not_page_number']);
+ }
+ else {
+ $form->checkValue(['Name' => '']);
+ }
+
+ $page_dialog->query('button:Apply')->one()->click();
+ $dashboard->waitUntilReady();
+ $allpage_name = ($page_name === 'not_page_number') ? ['Page 1', 'not_page_number'] : ['Page 1', 'not_page_number', 'Page 3'];
+ $this->assertEquals($allpage_name, $this->getPagesTitles());
+ }
+
+ $dashboard->save();
+ $this->page->waitUntilReady();
+ $this->assertEquals(['Page 1', 'not_page_number', 'Page 3'], $this->getPagesTitles());
+ }
+
+ /**
+ * Check navigation in kiosk mode.
+ *
+ * @backup profiles
+ */
+ public function testDashboardPages_KioskMode() {
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$ids['Dashboard for kiosk'])
+ ->waitUntilReady();
+ $this->query('xpath://button[@title="Kiosk mode"]')->one()->click();
+ $this->page->waitUntilReady();
+
+ // Switch pages next/previous.
+ $dashboard = CDashboardElement::find()->one();
+ foreach (['next-page', 'previous-page'] as $direction) {
+ $widget_name = ['First', 'Second', 'Third'];
+ if ($direction === 'previous-page') {
+ $widget_name = ['First', 'Third', 'Second'];
+ }
+
+ foreach ($widget_name as $widget) {
+ $this->assertEquals($widget.' page kiosk', $dashboard->getWidgets()->last()->getHeaderText());
+ $this->query('xpath://button[contains(@class, '.CXPathHelper::escapeQuotes($direction).')]')
+ ->one()->click();
+ }
+ }
+
+ // Control panel screenshot - start/stop/next/previous.
+ $this->page->removeFocus();
+ foreach (['Stop', 'Start'] as $status) {
+ $screenshot_area = $this->query('xpath://ul[@class="header-kioskmode-controls"]')->waitUntilVisible()->one();
+ $this->assertScreenshot($screenshot_area, $status);
+ $this->query('xpath://button[@title="'.$status.' slideshow"]')->one()->click();
+ }
+
+ // Check that returned from kiosk view.
+ $this->query('xpath://button[@title="Normal view"]')->one()->click();
+ $this->page->waitUntilReady();
+ $this->page->assertHeader('Dashboard for kiosk');
+ }
+
+ // Check default period change for page.
+ public function testDashboardPages_DefaultPeriod() {
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$ids['Dashboard for page delete'])
+ ->waitUntilReady();
+ $dashboard = CDashboardElement::find()->one();
+ $dashboard->edit();
+ foreach (['10 seconds', '30 seconds', '1 minute', '2 minutes', '10 minutes', '30 minutes', '1 hour'] as $default) {
+ $this->query('id:dashboard-config')->one()->click();
+ $properties = COverlayDialogElement::find()->waitUntilReady()->one();
+ $properties->query('name:dashboard_properties_form')->asForm()->one()->fill(['Default page display period' => $default]);
+ $properties->query('button:Apply')->one()->click();
+ $dashboard->waitUntilReady();
+
+ // Check that default time for page changed in edit mode and after dashboard save.
+ foreach([true, false] as $save_dashboard) {
+ $this->selectPageAction('Page 1', 'Properties');
+ $page_dialog = COverlayDialogElement::find()->waitUntilReady()->one();
+ $page_dialog->query('name:dashboard_page_properties_form')->asForm()->one()
+ ->checkValue(['Page display period' => 'Default ('.$default.')']);
+ $page_dialog->query('button:Cancel')->one()->click();
+
+ if ($save_dashboard) {
+ $dashboard->save();
+ $this->page->waitUntilReady();
+ $dashboard->edit();
+ }
+ }
+ }
+ }
+
+ /**
+ * Open page popup menu.
+ *
+ * @param string $page_name page name where to open menu
+ * @param integer $index number of page that has duplicated name
+ */
+ private function getPageMenu($page_name, $index = 1) {
+ $selector = '//ul[@class="sortable-list"]//span[@title='.CXPathHelper::escapeQuotes($page_name);
+
+ $value = $this->query('xpath:('.$selector.']/../../div)['.$index.']')->one()->getAttribute('class');
+ if ($value !== 'selected-tab') {
+ $this->selectPage($page_name, $index);
+ }
+ $this->query('xpath:('.$selector.']/following-sibling::button)['.$index.']')->waitUntilPresent()->one()->click();
+
+ return CPopupMenuElement::find()->waitUntilVisible()->one();
+ }
+
+ /**
+ * Select page by name.
+ *
+ * @param string $page_name page name where to open menu
+ * @param integer $index number of page that has duplicated name
+ */
+ private function selectPage($page_name, $index = 1) {
+ $selection = '//ul[@class="sortable-list"]//span[@title='.CXPathHelper::escapeQuotes($page_name);
+ $this->query('xpath:('.$selection.'])['.$index.']')
+ ->one()->click()->waitUntilReady();
+ $this->query('xpath:'.$selection.']/../../div[@class="selected-tab"]')
+ ->one()->waitUntilPresent();
+ }
+
+ /**
+ * Select action from pages popup menu.
+ *
+ * @param string $page_name page name where to open menu
+ * @param string $menu_item action name
+ * @param integer $index number of page that has duplicated name
+ */
+ private function selectPageAction($page_name, $menu_item, $index = 1) {
+ $this->getPageMenu($page_name, $index)->select($menu_item);
+ }
+
+ /**
+ * Get pages names.
+ *
+ * @return string
+ */
+ private function getPagesTitles() {
+ $pages = $this->query('xpath://li[@class="sortable-item"]')->all();
+
+ return $pages->asText();
+ }
+
+ /**
+ * Checks dashboard page properties.
+ */
+ private function checkPageProperties() {
+ $page_dialog = COverlayDialogElement::find()->waitUntilReady()->one();
+ $page_form = $page_dialog->query('name:dashboard_page_properties_form')->asForm()->one();
+ $this->assertEquals('255', $page_form->query('id:name')->one()->getAttribute('maxlength'));
+ $this->assertEquals('Dashboard page properties', $page_dialog->getTitle());
+ $this->assertEquals(['Name', 'Page display period'], $page_form->getLabels()->asText());
+ $this->assertEquals(['Default (30 seconds)', '10 seconds', '30 seconds', '1 minute', '2 minutes', '10 minutes',
+ '30 minutes', '1 hour'], $page_form->query('name:display_period')->asZDropdown()->one()->getOptions()->asText()
+ );
+ $page_dialog->query('button:Cancel')->one()->click();
+ }
+}
diff --git a/ui/tests/selenium/dashboard/testDashboardSystemInformationWidget.php b/ui/tests/selenium/dashboard/testDashboardSystemInformationWidget.php
new file mode 100644
index 00000000000..bf092b47319
--- /dev/null
+++ b/ui/tests/selenium/dashboard/testDashboardSystemInformationWidget.php
@@ -0,0 +1,290 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../common/testSystemInformation.php';
+require_once dirname(__FILE__).'/../behaviors/CMessageBehavior.php';
+
+/**
+ * @backup dashboard, ha_node, config
+ *
+ * @backupConfig
+ *
+ * @onBefore prepareDashboardData
+ */
+class testDashboardSystemInformationWidget extends testSystemInformation {
+
+ public static $dashboardid; // Dashboard for checking widget content with enabled and disabled HA cluster.
+ public static $widgets_dashboardid; // Dashboard for checking creation and update of system information widgets.
+
+ /**
+ * Attach MessageBehavior to the test.
+ */
+ public function getBehaviors() {
+ return [CMessageBehavior::class];
+ }
+
+ /**
+ * Function creates dashboards with widgets for test and defines the corresponding dashboard IDs.
+ */
+ public static function prepareDashboardData() {
+ $response = CDataHelper::call('dashboard.create', [
+ [
+ 'name' => 'Dashboard for Sysinfo + HA test',
+ 'private' => 0,
+ 'pages' => [
+ [
+ 'name' => 'Page with widgets',
+ 'widgets' => [
+ [
+ 'type' => 'systeminfo',
+ 'name' => 'System stats view',
+ 'width' => 12,
+ 'height' => 8
+ ],
+ [
+ 'type' => 'systeminfo',
+ 'name' => 'High availability nodes view',
+ 'x' => 12,
+ 'y' => 0,
+ 'width' => 12,
+ 'height' => 8,
+ 'fields' => [
+ [
+ 'type' => 0,
+ 'name' => 'info_type',
+ 'value' => 1
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]
+ ],
+ [
+ 'name' => 'Dashboard for SysInfo widget test',
+ 'private' => 0,
+ 'pages' => [
+ [
+ 'name' => 'Page for creating widgets',
+ 'widgets' => []
+ ],
+ [
+ 'name' => 'Page for updating widgets',
+ 'widgets' => [
+ [
+ 'type' => 'systeminfo',
+ 'name' => 'System stats view',
+ 'width' => 12,
+ 'height' => 8
+ ],
+ [
+ 'type' => 'systeminfo',
+ 'name' => 'HA nodes view',
+ 'x' => 12,
+ 'y' => 0,
+ 'width' => 12,
+ 'height' => 8,
+ 'fields' => [
+ [
+ 'type' => 0,
+ 'name' => 'info_type',
+ 'value' => 1
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]
+ ]);
+
+ self::$dashboardid = $response['dashboardids'][0];
+ self::$widgets_dashboardid = $response['dashboardids'][1];
+ }
+
+ public function testDashboardSystemInformationWidget_checkDisabledHA() {
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$dashboardid)->waitUntilReady();
+ $this->assertScreenshot(CDashboardElement::find()->waitUntilReady()->one(), 'widget_without_ha');
+ }
+
+ public function testDashboardSystemInformationWidget_Create() {
+ $widgets = [
+ [
+ 'fields' => [
+ 'Name' => 'Widget with default Show',
+ 'Refresh interval' => '2 minutes'
+ ]
+ ],
+ [
+ 'fields' => ['Show' => 'High availability nodes']
+ ]
+ ];
+ $this->executeWidgetAction($widgets, 'create');
+ }
+
+ public function testDashboardSystemInformationWidget_Update() {
+ $widgets = [
+ [
+ 'old_name' => 'System stats view',
+ 'fields' => [
+ 'Name' => 'Updated to HA nodes view',
+ 'Show' => 'High availability nodes',
+ 'Refresh interval' => '30 seconds'
+ ],
+ 'not_last' => true
+ ],
+ [
+ 'old_name' => 'HA nodes view',
+ 'fields' => [
+ 'Name' => 'Updated to Sysem Info view',
+ 'Show' => 'System stats',
+ 'Refresh interval' => '10 minutes'
+ ]
+ ]
+ ];
+ $this->executeWidgetAction($widgets, 'update');
+ }
+
+ /**
+ * @onBefore prepareHANodeData
+ */
+ public function testDashboardSystemInformationWidget_checkEnabledHA() {
+ $this->assertEnabledHACluster(self::$dashboardid);
+ $this->assertScreenshotExcept(CDashboardElement::find()->one(), self::$skip_fields, 'widgets_with_ha');
+ }
+
+ /**
+ * Function checks that Zabbix server status is updated after failover delay passes and frontend config is re-validated.
+ *
+ * @depends testDashboardSystemInformationWidget_checkEnabledHA
+ *
+ * @onBefore changeFailoverDelay
+ */
+ public function testDashboardSystemInformationWidget_checkServerStatus() {
+ $this->assertServerStatusAfterFailover(self::$dashboardid);
+ }
+
+ public function getUserData() {
+ return [
+ [
+ [
+ 'user' => 'admin-zabbix',
+ 'password' => 'zabbix'
+ ]
+ ],
+ [
+ [
+ 'user' => 'user-zabbix',
+ 'password' => 'zabbix'
+ ]
+ ]
+ ];
+ }
+
+ /**
+ * Function checks that only super-admin users can view HA cluster data.
+ *
+ * @depends testDashboardSystemInformationWidget_checkServerStatus
+ *
+ * @dataProvider getUserData
+ */
+ public function testDashboardSystemInformationWidget_checkHAPermissions($data) {
+ $this->page->userLogin($data['user'], $data['password']);
+ $this->page->open('zabbix.php?action=dashboard.view&dashboardid='.self::$dashboardid)->waitUntilReady();
+
+ $dashboard = CDashboardElement::find()->waitUntilReady()->one();
+ $nodes_table = $dashboard->getWidget('High availability nodes view')->query('xpath:.//table')->asTable()->one();
+ // No content of the widget in High availability nodes view should be visible to User and Admin user roles.
+ $this->assertEquals('No permissions to referred object or it does not exist!', $nodes_table->getText());
+
+ // HA cluster satus should not be visible to User and Admin role users.
+ $info_table = $dashboard->getWidget('System stats view')->asTable();
+ $this->assertFalse($info_table->findRow('Parameter', 'High availability cluster')->isValid());
+ }
+
+ /**
+ * Function performs widget creation of update with the given widget parameters.
+ *
+ * @param array $widgets widget related information
+ * @param string $action operation to be performed with the widget
+ */
+ private function executeWidgetAction($widgets, $action) {
+ $page_name = ($action === 'update') ? 'Page for updating widgets' : 'Page for creating widgets';
+ $this->page->login()->open('zabbix.php?action=dashboard.view&dashboardid='.self::$widgets_dashboardid);
+ $dashboard = CDashboardElement::find()->one()->waitUntilReady();
+ $dashboard->edit();
+ // Open the corresponding dashboard page in case of update.
+ if ($action === 'update') {
+ $this->query('xpath://span[@title='.zbx_dbstr($page_name).']')->one()->click();
+ }
+
+ // Execute the required operation for both widgets.
+ foreach ($widgets as $widget_data) {
+ if ($action === 'update') {
+ $form = $dashboard->getWidget($widget_data['old_name'])->edit()->asForm();
+ }
+ else {
+ $form = $dashboard->addWidget()->asForm();
+ $form->getField('Type')->fill('System information');
+ }
+ $form->fill($widget_data['fields']);
+ $form->submit();
+ }
+ // Save the dashboard and check info displayed by the widgets.
+ $dashboard->save();
+ if ($action === 'update') {
+ $this->query('xpath://span[@title='.CXPathHelper::escapeQuotes($page_name).']')->waitUntilClickable()->one()->click();
+ }
+ $this->page->waitUntilReady();
+ $this->assertMessage(TEST_GOOD, 'Dashboard updated');
+ $this->assertScreenshot($dashboard, $action.'_widgets');
+
+ foreach ($widgets as $widget_data) {
+ // Check widget refresh interval.
+ $refresh_interval = CTestArrayHelper::get($widget_data['fields'], 'Refresh interval', '15 minutes');
+ $widget = $dashboard->getWidget(CTestArrayHelper::get($widget_data['fields'], 'Name', 'System information'));
+ $this->assertEquals($refresh_interval, $widget->getRefreshInterval());
+
+ // Check that widget with the corresponding name is present in DB.
+ $widget_sql = 'SELECT count(widgetid) FROM widget WHERE type='.zbx_dbstr('systeminfo').' AND dashboard_pageid IN'.
+ ' (SELECT dashboard_pageid from dashboard_page WHERE name='.zbx_dbstr($page_name).')'.
+ ' AND name='.zbx_dbstr(CTestArrayHelper::get($widget_data['fields'], 'Name', ''));
+ $this->assertEquals('1', CDBHelper::getValue($widget_sql));
+
+ // Check field values when opening widget config and exit edit mode.
+ $field_values = [
+ 'Type' => 'System information',
+ 'Name' => '',
+ 'Refresh interval' => 'Default (15 minutes)',
+ 'Show' => 'System stats'
+ ];
+
+ $form = $widget->edit()->asForm();
+ $this->assertEquals(array_merge($field_values, $widget_data['fields']), $form->getFields()->asValues());
+ $form->submit();
+ $dashboard->cancelEditing();
+
+ // Reopen the corresponding Dashboard page if more updated widgets need to be checked.
+ if ($action === 'update' && CTestArrayHelper::get($widget_data, 'not_last')) {
+ $this->query('xpath://span[@title='.zbx_dbstr($page_name).']')->waitUntilClickable()->one()->click();
+ }
+ }
+ }
+}
diff --git a/ui/tests/selenium/hosts/testFormHostConfiguration.php b/ui/tests/selenium/hosts/testFormHostConfiguration.php
new file mode 100644
index 00000000000..9f464a2eb97
--- /dev/null
+++ b/ui/tests/selenium/hosts/testFormHostConfiguration.php
@@ -0,0 +1,99 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../common/testFormHost.php';
+
+/**
+ * @backup hosts
+ *
+ * @onBefore prepareUpdateData
+ */
+class testFormHostConfiguration extends testFormHost {
+
+ public $link = 'zabbix.php?action=host.list';
+
+ public function testFormHostConfiguration_Layout() {
+ $this->checkHostLayout();
+ }
+
+ /**
+ * @dataProvider getCreateData
+ */
+ public function testFormHostConfiguration_Create($data) {
+ $this->checkHostCreate($data);
+ }
+
+ /**
+ * @dataProvider getValidationUpdateData
+ */
+ public function testFormHostConfiguration_ValidationUpdate($data) {
+ $this->checkHostUpdate($data);
+ }
+
+ /**
+ * @backup hosts
+ *
+ * @dataProvider getUpdateData
+ */
+ public function testFormHostConfiguration_Update($data) {
+ $this->checkHostUpdate($data);
+ }
+
+ /**
+ * Update the host without any changes and check host and interfaces hashes.
+ */
+ public function testFormHostConfiguration_SimpleUpdate() {
+ $this->checkHostSimpleUpdate();
+ }
+
+ /**
+ * @dataProvider getCloneData
+ */
+ public function testFormHostConfiguration_Clone($data) {
+ $this->cloneHost($data);
+
+ // Check that items aren't cloned from original host.
+ $this->assertItemsDBCount($data['host_fields']['Host name'], 0);
+ }
+
+ /**
+ * @dataProvider getCloneData
+ */
+ public function testFormHostConfiguration_FullClone($data) {
+ $this->cloneHost($data, 'Full clone');
+
+ // Check that items cloned from original host.
+ $this->assertItemsDBCount($data['host_fields']['Host name'], 3);
+ }
+
+ /**
+ * @dataProvider getCancelData
+ */
+ public function testFormHostConfiguration_Cancel($data) {
+ $this->checkCancel($data);
+ }
+
+ /**
+ * @dataProvider getDeleteData
+ */
+ public function testFormHostConfiguration_Delete($data) {
+ $this->checkDelete($data);
+ }
+}
diff --git a/ui/tests/selenium/hosts/testFormHostMonitoring.php b/ui/tests/selenium/hosts/testFormHostMonitoring.php
new file mode 100644
index 00000000000..3abfd899540
--- /dev/null
+++ b/ui/tests/selenium/hosts/testFormHostMonitoring.php
@@ -0,0 +1,101 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../common/testFormHost.php';
+
+/**
+ * @backup hosts
+ *
+ * @onBefore prepareUpdateData
+ */
+class testFormHostMonitoring extends testFormHost {
+
+ public $monitoring = true;
+ public $link = 'zabbix.php?action=host.view';
+
+ public function testFormHostMonitoring_Layout() {
+ $this->checkHostLayout();
+ }
+
+ /**
+ * @dataProvider getCreateData
+ */
+ public function testFormHostMonitoring_Create($data) {
+ $this->checkHostCreate($data);
+ }
+
+ /**
+ * @dataProvider getValidationUpdateData
+ */
+ public function testFormHostMonitoring_ValidationUpdate($data) {
+ $this->checkHostUpdate($data);
+ }
+
+ /**
+ * @backup hosts
+ *
+ * @dataProvider getUpdateData
+ */
+ public function testFormHostMonitoring_Update($data) {
+ $this->checkHostUpdate($data);
+ }
+
+ /**
+ * Update the host without any changes and check host and interfaces hashes.
+ */
+ public function testFormHostMonitoring_SimpleUpdate() {
+ $this->checkHostSimpleUpdate();
+ }
+
+ /**
+ * @dataProvider getCloneData
+ */
+ public function testFormHostMonitoring_Clone($data) {
+ $this->cloneHost($data, 'Clone');
+
+ // Check that items aren't cloned from original host.
+ $this->assertItemsDBCount($data['host_fields']['Host name'], 0);
+ }
+
+ /**
+ * @dataProvider getCloneData
+ */
+ public function testFormHostMonitoring_FullClone($data) {
+ $this->cloneHost($data, 'Full clone');
+
+ // Check that items cloned from original host.
+ $this->assertItemsDBCount($data['host_fields']['Host name'], 3);
+ }
+
+ /**
+ * @dataProvider getCancelData
+ */
+ public function testFormHostMonitoring_Cancel($data) {
+ $this->checkCancel($data);
+ }
+
+ /**
+ * @dataProvider getDeleteData
+ */
+ public function testFormHostMonitoring_Delete($data) {
+ $this->checkDelete($data);
+ }
+}
+
diff --git a/ui/tests/selenium/hosts/testFormHostStandalone.php b/ui/tests/selenium/hosts/testFormHostStandalone.php
new file mode 100644
index 00000000000..c2951b3fd53
--- /dev/null
+++ b/ui/tests/selenium/hosts/testFormHostStandalone.php
@@ -0,0 +1,102 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../common/testFormHost.php';
+
+/**
+ * @backup hosts
+ *
+ * @onBefore prepareUpdateData
+ */
+class testFormHostStandalone extends testFormHost {
+
+ public $standalone = true;
+ public $link = 'zabbix.php?action=host.edit&hostid=';
+
+ public function testFormHostStandalone_Layout() {
+ $this->checkHostLayout();
+ }
+
+ /**
+ * @dataProvider getCreateData
+ */
+ public function testFormHostStandalone_Create($data) {
+ $this->link = 'zabbix.php?action=host.edit';
+ $this->checkHostCreate($data);
+ }
+
+ /**
+ * @dataProvider getValidationUpdateData
+ */
+ public function testFormHostStandalone_ValidationUpdate($data) {
+ $this->checkHostUpdate($data);
+ }
+
+ /**
+ * @backup hosts
+ *
+ * @dataProvider getUpdateData
+ */
+ public function testFormHostStandalone_Update($data) {
+ $this->checkHostUpdate($data);
+ }
+
+ /**
+ * Update the host without any changes and check host and interfaces hashes.
+ */
+ public function testFormHostStandalone_SimpleUpdate() {
+ $this->checkHostSimpleUpdate();
+ }
+
+ /**
+ * @dataProvider getCloneData
+ */
+ public function testFormHostStandalone_Clone($data) {
+ $this->cloneHost($data, 'Clone');
+
+ // Check that items aren't cloned from original host.
+ $this->assertItemsDBCount($data['host_fields']['Host name'], 0);
+ }
+
+ /**
+ * @dataProvider getCloneData
+ */
+ public function testFormHostStandalone_FullClone($data) {
+ $this->cloneHost($data, 'Full clone');
+
+ // Check that items cloned from original host.
+ $this->assertItemsDBCount($data['host_fields']['Host name'], 3);
+ }
+
+ /**
+ * @dataProvider getCancelData
+ */
+ public function testFormHostStandalone_Cancel($data) {
+ $this->link = 'zabbix.php?action=host.edit';
+ $this->checkCancel($data);
+ }
+
+ /**
+ * @dataProvider getDeleteData
+ */
+ public function testFormHostStandalone_Delete($data) {
+ $this->checkDelete($data);
+ }
+}
diff --git a/ui/tests/selenium/scheduledReports/testFormScheduledReport.php b/ui/tests/selenium/reports/testFormScheduledReport.php
index 56353dec6d9..56353dec6d9 100644
--- a/ui/tests/selenium/scheduledReports/testFormScheduledReport.php
+++ b/ui/tests/selenium/reports/testFormScheduledReport.php
diff --git a/ui/tests/selenium/testPageReportsActionLog.php b/ui/tests/selenium/reports/testPageReportsActionLog.php
index a151e0458ce..45ca495c07d 100644
--- a/ui/tests/selenium/testPageReportsActionLog.php
+++ b/ui/tests/selenium/reports/testPageReportsActionLog.php
@@ -18,7 +18,7 @@
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**/
-require_once dirname(__FILE__).'/../include/CLegacyWebTest.php';
+require_once dirname(__FILE__).'/../../include/CLegacyWebTest.php';
class testPageReportsActionLog extends CLegacyWebTest {
diff --git a/ui/tests/selenium/testPageReportsAudit.php b/ui/tests/selenium/reports/testPageReportsAudit.php
index 583f224705e..becebcea80e 100644
--- a/ui/tests/selenium/testPageReportsAudit.php
+++ b/ui/tests/selenium/reports/testPageReportsAudit.php
@@ -18,8 +18,8 @@
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**/
-require_once dirname(__FILE__).'/../include/CLegacyWebTest.php';
-require_once dirname(__FILE__).'/traits/MacrosTrait.php';
+require_once dirname(__FILE__).'/../../include/CLegacyWebTest.php';
+require_once dirname(__FILE__).'/../traits/MacrosTrait.php';
class testPageReportsAudit extends CLegacyWebTest {
diff --git a/ui/tests/selenium/testPageReportsNotifications.php b/ui/tests/selenium/reports/testPageReportsNotifications.php
index 732a78ee350..fdc898c5449 100644
--- a/ui/tests/selenium/testPageReportsNotifications.php
+++ b/ui/tests/selenium/reports/testPageReportsNotifications.php
@@ -18,7 +18,7 @@
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**/
-require_once dirname(__FILE__).'/../include/CLegacyWebTest.php';
+require_once dirname(__FILE__).'/../../include/CLegacyWebTest.php';
use Facebook\WebDriver\WebDriverBy;
diff --git a/ui/tests/selenium/reports/testPageReportsSystemInformation.php b/ui/tests/selenium/reports/testPageReportsSystemInformation.php
new file mode 100644
index 00000000000..f697ffc85e3
--- /dev/null
+++ b/ui/tests/selenium/reports/testPageReportsSystemInformation.php
@@ -0,0 +1,53 @@
+<?php
+/*
+** Zabbix
+** Copyright (C) 2001-2021 Zabbix SIA
+**
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; either version 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+**/
+
+require_once dirname(__FILE__).'/../common/testSystemInformation.php';
+
+/**
+ * @backup ha_node, config
+ *
+ * @backupConfig
+ */
+class testPageReportsSystemInformation extends testSystemInformation {
+
+ public function testPageReportsSystemInformation_checkDisabledHA() {
+ $this->page->login()->open('zabbix.php?action=report.status')->waitUntilReady();
+ $this->assertScreenshotExcept(null, $this->query('xpath://footer')->one(), 'report_without_ha');
+ }
+
+ /**
+ * @onBefore prepareHANodeData
+ */
+ public function testPageReportsSystemInformation_checkEnabledHA() {
+ $this->assertEnabledHACluster();
+ $this->assertScreenshotExcept(null, self::$skip_fields, 'report_with_ha');
+ }
+
+ /**
+ * Function checks that zabbix server status is updated after failover delay passes and frontend config is re-validated.
+ *
+ * @depends testPageReportsSystemInformation_checkEnabledHA
+ *
+ * @onBefore changeFailoverDelay
+ */
+ public function testPageReportsSystemInformation_CheckServerStatus() {
+ $this->assertServerStatusAfterFailover();
+ }
+}
diff --git a/ui/tests/selenium/testPageReportsTriggerTop.php b/ui/tests/selenium/reports/testPageReportsTriggerTop.php
index 272750850b7..4539cd57a31 100644
--- a/ui/tests/selenium/testPageReportsTriggerTop.php
+++ b/ui/tests/selenium/reports/testPageReportsTriggerTop.php
@@ -18,7 +18,7 @@
** Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
**/
-require_once dirname(__FILE__).'/../include/CLegacyWebTest.php';
+require_once dirname(__FILE__).'/../../include/CLegacyWebTest.php';
use Facebook\WebDriver\WebDriverBy;
diff --git a/ui/tests/selenium/scheduledReports/testPageScheduledReport.php b/ui/tests/selenium/reports/testPageScheduledReport.php
index db93196af3d..db93196af3d 100644
--- a/ui/tests/selenium/scheduledReports/testPageScheduledReport.php
+++ b/ui/tests/selenium/reports/testPageScheduledReport.php
diff --git a/ui/tests/selenium/scheduledReports/testScheduledReportPermissions.php b/ui/tests/selenium/reports/testScheduledReportPermissions.php
index a752c9488c9..a752c9488c9 100644
--- a/ui/tests/selenium/scheduledReports/testScheduledReportPermissions.php
+++ b/ui/tests/selenium/reports/testScheduledReportPermissions.php
diff --git a/ui/tests/selenium/testFormHostLinkTemplates.php b/ui/tests/selenium/testFormHostLinkTemplates.php
index 59c3e74ee53..286875f6ca9 100644
--- a/ui/tests/selenium/testFormHostLinkTemplates.php
+++ b/ui/tests/selenium/testFormHostLinkTemplates.php
@@ -47,8 +47,7 @@ class testFormHostLinkTemplates extends CLegacyWebTest {
$this->zbxTestClickLinkTextWait($this->host_for_template);
$dialog = COverlayDialogElement::find()->asForm()->waitUntilReady()->one();
- $dialog->selectTab('Templates');
- $dialog->fill(['Link new templates' => 'Linux by Zabbix agent']);
+ $dialog->fill(['Templates' => 'Linux by Zabbix agent']);
$this->zbxTestTextPresent('Linux by Zabbix agent');
$dialog->submit();
@@ -79,11 +78,10 @@ class testFormHostLinkTemplates extends CLegacyWebTest {
$this->zbxTestClickLinkTextWait($this->host_for_template);
$dialog = COverlayDialogElement::find()->asForm()->waitUntilReady()->one();
- $dialog->selectTab('Templates');
// Clicks button named "Unlink" next to a template by name.
$this->assertTrue($dialog->query('link', $template)->exists());
- $dialog->query('id:linked-template')->asTable()->one()->findRow('Name', $template)->getColumn('Action')
+ $dialog->query('id:linked-templates')->asTable()->one()->findRow('Name', $template)->getColumn('Action')
->query('button:Unlink')->one()->click();
$this->assertFalse($dialog->query('link', $template)->exists());
@@ -109,8 +107,7 @@ class testFormHostLinkTemplates extends CLegacyWebTest {
$this->zbxTestClickLinkTextWait($this->host_for_template);
$form = $this->query('name:host-form')->asForm()->waitUntilReady()->one();
- $form->selectTab('Templates');
- $form->fill(['Link new templates' => 'Linux by Zabbix agent']);
+ $form->fill(['Templates' => 'Linux by Zabbix agent']);
$this->zbxTestTextPresent('Linux by Zabbix agent');
$form->submit();
@@ -141,11 +138,10 @@ class testFormHostLinkTemplates extends CLegacyWebTest {
$this->zbxTestClickLinkTextWait($this->host_for_template);
$dialog = COverlayDialogElement::find()->asForm()->waitUntilReady()->one();
- $dialog->selectTab('Templates');
// Clicks button named "Unlink and clear" next to a template by name.
$this->assertTrue($dialog->query('link', $template)->exists());
- $dialog->query('id:linked-template')->asTable()->one()->findRow('Name', $template)->getColumn('Action')
+ $dialog->query('id:linked-templates')->asTable()->one()->findRow('Name', $template)->getColumn('Action')
->query('button:Unlink and clear')->one()->click();
$this->assertFalse($dialog->query('link', $template)->exists());
diff --git a/ui/tests/selenium/testFormHostPrototype.php b/ui/tests/selenium/testFormHostPrototype.php
index 27859f6803e..bbb80d2c5d6 100644
--- a/ui/tests/selenium/testFormHostPrototype.php
+++ b/ui/tests/selenium/testFormHostPrototype.php
@@ -263,8 +263,6 @@ class testFormHostPrototype extends CLegacyWebTest {
$this->zbxTestInputType('name', $data['visible_name']);
}
- $this->zbxTestTabSwitch('Groups');
-
if (array_key_exists('hostgroup', $data)) {
$this->zbxTestClickButtonMultiselect('group_links_');
$this->zbxTestLaunchOverlayDialog('Host groups');
@@ -390,8 +388,6 @@ class testFormHostPrototype extends CLegacyWebTest {
$this->zbxTestInputClearAndTypeByXpath('//input[@id="name"]', $data['visible_name']);
}
- $this->zbxTestTabSwitch('Groups');
-
if (array_key_exists('clear_groups', $data)) {
$this->zbxTestMultiselectClear('group_links_');
}
@@ -493,7 +489,6 @@ class testFormHostPrototype extends CLegacyWebTest {
$this->zbxTestCheckboxSelect('status', $data['checkbox']);
}
- $this->zbxTestTabSwitch('Groups');
$this->zbxTestClickButtonMultiselect('group_links_');
$this->zbxTestLaunchOverlayDialog('Host groups');
$this->zbxTestClickLinkTextWait($data['hostgroup']);
@@ -503,7 +498,6 @@ class testFormHostPrototype extends CLegacyWebTest {
}
if (array_key_exists('template', $data)) {
- $this->zbxTestTabSwitch('Templates');
$this->zbxTestClickButtonMultiselect('add_templates_');
$this->zbxTestLaunchOverlayDialog('Templates');
COverlayDialogElement::find()->one()->setDataContext('Templates');
@@ -614,7 +608,6 @@ class testFormHostPrototype extends CLegacyWebTest {
// Change Host group and Group prototype.
if (array_key_exists('hostgroup', $data)) {
- $this->zbxTestTabSwitch('Groups');
$this->zbxTestMultiselectClear('group_links_');
$this->zbxTestClickButtonMultiselect('group_links_');
$this->zbxTestLaunchOverlayDialog('Host groups');
@@ -624,7 +617,6 @@ class testFormHostPrototype extends CLegacyWebTest {
// Change template.
if (array_key_exists('template', $data)) {
- $this->zbxTestTabSwitch('Templates');
$this->zbxTestClickXpathWait('//button[contains(@onclick,"unlink")]');
$this->zbxTestClickButtonMultiselect('add_templates_');
$this->zbxTestLaunchOverlayDialog('Templates');
@@ -886,7 +878,6 @@ class testFormHostPrototype extends CLegacyWebTest {
if (array_key_exists('checkbox', $data)) {
$this->zbxTestCheckboxSelect('status', $data['checkbox']);
}
- $this->zbxTestTabSwitch('Groups');
// Change host group.
if (array_key_exists('hostgroup', $data)) {
$this->zbxTestClickXpathWait('//span[@class="subfilter-disable-btn"]');
@@ -902,8 +893,6 @@ class testFormHostPrototype extends CLegacyWebTest {
// Change template.
if (array_key_exists('template', $data)) {
- $this->zbxTestTabSwitch('Templates');
- $this->zbxTestWaitForPageToLoad();
$this->zbxTestClickButtonMultiselect('add_templates_');
$this->zbxTestLaunchOverlayDialog('Templates');
COverlayDialogElement::find()->one()->setDataContext('Templates');
@@ -951,7 +940,6 @@ class testFormHostPrototype extends CLegacyWebTest {
}
if (array_key_exists('hostgroup', $data)) {
- $this->zbxTestTabSwitch('Groups');
$this->zbxTestMultiselectAssertSelected('group_links_', $data['hostgroup']);
if (array_key_exists('group_prototype', $data)) {
$this->assertEquals($data['group_prototype'], $this->zbxTestGetValue('//input[@name="group_prototypes[0][name]"]'));
@@ -959,8 +947,7 @@ class testFormHostPrototype extends CLegacyWebTest {
}
if (array_key_exists('template', $data)) {
- $this->zbxTestTabSwitch('Templates');
- $this->zbxTestAssertElementText('//div[@id="templateTab"]//a', $data['template']);
+ $this->query('link', $data['template']);
}
if (array_key_exists('macros', $data)) {
@@ -1009,7 +996,6 @@ class testFormHostPrototype extends CLegacyWebTest {
$this->zbxTestContentControlButtonClickTextWait('Create host prototype');
$this->zbxTestInputType('host', $name);
- $this->zbxTestTabSwitch('Groups');
$this->zbxTestClickButtonMultiselect('group_links_');
$this->zbxTestLaunchOverlayDialog('Host groups');
$this->zbxTestClickLinkText($group);
diff --git a/ui/tests/selenium/testFormTabIndicators.php b/ui/tests/selenium/testFormTabIndicators.php
index e3a80fb07e8..68b8d4e93b5 100644
--- a/ui/tests/selenium/testFormTabIndicators.php
+++ b/ui/tests/selenium/testFormTabIndicators.php
@@ -39,14 +39,6 @@ class testFormTabIndicators extends CWebTest {
'form' => 'name:templatesForm',
'tabs' => [
[
- 'name' => 'Linked templates',
- 'entries' => [
- 'Link new templates' => ['Empty template', 'Form test template', 'Docker']
- ],
- 'field_type' => 'DEV-1671', // Change field type to multiselect once DEV-1671 is merged.
- 'count' => 3
- ],
- [
'name' => 'Tags',
'entries' => [
[
@@ -101,14 +93,6 @@ class testFormTabIndicators extends CWebTest {
'form' => 'id:host-form',
'tabs' => [
[
- 'name' => 'Templates',
- 'entries' => [
- 'Link new templates' => ['Empty template', 'Form test template']
- ],
- 'field_type' => 'DEV-1671', // Change field type to multiselect once DEV-1671 is merged.
- 'count' => 2
- ],
- [
'name' => 'Tags',
'entries' => [
[
@@ -187,22 +171,6 @@ class testFormTabIndicators extends CWebTest {
'form' => 'name:hostPrototypeForm',
'tabs' => [
[
- 'name' => 'Groups',
- 'entries' => [
- 'Groups' => ['Discovered hosts', 'Empty group', 'Hypervisors']
- ],
- 'field_type' => 'multiselect',
- 'count' => 3
- ],
- [
- 'name' => 'Templates',
- 'entries' => [
- 'Link new templates' => ['Empty template', 'Form test template', 'MySQL by Zabbix agent']
- ],
- 'field_type' => 'DEV-1671', // Change field type to multiselect once DEV-1671 is merged.
- 'count' => 3
- ],
- [
'name' => 'Tags',
'entries' => [
[
@@ -698,9 +666,6 @@ class testFormTabIndicators extends CWebTest {
$form->getField('Type')->fill('Graph');
$form->invalidate();
}
- elseif ($data['url'] === 'zabbix.php?action=host.edit') {
- $form = $this->query($data['form'])->asForm()->one()->waitUntilVisible();
- }
else {
$form = $this->query($data['form'])->asForm()->one()->waitUntilVisible();
}
diff --git a/ui/tests/selenium/testInheritanceHostPrototype.php b/ui/tests/selenium/testInheritanceHostPrototype.php
index 8b649dd0baa..7e9315f3d36 100644
--- a/ui/tests/selenium/testInheritanceHostPrototype.php
+++ b/ui/tests/selenium/testInheritanceHostPrototype.php
@@ -78,7 +78,6 @@ class testInheritanceHostPrototype extends CLegacyWebTest {
$this->zbxTestAssertElementPresentXpath('//input[@id="proxy_hostid"][@readonly]');
// Check layout at Groups tab.
- $this->zbxTestTabSwitch('Groups');
$this->zbxTestAssertElementPresentXpath('//div[@id="group_links_"]//ul[@class="multiselect-list disabled"]');
$this->zbxTestAssertElementPresentXpath('//button[@class="btn-grey"][@disabled]');
$this->zbxTestAssertElementPresentXpath('//input[@name="group_prototypes[0][name]"][@readonly]');
@@ -179,8 +178,7 @@ class testInheritanceHostPrototype extends CLegacyWebTest {
$form->getFieldContainer('Interfaces')->asHostInterfaceElement(['names' => ['1' => 'default']])
->fill($data['interfaces']);
- $form->selectTab('Templates');
- $form->getFieldContainer('Link new templates')->asMultiselect()->fill($data['template']);
+ $form->getFieldContainer('Templates')->asMultiselect()->fill($data['template']);
$form->submit();
$this->page->waitUntilReady();
@@ -321,8 +319,7 @@ class testInheritanceHostPrototype extends CLegacyWebTest {
$this->zbxTestCheckboxSelect('status', $data['create_enabled']);
}
- // Groups tab.
- $this->zbxTestTabSwitch('Groups');
+ // Groups.
if (array_key_exists('groups', $data)) {
foreach ($data['groups'] as $group) {
$this->zbxTestClickButtonMultiselect('group_links_');
@@ -335,8 +332,7 @@ class testInheritanceHostPrototype extends CLegacyWebTest {
$this->zbxTestInputTypeByXpath('//*[@name="group_prototypes[0][name]"]', $data['group_macro']);
}
- // Templates tab.
- $this->zbxTestTabSwitch('Templates');
+ // Templates.
if (array_key_exists('templates', $data)) {
foreach ($data['templates'] as $template) {
$this->zbxTestClickButtonMultiselect('add_templates_');
@@ -443,7 +439,6 @@ class testInheritanceHostPrototype extends CLegacyWebTest {
// Change groups.
if (array_key_exists('hostgroup', $data) || array_key_exists('group_prototype', $data)) {
- $this->zbxTestTabSwitch('Groups');
if (array_key_exists('hostgroup', $data)) {
$this->zbxTestClickXpathWait('//span[@class="subfilter-disable-btn"]');
$this->zbxTestMultiselectClear('group_links_');
@@ -458,7 +453,6 @@ class testInheritanceHostPrototype extends CLegacyWebTest {
// Change template.
if (array_key_exists('template', $data)) {
- $this->zbxTestTabSwitch('Templates');
$this->zbxTestClickButtonMultiselect('add_templates_');
$this->zbxTestLaunchOverlayDialog('Templates');
COverlayDialogElement::find()->one()->setDataContext('Templates');
@@ -496,11 +490,9 @@ class testInheritanceHostPrototype extends CLegacyWebTest {
$this->zbxTestAssertElementValue('host', $data['cloned_name']);
$this->zbxTestAssertElementValue('name', $data['cloned_visible_name']);
$this->zbxTestCheckboxSelected('status');
- $this->zbxTestTabSwitch('Groups');
$this->zbxTestMultiselectAssertSelected('group_links_', $data['hostgroup']);
$this->zbxTestAssertAttribute('//*[@name="group_prototypes[0][name]"]', 'value' , $data['group_prototype']);
- $this->zbxTestTabSwitch('Templates');
- $this->zbxTestAssertElementText('//div[@id="templateTab"]//a', $data['template']);
+ $this->query('link', $data['template']);
$this->zbxTestTabSwitch('Inventory');
$this->zbxTestAssertAttribute('//label[text()="'.$data['inventory'].'"]/../input', 'checked');
}
diff --git a/ui/tests/selenium/testPageDashboard.php b/ui/tests/selenium/testPageDashboard.php
index c20899c7840..cf4354565b2 100644
--- a/ui/tests/selenium/testPageDashboard.php
+++ b/ui/tests/selenium/testPageDashboard.php
@@ -86,6 +86,36 @@ class testPageDashboard extends CLegacyWebTest {
}
}
+ public function testPageDashboard_CheckDasboardPopupLayout() {
+ $this->page->login()->open('zabbix.php?action=dashboard.view&new=1')->waitUntilReady();
+ $dialog = COverlayDialogElement::find()->waitUntilVisible()->one();
+ $this->assertEquals('Dashboard properties', $dialog->getTitle());
+ $properties_form = $dialog->query('name:dashboard_properties_form')->asForm()->one();
+ $this->assertEquals(['Owner', 'Name', 'Default page display period', 'Start slideshow automatically'],
+ $properties_form->getLabels()->asText()
+ );
+
+ // Check available display periods.
+ $properties_form->checkValue(['Default page display period' => '30 seconds', 'Name' => 'New dashboard']);
+ $this->assertEquals('255', $properties_form->query('id:name')->one()->getAttribute('maxlength'));
+ $this->assertEquals(['10 seconds', '30 seconds', '1 minute', '2 minutes', '10 minutes', '30 minutes', '1 hour'],
+ $properties_form->query('name:display_period')->asZDropdown()->one()->getOptions()->asText()
+ );
+
+ $properties_form->fill(['Name' => 'Dashboard creation']);
+ $properties_form->submit();
+ $this->page->waitUntilReady();
+ $dashboard = CDashboardElement::find()->one();
+
+ // Check popup-menu options.
+ $this->query('id:dashboard-add')->one()->click();
+ $add_menu = CPopupMenuElement::find()->one()->waitUntilVisible();
+ foreach (['Add widget' => true, 'Add page' => true, 'Paste widget' => false, 'Paste page'=> false] as $item => $enabled) {
+ $this->assertTrue($add_menu->getItem($item)->isEnabled($enabled));
+ }
+ $dashboard->cancelEditing();
+ }
+
public function testPageDashboard_AddFavouriteGraphs() {
CMultiselectElement::setDefaultFillMode(CMultiselectElement::MODE_SELECT);
diff --git a/ui/tests/selenium/testTemplateInheritance.php b/ui/tests/selenium/testTemplateInheritance.php
index e0b9c665d00..b9ff4b64336 100644
--- a/ui/tests/selenium/testTemplateInheritance.php
+++ b/ui/tests/selenium/testTemplateInheritance.php
@@ -53,7 +53,6 @@ class testTemplateInheritance extends CLegacyWebTest {
$this->zbxTestCheckTitle('Configuration of hosts');
$this->filterEntriesAndOpenObjects($this->hostName, 'Name', $this->hostName);
$form = COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
- $form->selectTab('Templates');
$this->zbxTestClickButtonMultiselect('add_templates_');
$this->zbxTestLaunchOverlayDialog('Templates');
COverlayDialogElement::find()->all()->last()->setDataContext('Templates');
@@ -179,8 +178,7 @@ class testTemplateInheritance extends CLegacyWebTest {
$this->zbxTestLogin(self::HOST_LIST_PAGE);
$this->filterEntriesAndOpenObjects($this->hostName, 'Name', $this->hostName);
$form = COverlayDialogElement::find()->asForm()->one()->waitUntilVisible();
- $form->selectTab('Templates');
- $table = $form->query('id:linked-template')->asTable()->one()->waitUntilVisible();
+ $table = $form->query('id:linked-templates')->asTable()->one()->waitUntilVisible();
$table->findRow('Name', $template)
->getColumn('Action')->query('button:Unlink and clear')->one()->click();
$this->assertFalse($table->findRow('Name', $template)->isValid());
diff --git a/ui/tests/selenium/traits/MacrosTrait.php b/ui/tests/selenium/traits/MacrosTrait.php
index dc96ed8bb47..f315eee49dd 100644
--- a/ui/tests/selenium/traits/MacrosTrait.php
+++ b/ui/tests/selenium/traits/MacrosTrait.php
@@ -64,7 +64,7 @@ trait MacrosTrait {
'class' => 'CElement'
]
]
- ])->one()->waitUntilVisible();
+ ])->waitUntilVisible()->one();
}
/**
diff --git a/ui/tests/unit/include/classes/parsers/CHistFunctionParserTest.php b/ui/tests/unit/include/classes/parsers/CHistFunctionParserTest.php
index 5b757826492..70fa203f1f6 100644
--- a/ui/tests/unit/include/classes/parsers/CHistFunctionParserTest.php
+++ b/ui/tests/unit/include/classes/parsers/CHistFunctionParserTest.php
@@ -1071,6 +1071,47 @@ class CHistFunctionParserTest extends TestCase {
['/host/key', '1h']
],
[
+ 'function(/host/key, 1h, 0.5y)', 0, [],
+ [
+ 'rc' => CParser::PARSE_SUCCESS,
+ 'match' => 'function(/host/key, 1h, 0.5y)',
+ 'function' => 'function',
+ 'parameters' => [
+ [
+ 'type' => CHistFunctionParser::PARAM_TYPE_QUERY,
+ 'pos' => 9,
+ 'match' => '/host/key',
+ 'length' => 9,
+ 'data' => [
+ 'host' => 'host',
+ 'item' => 'key',
+ 'filter' => [
+ 'match' => '',
+ 'tokens' => []
+ ]
+ ]
+ ],
+ [
+ 'type' => CHistFunctionParser::PARAM_TYPE_PERIOD,
+ 'pos' => 20,
+ 'match' => '1h',
+ 'length' => 2,
+ 'data' => [
+ 'sec_num' => '1h',
+ 'time_shift' => ''
+ ]
+ ],
+ [
+ 'type' => CHistFunctionParser::PARAM_TYPE_UNQUOTED,
+ 'pos' => 24,
+ 'match' => '0.5y',
+ 'length' => 4
+ ]
+ ]
+ ],
+ ['/host/key', '1h', '0.5y']
+ ],
+ [
'nodata(/host/key, "\\\\1h\\\\")', 0, [],
[
'rc' => CParser::PARSE_SUCCESS,
diff --git a/ui/tests/unit/include/classes/validators/CHistFunctionValidatorTest.php b/ui/tests/unit/include/classes/validators/CHistFunctionValidatorTest.php
index 284d4caeeef..0d483a58dc6 100644
--- a/ui/tests/unit/include/classes/validators/CHistFunctionValidatorTest.php
+++ b/ui/tests/unit/include/classes/validators/CHistFunctionValidatorTest.php
@@ -677,6 +677,50 @@ class CHistFunctionValidatorTest extends TestCase {
['trendmin(/host/key, {#LLDMACRO})', ['lldmacros' => true], ['rc' => true, 'error' => null]],
['trendmin(/host/key, 1y:now/y,)', [], ['rc' => false, 'error' => 'invalid number of parameters in function "trendmin"']],
+ ['trendstl(/host/key)', ['calculated' => true], ['rc' => false, 'error' => 'mandatory parameter is missing in function "trendstl"']],
+ ['trendstl(/host/key, 0, 1h, 1)', ['calculated' => true], ['rc' => false, 'error' => 'invalid second parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1m:now/h, 1h, 1d)', ['calculated' => true], ['rc' => false, 'error' => 'invalid second parameter in function "trendstl"']],
+ ['trendstl(/host/key, #0, 1h, 1)', ['calculated' => true], ['rc' => false, 'error' => 'invalid second parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1y, 1h, 1)', ['calculated' => true], ['rc' => false, 'error' => 'invalid second parameter in function "trendstl"']],
+ ['trendstl(/host/key, 240h:now/h, 1M, 1d)', [], ['rc' => false, 'error' => 'invalid third parameter in function "trendstl"']],
+ ['trendstl(/host/key, 240h:now/h, 1y, 1d)', [], ['rc' => false, 'error' => 'invalid third parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 0, 1)', ['calculated' => true], ['rc' => false, 'error' => 'invalid third parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1h:now/h, 1m, 1d)', ['calculated' => true], ['rc' => false, 'error' => 'invalid third parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 0)', ['calculated' => true], ['rc' => false, 'error' => 'invalid fourth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 1h)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 1d, 0.5)', ['calculated' => true], ['rc' => false, 'error' => 'invalid fifth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 1d, 1.55555)', ['calculated' => true], ['rc' => false, 'error' => 'invalid fifth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 1d, 2147483647.5)', ['calculated' => true], ['rc' => false, 'error' => 'invalid fifth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 1d, 2147483648)', ['calculated' => true], ['rc' => false, 'error' => 'invalid fifth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 1d, -1)', ['calculated' => true], ['rc' => false, 'error' => 'invalid fifth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1w, 1h, 1d, 1, 0)', ['calculated' => true], ['rc' => false, 'error' => 'invalid sixth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1h:now/d, 1h, 1d, 1, "test")', ['calculated' => true], ['rc' => false, 'error' => 'invalid sixth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 240h:now/h, 1h, 1d, 1, "mad", 0)', ['calculated' => true], ['rc' => false, 'error' => 'invalid seventh parameter in function "trendstl"']],
+ ['trendstl(/host/key, 240h:now/h, 1h, 1d, 1, "mad", 7.5)', ['calculated' => true], ['rc' => false, 'error' => 'invalid seventh parameter in function "trendstl"']],
+ ['trendstl(/host/key, 240h:now/h, 1h, 1d, 1, "mad", 2147483648)', ['calculated' => true], ['rc' => false, 'error' => 'invalid seventh parameter in function "trendstl"']],
+ ['trendstl(/host/key)', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "trendstl"']],
+ ['trendstl(/host/key, 0, 1h, 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "trendstl"']],
+ ['trendstl(/host/key, #0, 1h, 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1y, 1h, 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 0, 1)', [], ['rc' => false, 'error' => 'invalid third parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 0)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 1d, 0)', [], ['rc' => false, 'error' => 'invalid fifth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 2h, 1, 0)', [], ['rc' => false, 'error' => 'invalid sixth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 1d, 1, "test")', [], ['rc' => false, 'error' => 'invalid sixth parameter in function "trendstl"']],
+ ['trendstl(/host/key, 1d:now/M-1h, 1h, 1w, 1, "mad", 0)', [], ['rc' => false, 'error' => 'invalid seventh parameter in function "trendstl"']],
+ ['trendstl(/host/key, 240h:now/h, 1h, 1d)', [], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, 1y:now/h, 1h, 1d)', [], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, 240h:now/h, 4w, 1d)', [], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, 240h:now/h, 365d, 1d)', [], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, 240h:now/h, 365d, 1d, 1.53)', [], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, 240h:now/h, 365d, 1d, 2147483647)', [], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, {$PERIOD}:{$TIMESHIFT}, 1h, 1d)', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, 240h:now/h, 1h, 1d, 1, "mad", 7)', ['calculated' => true], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, 240h:now/h, 1h, 1d, 1, "mad", 2147483647)', ['calculated' => true], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, {$PARAM2}, {$MACRO3}, {$MACRO4}, {$MACRO5}, {$MACRO6}, {$MACRO7})', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, {#PARAM2}, {#PARAM3}, {#PARAM4}), {#PARAM5}), {#PARAM6}), {#PARAM7})', ['lldmacros' => true], ['rc' => true, 'error' => null]],
+ ['trendstl(/host/key, {$PARAM2}, {#PARAM3}, {$PARAM4}), {#PARAM5}), {$PARAM6}), {#PARAM7})', ['lldmacros' => true, 'usermacros' => true], ['rc' => true, 'error' => null]],
+
['trendsum(/host/key)', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "trendsum"']],
['trendsum(/host/key,)', [], ['rc' => false, 'error' => 'invalid second parameter in function "trendsum"']],
['trendsum(/host/key, 0)', [], ['rc' => false, 'error' => 'invalid second parameter in function "trendsum"']],
@@ -779,7 +823,101 @@ class CHistFunctionValidatorTest extends TestCase {
// Filters.
['sum(/host/key?[tag="foo"], 1d)', ['calculated' => true], ['rc' => false, 'error' => 'invalid first parameter in function "sum"']],
- ['sum_foreach(/host/key?[tag="foo"], 1d)', ['calculated' => true, 'aggregating' => true], ['rc' => true, 'error' => null]]
+ ['sum_foreach(/host/key?[tag="foo"], 1d)', ['calculated' => true, 'aggregating' => true], ['rc' => true, 'error' => null]],
+
+ ['baselinedev(/host/key)', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "baselinedev"']],
+ ['baselinedev(/host/key,)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 0)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, #0)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, #1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1h)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1h:now-1h)', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "baselinedev"']],
+ ['baselinedev(/host/key, 1y:now/y,)', [], ['rc' => false, 'error' => 'invalid third parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1h:now-1h, 1M)', [], ['rc' => false, 'error' => 'invalid third parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1h:now-1h, "M")', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "baselinedev"']],
+ ['baselinedev(/host/key, 1h:now-1h, "M", "M")', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1h:now-1h, "M", 2)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, 1d:now-1d, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, 1d:now-1d, "y", -1)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1d:now-1d, "y", 0)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1d:now-1d, "y", 5.0)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1d:now-1d, "y", 5.00000000000000000000000000000000000000000000000000001)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1d:now-1d, "y", 5.2)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1d:now-1d, "y", 5e-1)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1d:now-1d, "y", 5e3d)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1d:now-1d, "y", 5e3)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1M:now/M+2M, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, 1h:now/m, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1d:now/h, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1y:now/M, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1M:now/w, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1w:now/d, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1d:now/h, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1h:now/m, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1s:now/m, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1m:now/h, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, 1h:now/h, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, 1h:now/d, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, 1h:now/w, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, 1h:now/M, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, 1d:now/w, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, 1w:now/M, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, 1M:now/y, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, {$PERIOD}:{$TIMESHIFT}, "y", 2)', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, {$PERIOD}:now-{$TIMESHIFT}, "y", 2)', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, {$MACRO}, "y", 2)', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, {$MACRO}, {$MACRO}, {$MACRO})', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, {#LLDMACRO}, {#LLDMACRO}, {#LLDMACRO})', ['lldmacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinedev(/host/key, {#LLDMACRO}, {$MACRO}, {#LLDMACRO})', ['lldmacros' => true], ['rc' => false, 'error' => 'invalid third parameter in function "baselinedev"']],
+ ['baselinedev(/host/key, {#LLDMACRO}, {$MACRO}, {#LLDMACRO})', ['lldmacros' => true, 'usermacros' => true], ['rc' => true, 'error' => null]],
+
+ ['baselinewma(/host/key)', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "baselinewma"']],
+ ['baselinewma(/host/key,)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 0)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, #0)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, #1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1h)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1h:now-1h)', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "baselinewma"']],
+ ['baselinewma(/host/key, 1y:now/y,)', [], ['rc' => false, 'error' => 'invalid third parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1h:now-1h, 1M)', [], ['rc' => false, 'error' => 'invalid third parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1h:now-1h, "M")', [], ['rc' => false, 'error' => 'mandatory parameter is missing in function "baselinewma"']],
+ ['baselinewma(/host/key, 1h:now-1h, "M", "M")', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1h:now-1h, "M", 2)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, 1d:now-1d, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, 1d:now-1d, "y", -1)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1d:now-1d, "y", 0)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1d:now-1d, "y", 5.0)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1d:now-1d, "y", 5.00000000000000000000000000000000000000000000000000001)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1d:now-1d, "y", 5.2)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1d:now-1d, "y", 5e-1)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1d:now-1d, "y", 5e3d)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1d:now-1d, "y", 5e3)', [], ['rc' => false, 'error' => 'invalid fourth parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1M:now/M+2M, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, 1h:now/m, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1d:now/h, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1y:now/M, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1M:now/w, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1w:now/d, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1d:now/h, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1h:now/m, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1s:now/m, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1m:now/h, "y", 1)', [], ['rc' => false, 'error' => 'invalid second parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, 1h:now/h, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, 1h:now/d, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, 1h:now/w, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, 1h:now/M, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, 1d:now/w, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, 1w:now/M, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, 1M:now/y, "y", 1)', [], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, {$PERIOD}:{$TIMESHIFT}, "y", 2)', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, {$PERIOD}:now-{$TIMESHIFT}, "y", 2)', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, {$MACRO}, "y", 2)', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, {$MACRO}, {$MACRO}, {$MACRO})', ['usermacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, {#LLDMACRO}, {#LLDMACRO}, {#LLDMACRO})', ['lldmacros' => true], ['rc' => true, 'error' => null]],
+ ['baselinewma(/host/key, {#LLDMACRO}, {$MACRO}, {#LLDMACRO})', ['lldmacros' => true], ['rc' => false, 'error' => 'invalid third parameter in function "baselinewma"']],
+ ['baselinewma(/host/key, {#LLDMACRO}, {$MACRO}, {#LLDMACRO})', ['lldmacros' => true, 'usermacros' => true], ['rc' => true, 'error' => null]],
];
}
@@ -795,6 +933,7 @@ class CHistFunctionValidatorTest extends TestCase {
'parameters' => (new CHistFunctionData($options))->getParameters()
] + $options);
$expression_parser->parse($source);
+ $this->assertNotNull($expression_parser->getResult(), $expression_parser->getError());
$tokens = $expression_parser->getResult()->getTokens();
$this->assertSame(CExpressionParserResult::TOKEN_TYPE_HIST_FUNCTION, $tokens[0]['type']);