diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/zbxdb.h | 7 | ||||
| -rw-r--r-- | include/zbxhistory.h | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/zbxdb.h b/include/zbxdb.h index 4bdf66eb568..751ccc969d0 100644 --- a/include/zbxdb.h +++ b/include/zbxdb.h @@ -177,7 +177,8 @@ int zbx_db_strlen_n(const char *text_loc, size_t maxlen); #define ZBX_ORACLE_MAX_VERSION_FRIENDLY "Database 21c Release 21.x.x" #define ZBX_ELASTIC_MIN_VERSION 70000 -#define ZBX_ELASTIC_MIN_VERSION_FRIENDLY "7.x" +#define ZBX_ELASTIC_SUPPORTED_VERSION_FRIENDLY "7.x" +#define ZBX_ELASTIC_MAX_VERSION 79999 #define ZBX_DBVERSION_UNDEFINED 0 @@ -188,7 +189,9 @@ typedef enum DB_VERSION_HIGHER_THAN_MAXIMUM, DB_VERSION_FAILED_TO_RETRIEVE, DB_VERSION_NOT_SUPPORTED_ERROR, - DB_VERSION_NOT_SUPPORTED_WARNING + DB_VERSION_NOT_SUPPORTED_WARNING, + DB_VERSION_HIGHER_THAN_MAXIMUM_ERROR, + DB_VERSION_HIGHER_THAN_MAXIMUM_WARNING, } zbx_db_version_status_t; diff --git a/include/zbxhistory.h b/include/zbxhistory.h index 8f3e85cfb0b..d0fdaa7d157 100644 --- a/include/zbxhistory.h +++ b/include/zbxhistory.h @@ -61,7 +61,7 @@ int zbx_history_get_values(zbx_uint64_t itemid, int value_type, int start, int c zbx_vector_history_record_t *values); int zbx_history_requires_trends(int value_type); -void zbx_history_check_version(struct zbx_json *json); +void zbx_history_check_version(struct zbx_json *json, int *result); #define FLUSH_SUCCEED 0 #define FLUSH_FAIL -1 |