From 573593d632d1cfc80c0362e769956263b7eea822 Mon Sep 17 00:00:00 2001
From: Thibault Debatty <thibault.debatty@gmail.com>
Date: Wed, 17 Oct 2018 11:28:54 +0200
Subject: [PATCH] Load JSON from correct domain
---
web/public/js/sensor.memory.js | 5 ++++-
web/resources/views/agent/meminfo.blade.php | 1 +
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/web/public/js/sensor.memory.js b/web/public/js/sensor.memory.js
index f59dc78..47c103b 100644
--- a/web/public/js/sensor.memory.js
+++ b/web/public/js/sensor.memory.js
@@ -65,7 +65,10 @@ window.monitorMemChart = function(element) {
};
window.memChart = new Chart(ctx, config);
- var used_url = "/api/sensor/"
+ if (typeof window.monitorURL === 'undefined') {
+ window.monitorURL = "https://monitor.web-d.be";
+ }
+ var used_url = window.monitorURL + "/api/sensor/"
+ window.monitorServerID + "/" + window.monitorServerToken
+ "/memory/used"
$.getJSON(used_url, function( data ) {
diff --git a/web/resources/views/agent/meminfo.blade.php b/web/resources/views/agent/meminfo.blade.php
index 7044eae..2efe7d6 100644
--- a/web/resources/views/agent/meminfo.blade.php
+++ b/web/resources/views/agent/meminfo.blade.php
@@ -2,6 +2,7 @@
<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 }}";
--
GitLab