IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

change(graphite): removed graphite png option in graph panel, closes #5367

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-06-15 14:20:44 +02:00
parent f842e28b85
commit ae554a736b
4 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -15,6 +15,7 @@
## Breaking changes
* **Logging** : Changed default logging output format (now structured into message, and key value pairs, with logger key acting as component). You can also no change in config to json log ouput.
* **Graphite** : The Graph panel no longer have a Graphite PNG option. closes #[5367](https://github.com/grafana/grafana/issues/5367)
# 3.0.4 Patch release (2016-05-25)
* **Panel**: Fixed blank dashboard issue when switching to other dashboard while in fullscreen edit mode, fixes [#5163](https://github.com/grafana/grafana/pull/5163)

8
public/app/plugins/datasource/graphite/datasource.ts
View File

@ -30,10 +30,6 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
return $q.when({data: []});
}
if (options.format === 'png') {
return $q.when({data: this.url + '/render' + '?' + params.join('&')});
}
var httpOptions: any = {method: this.render_method, url: '/render'};
if (httpOptions.method === 'GET') {
@ -217,9 +213,7 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
var intervalFormatFixRegex = /'(\d+)m'/gi;
var hasTargets = false;
if (options.format !== 'png') {
options['format'] = 'json';
}
options['format'] = 'json';
function fixIntervalFormat(match) {
return match.replace('m', 'min').replace('M', 'mon');

6
public/app/plugins/panel/graph/module.ts
View File

@ -171,12 +171,6 @@ class GraphCtrl extends MetricsPanelCtrl {
}
onDataReceived(dataList) {
// png renderer returns just a url
if (_.isString(dataList)) {
this.render(dataList);
return;
}
this.datapointsWarning = false;
this.datapointsCount = 0;
this.datapointsOutside = false;

6
public/app/plugins/panel/graph/tab_display.html
View File

@ -47,12 +47,6 @@
<select class="gf-form-input max-width-8" ng-model="ctrl.panel.nullPointMode" ng-options="f for f in ['connected', 'null', 'null as zero']" ng-change="ctrl.render()"></select>
</div>
</div>
<div class="gf-form">
<label class="gf-form-label width-9">Renderer</label>
<div class="gf-form-select-wrapper max-width-8">
<select class="gf-form-input" ng-model="ctrl.panel.renderer" ng-options="f for f in ['flot', 'png']" ng-change="ctrl.render()"></select>
</div>
</div>
<div class="gf-form">
<label class="gf-form-label width-9">Tooltip mode</label>
<div class="gf-form-select-wrapper max-width-8">