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

Problems: fix tags add/remove

Browse Source
This commit is contained in:
Alexander Zobnin
2020-05-08 15:11:55 +03:00
parent 0381d77519
commit 001d911282
3 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/datasource-zabbix/datasource.ts
View File

@@ -456,8 +456,6 @@ export class ZabbixDatasource {
return problemsPromises.then(problems => {
const problemsDataFrame = problemsHandler.toDataFrame(problems);
console.log(problems);
console.log(problemsDataFrame);
return problemsDataFrame;
});
}

14
src/panel-triggers/migrations.ts
View File

@@ -1,10 +1,21 @@
import _ from 'lodash';
import { getNextRefIdChar } from './utils';
import { getDefaultTarget } from './triggers_panel_ctrl';
// Actual schema version
export const CURRENT_SCHEMA_VERSION = 8;
export const getDefaultTarget = (targets?) => {
return {
group: {filter: ""},
host: {filter: ""},
application: {filter: ""},
trigger: {filter: ""},
tags: {filter: ""},
proxy: {filter: ""},
refId: getNextRefIdChar(targets),
};
};
export function getDefaultTargetOptions() {
return {
hostsInMaintenance: true,
@@ -89,6 +100,7 @@ export function migratePanelSchema(panel) {
// set queryType to PROBLEMS
target.queryType = 5;
target.options = getDefaultTargetOptions();
_.defaults(target, {tags: {filter: ""}});
}
}

37
src/panel-triggers/triggers_panel_ctrl.js
View File

@@ -266,25 +266,32 @@ export class TriggerPanelCtrl extends MetricsPanelCtrl {
}
addTagFilter(tag, datasource) {
const target = this.panel.targets.find(t => t.datasource === datasource);
let tagFilter = target.tags.filter;
let targetTags = this.parseTags(tagFilter);
let newTag = {tag: tag.tag, value: tag.value};
targetTags.push(newTag);
targetTags = _.uniqWith(targetTags, _.isEqual);
let newFilter = this.tagsToString(targetTags);
target.tags.filter = newFilter;
for (const target of this.panel.targets) {
if (target.datasource === datasource || this.panel.datasource === datasource) {
let tagFilter = target.tags.filter;
let targetTags = this.parseTags(tagFilter);
let newTag = {tag: tag.tag, value: tag.value};
targetTags.push(newTag);
targetTags = _.uniqWith(targetTags, _.isEqual);
let newFilter = this.tagsToString(targetTags);
target.tags.filter = newFilter;
}
}
this.refresh();
}
removeTagFilter(tag, datasource) {
const target = this.panel.targets.find(t => t.datasource === datasource);
let tagFilter = target.tags.filter;
let targetTags = this.parseTags(tagFilter);
_.remove(targetTags, t => t.tag === tag.tag && t.value === tag.value);
targetTags = _.uniqWith(targetTags, _.isEqual);
let newFilter = this.tagsToString(targetTags);
target.tags.filter = newFilter;
const matchTag = t => t.tag === tag.tag && t.value === tag.value;
for (const target of this.panel.targets) {
if (target.datasource === datasource || this.panel.datasource === datasource) {
let tagFilter = target.tags.filter;
let targetTags = this.parseTags(tagFilter);
_.remove(targetTags, matchTag);
targetTags = _.uniqWith(targetTags, _.isEqual);
let newFilter = this.tagsToString(targetTags);
target.tags.filter = newFilter;
}
}
this.refresh();
}