Andreas Hilbig
fb5e9cbe81
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.
50 lines
1.6 KiB
TypeScript
50 lines
1.6 KiB
TypeScript
import {createResolvers} from "../api/resolvers.js";
|
|
import {zabbixAPI} from "../datasources/zabbix-api.js";
|
|
|
|
// Mocking ZabbixAPI
|
|
jest.mock("../datasources/zabbix-api.js", () => ({
|
|
zabbixAPI: {
|
|
executeRequest: jest.fn(),
|
|
post: jest.fn(),
|
|
getVersion: jest.fn().mockResolvedValue("7.0.0"),
|
|
}
|
|
}));
|
|
|
|
// Mocking Config
|
|
jest.mock("../common_utils.js", () => ({
|
|
Config: {
|
|
API_VERSION: "1.2.3"
|
|
}
|
|
}));
|
|
|
|
describe("Miscellaneous Resolvers", () => {
|
|
let resolvers: any;
|
|
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
resolvers = createResolvers();
|
|
});
|
|
|
|
test("apiVersion query", async () => {
|
|
const result = await resolvers.Query.apiVersion();
|
|
expect(result).toBe("1.2.3");
|
|
});
|
|
|
|
test("login query", async () => {
|
|
(zabbixAPI.post as jest.Mock).mockResolvedValueOnce("mock-token");
|
|
const result = await resolvers.Query.login(null, { username: "admin", password: "password" });
|
|
expect(result).toBe("mock-token");
|
|
expect(zabbixAPI.post).toHaveBeenCalledWith("user.login", expect.objectContaining({
|
|
body: expect.objectContaining({
|
|
params: { username: "admin", password: "password" }
|
|
})
|
|
}));
|
|
});
|
|
|
|
test("logout query", async () => {
|
|
(zabbixAPI.post as jest.Mock).mockResolvedValueOnce(true);
|
|
const result = await resolvers.Query.logout(null, null, { zabbixAuthToken: "token" });
|
|
expect(result).toBe(true);
|
|
expect(zabbixAPI.post).toHaveBeenCalledWith("user.logout", expect.anything());
|
|
});
|
|
});
|