Merge pull request #487 from TheSerapher/issue-486

Adding notifications and start/end times

cronjobs/cron_end.inc.php

@@ -22,7 +22,7 @@ limitations under the License.
 $monitoring->setStatus($cron_name . "_message", "message", "OK");
 $monitoring->setStatus($cron_name . "_status", "okerror", 0);
 $monitoring->setStatus($cron_name . "_runtime", "time", microtime(true) - $cron_start[$cron_name]);
-$monitoring->setStatus($cron_name . "_lastrun", "date", time());
+$monitoring->setStatus($cron_name . "_endtime", "date", time());
 // Mark cron as running for monitoring
 $monitoring->setStatus($cron_name . '_active', "yesno", 0);
 ?>

cronjobs/notifications.php

@@ -65,4 +65,6 @@ if (!empty($aNotifications)) {
 } else {
   $log->logDebug(" no active IDLE worker notifications\n");
 }
+
+require_once('cron_end.inc.php');
 ?>

cronjobs/shared.inc.php

@@ -48,4 +48,5 @@ $cron_start[$cron_name] = microtime(true);
 // Mark cron as running for monitoring
 $log->logDebug('Marking cronjob as running for monitoring');
 $monitoring->setStatus($cron_name . '_active', 'yesno', 1);
+$monitoring->setStatus($cron_name . '_starttime', 'date', time());
 ?>

public/include/pages/admin/monitoring.inc.php

@@ -15,42 +15,56 @@ $aCronStatus = array(
     array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('statistics_status') ),
     array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('statistics_active') ),
     array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('statistics_runtime') ),
-    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('statistics_lastrun') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('statistics_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('statistics_endtime') ),
     array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('statistics_message') ),
   ),
   'auto_payout' => array (
     array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('auto_payout_status') ),
     array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('auto_payout_active') ),
     array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('auto_payout_runtime') ),
-    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('auto_payout_lastrun') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('auto_payout_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('auto_payout_endtime') ),
     array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('auto_payout_message') ),
   ),
   'archive_cleanup' => array (
     array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('archive_cleanup_status') ),
     array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('archive_cleanup_active') ),
     array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('archive_cleanup_runtime') ),
-    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('archive_cleanup_lastrun') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('archive_cleanup_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('archive_cleanup_endtime') ),
     array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('archive_cleanup_message') ),
   ),
   'blockupdate' => array (
     array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('blockupdate_status') ),
     array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('blockupdate_active') ),
     array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('blockupdate_runtime') ),
-    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('blockupdate_lastrun') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('blockupdate_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('blockupdate_endtime') ),
     array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('blockupdate_message') ),
   ),
   'findblock' => array (
     array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('findblock_status') ),
     array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('findblock_active') ),
     array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('findblock_runtime') ),
-    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('findblock_lastrun') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('findblock_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('findblock_endtime') ),
     array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('findblock_message') ),
   ),
+  'notifications' => array (
+    array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('notifications_status') ),
+    array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('notifications_active') ),
+    array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('notifications_runtime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('notifications_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('notifications_endtime') ),
+    array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('notifications_message') ),
+  ),
   'tickerupdate' => array (
     array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('tickerupdate_status') ),
     array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('tickerupdate_active') ),
     array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('tickerupdate_runtime') ),
-    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('tickerupdate_lastrun') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('tickerupdate_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('tickerupdate_endtime') ),
     array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('tickerupdate_message') ),
   )
 );
@@ -61,7 +75,8 @@ case 'pplns':
     array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('pplns_payout_status') ),
     array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('pplns_payout_active') ),
     array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('pplns_payout_runtime') ),
-    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('pplns_payout_lastrun') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('pplns_payout_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('pplns_payout_endtime') ),
     array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('pplns_payout_message') ),
   );
   break;
@@ -70,7 +85,8 @@ case 'pps':
     array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('pps_payout_status') ),
     array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('pps_payout_active') ),
     array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('pps_payout_runtime') ),
-    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('pps_payout_lastrun') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('pps_payout_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('pps_payout_endtime') ),
     array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('pps_payout_message') ),
   );
   break;
@@ -79,7 +95,8 @@ case 'prop':
     array( 'NAME' => 'Exit Code', 'STATUS' => $monitoring->getStatus('proportional_payout_status') ),
     array( 'NAME' => 'Active', 'STATUS' => $monitoring->getStatus('proportional_payout_active') ),
     array( 'NAME' => 'Runtime', 'STATUS' => $monitoring->getStatus('proportional_payout_runtime') ),
-    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('proportional_payout_lastrun') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('proportional_payout_starttime') ),
+    array( 'NAME' => 'Last Run', 'STATUS' => $monitoring->getStatus('proportional_payout_endtime') ),
     array( 'NAME' => 'Last Message', 'STATUS' => $monitoring->getStatus('proportional_payout_message') ),
   );
   break;

public/templates/mmcFE/admin/monitoring/default.tpl

@@ -5,7 +5,8 @@
         <th>Exit Code</th>
         <th>Active</th>
         <th>Runtime</th>
-        <th>Last Run</th>
+        <th>Start Time</th>
+        <th>End Time</th>
         <th>Message</th>
       </thead>
       <tbody>