Merge remote-tracking branch 'upstream/master' into threshold_regex

# Conflicts: # dist/datasource-zabbix/datasource.js # dist/datasource-zabbix/datasource.js.map # dist/datasource-zabbix/specs/test-main.js # dist/test/datasource-zabbix/datasource.js # dist/test/datasource-zabbix/specs/test-main.js
grafana · Oct 23, 2017 · 0ab31e5 · 0ab31e5
2 parents eb1ef06 + 61cedec
commit 0ab31e5
Show file tree

Hide file tree

Showing 48 changed files with 1,791 additions and 605 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]
 ### Added
 - PostgreSQL support for Direct DB Connection.
+- _Triggers_ query mode which allows to count active alerts by group, host and application, [#141](https://github.com/alexanderzobnin/grafana-zabbix/issues/141)
 - `sortSeries()` function that allows to sort multiple timeseries by name, [#447](https://github.com/alexanderzobnin/grafana-zabbix/issues/447)
 - `percentil()` function