diff options
| author | Dace Petra <dace.petra@zabbix.com> | 2022-10-20 22:54:22 +0300 |
|---|---|---|
| committer | Dace Petra <dace.petra@zabbix.com> | 2022-10-20 22:54:22 +0300 |
| commit | 4a5b2ad869b92f6764054c550b3f1b26cace08b8 (patch) | |
| tree | 63c21785e763b3e59d754aed9f8232e483bf17d3 /include | |
| parent | ff86597e70ef9d57d1df8f6d6bef6937c2592370 (diff) | |
| parent | 9c42a3f91bf90a698eaa4a7ce0199ecfc94b9ef8 (diff) | |
.......... [ZBXNEXT-7972] updated to latest master; no conflicts
Diffstat (limited to 'include')
| -rw-r--r-- | include/zbxavailability.h | 6 | ||||
| -rw-r--r-- | include/zbxdb.h | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/include/zbxavailability.h b/include/zbxavailability.h index d3c83a8436e..66009bdae9c 100644 --- a/include/zbxavailability.h +++ b/include/zbxavailability.h @@ -31,7 +31,7 @@ #define ZBX_IPC_AVAILMAN_ACTIVE_STATUS 4 #define ZBX_IPC_AVAILMAN_CONFSYNC_DIFF 5 #define ZBX_IPC_AVAILMAN_PROCESS_PROXY_HOSTDATA 6 -#define ZBX_IPC_AVAILMAN_PROXY_FLUSH_ALL_HOSTS 7 +#define ZBX_IPC_AVAILMAN_ACTIVE_PROXY_HB_UPDATE 7 #define ZBX_AVAIL_SERVER_CONN_TIMEOUT 3600 /* agent (ZABBIX, SNMP, IPMI, JMX) availability data */ @@ -145,4 +145,8 @@ void zbx_availability_deserialize_proxy_hostdata(const unsigned char *data, zbx zbx_uint32_t zbx_availability_serialize_hostids(unsigned char **data, zbx_vector_uint64_t *hostids); void zbx_availability_deserialize_hostids(const unsigned char *data, zbx_vector_uint64_t *hostids); + +zbx_uint32_t zbx_availability_serialize_active_proxy_hb_update(unsigned char **data, zbx_uint64_t hostid); +void zbx_availability_deserialize_active_proxy_hb_update(const unsigned char *data, zbx_uint64_t *hostid); + #endif /* ZABBIX_AVAILABILITY_H */ diff --git a/include/zbxdb.h b/include/zbxdb.h index 16c016c7be8..88295f3ed8a 100644 --- a/include/zbxdb.h +++ b/include/zbxdb.h @@ -181,8 +181,8 @@ int zbx_db_strlen_n(const char *text_loc, size_t maxlen); #define ZBX_POSTGRESQL_MIN_VERSION_FRIENDLY "10.9" #define ZBX_POSTGRESQL_MIN_SUPPORTED_VERSION 130000 #define ZBX_POSTGRESQL_MIN_SUPPORTED_VERSION_FRIENDLY "13.0" -#define ZBX_POSTGRESQL_MAX_VERSION 149999 -#define ZBX_POSTGRESQL_MAX_VERSION_FRIENDLY "14.x" +#define ZBX_POSTGRESQL_MAX_VERSION 159999 +#define ZBX_POSTGRESQL_MAX_VERSION_FRIENDLY "15.x" #define ZBX_ORACLE_MIN_VERSION 1201000200 #define ZBX_ORACLE_MIN_VERSION_FRIENDLY "Database 12c Release 12.01.00.02.x" @@ -206,8 +206,8 @@ int zbx_db_strlen_n(const char *text_loc, size_t maxlen); #define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION 20001 #define ZBX_TIMESCALE_MIN_SUPPORTED_VERSION_FRIENDLY "2.0.1" #define ZBX_TIMESCALE_MIN_VERSION_WITH_LICENSE_PARAM_SUPPORT 20000 -#define ZBX_TIMESCALE_MAX_VERSION 20799 -#define ZBX_TIMESCALE_MAX_VERSION_FRIENDLY "2.7" +#define ZBX_TIMESCALE_MAX_VERSION 20899 +#define ZBX_TIMESCALE_MAX_VERSION_FRIENDLY "2.8" #define ZBX_TIMESCALE_LICENSE_APACHE "apache" #define ZBX_TIMESCALE_LICENSE_APACHE_FRIENDLY "TimescaleDB Apache 2 Edition" #define ZBX_TIMESCALE_LICENSE_COMMUNITY "timescale" |