Merge branch 'master' into docs

This commit is contained in:
Alexander Zobnin
2016-11-16 23:15:35 +03:00
34 changed files with 2414 additions and 1558 deletions

View File

@@ -22,7 +22,7 @@ a number of ways to get help:
- [Gitter room](https://gitter.im/alexanderzobnin/grafana-zabbix)
- [Twitter](https://twitter.com/AlexanderZobnin)
Or you can just send me [email](mailto:alexanderzobnin@gmail.com).
Or you can send me [email](mailto:alexanderzobnin@gmail.com).
## Support Project
I develop this project in my free time, but if you really find it helpful and promising, you can
@@ -34,5 +34,5 @@ Triggers panel was sponsored by [Core IT Project](http://coreit.fr/)).
By utilizing this software, you agree to the terms of the included license. Grafana-Zabbix plugin is
licensed under the Apache 2.0 agreement. See
[LICENSE](https://github.com/alexanderzobnin/grafana-zabbix/blob/master/LICENSE.md) for the full
[LICENSE](https://github.com/alexanderzobnin/grafana-zabbix/blob/master/LICENSE) for the full
license terms.

View File

@@ -30,6 +30,13 @@ scale(100)
scale(0.01)
```
### delta
```
delta()
```
Convert absolute values to delta, for example, bits to bits/sec.
Aggregate
---------
@@ -71,6 +78,38 @@ max(interval)
```
**Deprecated**, use `aggregateBy(interval, max)` instead.
Filter
---------
### top
```
top(N, value)
```
Returns top N series, sorted by _value_, which can be one of: _avg_, _min_, _max_, _median_.
Examples:
```
top(10, avg)
top(5, max)
```
### bottom
```
bottom(N, value)
```
Returns bottom N series, sorted by _value_, which can be one of: _avg_, _min_, _max_, _median_.
Examples:
```
bottom(5, avg)
```
## Trends
### trendValue