diff --git a/.changeset/gentle-suits-invite.md b/.changeset/gentle-suits-invite.md new file mode 100644 index 0000000..ca6607d --- /dev/null +++ b/.changeset/gentle-suits-invite.md @@ -0,0 +1,5 @@ +--- +'grafana-zabbix': patch +--- + +Fix: `real_hosts` deprecated in version 6.2 and 6.4 diff --git a/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.test.ts b/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.test.ts index 56dbafe..1cd3bea 100644 --- a/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.test.ts +++ b/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.test.ts @@ -37,9 +37,9 @@ describe('Zabbix API connector', () => { }); }); - it('should send the real_hosts parameter when version is <7.0', () => { + it('should send the real_hosts parameter when version is <=6.0', () => { const zabbixAPIConnector = new ZabbixAPIConnector(true, true, 123); - zabbixAPIConnector.version = '6.5.0'; + zabbixAPIConnector.version = '6.0.0'; zabbixAPIConnector.request = jest.fn(); zabbixAPIConnector.getGroups(); @@ -49,6 +49,19 @@ describe('Zabbix API connector', () => { real_hosts: true, }); }); + + it('should send the with_hosts parameter when version is >=6.2', () => { + const zabbixAPIConnector = new ZabbixAPIConnector(true, true, 123); + zabbixAPIConnector.version = '6.2.0'; + zabbixAPIConnector.request = jest.fn(); + + zabbixAPIConnector.getGroups(); + expect(zabbixAPIConnector.request).toHaveBeenCalledWith('hostgroup.get', { + output: ['name', 'groupid'], + sortfield: 'name', + with_hosts: true, + }); + }); }); describe('getHostAlerts function', () => { diff --git a/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts b/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts index a71d3ca..6428584 100644 --- a/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts +++ b/src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts @@ -1029,7 +1029,7 @@ function getParamsKeyByVersion( case 'selectAcknowledges': return semver.gte(version, '7.0.0') ? 'selectAcknowledges' : 'select_acknowledges'; case 'with_hosts': - return semver.gte(version, '7.0.0') ? 'with_hosts' : 'real_hosts'; + return semver.gte(version, '6.2.0') ? 'with_hosts' : 'real_hosts'; default: return ''; }