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

Backend: Merge master into the backend branch (#845)

Browse Source 
* 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

Co-authored-by: Mario Trangoni <mario@mariotrangoni.de>
Co-authored-by: Alexander Zobnin <alexanderzobnin@gmail.com>
This commit is contained in:
vignesh-reddy
2019-12-30 01:45:47 -06:00
committed by Alexander Zobnin
parent b4b0c5b8f4
commit c300debe35
15 changed files with 499 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/datasource-zabbix/zabbixAlerting.service.js
View File

@@ -32,7 +32,8 @@ export class ZabbixAlertingService {
});
}
if (panelIndex >= 0) {
// Don't apply alert styles to .panel-container--absolute (it rewrites position from absolute to relative)
if (panelIndex >= 0 && !panelContainers[panelIndex].className.includes('panel-container--absolute')) {
let alertClass = "panel-has-alert panel-alert-state--ok panel-alert-state--alerting";
$(panelContainers[panelIndex]).removeClass(alertClass);