Merge remote-tracking branch 'upstream/master' into rrd-create-remote

This commit is contained in:
Tony Murray
2016-08-07 08:22:32 -05:00
68 changed files with 941 additions and 506 deletions

View File

@@ -18,11 +18,14 @@ foreach ($graphs as $key => $text) {
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<h3>'.$text.'</h3>';
echo "<tr bgcolor='$row_colour'><td colspan=5>";
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</td></tr>';
echo '</div>';
echo '</div>';
echo '</div>';
}

View File

@@ -0,0 +1,28 @@
<?php
global $config;
$graphs = array(
'dhcp-stats' => 'DHCP Stats',
);
foreach ($graphs as $key => $text) {
$graph_type = $key;
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</div>';
echo '</div>';
echo '</div>';
}

View File

@@ -3,13 +3,13 @@
global $config;
$graphs = array(
'nfs-v3-stats' => 'NFS v3 Statistics',
'nfs-io' => 'IO',
'nfs-fh' => 'File handler',
'nfs-rc' => 'Reply cache',
'nfs-ra' => 'Read ahead cache',
'nfs-net' => 'Network stats',
'nfs-rpc' => 'RPC Stats',
'nfs-v3-stats_stats' => 'NFS v3 Statistics',
'nfs-v3-stats_io' => 'IO',
'nfs-v3-stats_fh' => 'File handler',
'nfs-v3-stats_rc' => 'Reply cache',
'nfs-v3-stats_ra' => 'Read ahead cache',
'nfs-v3-stats_net' => 'Network stats',
'nfs-v3-stats_rpc' => 'RPC Stats',
);

View File

@@ -0,0 +1,28 @@
<?php
global $config;
$graphs = array(
'os-updates' => 'OS updates',
);
foreach ($graphs as $key => $text) {
$graph_type = $key;
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['to'] = $config['time']['now'];
$graph_array['id'] = $app['app_id'];
$graph_array['type'] = 'application_'.$key;
echo '<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">'.$text.'</h3>
</div>
<div class="panel-body">
<div class="row">';
include 'includes/print-graphrow.inc.php';
echo '</div>';
echo '</div>';
echo '</div>';
}