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

Merge pull request #1650 from influxdata/bug/fix-cpu-reporting 

Fix broken cpu reporting on hosts page and normalize InfluxQL
pull/1652/head
Nathan Haugo 2017-06-21 17:43:30 -07:00 committed by GitHub
parent 21c3f78fe3 9bc9ee22b8
commit fcf283c055
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,9 +1,11 @@
## v1.3.4.0 [unreleased] ## v1.3.4.0 [unreleased]
### Bug Fixes ### Bug Fixes
### Features ### Features
### UI Improvements ### UI Improvements
## v1.3.3.2 [2017-06-20]
1. [1650](https://github.com/influxdata/chronograf/pull/1650): Fix broken cpu reporting on hosts page and normalize InfluxQL
## v1.3.3.1 [2017-06-20] ## v1.3.3.1 [2017-06-20]
### Bug Fixes ### Bug Fixes
1. [#1642](https://github.com/influxdata/chronograf/pull/1642): Do not prefix basepath to external link for news feed 1. [#1642](https://github.com/influxdata/chronograf/pull/1642): Do not prefix basepath to external link for news feed

14
ui/src/hosts/apis/index.js
View File

@ -5,13 +5,13 @@ import _ from 'lodash'
export function getCpuAndLoadForHosts(proxyLink, telegrafDB) { export function getCpuAndLoadForHosts(proxyLink, telegrafDB) {
return proxy({ return proxy({
source: proxyLink, source: proxyLink,
query: `select mean(usage_user) from cpu where cpu = "cpu-total" and time > now() - 10m group by host; query: `SELECT mean("usage_user") FROM cpu WHERE "cpu" = 'cpu-total' AND time > now() - 10m GROUP BY host;
select mean("load1") from "system" where time > now() - 10m group by host; SELECT mean("load1") FROM "system" WHERE time > now() - 10m GROUP BY host;
select non_negative_derivative(mean(uptime)) as deltaUptime from "system" where time > now() - 10m group by host, time(1m) fill(0); SELECT non_negative_derivative(mean(uptime)) AS deltaUptime FROM "system" WHERE time > now() - 10m GROUP BY host, time(1m) fill(0);
select mean("Percent_Processor_Time") from win_cpu where time > now() - 10m group by host; SELECT mean("Percent_Processor_Time") FROM win_cpu WHERE time > now() - 10m GROUP BY host;
select mean("Processor_Queue_Length") from win_system where time > now() - 10s group by host; SELECT mean("Processor_Queue_Length") FROM win_system WHERE time > now() - 10s GROUP BY host;
select non_negative_derivative(mean("System_Up_Time")) as deltaUptime from "telegraf"."autogen"."win_uptime" where time > now() - 10m group by host, time(1m) fill(0); SELECT non_negative_derivative(mean("System_Up_Time")) AS deltaUptime FROM "telegraf"."autogen"."win_uptime" WHERE time > now() - 10m GROUP BY host, time(1m) fill(0);
show tag values from /win_system|system/ with key = "host"`, SHOW TAG VALUES FROM /win_system|system/ WITH KEY = "host"`,
db: telegrafDB, db: telegrafDB,
}).then(resp => { }).then(resp => {
const hosts = {} const hosts = {}