mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-04-12 18:20:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adds the CPU box (Was removed because I took the 3.5.4 one by an accident

Browse Source
This commit is contained in:
Fuzzlemann 2017-07-27 13:18:03 +02:00
parent 3c63fde839
commit 2df8e7a4a2
1 changed files with 133 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
Plan/src/main/resources/analysis.html
View File

@ -688,6 +688,9 @@
</div>
<canvas id="tps7d" width="1000" height="600" style="width: 95%;"></canvas>
</div>
<div class="box column">
<canvas id="cpu7d" width="1000" height="600" style="width: 95%;"></canvas>
</div>
</div>
<div class="row">
<div class="box column">
@ -712,6 +715,10 @@
</div>
<canvas id="tps24h" width="1000" height="600" style="width: 95%;"></canvas>
</div>
<div class="box column">
<canvas id="cpu24h" width="1000" height="600" style="width: 95%;"></canvas>
</div>
<p>If CPU Graph displays '-1' CPU usage is not available for this platform.</p>
</div>
</div>
<div class="tab">
@ -1302,6 +1309,131 @@
});
</script>
<script>
// CPU Graph 24h
var ctxcpu = document.getElementById("cpu24h");
var datacpu = {
datasets: [
{
label: "CPU Usage",
fill: false,
lineTension: 0.1,
borderColor: "#e0d264",
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0.0,
borderJoinStyle: 'miter',
pointBorderColor: "#e0d264",
pointBackgroundColor: "#ede5aa",
pointBorderWidth: 1,
pointHoverRadius: 5,
pointHoverBackgroundColor: "#e0d264",
pointHoverBorderColor: "#8fabc6",
pointHoverBorderWidth: 2,
pointRadius: 1,
pointHitRadius: 10,
spanGaps: false,
data: %cpuscatterday%
}]
};
var cpuChart = new Chart(ctxcpu, {
type: 'scatter',
data: datacpu,
options: {
tooltips: {
callbacks: {
label: function(tooltipItems, data) {
var newDate = new Date();
newDate.setTime(tooltipItems.xLabel);
dateString = newDate.toUTCString();
return dateString+ ': '+ tooltipItems.yLabel + '%';
}
}
},
scales: {
yAxes: [{
type: 'linear',
position: 'left',
ticks: {
suggestedMax: 100,
suggestedMin: 0
},
scaleLabel: {
display: true,
labelString: 'CPU Usage'
}
}],
xAxes: [{
type: 'linear',
display: false
}]
}
}
});
</script>
<script>
// CPU Graph 7d
var ctxcpu = document.getElementById("cpu7d");
var datacpu = {
datasets: [
{
label: "CPU Usage",
fill: false,
lineTension: 0.1,
borderColor: "#e0d264",
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0.0,
borderJoinStyle: 'miter',
pointBorderColor: "#e0d264",
pointBackgroundColor: "#ede5aa",
pointBorderWidth: 1,
pointHoverRadius: 5,
pointHoverBackgroundColor: "#e0d264",
pointHoverBorderColor: "#8fabc6",
pointHoverBorderWidth: 2,
pointRadius: 1,
pointHitRadius: 10,
spanGaps: false,
data: %cpuscatterweek%
}]
};
var cpuChart = new Chart(ctxcpu, {
type: 'scatter',
data: datacpu,
options: {
tooltips: {
callbacks: {
label: function(tooltipItems, data) {
var newDate = new Date();
newDate.setTime(tooltipItems.xLabel);
dateString = newDate.toUTCString();
return dateString+ ': '+ tooltipItems.yLabel + '%';
}
}
},
scales: {
yAxes: [{
type: 'linear',
position: 'left',
ticks: {
suggestedMax: 100,
suggestedMin: 0
},
scaleLabel: {
display: true,
labelString: 'CPU Usage'
}
}],
xAxes: [{
type: 'linear',
display: false
}]
}
}
});
</script>
<script>
// ActivityPie Graph
var ctxactivitypie = document.getElementById("activityPie");
@ -1514,7 +1646,7 @@
colorbar: {
autotic: false,
tickprefix: '',
title: 'Players',
title: 'Players'
}
}];
var layout = {