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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
includes/html/graphs/application/hv-monitor_cow.inc.php
View File

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

11
includes/html/graphs/application/hv-monitor_disk-freqs.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_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
} }
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) { if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [ $filename = $rrd_filename;
'filename' => $rrd_filename, $descr = 'Flushes';
'descr' => 'Flushes', $ds = 'freqs';
'ds' => 'freqs',
];
} else { } else {
d_echo('RRD "' . $rrd_filename . '" not found'); d_echo('RRD "' . $rrd_filename . '" not found');
} }
require 'includes/html/graphs/generic_multi_line.inc.php'; require 'includes/html/graphs/generic_stats.inc.php';

11
includes/html/graphs/application/hv-monitor_disk-ftime.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_filename = Rrd::name($device['hostname'], ['app', $name, $app->app_id]);
} }
$rrd_list = [];
if (Rrd::checkRrdExists($rrd_filename)) { if (Rrd::checkRrdExists($rrd_filename)) {
$rrd_list[] = [ $filename = $rrd_filename;
'filename' => $rrd_filename, $descr = 'Flush Time';
'descr' => 'Flush Time', $ds = 'ftime';
'ds' => 'ftime',
];
} else { } else {
d_echo('RRD "' . $rrd_filename . '" not found'); d_echo('RRD "' . $rrd_filename . '" not found');
} }
require 'includes/html/graphs/generic_multi_line.inc.php'; require 'includes/html/graphs/generic_stats.inc.php';

11
includes/html/graphs/application/hv-monitor_etimes.inc.php
View File

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

11
includes/html/graphs/application/hv-monitor_net-coll.inc.php
View File

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

13
includes/html/graphs/application/hv-monitor_pcpu.inc.php
View File

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

11
includes/html/graphs/application/hv-monitor_snaps.inc.php
View File

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

11
includes/html/graphs/application/hv-monitor_snaps_size.inc.php
View File

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