summaryrefslogtreecommitdiffstats
path: root/ogcp
diff options
context:
space:
mode:
authorAlejandro Sirgo Rica <asirgo@soleta.eu>2024-09-26 10:34:28 +0200
committerAlejandro Sirgo Rica <asirgo@soleta.eu>2024-09-26 13:21:02 +0200
commitc1d9018e2174a3144c6babba86b4959dd77448d2 (patch)
treecb85898b3f1d67e7ff870781d3b94aae18784fd9 /ogcp
parent77a60b717af0db3deed845745c39a3fd1e52e6e2 (diff)
templates: show real sizes in cache inspector
Use real free and available cache in cache_inspector.html
Diffstat (limited to 'ogcp')
-rw-r--r--ogcp/templates/cache_inspector.html8
-rw-r--r--ogcp/templates/disk_inspector.html5
-rw-r--r--ogcp/views.py8
3 files changed, 12 insertions, 9 deletions
diff --git a/ogcp/templates/cache_inspector.html b/ogcp/templates/cache_inspector.html
index 42dd983..8e64cd4 100644
--- a/ogcp/templates/cache_inspector.html
+++ b/ogcp/templates/cache_inspector.html
@@ -100,9 +100,9 @@
}
function updateChart(ip) {
- var totalCache = toGiB(storageData[ip].total, 3);
+ var totalCache = toGiB(storageData[ip].used + storageData[ip].free, 3);
var usedCache = toGiB(storageData[ip].used, 3);
- var freeCache = toGiB(storageData[ip].total - storageData[ip].used, 3)
+ var freeCache = toGiB(storageData[ip].free, 3);
cacheChart.data.datasets[0].data = [
usedCache,
@@ -134,9 +134,7 @@
$('.badge-pill').each(function(index) {
for (var ip in storageData) {
if ($(this).html().includes(ip)) {
- var totalCache = storageData[ip].total;
- var usedCache = storageData[ip].used;
- var freeCache = toGiB(totalCache - usedCache, 1)
+ var freeCache = toGiB(storageData[ip].free, 1)
$(this).html($(this).html() + '<br>free: ' + freeCache + ' GiB');
break;
}
diff --git a/ogcp/templates/disk_inspector.html b/ogcp/templates/disk_inspector.html
index f3f190a..2f1b3dc 100644
--- a/ogcp/templates/disk_inspector.html
+++ b/ogcp/templates/disk_inspector.html
@@ -180,7 +180,12 @@
let freeSpace = diskSize;
let partNum = 1;
$('#partitionsTable tr').each(function() {
+ {% if readonly_disk_inspector is defined %}
+ let partitionSize = parseInt($(this).find('td').eq(3).text().trim());
+ {% else %}
let partitionSize = parseInt($(this).find('td').eq(3).find('input').val().trim());
+ {% endif %}
+
if (isNaN(partitionSize)) {
partitionSize = 0;
}
diff --git a/ogcp/views.py b/ogcp/views.py
index b41a2bc..c230288 100644
--- a/ogcp/views.py
+++ b/ogcp/views.py
@@ -408,12 +408,12 @@ def hash_password(pwd):
def get_cache_info(clients_info, storage_data, images_data, client_images):
for client_info in clients_info:
ip = client_info['ip']
- cache_size = int(client_info['cache_size'])
- used_cache = 0
+ cache_size = client_info['cache_size'] * 1024
+ used_cache = client_info['used_cache']
+ free_cache = client_info['free_cache']
for image_info in client_info['images']:
image_name = image_info['name']
checksum = image_info['checksum']
- used_cache += int(image_info['size'])
img_identifier = f'{image_name}.{checksum}'
if ip in client_images:
@@ -432,7 +432,7 @@ def get_cache_info(clients_info, storage_data, images_data, client_images):
}
storage_data[ip] = {'used': used_cache,
- 'total': cache_size}
+ 'free': free_cache}
def authenticate_user(username, pwd):
for user in app.config['USERS']: