Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix variable query editor, #1590

Browse Source
This commit is contained in:
Alexander Zobnin
2023-03-22 10:38:10 +01:00
parent 3f7f0f4384
commit 24708032e3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/datasource/components/VariableQueryEditor.tsx
View File

@@ -87,10 +87,10 @@ export class ZabbixVariableQueryEditor extends PureComponent<VariableQueryProps,
this.props.onChange(queryModel, `Zabbix - ${queryType}`); this.props.onChange(queryModel, `Zabbix - ${queryType}`);
}; };
async render() { render() {
const { selectedQueryType, legacyQuery, group, host, application, itemTag, item } = this.state; const { selectedQueryType, legacyQuery, group, host, application, itemTag, item } = this.state;
const { datasource } = this.props; const { datasource } = this.props;
const supportsItemTags = (await datasource?.zabbix?.isZabbix54OrHigher()) || false; const supportsItemTags = datasource?.zabbix?.isZabbix54OrHigherSync() || false;
return ( return (
<> <>

4
src/datasource/zabbix/zabbix.ts
View File

@@ -261,6 +261,10 @@ export class Zabbix implements ZabbixConnector {
return version ? semver.gte(version, '5.4.0') : false; return version ? semver.gte(version, '5.4.0') : false;
} }
isZabbix54OrHigherSync() {
return this.version ? semver.gte(this.version, '5.4.0') : false;
}
getItemsFromTarget(target, options) { getItemsFromTarget(target, options) {
const parts = ['group', 'host', 'application', 'itemTag', 'item']; const parts = ['group', 'host', 'application', 'itemTag', 'item'];
const filters = _.map(parts, (p) => target[p].filter); const filters = _.map(parts, (p) => target[p].filter);