services: merge memory limit column

dashboard/src/views/ServicesView.vue

@@ -30,11 +30,6 @@ const columns = {
     sort: true,
     hideMobile: true,
   },
-  memoryLimit: {
-    label: t('services.memoryLimit'),
-    sort: true,
-    hideMobile: true,
-  },
   actions: {
     width: '100px',
   }
@@ -69,7 +64,8 @@ const services = reactive({
   box: {
     name: 'cloudron',
     status: 'active',
-    memoryUsage: 0,
+    memoryUsed: 0,
+    memoryUsage: '',
     memoryLimit: 0,
     config: {}
   }
@@ -269,7 +265,9 @@ onUnmounted(() => {
           <StateLED :busy="!service.status" :state="state(service)" :title="stateTooltip(service)"/>
         </template>
         <template #memoryPercent="service">
-          <ProgressBar :value="service.memoryPercent" v-show="service.memoryPercent" />
+          <ProgressBar :value="service.memoryPercent" v-show="service.memoryPercent">
+            {{ prettyBinarySize(service.memoryUsed) }} / {{ prettyBinarySize(service.memoryLimit) }} ({{ service.memoryPercent }}%)
+          </ProgressBar>
         </template>
         <template #memoryLimit="service">
           <span v-show="service.memoryLimit">{{ prettyBinarySize(service.memoryLimit) }}</span>