Fixing hourly
This commit is contained in:
@@ -44,9 +44,10 @@ export async function queryHourly(start, end) {
|
||||
const results = await query(c, `avg_over_time({__name__!=""}[1h])`, s, e);
|
||||
results.forEach(r => {
|
||||
r.values.forEach(([ts, val]) => {
|
||||
if(r.metric.__name__.startsWith('system_')) return;
|
||||
const time = new Date(ts * 1000).toISOString().slice(0, 13) + ':00';
|
||||
if (!byTime[time]) byTime[time] = {time};
|
||||
byTime[time][r.metric.__name__] = parseFloat(val);
|
||||
byTime[time][r.metric.__name__.replace('weather_', '')] = parseFloat(val);
|
||||
});
|
||||
});
|
||||
return Object.values(byTime).sort((a, b) => a.time.localeCompare(b.time));
|
||||
@@ -68,7 +69,7 @@ export async function queryDaily(start, end) {
|
||||
r.values.forEach(([ts, val]) => {
|
||||
const time = new Date(ts * 1000).toISOString().slice(0, 10);
|
||||
if (!byTime[time]) byTime[time] = {time};
|
||||
byTime[time][r.metric.__name__] = parseFloat(val);
|
||||
byTime[time][r.metric.__name__.replace('weather_', '')] = parseFloat(val);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user