@@ -24,16 +24,21 @@

 #    along with this program.  If not, see http://www.gnu.org/license.

 #

 # Revision History

-#   * v10 released 15 Sep 2015 by J L Owrey

+#   * v11 released 24 Jul 2018 by J L Owrey

 #

+# Example of rrdtool command line executed by this program:

+#

+#   rrdtool create radmonData.rrd --step 30 DS:CPM:GAUGE:60:U:U

+#   DS:SvperHr:GAUGE:60:U:U RRA:LAST:0.5:1:2880 RRA:LAST:0.5:30:35520

+#

+

 import os

-import time

 import subprocess

     ### DEFINE FILE LOCATIONS ###

 _USER = os.environ['USER']

-_RRD_FILE = "/home/%s/database/radmonData.rrd" % _USER  # the file that stores the data

+_RRD_FILE = "/home/%s/database/radmonData.rrd" % _USER  # rrd database file

 _RRD_SIZE_IN_DAYS = 370 # days

 _1YR_RRA_STEPS_PER_DAY = 96

 _DATABASE_UPDATE_INTERVAL = 30

@@ -51,7 +56,8 @@ def createRrdFile():

      ## Calculate database size

     heartBeat = 2 * _DATABASE_UPDATE_INTERVAL

-    rra1yrNumPDP =  int(round(86400 / (_1YR_RRA_STEPS_PER_DAY * _DATABASE_UPDATE_INTERVAL)))

+    rra1yrNumPDP =  int(round(86400 / (_1YR_RRA_STEPS_PER_DAY * \

+                        _DATABASE_UPDATE_INTERVAL)))

     rrd24hrNumRows = int(round(86400 / _DATABASE_UPDATE_INTERVAL))

     rrd1yearNumRows = _1YR_RRA_STEPS_PER_DAY * _RRD_SIZE_IN_DAYS

@@ -69,8 +75,7 @@ def createRrdFile():

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

                                 shell=True)

     except subprocess.CalledProcessError, exError:

-        print "%s rrdtool create failed: %s" % \

-                            (getTimeStamp(), exError.output)

+        print "rrdtool create failed: %s" % (exError.output)

         return False

     return True

 ##end def

@@ -4,12 +4,14 @@

 # something linke http://radiationMonitor.domain.com depending on

 # whether your local network uses a domain name server.

 #

-MONITOR_URL="{your monitor url}"

 APP_PATH="/home/$USER/bin"

 LOG_PATH="/home/$USER/log"

-PROCESS_ID="$(ps x | awk '/[r]admonAgent.py/{print $1}')"

+AGENT_NAME="[r]admonAgent.py"

+SOURCE_URL="{your radiation monitor url}"

+

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

 if [ -n "$PROCESS_ID" ]; then

   if [ "$1" != "-q" ]; then

@@ -18,5 +20,10 @@ if [ -n "$PROCESS_ID" ]; then

 else

   printf "starting up radmon agent\n"

   cd $APP_PATH

-  ./radmonAgent.py -t 10 -u $MONITOR_URL >> $LOG_PATH/radmonAgent.log 2>&1 &

+  if [ "$1" != "" ]; then

+    ./$AGENT_NAME $1 -u $SOURCE_URL

+  else

+    ./$AGENT_NAME -u $SOURCE_URL >> \

+      $LOG_PATH/radmonAgent.log 2>&1 &

+  fi

 fi

@@ -1,7 +1,9 @@

 #!/bin/bash

-# Stop the radmon agent process and clean up environment.

+# Stop the radmon agent process.

-PROCESS_ID="$(ps x | awk '/[r]admonAgent.py/{print $1}')"

+AGENT_NAME="[r]admonAgent.py"

+

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

 if [ -n "$PROCESS_ID" ]; then

   printf "killing radmon agent [%s]\n" $PROCESS_ID

old mode 100644

new mode 100755

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

     text-align: left;

     padding: 10px;

 }

