Merge branch 'fix-codespell-issues' of git://github.com/mjtrangoni/grafana-zabbix into mjtrangoni-fix-codespell-issues

This commit is contained in:
Alexander Zobnin
2019-04-19 13:00:25 +03:00
9 changed files with 28 additions and 12 deletions

View File

@@ -155,12 +155,23 @@ jobs:
at: ../gh-pages
- run: ./.circleci/deploy-docs.sh
codespell:
docker:
- image: circleci/python
steps:
- checkout
- run: sudo pip install codespell
- run: codespell -S './.git*,./src/img*' -L que
workflows:
version: 2
build-master:
jobs:
- build:
filters: *filter-only-master
- codespell:
filters: *filter-only-master
- lint:
filters: *filter-only-master
- test:
@@ -170,6 +181,8 @@ workflows:
jobs:
- build:
filters: *filter-not-release-or-master
- codespell:
filters: *filter-not-release-or-master
- lint:
filters: *filter-not-release-or-master
- test:
@@ -179,6 +192,8 @@ workflows:
jobs:
- build:
filters: *filter-only-release
- codespell:
filters: *filter-only-release
- lint:
filters: *filter-only-release
- test:
@@ -186,6 +201,7 @@ workflows:
- make-release:
requires:
- build
- codespell
- lint
- test
filters: *filter-only-release

View File

@@ -189,7 +189,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- setAliasByRegex() function
### Changed
- **Docs**: deprecate special repo with builded plugin.
- **Docs**: deprecate special repo with built plugins.
- **Triggers panel**: remove 'default' from datasources list (cause error), iss [#340](https://github.com/alexanderzobnin/grafana-zabbix/issues/340)
- Add dist/ directory to repo to correspond development guide http://docs.grafana.org/plugins/development/

View File

@@ -56,7 +56,7 @@ Direct access is still supported because in some cases it may be useful to acces
Direct DB Connection allows plugin to use existing SQL data source for querying history data directly from Zabbix
database. This way usually faster than pulling data from Zabbix API, especially on the wide time ranges, and reduces
amount of data transfered.
amount of data transferred.
Read [how to configure](./sql_datasource) SQL data source in Grafana.

View File

@@ -25,7 +25,7 @@ Another case to use regex is comparing the same metrics for different hosts. Use
![Backend system time](../img/getstarting-regex_backend_system_time.png)
## Bar Chart
Let's create a graph wich show queries stats for MySQL database. Select Group, Host, Application (_MySQL_ in my case) and Items. I use `/MySQL .* operations/` regex for filtering different types of operations.
Let's create a graph which show queries stats for MySQL database. Select Group, Host, Application (_MySQL_ in my case) and Items. I use `/MySQL .* operations/` regex for filtering different types of operations.
![MySQL operations 1](../img/getstarting-mysql_operations_1.png)

View File

@@ -14,7 +14,7 @@ consists of two main parts:
- **Alerting execution engine**
The alert rules are evaluated in the Grafana backend in a scheduler and query execution engine that is part of core
Grafana. Only some data soures are supported right now. They include Graphite, Prometheus, InfluxDB and OpenTSDB.
Grafana. Only some data sources are supported right now. They include Graphite, Prometheus, InfluxDB and OpenTSDB.
- **Alerting visualisations**
Alerts highlight panels with problems and it can easily be found on the dashboard.

View File

@@ -66,7 +66,7 @@ angular
});
$input.blur(function() {
// clicking the function dropdown menu wont
// clicking the function dropdown menu won't
// work if you remove class at once
setTimeout(function() {
$input.val('');

View File

@@ -19,7 +19,7 @@ let AVERAGE = ts.AVERAGE;
let MIN = ts.MIN;
let MAX = ts.MAX;
let MEDIAN = ts.MEDIAN;
let PERCENTIL = ts.PERCENTIL;
let PERCENTILE = ts.PERCENTILE;
function limit(order, n, orderByFunc, timeseries) {
let orderByCallback = aggregationFunctions[orderByFunc];
@@ -121,9 +121,9 @@ function aggregateWrapper(groupByCallback, interval, datapoints) {
return groupBy(sortedPoints, interval, groupByCallback);
}
function percentil(interval, n, datapoints) {
function percentile(interval, n, datapoints) {
var flattenedPoints = ts.flattenDatapoints(datapoints);
var groupByCallback = _.partial(PERCENTIL, n);
var groupByCallback = _.partial(PERCENTILE, n);
return groupBy(flattenedPoints, interval, groupByCallback);
}
@@ -155,7 +155,7 @@ let metricFunctions = {
transformNull: transformNull,
aggregateBy: aggregateByWrapper,
// Predefined aggs
percentil: percentil,
percentile: percentile,
average: _.partial(aggregateWrapper, AVERAGE),
min: _.partial(aggregateWrapper, MIN),
max: _.partial(aggregateWrapper, MAX),

View File

@@ -99,7 +99,7 @@
In order to use this feature it should be <a href="/datasources/new" target="_blank">created</a> and
configured first. Zabbix plugin uses this data source for querying history data directly from the database.
This way usually faster than pulling data from Zabbix API, especially on the wide time ranges, and reduces
amount of data transfered.
amount of data transferred.
</info-popover>
</span>
<div class="gf-form-select-wrapper max-width-16">

View File

@@ -333,7 +333,7 @@ function expMovingAverage(datapoints, n) {
return ema;
}
function PERCENTIL(n, values) {
function PERCENTILE(n, values) {
var sorted = _.sortBy(values);
return sorted[Math.floor(sorted.length * n / 100)];
}
@@ -509,7 +509,7 @@ const exportedFunctions = {
MIN,
MAX,
MEDIAN,
PERCENTIL,
PERCENTILE,
sortByTime,
flattenDatapoints,
};