@@ -5,7 +5,7 @@

 # Module: arednsigAgent.py

 #

 # Description: This module acts as an agent between the aredn node

-# and aredn mesh web services.  The agent periodically sends an http

+# and aredn mest services.  The agent periodically sends an http

 # request to the aredn node, processes the response from

 # the node, and performs a number of operations:

 #     - conversion of data items

@@ -57,8 +57,8 @@ _DOCROOT_PATH = "/home/%s/public_html/arednsig/" % _USER

 _CHARTS_DIRECTORY = _DOCROOT_PATH + "dynamic/"

 # location of data output file

 _OUTPUT_DATA_FILE = _DOCROOT_PATH + "dynamic/arednsigOutputData.js"

-# small size output data file for heartbeat signal to html docs

-_SMALL_OUTPUT_FILE = _DOCROOT_PATH + "dynamic/nodeOnline.js"

+# dummy output data file

+_DUMMY_OUTPUT_FILE = _DOCROOT_PATH + "dynamic/nodeOnline.js"

 # database that stores radmon data

 _RRD_FILE = "/home/%s/database/arednsigData.rrd" % _USER

@@ -74,6 +74,8 @@ _HTTP_REQUEST_TIMEOUT = 10

 _CHART_WIDTH = 600

 # standard chart height in pixels

 _CHART_HEIGHT = 150

+# source of time stamp attached to output data file

+_USE_NODE_TIMESTAMP = True

    ### GLOBAL VARIABLES ###

@@ -89,7 +91,9 @@ failedUpdateCount = 0

 # detected status of aredn node device

 nodeOnline = True

-# network address of aredn node

+# status of reset command to aredn node

+remoteDeviceReset = False

+# ip address of aredn node

 arednNodeUrl = _DEFAULT_AREDN_NODE_URL

 # frequency of data requests to aredn node

 dataRequestInterval = _DEFAULT_DATA_REQUEST_INTERVAL

@@ -142,8 +146,8 @@ def setStatusToOffline():

     # Inform downstream clients by removing output data file.

     if os.path.exists(_OUTPUT_DATA_FILE):

        os.remove(_OUTPUT_DATA_FILE)

-    if os.path.exists(_SMALL_OUTPUT_FILE):

-       os.remove(_SMALL_OUTPUT_FILE)

+    if os.path.exists(_DUMMY_OUTPUT_FILE):

+       os.remove(_DUMMY_OUTPUT_FILE)

     # If the aredn node was previously online, then send

     # a message that we are now offline.

     if nodeOnline:

@@ -162,8 +166,8 @@ def terminateAgentProcess(signal, frame):

     # Inform downstream clients by removing output data file.

     if os.path.exists(_OUTPUT_DATA_FILE):

        os.remove(_OUTPUT_DATA_FILE)

-    if os.path.exists(_SMALL_OUTPUT_FILE):

-       os.remove(_SMALL_OUTPUT_FILE)

+    if os.path.exists(_DUMMY_OUTPUT_FILE):

+       os.remove(_DUMMY_OUTPUT_FILE)

     print '%s terminating arednsig agent process' % \

               (getTimeStamp())

     sys.exit(0)

@@ -188,8 +192,8 @@ def getArednNodeData():

         del conn

     except Exception, exError:

-        # If no response is received from the node, then assume that

-        # the node is down or unavailable over the network.  In

+        # If no response is received from the device, then assume that

+        # the device is down or unavailable over the network.  In

         # that case return None to the calling function.

         print "%s http error: %s" % (getTimeStamp(), exError)

         return None

@@ -205,23 +209,11 @@ def parseNodeData(sData, ldData):

        into its component parts.  

        Parameters:

            sData - the string containing the data to be parsed

-           ldData - a list object to contain the parsed data items

+           dData - a dictionary object to contain the parsed data items

        Returns: True if successful, False otherwise

     """

-    # Only interested in datapoints that have arrived during the

-    # current update cycle defined by the data request interval.

-    # The default is sixty minutes, and the node records a data point

-    # once a minute.  Therefore, in the default case, extract the last

-    # sixty data points from the node's response.  Otherwise, extract

-    # a number of datapoints equal the the data request interval

-    # (in minutes). 

     iTrail = int(dataRequestInterval)

-    # The node response with json object containing 24 hours worth

-    # of datapoints.  Each data point is, itself, a json object.

-    # The following code converts the json object to a python list

-    # object containing dictionary objects.  Each dictionary object

-    # stores one data point.

     try:

         ldTmp = json.loads(sData[1:-1])

         ldTmp = ldTmp[-iTrail:]

@@ -230,9 +222,7 @@ def parseNodeData(sData, ldData):

     except Exception, exError:

         print "%s parse failed: %s" % (getTimeStamp(), exError)

         return False

-       

-    # Store the dictionary objects in the list object passed by

-    # reference to this function.

+    

     del ldData[:]

     for item in ldTmp:

         ldData.append(item)

@@ -245,7 +235,7 @@ def parseNodeData(sData, ldData):

 def convertData(ldData):

     """Convert individual node signal data items as necessary.

        Parameters:

