feat: improve Zabbix multi-version compatibility and introduce local development environment
This update enhances compatibility across multiple Zabbix versions and introduces tools for easier local development and testing. Key improvements and verified version support: - Verified Zabbix version support: 6.2, 6.4, 7.0, and 7.4. - Version-specific feature handling: - `history.push` is enabled only for Zabbix 7.0+; older versions skip it with a clear error or notice. - Conditional JSON-RPC authentication: the `auth` field is automatically added to the request body for versions older than 6.4. - Implemented static Zabbix version caching in the datasource to minimize redundant API calls. - Query optimization refinements: - Added mapping for implied fields (e.g., `state` -> `items`, `deviceType` -> `tags`). - Automatically prune unnecessary Zabbix parameters (like `selectItems` or `selectTags`) when not requested. - Local development environment: - Added a new `zabbix-local` Docker Compose profile that includes PostgreSQL, Zabbix Server, and Zabbix Web. - Supports testing different versions by passing the `ZABBIX_VERSION` environment variable (e.g., 6.2, 6.4, 7.0, 7.4). - Provided a sample environment file at `samples/zabbix-local.env`. - Documentation and Roadmap: - Updated README with a comprehensive version compatibility matrix and local environment instructions. - Created a new guide: `docs/howtos/local_development.md`. - Updated maintenance guides and added "Local Development Environment" as an achieved milestone in the roadmap. - Test suite enhancements: - Improved Smoketest and RegressionTest executors with more reliable resource cleanup and error reporting. - Made tests version-aware to prevent failures on older Zabbix instances. BREAKING CHANGE: Dropped Zabbix 6.0 specific workarounds; the minimum supported version is now 6.2.
This commit is contained in:
parent
7c2dee2b6c
commit
fb5e9cbe81
36 changed files with 470 additions and 172 deletions
|
|
@ -25,7 +25,7 @@ import {
|
|||
StorageItemType,
|
||||
} from "../schema/generated/graphql.js";
|
||||
|
||||
import { DateTimeResolver, JSONObjectResolver, TimeResolver } from "graphql-scalars";
|
||||
import {DateTimeResolver, JSONObjectResolver, TimeResolver} from "graphql-scalars";
|
||||
import {HostImporter} from "../execution/host_importer.js";
|
||||
import {HostDeleter} from "../execution/host_deleter.js";
|
||||
import {SmoketestExecutor} from "../execution/smoketest_executor.js";
|
||||
|
|
@ -35,7 +35,7 @@ import {TemplateDeleter} from "../execution/template_deleter.js";
|
|||
import {HostValueExporter} from "../execution/host_exporter.js";
|
||||
import {logger} from "../logging/logger.js";
|
||||
import {ParsedArgs, ZabbixRequest} from "../datasources/zabbix-request.js";
|
||||
import {ZabbixHistoryGetParams, ZabbixHistoryPushParams, ZabbixHistoryPushRequest, ZabbixQueryHistoryRequest} from "../datasources/zabbix-history.js";
|
||||
import {ZabbixHistoryPushParams, ZabbixHistoryPushRequest} from "../datasources/zabbix-history.js";
|
||||
import {
|
||||
ZabbixCreateHostRequest,
|
||||
ZabbixQueryDevices,
|
||||
|
|
@ -166,32 +166,22 @@ export function createResolvers(): Resolvers {
|
|||
zabbixAuthToken,
|
||||
cookie, dataSources
|
||||
}: any, info: any) => {
|
||||
let params: any = {}
|
||||
if (args.hostids) {
|
||||
params.templateids = args.hostids
|
||||
}
|
||||
if (args.name_pattern) {
|
||||
params.search = {
|
||||
name: args.name_pattern
|
||||
}
|
||||
// @ts-ignore
|
||||
args.templateids = args.hostids
|
||||
delete args.hostids
|
||||
}
|
||||
const output = GraphqlParamsToNeededZabbixOutput.mapTemplates(info);
|
||||
return await new ZabbixQueryTemplatesRequest(zabbixAuthToken, cookie)
|
||||
.executeRequestThrowError(dataSources?.zabbixAPI || zabbixAPI, new ParsedArgs(params), output);
|
||||
.executeRequestThrowError(dataSources?.zabbixAPI || zabbixAPI, new ParsedArgs(args), output);
|
||||
},
|
||||
|
||||
allTemplateGroups: async (_parent: any, args: any, {
|
||||
zabbixAuthToken,
|
||||
cookie
|
||||
}: any) => {
|
||||
let params: any = {}
|
||||
if (args.name_pattern) {
|
||||
params.search = {
|
||||
name: args.name_pattern
|
||||
}
|
||||
}
|
||||
return await new ZabbixQueryTemplateGroupRequest(zabbixAuthToken, cookie)
|
||||
.executeRequestThrowError(zabbixAPI, new ParsedArgs(params));
|
||||
.executeRequestThrowError(zabbixAPI, new ParsedArgs(args));
|
||||
}
|
||||
},
|
||||
Mutation: {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue