update HV::Monitor support to use generic_stats.inc.php (#14814)

This commit is contained in:
Zane C. Bowers-Hadley
2023-01-29 14:54:00 -06:00
committed by GitHub
parent af61958dc9
commit 653da5a3f0
8 changed files with 33 additions and 57 deletions

View File

@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
}
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [
'filename' => $rrd_filename,
'descr' => 'COW',
'ds' => 'cow',
];
$filename = $rrd_filename;
$descr = 'COW';
$ds = 'cow';
} else {
d_echo('RRD "' . $rrd_filename . '" not found');
}
require 'includes/html/graphs/generic_multi_line.inc.php';
require 'includes/html/graphs/generic_stats.inc.php';

View File

@@ -16,15 +16,12 @@ if (isset($vars['vmdisk']) && isset($vars['vm'])) {
$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
}
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [
'filename' => $rrd_filename,
'descr' => 'Flushes',
'ds' => 'freqs',
];
$filename = $rrd_filename;
$descr = 'Flushes';
$ds = 'freqs';
} else {
d_echo('RRD "' . $rrd_filename . '" not found');
}
require 'includes/html/graphs/generic_multi_line.inc.php';
require 'includes/html/graphs/generic_stats.inc.php';

View File

@@ -16,15 +16,12 @@ if (isset($vars['vmdisk']) && isset($vars['vm'])) {
$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
}
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [
'filename' => $rrd_filename,
'descr' => 'Flush Time',
'ds' => 'ftime',
];
$filename = $rrd_filename;
$descr = 'Flush Time';
$ds = 'ftime';
} else {
d_echo('RRD "' . $rrd_filename . '" not found');
}
require 'includes/html/graphs/generic_multi_line.inc.php';
require 'includes/html/graphs/generic_stats.inc.php';

View File

@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
}
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [
'filename' => $rrd_filename,
'descr' => 'Etimes',
'ds' => 'etimes',
];
$filename = $rrd_filename;
$descr = 'Etimes';
$ds = 'etimes';
} else {
d_echo('RRD "' . $rrd_filename . '" not found');
}
require 'includes/html/graphs/generic_multi_line.inc.php';
require 'includes/html/graphs/generic_stats.inc.php';

View File

@@ -16,15 +16,12 @@ if (isset($vars['vmif'])) {
$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
}
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [
'filename' => $rrd_filename,
'descr' => 'Collisions',
'ds' => 'coll',
];
$filename = $rrd_filename;
$descr = 'Collisions';
$ds = 'coll';
} else {
d_echo('RRD "' . $rrd_filename . '" not found');
}
require 'includes/html/graphs/generic_multi_line.inc.php';
require 'includes/html/graphs/generic_stats.inc.php';

View File

@@ -1,7 +1,7 @@
<?php
$name = 'hv-monitor';
$unit_text = 'Memory Usage %';
$unit_text = 'CPU Usage %';
$colours = 'psychedelic';
$dostack = 0;
$printtotal = 0;
@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
}
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [
'filename' => $rrd_filename,
'descr' => 'CPU%',
'ds' => 'pcpu',
];
$filename = $rrd_filename;
$descr = 'CPU%';
$ds = 'pcpu';
} else {
d_echo('RRD "' . $rrd_filename . '" not found');
}
require 'includes/html/graphs/generic_multi_line.inc.php';
require 'includes/html/graphs/generic_stats.inc.php';

View File

@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
}
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [
'filename' => $rrd_filename,
'descr' => 'Snaps',
'ds' => 'snaps',
];
$filename = $rrd_filename;
$descr = 'Snaps';
$ds = 'snaps';
} else {
d_echo('RRD "' . $rrd_filename . '" not found');
}
require 'includes/html/graphs/generic_multi_line.inc.php';
require 'includes/html/graphs/generic_stats.inc.php';

View File

@@ -14,15 +14,12 @@ if (isset($vars['vm'])) {
$rrd_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
}
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [
'filename' => $rrd_filename,
'descr' => 'Snap Size',
'ds' => 'snaps_size',
];
$filename = $rrd_filename;
$descr = 'Snaps Size';
$ds = 'snaps_size';
} else {
d_echo('RRD "' . $rrd_filename . '" not found');
}
require 'includes/html/graphs/generic_multi_line.inc.php';
require 'includes/html/graphs/generic_stats.inc.php';