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.
114 lines
3.7 KiB
TypeScript
114 lines
3.7 KiB
TypeScript
import {createResolvers} from "../api/resolvers.js";
|
|
import {zabbixAPI} from "../datasources/zabbix-api.js";
|
|
import {QueryAllDevicesArgs} from "../schema/generated/graphql.js";
|
|
|
|
// Mocking ZabbixAPI
|
|
jest.mock("../datasources/zabbix-api.js", () => ({
|
|
zabbixAPI: {
|
|
executeRequest: jest.fn(),
|
|
post: jest.fn(),
|
|
getVersion: jest.fn().mockResolvedValue("7.0.0"),
|
|
baseURL: "http://mock-zabbix",
|
|
}
|
|
}));
|
|
|
|
// Mocking Config
|
|
jest.mock("../common_utils.js", () => ({
|
|
Config: {
|
|
HOST_TYPE_FILTER_DEFAULT: null,
|
|
HOST_GROUP_FILTER_DEFAULT: null
|
|
}
|
|
}));
|
|
|
|
describe("Indirect Dependencies Optimization", () => {
|
|
let resolvers: any;
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
resolvers = createResolvers();
|
|
});
|
|
|
|
test("allDevices optimization - state implies items", async () => {
|
|
(zabbixAPI.post as jest.Mock).mockResolvedValueOnce([]);
|
|
|
|
const args: QueryAllDevicesArgs = {};
|
|
const context = {
|
|
zabbixAuthToken: "test-token",
|
|
dataSources: { zabbixAPI: zabbixAPI }
|
|
};
|
|
const info = {
|
|
fieldNodes: [{
|
|
selectionSet: {
|
|
selections: [
|
|
{ kind: 'Field', name: { value: 'hostid' } },
|
|
{ kind: 'Field', name: { value: 'state' } }
|
|
]
|
|
}
|
|
}]
|
|
};
|
|
|
|
await resolvers.Query.allDevices(null, args, context, info);
|
|
|
|
const callParams = (zabbixAPI.post as jest.Mock).mock.calls[0][1].body.params;
|
|
expect(callParams.output).toContain("items");
|
|
expect(callParams.selectItems).toBeDefined();
|
|
});
|
|
|
|
test("allHosts optimization - inventory implies selectInventory", async () => {
|
|
(zabbixAPI.post as jest.Mock).mockResolvedValueOnce([]);
|
|
|
|
const args = {};
|
|
const context = {
|
|
zabbixAuthToken: "test-token",
|
|
dataSources: { zabbixAPI: zabbixAPI }
|
|
};
|
|
const info = {
|
|
fieldNodes: [{
|
|
selectionSet: {
|
|
selections: [
|
|
{ kind: 'Field', name: { value: 'inventory' } }
|
|
]
|
|
}
|
|
}]
|
|
};
|
|
|
|
await resolvers.Query.allHosts(null, args, context, info);
|
|
|
|
const callParams = (zabbixAPI.post as jest.Mock).mock.calls[0][1].body.params;
|
|
// Zabbix inventory data is requested via selectInventory, and it maps to GraphQL 'inventory' field
|
|
expect(callParams.selectInventory).toBeDefined();
|
|
});
|
|
|
|
test("allHosts optimization - state fragment implies items", async () => {
|
|
(zabbixAPI.post as jest.Mock).mockResolvedValueOnce([]);
|
|
|
|
const args = {};
|
|
const context = {
|
|
zabbixAuthToken: "test-token",
|
|
dataSources: { zabbixAPI: zabbixAPI }
|
|
};
|
|
const info = {
|
|
fieldNodes: [{
|
|
selectionSet: {
|
|
selections: [
|
|
{
|
|
kind: 'InlineFragment',
|
|
typeCondition: { kind: 'NamedType', name: { value: 'Device' } },
|
|
selectionSet: {
|
|
selections: [
|
|
{ kind: 'Field', name: { value: 'state' } }
|
|
]
|
|
}
|
|
}
|
|
]
|
|
}
|
|
}]
|
|
};
|
|
|
|
await resolvers.Query.allHosts(null, args, context, info);
|
|
|
|
const callParams = (zabbixAPI.post as jest.Mock).mock.calls[0][1].body.params;
|
|
expect(callParams.output).toContain("items");
|
|
expect(callParams.selectItems).toBeDefined();
|
|
});
|
|
});
|