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

fix: reduce mib graph queries (#4439)

Browse Source 
Used have 1 query for every graph type known to LibreNMS.
Now it just gets a list of the graphs for the device and checks against that.
This commit is contained in:
Tony Murray
2016-09-15 02:45:45 -05:00
committed by Neil Lathwood
parent 5b3ee62b33
commit 83d7bbdd1b
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
includes/common.php
View File

@@ -739,11 +739,15 @@ function get_graph_subtypes($type, $device = null)
closedir($handle);
}
// find the MIB subtypes
foreach ($config['graph_types'] as $type => $unused1) {
foreach ($config['graph_types'][$type] as $subtype => $unused2) {
if (is_mib_graph($type, $subtype) && $device != null && is_device_graph($device, $subtype)) {
$types[] = $subtype;
if ($device != null) {
// find the MIB subtypes
$graphs = get_device_graphs($device);
foreach ($config['graph_types'] as $type => $unused1) {
foreach ($config['graph_types'][$type] as $subtype => $unused2) {
if (is_mib_graph($type, $subtype) && in_array($graphs, $subtype)) {
$types[] = $subtype;
}
}
}
}
@@ -752,13 +756,11 @@ function get_graph_subtypes($type, $device = null)
return $types;
} // get_graph_subtypes
function is_device_graph($device, $subtype)
function get_device_graphs($device)
{
$query = 'SELECT COUNT(*) FROM `device_graphs` WHERE `device_id` = ? AND `graph` = ?';
return dbFetchCell($query, array($device['device_id'], $subtype)) > 0;
} // is_device_graph
$query = 'SELECT `graph` FROM `device_graphs` WHERE `device_id` = ?';
return dbFetchColumn($query, array($device['device_id']));
}
function get_smokeping_files($device)
{