-           ldData - a list object containing the node signal data

+           dData - a dictionary object containing the node signal data

        Returns: True if successful, False otherwise

     """

     # parse example string

@@ -255,9 +245,6 @@ def convertData(ldData):

     #

     for item in ldData:

         try:

-            # Convert data items to the required data types

-            # (all integer in this case).  Change the dictionary

-            # object keys to more friendly names.

             item['time'] = int(item.pop('x')) / 1000

             item['signal'] = int(item['y'][0])

             item['noise'] = int(item['y'][1])

@@ -282,8 +269,8 @@ def updateDatabase(ldData):

     Update the rrdtool database by executing an rrdtool system command.

     Format the command using the data extracted from the aredn node

     response.   

-    Parameters: ldData - a list object containing data items to be

-                        written to the RRD file

+    Parameters: dData - dictionary object containing data items to be

+                        written to the rr database file

     Returns: True if successful, False otherwise

     """

     updateCount = 0

@@ -293,9 +280,7 @@ def updateDatabase(ldData):

          print "updating database..."

     for item in ldData:

-        # Throw out data points that have a time stamp earlier

-        # than the last entry in the round-robin database (RRD).

-        # rrdtool will throw an error in this case.

+

         if item['time'] <= lastDataPointTime:

             if verboseDebug:

                 print "%s invalid timestamp: discarding data" % \

@@ -349,7 +334,7 @@ def writeOutputDataFile(sData, ldData):

     sDate = "[{\"date\":\"%s\",\"period\":\"%s\"}]" % \

            (lastUpdate, dataRequestInterval)

     try:

-        fc = open(_SMALL_OUTPUT_FILE, "w")

+        fc = open(_DUMMY_OUTPUT_FILE, "w")

         fc.write(sDate)

         fc.close()

     except Exception, exError:

@@ -1,7 +1,6 @@

 #!/usr/bin/python -u

-# The -u option above turns off block buffering of python output. This

-# assures that each error message gets individually printed to the

-# log file.

+## The -u option above turns off block buffering of python output. This assures

+## that each error message gets individually printed to the log file.

 #

 # Module: createArednsigRrd.py

 #

@@ -27,7 +26,6 @@

 # Revision History

 #   * v10 released 11 Jan 2020 by J L Owrey

 #

-#2345678901234567890123456789012345678901234567890123456789012345678901234567890

 import os

 import time

 import subprocess

@@ -35,11 +33,8 @@ import subprocess

     ### DEFINE FILE LOCATIONS ###

 _USER = os.environ['USER']

-# the RRD file that stores the data

+# the file that stores the data

 _RRD_FILE = "/home/%s/database/arednsigData.rrd" % _USER

-

-    ### DEFINE DATABASE GRANULARITY AND TIME SPAN ###

-

 _RRD_SIZE_IN_DAYS = 370 # days

 _1YR_RRA_STEPS_PER_DAY = 96

 _DATABASE_UPDATE_INTERVAL = 60

