Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 12:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also show stale cache entries in the new doughnut chart

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2023-05-11 14:19:34 +02:00
parent c99eca3aee
commit 895f35f587
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scripts/pi-hole/js/settings-system.js
View File

@@ -12,7 +12,6 @@ var cachePieChart = null;
var cacheSize = 0, var cacheSize = 0,
cacheEntries = 0; cacheEntries = 0;
var querytypeids = [];
function updateCachePie(data) { function updateCachePie(data) {
var v = [], var v = [],
c = [], c = [],
@@ -22,7 +21,8 @@ function updateCachePie(data) {
// Compute total number of cache entries // Compute total number of cache entries
cacheEntries = 0; cacheEntries = 0;
Object.keys(data).forEach(function (item) { Object.keys(data).forEach(function (item) {
cacheEntries += data[item]; cacheEntries += data[item].valid;
cacheEntries += data[item].stale;
}); });
// Sort data by value, put OTHER always as last // Sort data by value, put OTHER always as last
@@ -32,7 +32,7 @@ function updateCachePie(data) {
} else if (b === "OTHER") { } else if (b === "OTHER") {
return -1; return -1;
} else { } else {
return data[b] - data[a]; return data[b].valid + data[b].stale - (data[a].valid + data[a].stale);
} }
}); });
@@ -44,17 +44,23 @@ function updateCachePie(data) {
data = tmp; data = tmp;
// Add empty space to chart // Add empty space to chart
data.empty = cacheSize - cacheEntries; data.empty = {};
data.empty.valid = cacheSize - cacheEntries;
// Fill chart with data // Fill chart with data
querytypeids = [];
Object.keys(data).forEach(function (item) { Object.keys(data).forEach(function (item) {
v.push((100 * data[item]) / cacheSize); if (data[item].valid > 0) {
c.push(item !== "empty" ? THEME_COLORS[i % THEME_COLORS.length] : "#80808040"); v.push((100 * data[item].valid) / cacheSize);
k.push(item); c.push(item !== "empty" ? THEME_COLORS[i++ % THEME_COLORS.length] : "#80808040");
querytypeids.push(i + 1); k.push(item);
}
i++; if (data[item].stale > 0) {
// There are no stale empty entries
v.push((100 * data[item].stale) / cacheSize);
c.push(THEME_COLORS[i++ % THEME_COLORS.length]);
k.push(item + " (stale)");
}
}); });
// Build a single dataset with the data to be pushed // Build a single dataset with the data to be pushed