From 4e1501b172a7fa85d02d301357882cacf5895049 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Tanda <mitsuhiro.tanda@gmail.com>
Date: Mon, 12 Mar 2018 13:53:05 +0900
Subject: [PATCH] set default value of httpMethod

---
 public/app/plugins/datasource/prometheus/config_ctrl.ts | 9 +++++++++
 public/app/plugins/datasource/prometheus/datasource.ts  | 2 +-
 public/app/plugins/datasource/prometheus/module.ts      | 5 +----
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 public/app/plugins/datasource/prometheus/config_ctrl.ts

diff --git a/public/app/plugins/datasource/prometheus/config_ctrl.ts b/public/app/plugins/datasource/prometheus/config_ctrl.ts
new file mode 100644
index 00000000000..f7949ec9824
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/config_ctrl.ts
@@ -0,0 +1,9 @@
+export class PrometheusConfigCtrl {
+  static templateUrl = 'public/app/plugins/datasource/prometheus/partials/config.html';
+  current: any;
+
+  /** @ngInject */
+  constructor($scope) {
+    this.current.jsonData.httpMethod = this.current.jsonData.httpMethod || 'GET';
+  }
+}
diff --git a/public/app/plugins/datasource/prometheus/datasource.ts b/public/app/plugins/datasource/prometheus/datasource.ts
index 85a0f733fd2..a64690bfb88 100644
--- a/public/app/plugins/datasource/prometheus/datasource.ts
+++ b/public/app/plugins/datasource/prometheus/datasource.ts
@@ -34,7 +34,7 @@ export class PrometheusDatasource {
     this.basicAuth = instanceSettings.basicAuth;
     this.withCredentials = instanceSettings.withCredentials;
     this.interval = instanceSettings.jsonData.timeInterval || '15s';
-    this.httpMethod = instanceSettings.jsonData.httpMethod || 'GET';
+    this.httpMethod = instanceSettings.jsonData.httpMethod;
   }
 
   _request(method, url, data?, requestId?) {
diff --git a/public/app/plugins/datasource/prometheus/module.ts b/public/app/plugins/datasource/prometheus/module.ts
index e4292704916..d7e0b8ebe2c 100644
--- a/public/app/plugins/datasource/prometheus/module.ts
+++ b/public/app/plugins/datasource/prometheus/module.ts
@@ -1,9 +1,6 @@
 import { PrometheusDatasource } from './datasource';
 import { PrometheusQueryCtrl } from './query_ctrl';
-
-class PrometheusConfigCtrl {
-  static templateUrl = 'partials/config.html';
-}
+import { PrometheusConfigCtrl } from './config_ctrl';
 
 class PrometheusAnnotationsQueryCtrl {
   static templateUrl = 'partials/annotations.editor.html';