mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #809 from laf/alert-graph-date

Browse Source 
Updated alert_log query to get alerts based on minute interval
This commit is contained in:
Daniel Preussker
2015-04-15 14:15:18 +02:00
parent 415b53613e 384c037613
commit d218daabff
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/print-graph-alerts.inc.php
+4 -4
View File
@@ -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, '".$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(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, '".$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: 86400, //24hrs
zoomMax: <?php
$first_date = reset($data);
$last_date = end($data);
@@ -97,4 +97,4 @@ echo $milisec_diff;
};
var graph2d = new vis.Graph2d(container, items, groups, options);
</script>
</script>
includes/defaults.inc.php
+3
View File
@@ -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';
?>