diff --git a/launcher/src/backend/Monitoring.js b/launcher/src/backend/Monitoring.js index 6537528bc..e24c15024 100755 --- a/launcher/src/backend/Monitoring.js +++ b/launcher/src/backend/Monitoring.js @@ -1710,6 +1710,7 @@ export class Monitoring { var storagesizes = result.stdout.trim().split("\n"); storagesizes.forEach(function (val, index) { let svc = index in sshcommands ? sshcommands[index].svc : false; + if (svc) { // Prometheus NE does not store data but using "/" as volume, see #1095 // Likely not queried at all if defined in ignoreServices (see above) @@ -1725,6 +1726,7 @@ export class Monitoring { .replace(/NodeExporter/gi, " ne") .toUpperCase(), storageValue: (!val || val < 1 ? "0 " : val.replace(/([a-z]+)/is, " $1")) + "B", + service: svc.service, }); } }); diff --git a/launcher/src/components/UI/control-page/components/widgets/VolumeWidget.vue b/launcher/src/components/UI/control-page/components/widgets/VolumeWidget.vue index a9ff7464b..2aec981c9 100644 --- a/launcher/src/components/UI/control-page/components/widgets/VolumeWidget.vue +++ b/launcher/src/components/UI/control-page/components/widgets/VolumeWidget.vue @@ -4,37 +4,69 @@
- volume + volume
-
+
- icon + + Service Icon
-
+
{{ availDisk }} GB {{ $t("controlPage.free") }} / {{ totalDisk }} GB {{ $t("controlPage.total") }} + > + / {{ totalDisk }} GB {{ $t("controlPage.total") }}
-
write
-
read
+
+ write +
+
+ read +
-
-
+
+
{{ convertWriteValueToMb }} - {{ controlStore.writeValue / 1024 < 1 && controlStore.writeValue / 1024 > 0 ? "KB" : "MB" }} + {{ + controlStore.writeValue / 1024 < 1 && controlStore.writeValue / 1024 > 0 + ? "KB" + : "MB" + }}
-
+
{{ convertReadValueToMb }} - {{ controlStore.readValue / 1024 < 1 && controlStore.writeValue / 1024 > 0 ? "KB" : "MB" }} + {{ + controlStore.readValue / 1024 < 1 && controlStore.writeValue / 1024 > 0 + ? "KB" + : "MB" + }}
@@ -44,7 +76,7 @@