From 53ba0a34e03db38aa348ed0f949324b82ff4bfbf Mon Sep 17 00:00:00 2001
From: Thibault Debatty <thibault.debatty@gmail.com>
Date: Wed, 17 Oct 2018 09:45:18 +0200
Subject: [PATCH] colors
---
web/app/Sensor/MemInfo.php | 8 ++++----
web/resources/views/agent/meminfo.blade.php | 16 +++++++++++++++-
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/web/app/Sensor/MemInfo.php b/web/app/Sensor/MemInfo.php
index 134d960..59dfb41 100644
--- a/web/app/Sensor/MemInfo.php
+++ b/web/app/Sensor/MemInfo.php
@@ -15,19 +15,19 @@ class MemInfo extends AbstractSensor {
$records = $this->getLastRecords("memory", 288);
$used = [];
- $used_cached = [];
+ $cached = [];
foreach ($records as $record) {
$meminfo = $this->parseMeminfo($record->memory);
$used[] = new Point(
$record->time * 1000, $meminfo->used() / 1000);
- $used_cached[] = new Point(
+ $cached[] = new Point(
$record->time * 1000,
- ($meminfo->used() + $meminfo->cached) / 1000);
+ $meminfo->cached / 1000);
}
return view("agent.meminfo", [
"used" => $used,
- "used_cached" => $used_cached,
+ "cached" => $cached,
"server" => $this->getServer()]);
}
diff --git a/web/resources/views/agent/meminfo.blade.php b/web/resources/views/agent/meminfo.blade.php
index 3ea31bd..df49a14 100644
--- a/web/resources/views/agent/meminfo.blade.php
+++ b/web/resources/views/agent/meminfo.blade.php
@@ -1,16 +1,29 @@
<canvas id="memory-chart" width='400' height='300'></canvas>
<script>
+ window.chartColors = {
+ red: 'rgba(255, 99, 132, 0.2)',
+ orange: 'rgba(255, 165, 0, 0.3)',
+ yellow: 'rgba(255, 205, 86, 0.2)',
+ green: 'rgba(0, 178, 0, 0.3)',
+ blue: 'rgba(54, 162, 235, 0.2)',
+ purple: 'rgba(153, 102, 255, 0.2)',
+ grey: 'rgba(201, 203, 207, 0.2)'
+ };
var ctx = document.getElementById('memory-chart').getContext('2d');
var myChart = new Chart(ctx, {
type: 'line',
data: {
datasets: [{
label: 'Used',
+ backgroundColor: window.chartColors.green,
+ borderColor: window.chartColors.green,
data: {!! json_encode($used) !!},
},{
label: 'Cached',
- data: {!! json_encode($used_cached) !!},
+ backgroundColor: window.chartColors.orange,
+ borderColor: window.chartColors.orange,
+ data: {!! json_encode($cached) !!},
}]
},
options: {
@@ -27,6 +40,7 @@
}
}],
yAxes: [{
+ stacked: true,
ticks: {
beginAtZero:true
},
--
GitLab