From def3c434b38cfbeeb15952fe48008667d938ede6 Mon Sep 17 00:00:00 2001
From: Jade McGough <jade@influxdb.com>
Date: Thu, 3 Nov 2016 13:46:09 -0700
Subject: [PATCH] "name" is apparently a reserved word

---
 ui/src/alerts/apis/index.js           | 2 +-
 ui/src/alerts/containers/AlertsApp.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/alerts/apis/index.js b/ui/src/alerts/apis/index.js
index 26cebf2dcb..a167a30750 100644
--- a/ui/src/alerts/apis/index.js
+++ b/ui/src/alerts/apis/index.js
@@ -3,7 +3,7 @@ import {proxy} from 'utils/queryUrlGenerator';
 export function getAlerts(proxyLink) {
   return proxy({
     source: proxyLink,
-    query: "select host, value, level, alert_name from alert",
+    query: "select host, value, level, \"name\" from alert",
     db: "chronograf",
   });
 }
diff --git a/ui/src/alerts/containers/AlertsApp.js b/ui/src/alerts/containers/AlertsApp.js
index 82eb16a022..f9a21b5c2d 100644
--- a/ui/src/alerts/containers/AlertsApp.js
+++ b/ui/src/alerts/containers/AlertsApp.js
@@ -36,7 +36,7 @@ const AlertsApp = React.createClass({
       const hostIndex = alertSeries[0].columns.findIndex((col) => col === 'host');
       const valueIndex = alertSeries[0].columns.findIndex((col) => col === 'value');
       const levelIndex = alertSeries[0].columns.findIndex((col) => col === 'level');
-      const nameIndex = alertSeries[0].columns.findIndex((col) => col === 'alert_name');
+      const nameIndex = alertSeries[0].columns.findIndex((col) => col === 'name');
 
       alertSeries[0].values.forEach((s) => {
         results.push({