Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

"name" is apparently a reserved word

pull/10616/head
Jade McGough 2016-11-03 13:46:09 -07:00
parent 1db252643f
commit def3c434b3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/src/alerts/apis/index.js
View File

@ -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",
});
}

2
ui/src/alerts/containers/AlertsApp.js
View File

@ -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({