@@ -49,6 +44,7 @@ def createRrdFile():

        Parameters: none

        Returns: True, if successful

     """

+

     if os.path.exists(_RRD_FILE):

         print "aredn node database already exists"

         return True

@@ -61,8 +57,6 @@ def createRrdFile():

     rrd24hrNumRows = int(round(86400 / _DATABASE_UPDATE_INTERVAL))

     rrd1yearNumRows = _1YR_RRA_STEPS_PER_DAY * _RRD_SIZE_IN_DAYS

-    ## Format rrdtool command to create RRD database

-     

     strFmt = ("rrdtool create %s --start now-1day --step %s "

               "DS:S:GAUGE:%s:U:U DS:N:GAUGE:%s:U:U DS:SNR:GAUGE:%s:U:U "

               "DS:RX_MCS:GAUGE:%s:U:U DS:TX_MCS:GAUGE:%s:U:U "

@@ -74,10 +68,9 @@ def createRrdFile():

                 heartBeat,  heartBeat, heartBeat,            \

                 rrd24hrNumRows, rra1yrNumPDP, rrd1yearNumRows)

-    ## Run the command as a shell subprocess

-

     print "creating aredn node database...\n\n%s\n" % strCmd

+    # Spawn a sub-shell and run the command

     try:

         subprocess.check_output(strCmd, stderr=subprocess.STDOUT, \

                                 shell=True)

@@ -24,6 +24,7 @@ h4 {

     width: 750px;

     text-align: center;

     margin: auto;

+    /*border: 1px solid black;*/

 }

 .datetime {

     font: bold 22px arial, sans-serif;

@@ -40,7 +41,6 @@ h4 {

     text-align: center;

     display: table-cell;

     vertical-align: middle;

-    /*border: 1px solid black;*/

 }

 .dataItems {

     padding: 2px;

@@ -60,10 +60,10 @@ img.chart {

     text-align: left;

     padding: 10px;

 }

-span.chartNav {

+span.navContainer {

     margin: auto;

 }

-ul.chartNav {

+ul.navElement {

     list-style-type: none;

     margin: 10px;

     padding: 0;

@@ -71,20 +71,25 @@ ul.chartNav {

     background-color: #bbb;

     text-align: center;

 }

-li.chartNav {

+li.navElement {

     display: inline-block;

     font: bold 18px arial, sans-serif;

     color: black;

 }

-text.chartNav:hover {

+span.navElement:hover {

     background-color: #333;

     cursor: pointer;

     color: white;

 }

-text.chartNav {

+span.navElement {

     display: inline-block;

     padding: 8px 12px;

 }

+#iframe_a {

+    border:none;

+    width:100%;

+    height:450px;

+}

 </style>

 </head>

@@ -97,9 +102,9 @@ style="text-decoration:none" target="_new">

 KA7JLO Aredn Node Signal</a></h2>

 <h3>Last Updated</h3>

 <div class="datetime">

-<text id="date"></text>

+<span id="date"></span>

   

-<text id="time"></text>

+<span id="time"></span>

 </div>

 <div class="rowContainer">

@@ -109,43 +114,51 @@ Status:<br>

 Page updates every:

 </div>

 <div class="dataItems">

-<text id="status"></text><br>

-<text id="period"></text> minutes

+<span id="status"></span><br>

+<span id="period"></span> minutes

 </div>

 </div>

 </div>

-<span class="chartNav">

-<ul class="chartNav">

-<li class="chartNav">Select charts:</li>

-<li class="chartNav"><text class="chartNav" onclick="setChartPeriod(1)">

-24 hours</text></li>

-<li class="chartNav"><text class="chartNav" onclick="setChartPeriod(2)">

-4 weeks</text></li>

-<li class="chartNav"><text class="chartNav" onclick="setChartPeriod(3)">

-12 months</text></li>

+<span class="navContainer">

+<ul class="navElement">

+<li class="navElement">Select charts:</li>

+<li class="navElement"><span class="navElement" onclick="setChartPeriod(1)">

+24 hours</span></li>

+<li class="navElement"><span class="navElement" onclick="setChartPeriod(2)">

+4 weeks</span></li>

+<li class="navElement"><span class="navElement" onclick="setChartPeriod(3)">

+12 months</span></li>

+<li class="navElement"><span class="navElement" onclick="setChartPeriod(0)">

+Custom...</span></li>

 </ul>

 </span>

-<br>

-<div class="chartContainer">

-<img class="chart" id="snrChart">

+<div class="rowContainer" id="customChartsContainer" style="display:none;">

+<div class="currentDataCell">

+<form id="fmDateSelector" action="arednsig.php" method="post"

+ target="iframe_a">

+<label for="beginDate">Begin Date: </label>

+<input id="beginDate" name="beginDate" type="date" value="mm/dd/yyyy" />

+<label for="endDate">End Date: </label>

+<input id="endDate" name="endDate" type="date" value="mm/dd/yyyy" />

+<br><br>

+<input type="button" onclick="getCustomCharts()" value="Get Charts">

+</form>

+<span id="errorMsg"></span><br>

+<iframe id="iframe_a" name="iframe_a"></iframe>

 </div>

-

-<div class="chartContainer">

-<img class="chart" id="signalChart">

 </div>

-<div class="chartContainer">

-<img class="chart" id="noiseChart">

-</div>

+<br>

+<div class="rowContainer" id="stockChartsContainer">

 <div class="chartContainer">

-<img class="chart" id="rxrateChart">

+<img class="chart" id="signalChart">

 </div>

-

 <div class="chartContainer">

-<img class="chart" id="txrateChart">

+<img class="chart" id="snrChart">

+</div>

 </div>

 <div class="notes">

@@ -175,25 +188,32 @@ var nodeDataUrl = "dynamic/nodeOnline.js";

 /* Global DOM objects */

 // Chart elements

-var snrChart = document.getElementById("snrChart");

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

-var noiseChart = document.getElementById("noiseChart");

-var rxrateChart = document.getElementById("rxrateChart");

-var txrateChart = document.getElementById("txrateChart");

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

 // Text elements

 var dateElmt = document.getElementById("date");    

 var timeElmt = document.getElementById("time"); 

 var statusElmt = document.getElementById("status");

 var periodElmt = document.getElementById("period");

+

+// Document elements

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

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

+var chartContainer = document.getElementsByClassName("chartContainer");

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

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

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

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

+

 /* Global objects */

 var httpRequest = new XMLHttpRequest();

 /* Global variables */

-var graphPeriod;

-var graphRefreshRate = 10; // chart refresh rate in minutes

+var chartPeriod = 1;

+var chartRefreshRate = 10; // chart refresh rate in minutes

 function main() {

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

@@ -209,9 +229,9 @@ function main() {

         displayOfflineStatus();

     };

+    initializeDateSelector();

     getNodeData();

-    graphPeriod = 1;

-    getNodeGraphs();

+    getNodeCharts();

 }

 function getNodeData() {

@@ -221,15 +241,22 @@ function getNodeData() {

 }

 function setChartPeriod(n) {

-    graphPeriod = n;

-    getNodeGraphs();   

+    chartPeriod = n;

+    if (n == 0) {

+        customChartsContainer.style.display = "block";

+        stockChartsContainer.style.display = "none";

+    } else {

+        customChartsContainer.style.display = "none";

+        stockChartsContainer.style.display = "block";

+    getNodeCharts();   

+    }

 }

-function getNodeGraphs() {

+function getNodeCharts() {

     var d = new Date;

     var pfx;

-    switch(graphPeriod) {

+    switch(chartPeriod) {

         case 1:

             pfx = "24hr_";

             break;

@@ -241,10 +268,7 @@ function getNodeGraphs() {

             break;

     }

     signalChart.src = "dynamic/" + pfx + "signal.png?ver=" + d.getTime();

-    noiseChart.src = "dynamic/" + pfx + "noise.png?ver=" + d.getTime();

     snrChart.src = "dynamic/" + pfx + "snr.png?ver=" + d.getTime();

-    rxrateChart.src = "dynamic/" + pfx + "rx_rate.png?ver=" + d.getTime();

-    txrateChart.src = "dynamic/" + pfx + "tx_rate.png?ver=" + d.getTime();

 }

 function displayData(dataItem) {

@@ -259,29 +283,51 @@ function displayData(dataItem) {

     localTimeZone = localDate.getTimezoneOffset() / 60;

     dateElmt.innerHTML = date;    

     timeElmt.innerHTML = hourminute +

-        "  <small>(GMT+" + localTimeZone + ")</small>";    

+                         "  <small>(GMT+" + localTimeZone + ")</small>";    

     statusElmt.innerHTML = "Online";

     statusElmt.style.color = "green";

-    graphRefreshRate = dataItem.period;

-    periodElmt.innerHTML = graphRefreshRate;

-    setInterval(getNodeData, 60000 * graphRefreshRate);

-    setInterval(getNodeGraphs, 60000 * graphRefreshRate);

+    chartRefreshRate = dataItem.period;

+    periodElmt.innerHTML = chartRefreshRate;

+    setInterval(getNodeData, 60000 * chartRefreshRate);

+    setInterval(getNodeCharts, 60000 * chartRefreshRate);

 }

 function displayOfflineStatus() {

     var d = new Date();

     localTimeZone = d.getTimezoneOffset() / 60;

     dateElmt.innerHTML = (d.getMonth() + 1) + "/" + d.getDate() + "/" +

-                       d.getFullYear();    

+                          d.getFullYear();    

     timeElmt.innerHTML = d.getHours() + ":" + d.getMinutes() +

-                       "  <small>(GMT+" + localTimeZone + ")</small>";

+                         "  <small>(GMT+" + localTimeZone + ")</small>";

     periodElmt.innerHTML = "?";    

     statusElmt.innerHTML = "offline";    

     statusElmt.style.color = "red";

 }

+function initializeDateSelector() {

+    var d = new Date();

+

+    var dEnd = new Date(d.getFullYear(),

+               d.getMonth(), d.getDate() - 0);

+

+    var dBegin = new Date(d.getFullYear(),

+               d.getMonth(), d.getDate() - 1);

+

+    var strBegin = dBegin.getFullYear() + "-" + (dBegin.getMonth() + 1) + 

+                   "-" + dBegin.getDate();

+    var strEnd = dEnd.getFullYear() + "-" + (dEnd.getMonth() + 1) + 

+                 "-" + dEnd.getDate();

+

+    beginDate.valueAsDate = dBegin;

+    endDate.valueAsDate = dEnd;

+    //errorMsg.innerHTML = strBegin + " thru " + strEnd;

+}

+

+function getCustomCharts() {

+    fmDateSelector.submit();

+}

 </script>

 </body>