Skip to content

Commit

Permalink
DIsk usage in dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
@lucatacconi
lucatacconi committed Feb 27, 2024
1 parent 4fe8c48 commit c829287
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 53 deletions.
88 changes: 39 additions & 49 deletions app/shareds/DiskUsage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,44 @@
<v-card>
<v-card-title>Log's directory usage</v-card-title>
<v-card-text id="usage-data-area-container">
<canvas v-show="calcStatExecuted">
<template v-if="calcStatExecuted">
<div>
<p>
Occupancy percentage of the partition where log folder resides.
</p>

<!-- Need to change color when over 80 (orange) and 90 (red) -->
<v-progress-linear
v-model="diskUsageData['used-space-percentage']"
height="30"
>
<strong>{{ Math.ceil(diskUsageData['used-space-percentage']) }}%</strong>
</v-progress-linear>

</div>
<br><br>
<p>
<template>
<span class="text-h2 text--primary">
<strong>{{ diskUsageData['partition-used-space'] }} {{ diskUsageData['unit'] }}.</strong>
</span>
<span class="text-h5 text--gray">
/{{ diskUsageData['total-partition-size'] }} {{ diskUsageData['unit'] }}
</span>
<span class="text-h6 text--gray">
<br>
<strong class="pl-3">({{ diskUsageData['total-log-size-yesterday'] }}</strong> {{ diskUsageData['unit'] }} - amount of logs collected yesterday)
</span>
</template>
</p>
<div>

<!-- Need to be completed -->
lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum
lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum lorem ipsum
</div>
</template>



</canvas>
<v-progress-circular
:size="100"
:width="7"
Expand All @@ -25,7 +58,7 @@
data: function() {
return {
diskUsageData: {},
calcStatExecuted: false
calcStatExecuted: true
}
},
Expand All @@ -41,56 +74,13 @@
};
var params = {
"unit": "AUTO"
}
Utils.apiCall("get", "/task-stat/log-partition-usage",params, options)
.then(function (response) {
self.calcStatExecuted = true;
self.diskUsageData = response.data;
// if(response.data.length != 0){
// self.graphFree.push(self.diskUsageData['free-space-percentage']);
// self.graphUsed.push(self.diskUsageData['used-space-percentage']);
// }
// self.graphLabel.push('Percentage occupancy status of the log directory');
// var config_graph_disk_usage = {
// type: 'bar',
// data: {
// labels: self.graphLabel,
// datasets: [
// {
// label: 'Perc. used',
// backgroundColor: "#FFA182",
// borderColor: "#FF5074",
// borderWidth: 1,
// stack: 'Stack 0',
// data: self.graphUsed
// }, {
// label: 'Free space left',
// backgroundColor: "#6DCEE8",
// borderColor: "#9199FE",
// borderWidth: 1,
// stack: 'Stack 0',
// data: self.graphFree
// }
// ]
// },
// options: {
// responsive: true,
// plugins: {
// legend: {
// position: 'right'
// }
// }
// }
// };
// let graph_container_disk_usage = document.getElementById('graph-area-disk-usage');
// graphDiskUsage = new Chart(graph_container_disk_usage, config_graph_disk_usage);
});
}
},
Expand Down
24 changes: 20 additions & 4 deletions routes/api/task-stat.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -856,22 +856,38 @@ static function (array $file) {
$unit = strtoupper($params["UNIT"]);
}

$total_space = $total_space_disp = disk_total_space($LOGS_DIR);
$free_space = $free_space_disp = disk_free_space($LOGS_DIR);
$used_space = $used_space_disp = $total_space - $free_space;

$num_len = strlen($used_space);
if($unit = 'AUTO'){
if($num_len < 4){
$unit = 'B';
}else if($num_len >= 4 && $num_len < 8){
$unit = 'KB';
}else if($num_len >= 8 && $num_len < 12){
$unit = 'MB';
}else if($num_len >= 12 && $num_len < 16){
$unit = 'GB';
}else{
$unit = 'TB';
}
}

$exponent = 0;
if(!empty($aUNITS[$unit])){
$exponent = $aUNITS[$unit];
}

$total_space = $total_space_disp = disk_total_space($LOGS_DIR);
$free_space = $free_space_disp = disk_free_space($LOGS_DIR);
$used_space = $used_space_disp = $total_space - $free_space;

if($exponent > 0){
$total_space_disp = number_format(($total_space / pow(1024, $exponent)), 2, '.', '');
$free_space_disp = number_format(($free_space / pow(1024, $exponent)), 2, '.', '');
$used_space_disp = number_format(($used_space / pow(1024, $exponent)), 2, '.', '');
}

$data["total-partition-size"] = $total_space_disp;
$data["total-log-size-yesterday"] = 0; //need implementation
$data["partition-free-space"] = $free_space_disp;
$data["partition-used-space"] = $used_space_disp;
$data["unit"] = $unit;
Expand Down

0 comments on commit c829287

Please sign in to comment.