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
path: root/tests/libs/zbxdbcache
diff options
context:
space:
mode:
Diffstat (limited to 'tests/libs/zbxdbcache')
-rw-r--r--tests/libs/zbxdbcache/dbconfig_maintenance_test.c2
-rw-r--r--tests/libs/zbxdbcache/dbconfig_maintenance_test.h2
-rw-r--r--tests/libs/zbxdbcache/dc_check_maintenance_period.c2
-rw-r--r--tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c2
-rw-r--r--tests/libs/zbxdbcache/dc_function_calculate_nextcheck.c2
-rw-r--r--tests/libs/zbxdbcache/dc_item_poller_type_update.c4
-rw-r--r--tests/libs/zbxdbcache/dc_item_poller_type_update.yaml35
-rw-r--r--tests/libs/zbxdbcache/dc_item_poller_type_update_test.c2
-rw-r--r--tests/libs/zbxdbcache/dc_item_poller_type_update_test.h2
-rw-r--r--tests/libs/zbxdbcache/dc_maintenance_match_tags.c2
-rw-r--r--tests/libs/zbxdbcache/is_item_processed_by_server.c2
-rw-r--r--tests/libs/zbxdbcache/valuecache_test.c2
-rw-r--r--tests/libs/zbxdbcache/valuecache_test.h2
-rw-r--r--tests/libs/zbxdbcache/zbx_vc_add_values.c2
-rw-r--r--tests/libs/zbxdbcache/zbx_vc_get_value.c2
-rw-r--r--tests/libs/zbxdbcache/zbx_vc_get_values.c2
16 files changed, 37 insertions, 30 deletions
diff --git a/tests/libs/zbxdbcache/dbconfig_maintenance_test.c b/tests/libs/zbxdbcache/dbconfig_maintenance_test.c
index 1d2c942c5af..e3467fb2e8e 100644
--- a/tests/libs/zbxdbcache/dbconfig_maintenance_test.c
+++ b/tests/libs/zbxdbcache/dbconfig_maintenance_test.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/dbconfig_maintenance_test.h b/tests/libs/zbxdbcache/dbconfig_maintenance_test.h
index 19e5109702a..ad40a8edc66 100644
--- a/tests/libs/zbxdbcache/dbconfig_maintenance_test.h
+++ b/tests/libs/zbxdbcache/dbconfig_maintenance_test.h
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/dc_check_maintenance_period.c b/tests/libs/zbxdbcache/dc_check_maintenance_period.c
index e04cb599e34..e8c899d7b78 100644
--- a/tests/libs/zbxdbcache/dc_check_maintenance_period.c
+++ b/tests/libs/zbxdbcache/dc_check_maintenance_period.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c
index 3a51f11a263..f6e4d413fa6 100644
--- a/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c
+++ b/tests/libs/zbxdbcache/dc_expand_user_macros_in_func_params.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.c b/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.c
index 0eadec95d61..e5adff7c4b8 100644
--- a/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.c
+++ b/tests/libs/zbxdbcache/dc_function_calculate_nextcheck.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update.c b/tests/libs/zbxdbcache/dc_item_poller_type_update.c
index 9d76d63b619..8fd604fc728 100644
--- a/tests/libs/zbxdbcache/dc_item_poller_type_update.c
+++ b/tests/libs/zbxdbcache/dc_item_poller_type_update.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
@@ -94,7 +94,7 @@ static unsigned char str2pollertype(const char *str)
_ZBX_MKMAP(ZBX_NO_POLLER), _ZBX_MKMAP(ZBX_POLLER_TYPE_NORMAL),
_ZBX_MKMAP(ZBX_POLLER_TYPE_UNREACHABLE), _ZBX_MKMAP(ZBX_POLLER_TYPE_IPMI),
_ZBX_MKMAP(ZBX_POLLER_TYPE_PINGER), _ZBX_MKMAP(ZBX_POLLER_TYPE_JAVA),
- _ZBX_MKMAP(ZBX_POLLER_TYPE_HISTORY),
+ _ZBX_MKMAP(ZBX_POLLER_TYPE_HISTORY), _ZBX_MKMAP(ZBX_POLLER_TYPE_ODBC),
{ 0 }
};
diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml b/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml
index 203c5ac7e2a..6f3970463a7 100644
--- a/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml
+++ b/tests/libs/zbxdbcache/dc_item_poller_type_update.yaml
@@ -1102,84 +1102,91 @@ in:
key: k
poller: ZBX_NO_POLLER
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 206
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_NO_POLLER
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 207
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
- poller: ZBX_POLLER_TYPE_NORMAL
+ poller: ZBX_POLLER_TYPE_ODBC
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 208
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
- poller: ZBX_POLLER_TYPE_NORMAL
+ poller: ZBX_POLLER_TYPE_ODBC
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 209
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_IPMI
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 210
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_IPMI
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 211
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_PINGER
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 212
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_PINGER
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 213
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_JAVA
flags: 0
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 214
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_JAVA
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 215
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_UNREACHABLE
flags: 0
- result: ZBX_POLLER_TYPE_UNREACHABLE
+ result: ZBX_POLLER_TYPE_ODBC
+ - ref: 2151
+ access: DIRECT
+ type: ITEM_TYPE_DB_MONITOR
+ key: k
+ poller: ZBX_POLLER_TYPE_JAVA
+ flags: ZBX_HOST_UNREACHABLE
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 216
access: DIRECT
type: ITEM_TYPE_DB_MONITOR
key: k
poller: ZBX_POLLER_TYPE_UNREACHABLE
flags: ZBX_ITEM_COLLECTED
- result: ZBX_POLLER_TYPE_NORMAL
+ result: ZBX_POLLER_TYPE_ODBC
- ref: 217
access: DIRECT
type: ITEM_TYPE_IPMI
diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update_test.c b/tests/libs/zbxdbcache/dc_item_poller_type_update_test.c
index 6dfeba80ff3..2ff991a9674 100644
--- a/tests/libs/zbxdbcache/dc_item_poller_type_update_test.c
+++ b/tests/libs/zbxdbcache/dc_item_poller_type_update_test.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/dc_item_poller_type_update_test.h b/tests/libs/zbxdbcache/dc_item_poller_type_update_test.h
index a331ecdd197..82ae179aa13 100644
--- a/tests/libs/zbxdbcache/dc_item_poller_type_update_test.h
+++ b/tests/libs/zbxdbcache/dc_item_poller_type_update_test.h
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c
index d1158931260..29f1bed54d4 100644
--- a/tests/libs/zbxdbcache/dc_maintenance_match_tags.c
+++ b/tests/libs/zbxdbcache/dc_maintenance_match_tags.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/is_item_processed_by_server.c b/tests/libs/zbxdbcache/is_item_processed_by_server.c
index f10fb24a86d..76082c022b2 100644
--- a/tests/libs/zbxdbcache/is_item_processed_by_server.c
+++ b/tests/libs/zbxdbcache/is_item_processed_by_server.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/valuecache_test.c b/tests/libs/zbxdbcache/valuecache_test.c
index d85bdf04273..ea6d66cb0cc 100644
--- a/tests/libs/zbxdbcache/valuecache_test.c
+++ b/tests/libs/zbxdbcache/valuecache_test.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/valuecache_test.h b/tests/libs/zbxdbcache/valuecache_test.h
index d30497f84a2..b29f6a50636 100644
--- a/tests/libs/zbxdbcache/valuecache_test.h
+++ b/tests/libs/zbxdbcache/valuecache_test.h
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/zbx_vc_add_values.c b/tests/libs/zbxdbcache/zbx_vc_add_values.c
index a83a8c7fee0..c9501bf57e2 100644
--- a/tests/libs/zbxdbcache/zbx_vc_add_values.c
+++ b/tests/libs/zbxdbcache/zbx_vc_add_values.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_value.c b/tests/libs/zbxdbcache/zbx_vc_get_value.c
index aa7ea5bde3d..0f7d323b8b6 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_value.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_value.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
diff --git a/tests/libs/zbxdbcache/zbx_vc_get_values.c b/tests/libs/zbxdbcache/zbx_vc_get_values.c
index cbff161a96e..254992a1e07 100644
--- a/tests/libs/zbxdbcache/zbx_vc_get_values.c
+++ b/tests/libs/zbxdbcache/zbx_vc_get_values.c
@@ -1,6 +1,6 @@
/*
** Zabbix
-** Copyright (C) 2001-2021 Zabbix SIA
+** Copyright (C) 2001-2022 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 23:02:23 +0300