[Backend] Merge 'master' changes into the backend (#875)
* CI: fix shellcheck issues (#789) Signed-off-by: Mario Trangoni <mjtrangoni@gmail.com> * annotations: fix options in grafana 6.x, fix #813 * fix function editor in Grafana 6.4, closes #810 * add typings for grafana packages * Add $__range_series variable for calculating function over the whole series, #531 * fix tests * Don't set alert styles for react panels, fix #823 * docs: add range variables * docs: percentile reference * fix codespell * update packages (build with node 12) * update circleci node image to 12 * fix test configuration (babel) * Fix 817 (#851) * problems: update panel schema * update packages (build with node 12) * problems: use datasource from target * problems: fix query editor after schema update * problems: fix list layout * update circleci node image to 12 * fix tests * build(deps-dev): bump lodash from 4.17.10 to 4.17.13 (#852) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.10 to 4.17.13. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.10...4.17.13) Signed-off-by: dependabot[bot] <support@github.com> * fix packages security alerts * problems: fix tags adding and removal * fix adding func from typeahead, closes #468 * update change log * bump plugin version to 3.10.5 * problems: fix tag removal (list layout) * Fix percentile() function, closes #862 (#863) Like the other aggregation functions, the datapoints need to be sorted in time before calling groupBy_perf(). * Update copyright, happy New Year! * fix not acknowledged problem color with a message (#858) * fix not acknowledged problem color with a message * fix not acknowledged problem color with a message, closes #857 * Variable query editor (#856) * refactor: convert module to typescript * refactor: covert utils to typescript * variable query editor WIP * variable editor: fix type error after grafana/ui update * variable editor: use FormLabel from grafana/ui * variable editor: refactor * variable editor: input validation and highlights * variable editor: fix tests * variable query: fix backward compatibility with empty queries * fix linter errors * variable editor: fix variable replacement in queries * Fixes for backend Co-authored-by: Mario Trangoni <mario@mariotrangoni.de> Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mark Reibert <mreibert@netskope.com> Co-authored-by: memfiz <arnis.civciss@gmail.com>
This commit is contained in:
Alec Sears
committed by
Alexander Zobnin
Alexander Zobnin
parent
fcfb237004
commit
92e77617cf
@@ -10,6 +10,7 @@ import { triggerPanelTriggersTab } from './triggers_tab';
|
||||
import { migratePanelSchema, CURRENT_SCHEMA_VERSION } from './migrations';
|
||||
import ProblemList from './components/Problems/Problems';
|
||||
import AlertList from './components/AlertList/AlertList';
|
||||
import { getNextRefIdChar } from './utils';
|
||||
|
||||
const ZABBIX_DS_ID = 'alexanderzobnin-zabbix-datasource';
|
||||
const PROBLEM_EVENTS_LIMIT = 100;
|
||||
@@ -23,7 +24,17 @@ export const DEFAULT_TARGET = {
|
||||
proxy: {filter: ""},
|
||||
};
|
||||
|
||||
export const getDefaultTarget = () => DEFAULT_TARGET;
|
||||
export const getDefaultTarget = (targets) => {
|
||||
return {
|
||||
group: {filter: ""},
|
||||
host: {filter: ""},
|
||||
application: {filter: ""},
|
||||
trigger: {filter: ""},
|
||||
tags: {filter: ""},
|
||||
proxy: {filter: ""},
|
||||
refId: getNextRefIdChar(targets),
|
||||
};
|
||||
};
|
||||
|
||||
export const DEFAULT_SEVERITY = [
|
||||
{ priority: 0, severity: 'Not classified', color: 'rgb(108, 108, 108)', show: true},
|
||||
@@ -40,8 +51,7 @@ const DEFAULT_TIME_FORMAT = "DD MMM YYYY HH:mm:ss";
|
||||
|
||||
export const PANEL_DEFAULTS = {
|
||||
schemaVersion: CURRENT_SCHEMA_VERSION,
|
||||
datasources: [],
|
||||
targets: {},
|
||||
targets: [getDefaultTarget([])],
|
||||
// Fields
|
||||
hostField: true,
|
||||
hostTechNameField: false,
|
||||
@@ -108,11 +118,8 @@ export class TriggerPanelCtrl extends PanelCtrl {
|
||||
_.defaultsDeep(this.panel, _.cloneDeep(PANEL_DEFAULTS));
|
||||
|
||||
this.available_datasources = _.map(this.getZabbixDataSources(), 'name');
|
||||
if (this.panel.datasources.length === 0) {
|
||||
this.panel.datasources.push(this.available_datasources[0]);
|
||||
}
|
||||
if (this.isEmptyTargets()) {
|
||||
this.panel.targets[this.panel.datasources[0]] = getDefaultTarget();
|
||||
if (this.panel.targets && !this.panel.targets[0].datasource) {
|
||||
this.panel.targets[0].datasource = this.available_datasources[0];
|
||||
}
|
||||
|
||||
this.initDatasources();
|
||||
@@ -138,7 +145,11 @@ export class TriggerPanelCtrl extends PanelCtrl {
|
||||
}
|
||||
|
||||
initDatasources() {
|
||||
let promises = _.map(this.panel.datasources, (ds) => {
|
||||
if (!this.panel.targets) {
|
||||
return;
|
||||
}
|
||||
const targetDatasources = _.compact(this.panel.targets.map(target => target.datasource));
|
||||
let promises = targetDatasources.map(ds => {
|
||||
// Load datasource
|
||||
return this.datasourceSrv.get(ds)
|
||||
.then(datasource => {
|
||||
@@ -236,14 +247,15 @@ export class TriggerPanelCtrl extends PanelCtrl {
|
||||
const timeTo = Math.ceil(dateMath.parse(this.range.to) / 1000);
|
||||
const userIsEditor = this.contextSrv.isEditor || this.contextSrv.isGrafanaAdmin;
|
||||
|
||||
let promises = _.map(this.panel.datasources, (ds) => {
|
||||
let promises = _.map(this.panel.targets, (target) => {
|
||||
const ds = target.datasource;
|
||||
let proxies;
|
||||
let showAckButton = true;
|
||||
return this.datasourceSrv.get(ds)
|
||||
.then(datasource => {
|
||||
const zabbix = datasource.zabbix;
|
||||
const showEvents = this.panel.showEvents.value;
|
||||
const triggerFilter = this.panel.targets[ds];
|
||||
const triggerFilter = target;
|
||||
const showProxy = this.panel.hostProxy;
|
||||
const getProxiesPromise = showProxy ? zabbix.getProxies() : () => [];
|
||||
showAckButton = !datasource.disableReadOnlyUsersAck || userIsEditor;
|
||||
@@ -284,8 +296,8 @@ export class TriggerPanelCtrl extends PanelCtrl {
|
||||
})
|
||||
.then(triggers => this.setMaintenanceStatus(triggers))
|
||||
.then(triggers => this.setAckButtonStatus(triggers, showAckButton))
|
||||
.then(triggers => this.filterTriggersPre(triggers, ds))
|
||||
.then(triggers => this.addTriggerDataSource(triggers, ds))
|
||||
.then(triggers => this.filterTriggersPre(triggers, target))
|
||||
.then(triggers => this.addTriggerDataSource(triggers, target))
|
||||
.then(triggers => this.addTriggerHostProxy(triggers, proxies));
|
||||
});
|
||||
|
||||
@@ -339,16 +351,17 @@ export class TriggerPanelCtrl extends PanelCtrl {
|
||||
return triggers;
|
||||
}
|
||||
|
||||
filterTriggersPre(triggerList, ds) {
|
||||
filterTriggersPre(triggerList, target) {
|
||||
// Filter triggers by description
|
||||
let triggerFilter = this.panel.targets[ds].trigger.filter;
|
||||
const ds = target.datasource;
|
||||
let triggerFilter = target.trigger.filter;
|
||||
triggerFilter = this.datasources[ds].replaceTemplateVars(triggerFilter);
|
||||
if (triggerFilter) {
|
||||
triggerList = filterTriggers(triggerList, triggerFilter);
|
||||
}
|
||||
|
||||
// Filter by tags
|
||||
const target = this.panel.targets[ds];
|
||||
// const target = this.panel.targets[ds];
|
||||
if (target.tags.filter) {
|
||||
let tagsFilter = this.datasources[ds].replaceTemplateVars(target.tags.filter);
|
||||
// replaceTemplateVars() builds regex-like string, so we should trim it.
|
||||
@@ -406,9 +419,9 @@ export class TriggerPanelCtrl extends PanelCtrl {
|
||||
return triggers;
|
||||
}
|
||||
|
||||
addTriggerDataSource(triggers, ds) {
|
||||
addTriggerDataSource(triggers, target) {
|
||||
_.each(triggers, (trigger) => {
|
||||
trigger.datasource = ds;
|
||||
trigger.datasource = target.datasource;
|
||||
});
|
||||
return triggers;
|
||||
}
|
||||
@@ -479,24 +492,27 @@ export class TriggerPanelCtrl extends PanelCtrl {
|
||||
return _.map(tags, (tag) => `${tag.tag}:${tag.value}`).join(', ');
|
||||
}
|
||||
|
||||
addTagFilter(tag, ds) {
|
||||
let tagFilter = this.panel.targets[ds].tags.filter;
|
||||
addTagFilter(tag, datasource) {
|
||||
const target = this.panel.targets.find(t => t.datasource === datasource);
|
||||
console.log(target);
|
||||
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);
|
||||
this.panel.targets[ds].tags.filter = newFilter;
|
||||
target.tags.filter = newFilter;
|
||||
this.refresh();
|
||||
}
|
||||
|
||||
removeTagFilter(tag, ds) {
|
||||
let tagFilter = this.panel.targets[ds].tags.filter;
|
||||
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);
|
||||
this.panel.targets[ds].tags.filter = newFilter;
|
||||
target.tags.filter = newFilter;
|
||||
this.refresh();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user