From ae554a736b54fcbc743e47e1dd5eac878c9de027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Wed, 15 Jun 2016 14:20:44 +0200
Subject: [PATCH] change(graphite): removed graphite png option in graph panel,
 closes #5367

---
 CHANGELOG.md                                         | 1 +
 public/app/plugins/datasource/graphite/datasource.ts | 8 +-------
 public/app/plugins/panel/graph/module.ts             | 6 ------
 public/app/plugins/panel/graph/tab_display.html      | 6 ------
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ad8f717d8f..b52f5ff3d45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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)
diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index 77d44be22e0..489d62f686f 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -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');
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 2b2e75b5a33..c7969bb6f07 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -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;
diff --git a/public/app/plugins/panel/graph/tab_display.html b/public/app/plugins/panel/graph/tab_display.html
index a33ae0bc67f..27bdab4635e 100644
--- a/public/app/plugins/panel/graph/tab_display.html
+++ b/public/app/plugins/panel/graph/tab_display.html
@@ -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">