.......... [ZBXNEXT-6470,ZBXNEXT-6867] updated to latest from master; no conflicts

13 files changed, 11 insertions, 2 deletions

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-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-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/bugfix/ZBX-20268 b/ChangeLog.d/bugfix/ZBX-20268
deleted file mode 100644
index d0a42f622fa..00000000000
--- a/ChangeLog.d/bugfix/ZBX-20268
+++ /dev/null
@@ -1 +0,0 @@
-..F....... [ZBX-20268] fixed disabled button issue when cloning a service (averza)
diff --git a/ChangeLog.d/bugfix/ZBX-20276 b/ChangeLog.d/bugfix/ZBX-20276
new file mode 100644
index 00000000000..09e682dca08
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20276
@@ -0,0 +1 @@
+.......PS. [ZBX-20276] fixed parameter parsing error in bucket_percentile (MVekslers)
diff --git a/ChangeLog.d/bugfix/ZBX-20278 b/ChangeLog.d/bugfix/ZBX-20278
new file mode 100644
index 00000000000..4b04e7bdb22
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20278
@@ -0,0 +1 @@
+..F....... [ZBX-20278] fixed XSS attack vulnerability in scheduled report configuration form (agriscenko)
diff --git a/ChangeLog.d/bugfix/ZBX-20311 b/ChangeLog.d/bugfix/ZBX-20311
new file mode 100644
index 00000000000..bd7a73653cc
--- /dev/null
+++ b/ChangeLog.d/bugfix/ZBX-20311
@@ -0,0 +1 @@
+.......PS. [ZBX-20311] returned the value -1 for bucket_percentile() and histogram_quantile() if bucket[+inf] = 0 (MVekslers)
diff --git a/ChangeLog.d/feature/ZBXNEXT-6966 b/ChangeLog.d/feature/ZBXNEXT-6966
new file mode 100644
index 00000000000..2d9ed9ab8e1
--- /dev/null
+++ b/ChangeLog.d/feature/ZBXNEXT-6966
@@ -0,0 +1 @@
+A.F....... [ZBXNEXT-6966] added single item widget (ashubin, averza, Ivo, miks, Sasha, vmurzins)
diff --git a/ChangeLog.d/feature/ZBXNEXT-7049 b/ChangeLog.d/feature/ZBXNEXT-7049
new file mode 100644
index 00000000000..7c8bc3ef69c
--- /dev/null
+++ b/ChangeLog.d/feature/ZBXNEXT-7049
@@ -0,0 +1 @@
+A.F.....S. [ZBXNEXT-7049] added aggregation options to prometheus pattern preprocessing step, added bulk preprocessing for dependent items (valdis, wiper)
diff --git a/ChangeLog.d/feature/ZBXNEXT-7070 b/ChangeLog.d/feature/ZBXNEXT-7070
deleted file mode 100644
index 88bb3e1e73b..00000000000
--- a/ChangeLog.d/feature/ZBXNEXT-7070
+++ /dev/null
@@ -1 +0,0 @@
-..F....... [ZBXNEXT-7070] transferred host and template mass update template inputs to main tab (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)