Simplify + fix memory graph

web/app/Sensor/Ifconfig.php

@@ -105,7 +105,7 @@ class Ifconfig extends AbstractSensor {
      */
     public function parseIfconfig($string) {
 
-        $allowed_prefixes = ["en", "eth"];
+        $allowed_prefixes = ["en", "eth", "wl"];
 
         if ($string == null) {
             return [];

web/public/js/sensor.ifconfig.js

@@ -35,11 +35,7 @@ window.monitorIfconfigChart = function(element) {
             }
         }
     };
-    window.memChart = new Chart(ctx, config);
-
-    if (typeof window.monitorURL === 'undefined') {
-        window.monitorURL = "https://monitor.web-d.be";
-    }
+    window.ifconfigChart = new Chart(ctx, config);
     var api_url = window.monitorURL + "/api/sensor/"
             + window.monitorServerID + "/" + window.monitorServerToken
             + "/ifconfig";
@@ -58,6 +54,6 @@ window.monitorIfconfigChart = function(element) {
             config.data.datasets.push(new_dataset);
         });
 
-        window.memChart.update();
+        window.ifconfigChart.update();
     });
 };
\ No newline at end of file

web/public/js/sensor.load.js

@@ -36,10 +36,6 @@ window.monitorLoadChart = function(element) {
     };
 
     window.loadChart = new Chart(ctx, config);
-
-    if (typeof window.monitorURL === 'undefined') {
-        window.monitorURL = "https://monitor.web-d.be";
-    }
     var load_url = window.monitorURL + "/api/sensor/"
             + window.monitorServerID + "/" + window.monitorServerToken
             + "/load";

web/public/js/sensor.memory.js

-
-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)'
-};
-
-window.colorNames = Object.keys(window.chartColors);
-
 window.monitorMemChart = function(element) {
     var ctx = element.getContext('2d');
     var config = {
@@ -48,14 +35,11 @@ window.monitorMemChart = function(element) {
         }
     };
     window.memChart = new Chart(ctx, config);
-
-    if (typeof window.monitorURL === 'undefined') {
-        window.monitorURL = "https://monitor.web-d.be";
-    }
     var meminfo_url = window.monitorURL + "/api/sensor/"
             + window.monitorServerID + "/" + window.monitorServerToken
             + "/memory";
-    $.getJSON(meminfo_url, function( data ) {
+    $.getJSON(meminfo_url, function(data) {
+        console.log(data);
         var new_dataset = {
                 label: 'Used',
                 backgroundColor: window.chartColors.green,

web/resources/views/agent/loadavg.blade.php

@@ -4,10 +4,6 @@
 <canvas id="load-chart" width='400' height='300'></canvas>
 <script src="/js/sensor.load.js"></script>
 <script>
-    window.monitorURL = "{{ url('/') }}";
-    window.monitorServerID = {{ $server->id }};
-    window.monitorServerToken = "{{ $server->read_token }}";
-
     window.addEventListener('load', function() {
         window.monitorLoadChart(document.getElementById('load-chart'));
     });

web/resources/views/agent/meminfo.blade.php

@@ -2,10 +2,6 @@
 <canvas id="memory-chart" width='400' height='300'></canvas>
 <script src="/js/sensor.memory.js"></script>
 <script>
-    window.monitorURL = "{{ url('/') }}";
-    window.monitorServerID = {{ $server->id }};
-    window.monitorServerToken = "{{ $server->read_token }}";
-
     window.addEventListener('load', function() {
         window.monitorMemChart(document.getElementById('memory-chart'));
     });

web/resources/views/server/show.blade.php

@@ -3,6 +3,23 @@
 @section('content')
 <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.bundle.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/chartjs-plugin-annotation/0.5.7/chartjs-plugin-annotation.min.js"></script>
+<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)'
+};
+
+window.colorNames = Object.keys(window.chartColors);
+
+window.monitorURL = "{{ url('/') }}";
+window.monitorServerID = {{ $server->id }};
+window.monitorServerToken = "{{ $server->read_token }}";
+</script>
 
 <div class="container">
     <div class="row">