IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 10:03:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
bergquist 2016-05-13 14:30:47 +02:00
commit 579b36754a
4 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -9,6 +9,11 @@
* **Templating**: Fixed issue mixing row repeat and panel repeats, fixes [#4988](https://github.com/grafana/grafana/issues/4988) * **Templating**: Fixed issue mixing row repeat and panel repeats, fixes [#4988](https://github.com/grafana/grafana/issues/4988)
* **Templating**: Fixed issue detecting dependencies in nested variables, fixes [#4987](https://github.com/grafana/grafana/issues/4987), fixes [#4986](https://github.com/grafana/grafana/issues/4986) * **Templating**: Fixed issue detecting dependencies in nested variables, fixes [#4987](https://github.com/grafana/grafana/issues/4987), fixes [#4986](https://github.com/grafana/grafana/issues/4986)
* **Graph**: Fixed broken PNG rendering in graph panel, fixes [#5025](https://github.com/grafana/grafana/issues/5025)
* **Graph**: Fixed broken xaxis on graph panel, fixes [#5024](https://github.com/grafana/grafana/issues/5024)
5024
* **Influxdb**: Fixes crash when hiding middle serie, fixes [#5005](https://github.com/grafana/grafana/issues/5005)
# 3.0.1 Stable (2016-05-11) # 3.0.1 Stable (2016-05-11)

2
public/app/features/panel/metrics_ds_selector.ts
View File

@ -10,7 +10,7 @@ var template = `
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label"> <label class="gf-form-label">
<i class="icon-gf icon-gf-datasource"></i> <i class="icon-gf icon-gf-datasources"></i>
</label> </label>
<label class="gf-form-label"> <label class="gf-form-label">
Panel data source Panel data source

10
public/app/plugins/datasource/influxdb/datasource.ts
View File

@ -45,7 +45,7 @@ export default class InfluxDatasource {
var i, y; var i, y;
var allQueries = _.map(options.targets, (target) => { var allQueries = _.map(options.targets, (target) => {
if (target.hide) { return []; } if (target.hide) { return ""; }
queryTargets.push(target); queryTargets.push(target);
@ -54,8 +54,12 @@ export default class InfluxDatasource {
var query = queryModel.render(true); var query = queryModel.render(true);
query = query.replace(/\$interval/g, (target.interval || options.interval)); query = query.replace(/\$interval/g, (target.interval || options.interval));
return query; return query;
}).reduce((acc, current) => {
}).join(";"); if (current !== "") {
acc += ";" + current;
}
return acc;
});
// replace grafana variables // replace grafana variables
allQueries = allQueries.replace(/\$timeFilter/g, timeFilter); allQueries = allQueries.replace(/\$timeFilter/g, timeFilter);

23
public/app/plugins/panel/graph/graph.js
View File

@ -282,7 +282,7 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
options.xaxis = { options.xaxis = {
timezone: dashboard.getTimezone(), timezone: dashboard.getTimezone(),
show: panel['x-axis'], show: panel.xaxis.show,
mode: "time", mode: "time",
min: min, min: min,
max: max, max: max,
@ -452,12 +452,21 @@ function (angular, $, moment, _, kbn, GraphTooltip) {
url += panel.fill !== 0 ? ('&areaAlpha=' + (panel.fill/10).toFixed(1)) : ''; url += panel.fill !== 0 ? ('&areaAlpha=' + (panel.fill/10).toFixed(1)) : '';
url += panel.linewidth !== 0 ? '&lineWidth=' + panel.linewidth : ''; url += panel.linewidth !== 0 ? '&lineWidth=' + panel.linewidth : '';
url += panel.legend.show ? '&hideLegend=false' : '&hideLegend=true'; url += panel.legend.show ? '&hideLegend=false' : '&hideLegend=true';
url += panel.grid.leftMin !== null ? '&yMin=' + panel.grid.leftMin : '';
url += panel.grid.leftMax !== null ? '&yMax=' + panel.grid.leftMax : ''; if (panel.yaxes && panel.yaxes.length > 0) {
url += panel.grid.rightMin !== null ? '&yMin=' + panel.grid.rightMin : ''; var showYaxis = false;
url += panel.grid.rightMax !== null ? '&yMax=' + panel.grid.rightMax : ''; for(var i = 0; panel.yaxes.length > i; i++) {
url += panel['x-axis'] ? '' : '&hideAxes=true'; if (panel.yaxes[i].show) {
url += panel['y-axis'] ? '' : '&hideYAxis=true'; url += (panel.yaxes[i].min !== null && panel.yaxes[i].min !== undefined) ? '&yMin=' + panel.yaxes[i].min : '';
url += (panel.yaxes[i].max !== null && panel.yaxes[i].max !== undefined) ? '&yMax=' + panel.yaxes[i].max : '';
showYaxis = true;
break;
}
}
url += showYaxis ? '' : '&hideYAxis=true';
}
url += panel.xaxis.show ? '' : '&hideAxes=true';
switch(panel.yaxes[0].format) { switch(panel.yaxes[0].format) {
case 'bytes': case 'bytes':