From 73fb0ca7ff47c838ab83dbc01c1e8fdeedd91068 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 15 Apr 2015 12:35:20 +0100
Subject: [PATCH 1/3] Updated alert_log query to get alerts based on minute
 interval

---
 html/includes/print-graph-alerts.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/includes/print-graph-alerts.inc.php b/html/includes/print-graph-alerts.inc.php
index ac4a713f0a..0ba38ac339 100644
--- a/html/includes/print-graph-alerts.inc.php
+++ b/html/includes/print-graph-alerts.inc.php
@@ -19,11 +19,11 @@ if (isset($device['device_id']) && $device['device_id'] > 0) {
 }
 
 if ($_SESSION['userlevel'] >= '5') {
-    $query = "SELECT DATE(time_logged) Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules WHERE alert_log.rule_id=alert_rules.id $sql GROUP BY DATE(time_logged),alert_rules.severity";
+    $query = "SELECT DATE_FORMAT(time_logged, '%Y-%m-%d %H:%i') Date, COUNT(alert_log.rule_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules WHERE alert_log.rule_id=alert_rules.id $sql GROUP BY DATE_FORMAT(time_logged, '%Y-%m-%d %H:%i'),alert_rules.severity";
 }
 
 if ($_SESSION['userlevel'] < '5') {
-    $query = "SELECT DATE(time_logged) Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " GROUP BY DATE(time_logged),alert_rules.severity";
+    $query = "SELECT DATE_FORMAT(time_logged, '%Y-%m-%d %H:%i') Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " GROUP BY DATE_FORMAT(time_logged, '%Y-%m-%d %H:%i'),alert_rules.severity";
 }
 
 ?>
@@ -97,4 +97,4 @@ echo $milisec_diff;
     };
     var graph2d = new vis.Graph2d(container, items, groups, options);
  
-</script>
\ No newline at end of file
+</script>

From 14e8195b26bdda2bf34817da9e80e16f5c40c1ae Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 15 Apr 2015 12:55:34 +0100
Subject: [PATCH 2/3] Changed to exlcude ok state + user configurable for
 resolution

---
 html/includes/print-graph-alerts.inc.php | 6 +++---
 includes/defaults.inc.php                | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/html/includes/print-graph-alerts.inc.php b/html/includes/print-graph-alerts.inc.php
index 0ba38ac339..1bc27fcbf7 100644
--- a/html/includes/print-graph-alerts.inc.php
+++ b/html/includes/print-graph-alerts.inc.php
@@ -19,11 +19,11 @@ if (isset($device['device_id']) && $device['device_id'] > 0) {
 }
 
 if ($_SESSION['userlevel'] >= '5') {
-    $query = "SELECT DATE_FORMAT(time_logged, '%Y-%m-%d %H:%i') Date, COUNT(alert_log.rule_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules WHERE alert_log.rule_id=alert_rules.id $sql GROUP BY DATE_FORMAT(time_logged, '%Y-%m-%d %H:%i'),alert_rules.severity";
+    $query = "SELECT DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."') Date, COUNT(alert_log.rule_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules WHERE alert_log.rule_id=alert_rules.id AND `alert_log`.`state` != 0 $sql GROUP BY DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."'),alert_rules.severity";
 }
 
 if ($_SESSION['userlevel'] < '5') {
-    $query = "SELECT DATE_FORMAT(time_logged, '%Y-%m-%d %H:%i') Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " GROUP BY DATE_FORMAT(time_logged, '%Y-%m-%d %H:%i'),alert_rules.severity";
+    $query = "SELECT DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."') Date, COUNT(alert_log.device_id) totalCount, alert_rules.severity Severity FROM alert_log,alert_rules,devices_perms WHERE alert_log.rule_id=alert_rules.id AND `alert_log`.`state` != 0 $sql AND alert_log.device_id = devices_perms.device_id AND devices_perms.user_id = " . $_SESSION['user_id'] . " GROUP BY DATE_FORMAT(time_logged, '".$config['alert_graph_date_format']."'),alert_rules.severity";
 }
 
 ?>
@@ -86,7 +86,7 @@ echo $max_count; ?>
                 }
             }
         },
-        zoomMin: 2073600000, //24hrs
+        zoomMin: <?php echo 86400; ?>, //24hrs
         zoomMax: <?php
 $first_date = reset($data);
 $last_date = end($data);
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 7cee0e712b..c9cc3d4c2c 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -603,4 +603,7 @@ $config['distributed_poller_memcached_port']             = '11211';
 $config['callback_post']                                 = 'https://stats.librenms.org/log.php';
 $config['callback_clear']                                = 'https://stats.librenms.org/clear.php';
 
+// Stat graphs
+$config['alert_graph_date_format']                       = '%Y-%m-%d %H:%i';
+
 ?>

From 384c037613388b40c5c88b19a8f628469acb4699 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 15 Apr 2015 13:01:35 +0100
Subject: [PATCH 3/3] Removed php echo - not needed

---
 html/includes/print-graph-alerts.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/includes/print-graph-alerts.inc.php b/html/includes/print-graph-alerts.inc.php
index 1bc27fcbf7..6479d7a7dc 100644
--- a/html/includes/print-graph-alerts.inc.php
+++ b/html/includes/print-graph-alerts.inc.php
@@ -86,7 +86,7 @@ echo $max_count; ?>
                 }
             }
         },
-        zoomMin: <?php echo 86400; ?>, //24hrs
+        zoomMin: 86400, //24hrs
         zoomMax: <?php
 $first_date = reset($data);
 $last_date = end($data);