diff --git a/public/app/features/alerts/partials/alert_log.html b/public/app/features/alerts/partials/alert_log.html
index 512432267c4..80c2686b9eb 100644
--- a/public/app/features/alerts/partials/alert_log.html
+++ b/public/app/features/alerts/partials/alert_log.html
@@ -6,6 +6,55 @@
     <h1>Alert history for {{ctrl.alert.title}}</h1>
   </div>
 
+  <div class="gf-form-group section" >
+    <h5 class="section-heading">Thresholds</h5>
+    <div class="gf-form">
+      <span class="gf-form-label width-9">
+        <i class="icon-gf icon-gf-warn alert-icon-warn"></i>
+        Warn level
+      </span>
+      <div class="gf-form-label max-width-10">
+        {{ctrl.alert.warnOperator}}
+      </div>
+      <div class="gf-form-label max-width-10">
+        {{ctrl.alert.warnLevel}}
+      </div>
+    </div>
+    <div class="gf-form">
+      <span class="gf-form-label width-9">
+        <i class="icon-gf icon-gf-critical alert-icon-critical"></i>
+        Critical level
+      </span>
+      <div class="gf-form-label max-width-10">
+        {{ctrl.alert.critOperator}}
+      </div>
+      <div class="gf-form-label max-width-10">
+        {{ctrl.alert.critLevel}}
+      </div>
+    </div>
+  </div>
+
+  <div class="gf-form-group section" >
+    <h5 class="section-heading">Aggregators</h5>
+    <div class="gf-form">
+      <span class="gf-form-label width-12">
+        Aggregator
+      </span>
+      <div class="gf-form-label max-width-10">
+        {{ctrl.alert.aggregator}}
+      </div>
+    </div>
+    <div class="gf-form">
+      <span class="gf-form-label width-12">Query range  (seconds)</span>
+      <span class="gf-form-label width-10">{{ctrl.alert.queryRange}}</span>
+    </div>
+
+    <div class="gf-form">
+      <span class="gf-form-label width-12">Frequency (seconds)</span>
+      <span class="gf-form-label width-10">{{ctrl.alert.frequency}}</span>
+    </div>
+  </div>
+
   <table class="filter-table">
     <thead>
       <th style="width: 68px">Status</th>
diff --git a/public/app/plugins/panel/graph/alert_tab_ctrl.ts b/public/app/plugins/panel/graph/alert_tab_ctrl.ts
index f494644f4ce..8e623e6f4aa 100644
--- a/public/app/plugins/panel/graph/alert_tab_ctrl.ts
+++ b/public/app/plugins/panel/graph/alert_tab_ctrl.ts
@@ -14,8 +14,8 @@ export class AlertTabCtrl {
 
   defaultValues = {
     aggregator: 'avg',
-    interval: '60s',
-    queryRange: '10m',
+    frequency: 10,
+    queryRange: 3600,
     warnOperator: '>',
     critOperator: '>',
     queryRef: '- select query -'