@@ -5,9 +5,6 @@

 # whether your local network uses a domain name server.

 #

-AGENT_NAME="[a]rednsigAgent.py"

-SOURCE_URL="http://localnode.local.mesh/cgi-bin/status"

-

 APP_PATH="/home/$USER/bin"

 LOG_PATH="/home/$USER/log"

@@ -15,6 +12,21 @@ LOG_PATH="/home/$USER/log"

 # in the agent script.  '60' is the default. Value is in seconds.

 POLLING_INTERVAL="60"

+

+if [ "$HOSTNAME" == "raspi3" ]; then

+  AGENT_NAME="[a]rednsigMirrorAgent.py"

+  SOURCE_URL="http://192.168.1.30:7368/arednsig/"

+elif [ "$HOSTNAME" == "redwall" ]; then

+  AGENT_NAME="[a]rednsigMirrorAgent.py"

+  SOURCE_URL="http://73.157.139.23:7361/arednsig/"

+elif [ "$HOSTNAME" == "ka7jlo-web" ]; then

+  AGENT_NAME="[a]rednsigAgent.py"

+  SOURCE_URL="http://ka7jlo-sw-albany-nano-m3.local.mesh/cgi-bin/status"

+else

+  echo invalid host

+  exit 1

+fi

+

 PROCESS_ID="$(ps x | awk -v a=$AGENT_NAME '$7 ~ a {print $1}')"

 if [ -n "$PROCESS_ID" ]; then

@@ -1,7 +1,16 @@

 #!/bin/bash

-# Stop the arednsig agent process.

+# Stop the radmon agent process.

-AGENT_NAME="[a]rednsigAgent.py"

+if [ "$HOSTNAME" == "raspi3" ]; then

+  AGENT_NAME="[a]rednsigMirrorAgent.py"

+elif [ "$HOSTNAME" == "redwall" ]; then

+  AGENT_NAME="[a]rednsigMirrorAgent.py"

+elif [ "$HOSTNAME" == "ka7jlo-web" ]; then

+  AGENT_NAME="[a]rednsigAgent.py"

+else

+  echo invalid host

+  exit 1

+fi

 PROCESS_ID="$(ps x | awk -v a=$AGENT_NAME '$7 ~ a {print $1}')"

old mode 100644

new mode 100755

@@ -125,8 +125,9 @@ Charts update every: <span id="period"></span> minutes

  onclick="setChartPeriod(2)">4 weeks</span></li>

 <li class="selectorElement"><span class="selectorElement"

  onclick="setChartPeriod(3)">12 months</span></li>

-<li class="selectorElement"><span class="selectorElement"

- onclick="setChartPeriod(0)">Custom…</span></li>

+<li id="customSelector" class="selectorElement" style="visibility:hidden;">

+<span  class="selectorElement"

+ onclick="setChartPeriod(0)">Custom...</span></li>

 </ul>

 </span>

@@ -177,10 +178,10 @@ www.arednmesh.org</a>.</li>

 <br>

 <script>

-

+"use strict";

 /* Global constants */

-var nodeDataUrl = "dynamic/nodeOnline.js";

+var nodeDataUrl = "dynamic/arednsigData.js";

 /* Global DOM objects */

@@ -199,6 +200,7 @@ var customChartsContainer = document.getElementById("customChartsContainer");

 var stockChartsContainer = document.getElementById("stockChartsContainer");

 var fmDateSelector = document.getElementById("fmDateSelector");

 var errorMsg = document.getElementById("errorMsg");

+var customSelector = document.getElementById("customSelector");

 /* Global objects */

@@ -207,9 +209,12 @@ var httpRequest = new XMLHttpRequest();

 /* Global variables */

 var chartPeriod = 1;

-var chartRefreshRate = 0; // chart refresh rate in minutes

+var chartUpdateInterval; // chart refresh rate in seconds

+var dataRequestInterval; // data request interval in seconds

 function main() {

+    httpRequest.timeout = 3000;

+

     /* Register call back function to process http requests */

     httpRequest.onreadystatechange = function() {

         if (httpRequest.readyState == 4 && httpRequest.status == 200) {

@@ -229,8 +234,7 @@ function main() {

 }

 function getNodeData() {

-    httpRequest.open("GET", nodeDataUrl, true);

-    httpRequest.timeout = 3000;

+    httpRequest.open("POST", nodeDataUrl, true);

     httpRequest.send();

 }

@@ -242,7 +246,7 @@ function setChartPeriod(n) {

     } else {

         customChartsContainer.style.display = "none";

         stockChartsContainer.style.display = "block";

-    getNodeCharts();   

+        getNodeCharts();   

     }

 }

@@ -267,7 +271,13 @@ function getNodeCharts() {

 function displayData(dataItem) {

     var timeStamp, date, time, hourminute;

-    var localDateObj,localTimeZone;

+    var localDate,localTimeZone;

+

+    // Custom charts can only be generated by the local server, i.e,

+    // with access to rrdtool database.

+    if (dataItem.serverMode == "primary") {

+        customSelector.style.visibility = "visible";

+    }

     timeStamp = dataItem.date;

     date = timeStamp.split(" ")[0];

@@ -282,10 +292,11 @@ function displayData(dataItem) {

     statusElmt.innerHTML = "Online";

     statusElmt.style.color = "green";

-    chartRefreshRate = dataItem.period;

-    periodElmt.innerHTML = chartRefreshRate / 60;

-    setInterval(getNodeData, 1000 * chartRefreshRate);

-    setInterval(getNodeCharts, 1000 * chartRefreshRate);

+    chartUpdateInterval = dataItem.chartUpdateInterval;

+    dataRequestInterval = dataItem.dataRequestInterval;

+    periodElmt.innerHTML = chartUpdateInterval / 60;

+    setInterval(getNodeData, 1000 * dataRequestInterval);

+    setInterval(getNodeCharts, 1000 * chartUpdateInterval);

 }

 function displayOfflineStatus() {

old mode 100644

new mode 100755

@@ -176,12 +176,11 @@ function createChart($chartFile, $dataItem, $label, $title, $begin,

     if ($addTrend == 0) {

         $cmd .= "LINE1:dSeries#0400ff ";

     } elseif ($addTrend == 1) {

-        $cmdfmt = "CDEF:smoothed=dSeries,%s,TREND LINE3:smoothed#ff0000 ";

+        $cmdfmt = "CDEF:smoothed=dSeries,%s,TREND LINE2:smoothed#006600 ";

         $cmd .= sprintf($cmdfmt, $trendWindow);

     } elseif ($addTrend == 2) {

         $cmd .= "LINE1:dSeries#0400ff ";

-        $cmdfmt = "CDEF:smoothed=dSeries,%s,TREND LINE3:smoothed#ff0000 ";

-        #$cmdfmt = "CDEF:smoothed=dSeries,%s,XYZZY LINE3:smoothed#ff0000 ";

+        $cmdfmt = "CDEF:smoothed=dSeries,%s,TREND LINE2:smoothed#006600 ";

         $cmd .=  sprintf($cmdfmt, $trendWindow);

     }