Merge branch 'master' of /home/git/monitoring
This commit is contained in:
10242
package-lock.json
generated
10242
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
6
public/js/app.js
vendored
6
public/js/app.js
vendored
@@ -65949,6 +65949,7 @@ var render = function() {
|
||||
"div",
|
||||
[
|
||||
_c("dygraphs", {
|
||||
ref: "dg",
|
||||
attrs: {
|
||||
width: "800",
|
||||
graphData: _vm.series,
|
||||
@@ -66032,6 +66033,7 @@ var render = function() {
|
||||
"div",
|
||||
[
|
||||
_c("dygraphs", {
|
||||
ref: "dg",
|
||||
attrs: {
|
||||
width: "800",
|
||||
graphData: _vm.series,
|
||||
@@ -66068,6 +66070,7 @@ var render = function() {
|
||||
"div",
|
||||
[
|
||||
_c("dygraphs", {
|
||||
ref: "dg",
|
||||
attrs: {
|
||||
width: "800",
|
||||
graphData: _vm.series,
|
||||
@@ -66104,6 +66107,7 @@ var render = function() {
|
||||
"div",
|
||||
[
|
||||
_c("dygraphs", {
|
||||
ref: "dg",
|
||||
attrs: {
|
||||
width: "800",
|
||||
graphData: _vm.series,
|
||||
@@ -66140,6 +66144,7 @@ var render = function() {
|
||||
"div",
|
||||
[
|
||||
_c("dygraphs", {
|
||||
ref: "dg",
|
||||
attrs: {
|
||||
width: "800",
|
||||
graphData: _vm.series,
|
||||
@@ -66364,6 +66369,7 @@ var render = function() {
|
||||
"div",
|
||||
[
|
||||
_c("dygraphs", {
|
||||
ref: "dg",
|
||||
attrs: {
|
||||
width: "800",
|
||||
graphData: _vm.series,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div>
|
||||
<dygraphs width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
<dygraphs ref="dg" width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div>
|
||||
<dygraphs width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
<dygraphs ref="dg" width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div>
|
||||
<dygraphs width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
<dygraphs ref="dg" width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div>
|
||||
<dygraphs width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
<dygraphs ref="dg" width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div>
|
||||
<dygraphs width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
<dygraphs ref="dg" width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div>
|
||||
<dygraphs width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
<dygraphs ref="dg" width="800" :graphData="series" :graphOptions="options"></dygraphs>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -38,12 +38,12 @@
|
||||
</div>
|
||||
|
||||
<div v-if="counter > 0" :key="counter">
|
||||
<network-graph v-show="settings['network'].show" :raw_data="chartData"></network-graph>
|
||||
<temp-graph ref="temp" v-show="settings['temp'].show" :raw_data="chartData" style="display: block; "></temp-graph>
|
||||
<memory-graph v-show="settings['memory'].show" :raw_data="chartData" style="display: block; "></memory-graph>
|
||||
<load-graph v-show="settings['load'].show" :raw_data="chartData"></load-graph>
|
||||
<processes-graph v-show="settings['processes'].show" :raw_data="chartData"></processes-graph>
|
||||
<disk-graph v-show="settings['disk'].show" :raw_data="chartData"></disk-graph>
|
||||
<network-graph ref="network" v-show="settings['network'].show" :raw_data="chartData"></network-graph>
|
||||
<temp-graph ref="temp" v-show="settings['temp'].show" :raw_data="chartData"></temp-graph>
|
||||
<memory-graph ref="memory" v-show="settings['memory'].show" :raw_data="chartData"></memory-graph>
|
||||
<load-graph ref="load" v-show="settings['load'].show" :raw_data="chartData"></load-graph>
|
||||
<processes-graph ref="processes" v-show="settings['processes'].show" :raw_data="chartData"></processes-graph>
|
||||
<disk-graph ref="disk" v-show="settings['disk'].show" :raw_data="chartData"></disk-graph>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
@@ -51,6 +51,7 @@
|
||||
|
||||
<script>
|
||||
$(document).ready( function() {
|
||||
Cookies.set('test','test2');
|
||||
var settings = { "network": { name:"Network",show: false, prefix: "netstat",suffix: { "recv": "Received", "sent": "Send Bytes" }, units:"B"},
|
||||
"temp": {name:"Temerature",show: false,prefix: null,units:"C"},
|
||||
"memory": {name:"Memory",show: false,prefix:"memory", suffix: {"free":"Free Memory", "total": "Total Memory","used":"Used Memory"},units: "KB"},
|
||||
@@ -58,11 +59,6 @@
|
||||
"disk": {name:"Disk",show: false,prefix:"disk",suffix: {"free":"Free Memory", "total": "Total Memory","used":"Used Memory"}, units:"MB"},
|
||||
"processes": {name:"Processes",show:false,prefix: null,units:""}};
|
||||
|
||||
function sleep (time) {
|
||||
return new Promise((resolve) => setTimeout(resolve, time));
|
||||
}
|
||||
|
||||
|
||||
var app = new Vue({
|
||||
el: "#app",
|
||||
data: {
|
||||
@@ -81,7 +77,10 @@
|
||||
settings[s].show = false;
|
||||
};
|
||||
settings[key].show = true;
|
||||
console.log(key);
|
||||
console.log('Change tab:',key);
|
||||
this.$nextTick(() => {
|
||||
app.$refs[key].$refs.dg._data._graph.resize();
|
||||
});
|
||||
},
|
||||
displayResults: function () {
|
||||
|
||||
@@ -91,6 +90,10 @@
|
||||
return;
|
||||
}
|
||||
|
||||
for (s in settings) {
|
||||
settings[s].show = false;
|
||||
};
|
||||
app.settings["network"].show = true;
|
||||
|
||||
axios.get('{{ url('/data') }}', {
|
||||
params: {
|
||||
@@ -100,21 +103,9 @@
|
||||
}
|
||||
})
|
||||
.then(function (response) {
|
||||
|
||||
for (s in app.settings) {
|
||||
app.settings[s].show = true;
|
||||
}
|
||||
|
||||
app.chartData = response.data;
|
||||
app.counter += 1;
|
||||
|
||||
sleep(1000).then(() => {
|
||||
for (s in app.settings) {
|
||||
app.settings[s].show = false;
|
||||
}
|
||||
app.settings["network"].show = true;
|
||||
});
|
||||
|
||||
})
|
||||
.catch(function (error) {
|
||||
console.log(error);
|
||||
|
||||
Reference in New Issue
Block a user