additions to unix-agent. addition of basic munin-plugin support.

git-svn-id: http://www.observium.org/svn/observer/trunk@3088 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-04-26 11:57:52 +00:00
parent b56d3d6320
commit 283f33afa1
12 changed files with 146 additions and 154 deletions

View File

@@ -17,13 +17,21 @@ echo("<span style='font-weight: bold;'>Graphs</span> &#187; ");
$sep = "";
foreach (dbFetchRows("SELECT * FROM device_graphs WHERE device_id = ?", array($device['device_id'])) as $graph)
foreach (dbFetchRows("SELECT * FROM munin_plugins WHERE device_id = ? ORDER BY mplug_category, mplug_type", array($device['device_id'])) as $mplug)
{
# if(strlen($mplug['mplug_category']) == 0) { $mplug['mplug_category'] = "general"; } else { }
$graph_enable[$mplug['mplug_category']][$mplug['mplug_type']]['id'] = $mplug['mplug_id'];
$graph_enable[$mplug['mplug_category']][$mplug['mplug_type']]['title'] = $mplug['mplug_title'];
}
foreach (dbFetchRows("SELECT * FROM device_graphs WHERE device_id = ? ORDER BY graph", array($device['device_id'])) as $graph)
{
$section = $config['graph_types']['device'][$graph['graph']]['section'];
$graph_enable[$section][$graph['graph']] = $graph['graph'];
}
foreach ($config['graph_sections'] as $section)
#foreach ($config['graph_sections'] as $section)
foreach($graph_enable as $section => $nothing)
{
if (isset($graph_enable) && is_array($graph_enable[$section]))
{
@@ -34,9 +42,7 @@ foreach ($config['graph_sections'] as $section)
{
echo('<span class="pagemenu-selected">');
}
echo(generate_link(ucwords($type),$link_array,array('group'=>$type)));
if ($vars['group'] == $type)
{
echo("</span>");
@@ -50,13 +56,20 @@ print_optionbar_end();
$graph_enable = $graph_enable[$vars['group']];
foreach ($config['graph_types']['device'] as $graph => $entry)
#foreach ($config['graph_types']['device'] as $graph => $entry)
foreach($graph_enable as $graph => $entry)
{
if ($graph_enable[$graph])
{
$graph_title = $config['graph_types']['device'][$graph]['descr'];
$graph_type = "device_" . $graph;
if(is_numeric($entry['id']))
{
$graph_title = $entry['title'];
$graph_array['type'] = "munin_graph";
$graph_array['id'] = $entry['id'];
} else {
$graph_title = $config['graph_types']['device'][$graph]['descr'];
$graph_array['type'] = "device_" . $graph;
}
include("includes/print-device-graph.php");
}
}