-span.chartNav {

+span.chartSelectors {

     margin: auto;

 }

-ul.chartNav {

+ul.selectorElement {

     list-style-type: none;

     margin: 10px;

     padding: 0;

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

     background-color: #bbb;

     text-align: center;

 }

-li.chartNav {

+li.selectorElement {

     display: inline-block;

     font: bold 18px arial, sans-serif;

     color: black;

 }

-text.chartNav:hover {

+span.selectorElement:hover {

     background-color: #333;

     cursor: pointer;

     color: white;

 }

-text.chartNav {

+span.selectorElement {

     display: inline-block;

     padding: 8px 12px;

 }

+#iframe_a {

+    border:none;

+    width:100%;

+    height:450px;

+}

 </style>

 </head>

@@ -94,9 +99,9 @@ DIY Radiation Monitor</a></h2>

 <h4>Albany, Oregon</h4>

 <div class="datetime">

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

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

   

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

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

 </div>

 <div class="rowContainer">

@@ -108,9 +113,9 @@ Counts per second:<br>

 uSv per hour:

 </div>

 <div class="dataItems">

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

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

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

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

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

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

 </div>

 </div>

@@ -121,32 +126,57 @@ Status:<br>

 Mode:

 </div>

 <div class="dataItems">

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

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

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

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

 </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="chartSelectors">

+<ul class="selectorElement">

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

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

+ onclick="setChartPeriod(1)">

+24 hours</span></li>

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

+ onclick="setChartPeriod(2)">

+4 weeks</span></li>

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

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

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

+<span  class="selectorElement"

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

 </ul>

 </span>

+

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

+<div class="currentDataCell">

+<form id="fmDateSelector" action="radmon.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>

+

 <br>

+

+

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

 <div class="chartContainer">

 <img class="chart" id="cpmChart">

 </div>

-

 <div class="chartContainer">

 <img class="chart" id="uSvChart">

 </div>

+</div>

 <div class="notes">

 <b>NOTES:</b>

@@ -166,10 +196,10 @@ Radiation Dose Chart</a> by Randall Monroe.</li>

 <br>

 <script>

-

+"use strick";

 /* Global constants */

-var radmonDataUrl = "dynamic/radmonOutputData.js";

+var radmonDataUrl = "dynamic/radmonData.js";

 /* Global DOM objects */

@@ -177,7 +207,7 @@ var radmonDataUrl = "dynamic/radmonOutputData.js";

 var cpmChart_g = document.getElementById("cpmChart");

 var uSvChart_g = document.getElementById("uSvChart");

-// Text elements

+// Document elements

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

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

 var cpm_e = document.getElementById("cpm");    

@@ -186,16 +216,25 @@ var uSvPerHr_e = document.getElementById("uSvPerHr");

 var mode_e = document.getElementById("mode");    

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

+// Custom charts document elements

+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 */

 var httpRequest = new XMLHttpRequest();

 /* Global variables */

-var graphPeriod;

-

+var chartPeriod = 1;

 function main() {

+    httpRequest.timeout = 3000;

+

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

     httpRequest.onreadystatechange = function() {

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

@@ -208,30 +247,38 @@ function main() {

     httpRequest.ontimeout = function(e) {

         displayOfflineStatus();

     };

-

+    

+    initializeDateSelector();

     getRadmonData();

-    graphPeriod = 1;

-    getRadmonGraphs();

-    setInterval(getRadmonData, 5000);

-    setInterval(getRadmonGraphs, 300000);

+    getRadmonCharts();

+    setInterval(getRadmonData, 2000);

+    setInterval(getRadmoncharts, 300000);

 }

 function getRadmonData() {

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

-    httpRequest.timeout = 3000;

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

     httpRequest.send();

 }

 function setChartPeriod(n) {

-    graphPeriod = n;

-    getRadmonGraphs();   

+    /* Show custom charts if custom charts selected, otherwise show

+       stock charts. */

+    chartPeriod = n;

+    if (n == 0) {

+        customChartsContainer.style.display = "block";

+        stockChartsContainer.style.display = "none";

+    } else {

+        customChartsContainer.style.display = "none";

+        stockChartsContainer.style.display = "block";

+        getRadmonCharts();   

+    }

 }

-function getRadmonGraphs() {

+function getRadmonCharts() {

     var d = new Date;

     var pfx;

-    switch(graphPeriod) {

+    switch(chartPeriod) {

         case 1:

             pfx = "24hr_";

             break;

@@ -250,6 +297,12 @@ function displayData(dataItem) {

     var timeStamp, date, time, hourminute;

     var localDateObj,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];

     time = timeStamp.split(" ")[1];

@@ -259,11 +312,11 @@ function displayData(dataItem) {

     date_e.innerHTML = date;    

     time_e.innerHTML = hourminute +

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

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

     cpm_e.innerHTML = dataItem.CPM;    

     cps_e.innerHTML = dataItem.CPS;    

     uSvPerHr_e.innerHTML = dataItem.uSvPerHr;    

-    mode_e.innerHTML = dataItem.Mode;    

+    mode_e.innerHTML = dataItem.mode;    

     status_e.innerHTML = dataItem.status;    

     if (dataItem.status == "online") {

@@ -277,7 +330,7 @@ function displayOfflineStatus() {

     var d = new Date();

     localTimeZone = d.getTimezoneOffset() / 60;

     date_e.innerHTML = (d.getMonth() + 1) + "/" + d.getDate() + "/" + d.getFullYear();    

-    time_e.innerHTML = d.getHours() + ":" + d.getMinutes() + "  <small>(GMT+" + 

+    time_e.innerHTML = d.getHours() + ":" + d.getMinutes() + "  <small>(UTC-" + 

                        localTimeZone + ")</small>";

     cpm_e.innerHTML = "";    

     cps_e.innerHTML = "";    

@@ -287,6 +340,22 @@ function displayOfflineStatus() {

     status_e.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);

+

+    document.getElementById("beginDate").valueAsDate = dBegin;

+    document.getElementById("endDate").valueAsDate = dEnd;

+}

+

+function getCustomCharts() {

+    fmDateSelector.submit();

+}

 </script>

 </body>

new file mode 100644

@@ -0,0 +1,204 @@

+<html>

+<!-- Courtsey ruler

+12345678901234567890123456789012345678901234567890123456789012345678901234567890

+-->

+<head>

+<style>

+p {

+    font: 14px ariel, sans serif;

+}

+#errorMsg {

+    font:bold 18px arial,sans-serif;

+    color:red;

+    text-align:center;

+}

+.chartContainer {

+    padding: 2px;

+}

+img.chart {

+    width:100%;

+}

+</style>

+</head>

+<body>

+

+<?php

+/*

+ Script: radmon.php

+

+ Description: This scripts generates on the server charts showing

+ radmon data spanning the period supplied by the user.  The script

+ does the following:

+    - converts user supplied dates to  epoch time

+    - gets the times of the first and last data point in the round

+      robin database (RRD)

+    - from above validates user supplied begin and end dates

+    - creates charts of the specified period

+

+ Copyright 2020 Jeff Owrey

+    This program is free software: you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation, either version 3 of the License, or

+    (at your option) any later version.

+

+    This program is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see http://www.gnu.org/license.

+

+ Revision History

+   * v20 released 18 Jan 2020 by J L Owrey; first release

+*/

+

+# Define global constants

+

+# round robin database file

+define("_RRD_FILE", str_replace("public_html/radmon/radmon.php",

+                                "database/radmonData.rrd",

+                                $_SERVER["SCRIPT_FILENAME"]));

+# charts html directory

+define("_CHART_DIRECTORY", str_replace("radmon.php",

+                                       "dynamic/",

+                                       $_SERVER["SCRIPT_FILENAME"]));

+# standard chart width in pixels

+define("_CHART_WIDTH", 600);

+# standard chart height in pixels

+define("_CHART_HEIGHT", 150);

+# debug mode

+define("_DEBUG", false);

+

+# Set error handling modes.

+error_reporting(E_ALL);

+

+# Get user supplied chart begin and end dates.

+$beginDate = $_POST["beginDate"];

+$endDate =  $_POST["endDate"];

+

+# Convert the user supplied dates to epoch time stamps.

+$beginDateEp = strtotime($beginDate);

+$endDateEp = strtotime($endDate);

+

+# Get the time stamp of the earliest data point in the RRD file.

+$cmd = sprintf("rrdtool first %s --rraindex 1", _RRD_FILE);

+$firstDP = shell_exec($cmd);

+

+# Get the time stamp of the latest data point in the RRD file.

+$cmd = sprintf("rrdtool last %s", _RRD_FILE);

+$lastDP = shell_exec($cmd);

+

+# Determine validity of user supplied dates.  User supplied begin

+# date must be less than user supplied end date.  Furthermore both

+# dates must be within the range of dates stored in the RRD.

+if ($beginDateEp > $endDateEp) {

+    echo "<p id=\"errorMsg\">" .

+         "End date must be after begin date.</p>";

+} elseif ($beginDateEp < $firstDP || $endDateEp > $lastDP) {

+    echo "<p id=\"errorMsg\">" .

+          "Date range must be between " .

+          date('m / d / Y', $firstDP) . " and " . 

+          date('m / d / Y', $lastDP) . ".</p>";

+} else {

+    # Generate charts from validated user supplied dates.

+    if (_DEBUG) {

+        echo "<p>Date range: " . $beginDateEp . " thru " .

+              $endDateEp . "</p>";

+    }

+    createChart('custom_cpm', 'CPM', 'counts\ per\ minute', 

+                'CPM', $beginDateEp, $endDateEp,

+                 0, 0, 2, false);

+    createChart('custom_svperhr', 'SvperHr', 'Sv\ per\ hour', 

+                'Sv/Hr', $beginDateEp, $endDateEp,

+                 0, 0, 2, false);

+    # Send html commands to client browser.

+    echo "<div class=\"chartContainer\">" .

+         "<img class=\"chart\" src=\"dynamic/custom_cpm.png\">" .

+         "</div>";

+    echo "<div class=\"chartContainer\">" .

+         "<img class=\"chart\" src=\"dynamic/custom_svperhr.png\">" .

+         "</div>";

+}

+

+function createChart($chartFile, $dataItem, $label, $title, $begin,

+                     $end, $lower, $upper, $addTrend, $autoScale) {

+    /*

+    Uses rrdtool to create a chart of specified aredn node data item.

+    Parameters:

+       fileName - name of the created chart file

+       dataItem - data item to be charted

+       label - string containing a label for the item to be charted

+       title - string containing a title for the chart

+       begin - beginning time of the chart data

+       end   - ending time of the data to be charted

+       lower - lower bound for chart ordinate #NOT USED

+       upper - upper bound for chart ordinate #NOT USED

+       addTrend - 0, show only chart data

+                  1, show only a trend line

+                  2, show a trend line and the chart data

+       autoScale - if True, then use vertical axis auto scaling

+           (lower and upper parameters are ignored), otherwise use

+           lower and upper parameters to set vertical axis scale

+    Returns: True if successful, False otherwise

+    */

+

+    # Define path on server to chart files.

+    $chartPath = _CHART_DIRECTORY . $chartFile . ".png";

+

+    # Format the rrdtool chart command.

+

+    # Set chart file name, start time, end time, height, and width.

+    $cmdfmt = "rrdtool graph %s -a PNG -s %s -e %s -w %s -h %s ";

+    $cmd = sprintf($cmdfmt, $chartPath, $begin, $end, _CHART_WIDTH,

+                   _CHART_HEIGHT);

+    $cmdfmt = "-l %s -u %s -r ";

+

+    # Set upper and lower ordinate bounds.

+    if ($lower < $upper) {

+        $cmd .= sprintf($cmdfmt, $lower, $upper);

+    } elseif ($autoScale) {

+        $cmd .= "-A ";

+    }

+    $cmd .= "-Y ";

+

+    # Set the chart ordinate label and chart title. 

+    $cmdfmt = "-v %s -t %s ";

+    $cmd .= sprintf($cmdfmt, $label, $title);

+   

+    # Define moving average window width.

+    $trendWindow = floor(($end - $begin) / 12);

+        

+    # Show the data, or a moving average trend line over

+    # the data, or both.

+    $cmdfmt = "DEF:dSeries=%s:%s:LAST ";

+    $cmd .= sprintf($cmdfmt, _RRD_FILE, $dataItem);

+    if ($addTrend == 0) {

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

+    } elseif ($addTrend == 1) {

+        $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 LINE2:smoothed#006600 ";

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

+    }

+     

+    # Execute the formatted rrdtool command in the shell. The rrdtool

+    # command will complete execution before the html image tags get

+    # sent to the browser.  This assures that the charts are available

+    # when the client browser executes the html code that loads the

+    # charts into the document displayed by the client browser.

+    if (_DEBUG) {

+        echo "<p>chart command:<br>" . $cmd . "</p>";

+    }

+    $result = shell_exec($cmd . " 2>&1");

+    if (_DEBUG) {

+        echo "<p>result:<br>" . $result . "</p>";

+    }

+}

+

+?>

+

+</body>

+</html>