diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index 99ffea84ee9..a22fa6286b9 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -103,6 +103,7 @@ class GraphCtrl extends MetricsPanelCtrl {
     aliasColors: {},
     // other style overrides
     seriesOverrides: [],
+    alerting: {},
   };
 
   /** @ngInject */
@@ -310,6 +311,16 @@ class GraphCtrl extends MetricsPanelCtrl {
     this.refresh();
   }
 
+  convertThresholdsToAlerts() {
+    if (this.panel.grid && this.panel.grid.thresholds1) {
+      this.panel.alerting.warn_level = '< ' + this.panel.grid.threshold1;
+    }
+
+    if (this.panel.grid && this.panel.grid.thresholds2) {
+      this.panel.alerting.crit_level = '< ' + this.panel.grid.threshold2;
+    }
+  }
+
   legendValuesOptionChanged() {
     var legend = this.panel.legend;
     legend.values = legend.min || legend.max || legend.avg || legend.current || legend.total;
diff --git a/public/app/plugins/panel/graph/partials/tab_alerting.html b/public/app/plugins/panel/graph/partials/tab_alerting.html
index 72c3aa05bfb..0bbfb262171 100644
--- a/public/app/plugins/panel/graph/partials/tab_alerting.html
+++ b/public/app/plugins/panel/graph/partials/tab_alerting.html
@@ -14,6 +14,7 @@
     </div>
 
     <h5 class="section-heading">Thresholds</h5>
+		<p ng-show="ctrl.panel.grid.threshold1 || ctrl.panel.grid.threshold2">We noticed you have existing threshholds.<a href="#" ng-click="ctrl.convertThresholdsToAlert()">Convert them</a></p>
     <div class="gf-form">
       <span class="gf-form-label width-7">Warn level</span>
       <input class="gf-form-input max-width-7" type="text" ng-model="ctrl.panel.alerting.warn_level"></input>