diff --git a/api/getWebData.js b/api/getWebData.js index b7d0411..f313595 100644 --- a/api/getWebData.js +++ b/api/getWebData.js @@ -22,7 +22,7 @@ const getWebData = (hostname, io) => { // monitoringState[hostname] = response.length // } } - // if (response[0] !== 'ok') monitoringState[hostname] = 0 + if (response[0] !== 'ok') monitoringState[hostname] = 0 }) } dataLoop() diff --git a/clientWeb/src/routes/+page.svelte b/clientWeb/src/routes/+page.svelte index eb5fc3d..20c4468 100644 --- a/clientWeb/src/routes/+page.svelte +++ b/clientWeb/src/routes/+page.svelte @@ -95,13 +95,13 @@
-
+
{#each time as timeElement} - + {/each}
History for the last {minutes} minutes diff --git a/clientWeb/src/routes/Header.svelte b/clientWeb/src/routes/Header.svelte index 1527b09..7babf16 100644 --- a/clientWeb/src/routes/Header.svelte +++ b/clientWeb/src/routes/Header.svelte @@ -5,6 +5,7 @@ export let metrics export let subscribe export let unsubscribe + export let minutes export let hostname let hostmenutoggle = false let currentHost @@ -32,7 +33,7 @@ unsubscribe(currentHost) console.log('unsub: ', currentHost) subscribe(name) - let resp = await fetch(`/api/serverchange/${name}`) + let resp = await fetch(`/api/serverchange/${name}/${minutes * 30}`) if (!resp.ok) throw new Error(resp.status) resp = await resp.json() resp.map((el) => { diff --git a/package.json b/package.json index ac853c0..e7f7b42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodesysmon", - "version": "0.7.1", + "version": "0.7.2", "description": "Node simple system monitoring", "main": "nodesysmon.js", "engines": { diff --git a/server.js b/server.js index d80372a..1a70c81 100644 --- a/server.js +++ b/server.js @@ -81,8 +81,8 @@ export default async (thresholds) => { res.status(200).json(data) }) - app.get('/api/serverchange/:host', async (req, res) => { - const data = await getHistory(300, req.params.host) + app.get('/api/serverchange/:host/:count', async (req, res) => { + const data = await getHistory(req.params.count, req.params.host) if (monitoringState[req.params.host]) { monitoringState[req.params.host] += 1 console.log('change: ', monitoringState)