Andreas Hilbig
ec6ed422b1
This commit introduces several improvements to ensure the API works seamlessly across Zabbix 6.0, 6.4, and 7.0+, while also optimizing data fetching performance. Key changes: - Zabbix Version Compatibility: - Added Zabbix version detection and static caching in ZabbixAPI. - Implemented name-based fallback for host/template group permissions to support Zabbix 6.0 (which lacks UUIDs for host groups). - Added manual host group expansion for Zabbix versions < 6.2.0 during user group import. - Added version-based guards for history.push (7.0+) and hostgroup.propagate (6.2+). - Updated documentation with detailed version compatibility notes. - Added src/test/zabbix_6_0_compatibility.test.ts to verify compatibility logic. - Query Optimization: - Implemented dynamic output selection in ZabbixRequest to fetch only fields requested in GraphQL queries. - Added GraphqlParamsToNeededZabbixOutput to map GraphQL selections to Zabbix API output parameters. - Moved "Query Optimization" to achieved milestones in roadmap.md. - Other: - Updated various tests to support the new version-aware logic. - Optimized imports and synchronized IDE settings.
75 lines
2.8 KiB
TypeScript
75 lines
2.8 KiB
TypeScript
import {ZabbixHistoryPushParams, ZabbixHistoryPushRequest} from "../datasources/zabbix-history.js";
|
|
import {zabbixAPI} from "../datasources/zabbix-api.js";
|
|
import {GraphQLError} from "graphql";
|
|
|
|
// Mocking ZabbixAPI
|
|
jest.mock("../datasources/zabbix-api.js", () => ({
|
|
zabbixAPI: {
|
|
post: jest.fn(),
|
|
getVersion: jest.fn().mockResolvedValue("7.0.0")
|
|
}
|
|
}));
|
|
|
|
describe("ZabbixHistoryPushRequest", () => {
|
|
let request: ZabbixHistoryPushRequest;
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
request = new ZabbixHistoryPushRequest("token");
|
|
});
|
|
|
|
test("createZabbixParams - transformation", () => {
|
|
const values = [
|
|
{ timestamp: "2024-01-01T10:00:00Z", value: { key: "value" } },
|
|
{ timestamp: "2024-01-01T10:00:01.500Z", value: "simple value" }
|
|
];
|
|
const params = new ZabbixHistoryPushParams(values, "1", "item.key", "host.name");
|
|
const zabbixParams = request.createZabbixParams(params);
|
|
|
|
expect(zabbixParams).toHaveLength(2);
|
|
expect(zabbixParams[0]).toEqual({
|
|
itemid: "1",
|
|
value: JSON.stringify({ key: "value" }),
|
|
clock: 1704103200,
|
|
ns: 0
|
|
});
|
|
expect(zabbixParams[1]).toEqual({
|
|
itemid: "1",
|
|
value: "simple value",
|
|
clock: 1704103201,
|
|
ns: 500000000
|
|
});
|
|
});
|
|
|
|
test("createZabbixParams - transformation without itemid", () => {
|
|
const values = [
|
|
{ timestamp: "2024-01-01T10:00:00Z", value: { key: "value" } }
|
|
];
|
|
const params = new ZabbixHistoryPushParams(values, undefined, "item.key", "host.name");
|
|
const zabbixParams = request.createZabbixParams(params);
|
|
|
|
expect(zabbixParams).toHaveLength(1);
|
|
expect(zabbixParams[0]).toEqual({
|
|
host: "host.name",
|
|
key: "item.key",
|
|
value: JSON.stringify({ key: "value" }),
|
|
clock: 1704103200,
|
|
ns: 0
|
|
});
|
|
});
|
|
|
|
test("prepare - throw error if item missing", async () => {
|
|
const values = [{ timestamp: "2024-01-01T10:00:00Z", value: "val" }];
|
|
const params = new ZabbixHistoryPushParams(values, undefined, undefined, "host.name");
|
|
|
|
await expect(request.prepare(zabbixAPI, params)).rejects.toThrow("if itemid is empty both key and host must be filled");
|
|
});
|
|
|
|
test("prepare - throw error if Zabbix version < 7.0.0", async () => {
|
|
(zabbixAPI.getVersion as jest.Mock).mockResolvedValue("6.0.0");
|
|
const values = [{ timestamp: "2024-01-01T10:00:00Z", value: "val" }];
|
|
const params = new ZabbixHistoryPushParams(values, "1");
|
|
|
|
await expect(request.prepare(zabbixAPI, params)).rejects.toThrow("history.push is only supported in Zabbix 7.0.0 and newer");
|
|
});
|
|
});
|