mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
0bbcde1227
* initial work on add the ability to save/fetch app data
* update to use get_app_data for ZFS
* update the poller for the new app_data stuff
* ZFS now logs changes to pools
* add schema update for app_data stuff
* small formatting fix
* add a missing \
* now adds a column
* sql-schema is no longer used, so remove the file that was added here
* misc cleanups
* rename the method in database/migrations/2022_07_03_1947_add_app_data.php
* hopefully fix the migration bit
* add the column to misc/db_schema.yaml
* more misc small DB fixes
* update the test as the json column uses collat of utf8mb4_bin
* revert the last change and try manually setting it to what is expected
* remove a extra ;
* update suricata as well
* correct the instance -> instances in one location to prevent the old instance list from being stomped
* remove a extra ;
* update fail2ban to use it as well
* remove two unused functions as suricata and fail2ban no longer use components
* style cleanup
* postgres poller updated to use it
* update html side of the postgres bits
* chronyd now uses app data bits now as well
* portactivity now uses it as well
* style fix
* sort the returned arrays from app_data
* correct log message for port activity
* collocation change
* try re-ordering it
* add in the new data column to the tests
* remove a extra ,
* hmm... ->collate('utf8mb4_unicode_ci') is not usable as apparently collate does not exist
* change the column type from json to longtext
* mv chronyd stuff while I sort out the rest of the tests... damn thing is always buggy
* hmm... fix a missing line then likely move stuff back
* style fix
* add fillable
* add the expexcted data for fail2ban json
* escape a " I missed
* add data for portactivity
* add suricata app data
* add app data to zfs legacy test
* put the moved tests back into place and update zfs-v1 test
* add app data for chronyd test
* add app data for fail2ban legacy test
* update zfs v1 app data
* add some notes on application dev work
* add Developing/Application-Notes.md to mkdocs.yml
* add data column to it
* added various suggestions from bennet-esyoil
* convert from isset to sizeof
* type fix
* fully remove the old save app data function and move it into a helper function... the other still needs cleaned up prior to removal
* update docs
* get_app_data is fully removed now as well
* a few style fixes
* add $casts
* update chronyd test
* attempt to fix the data
* more doc cleanup and try changing the cast
* style fix
* revert the changes to the chronyd test
* apply a few of murrant's suggestions
* document working with ->data as json and non-josn
* remove two no-longer used in this PR exceptions
* ->data now operates transparently
* style fix
* update data tests
* fix json
* test fix
* update the app notes to reflect how app data now works
* app test fix
* app data fix for linux_lsi
* json fix
* minor doc cleanup
* remove duplicate querty and use json_decode instead
* style fix
* modelize the app poller
* use a anon func instead of foreach
* test update
* style cleanup
* style cleanup
* another test cleanup
* more test cleanup
* reverse the test changes and add in some more glue code
* revert one of the test changes
* another small test fix
* Make things use models
Left some array access, but those will still work just fine.
* missed chronyd and portactivity
* rename poll to avoid make it any confusion
* Remove extra save and fix timestamp
* save any changes made to app->data
* nope, that was not it
* What are magic methods and how do they work?
* fix two typos
* update linux_lsi test
* change quote type
Co-authored-by: Tony Murray <murraytony@gmail.com>
90 lines
3.4 KiB
PHP
90 lines
3.4 KiB
PHP
<?php
|
|
|
|
$device = device_by_id_cache($vars['id']);
|
|
|
|
// $colour = "random";
|
|
$unit_text = 'ShoutCast Server';
|
|
$total_text = 'Total of all ShoutCast Servers';
|
|
$nototal = 0;
|
|
|
|
$rrd_list = [];
|
|
$rrd_filenames = glob(Rrd::name($device['hostname'], ['app', 'shoutcast', $app->app_id], '*.rrd'));
|
|
foreach ($rrd_filenames as $file) {
|
|
$pieces = explode('-', basename($file, '.rrd'));
|
|
$hostname = end($pieces);
|
|
[$host, $port] = explode('_', $hostname, 2);
|
|
$rrd_list[] = [
|
|
'filename' => $file,
|
|
'descr' => $host . ':' . $port,
|
|
// 'colour' => $colour
|
|
];
|
|
}
|
|
|
|
require 'includes/html/graphs/common.inc.php';
|
|
|
|
if ($width > '500') {
|
|
$descr_len = 38;
|
|
} else {
|
|
$descr_len = 8;
|
|
$descr_len += round(($width - 250) / 8);
|
|
}
|
|
|
|
if ($width > '500') {
|
|
$rrd_options .= ' COMMENT:"' . substr(str_pad($unit_text, ($descr_len + 2)), 0, ($descr_len + 2)) . ' Current Unique Average Peak\\n"';
|
|
} else {
|
|
$rrd_options .= ' COMMENT:"' . substr(str_pad($unit_text, ($descr_len + 5)), 0, ($descr_len + 5)) . ' Now Unique Average Peak\\n"';
|
|
}
|
|
|
|
foreach ($rrd_list as $rrd) {
|
|
$colours = (isset($rrd['colour']) ? $rrd['colour'] : 'default');
|
|
$strlen = ((strlen($rrd['descr']) < $descr_len) ? ($descr_len - strlen($rrd['descr'])) : '0');
|
|
$descr = (isset($rrd['descr']) ? \LibreNMS\Data\Store\Rrd::fixedSafeDescr($rrd['descr'], ($desc_len + $strlen)) : 'Unknown');
|
|
for ($z = 0; $z < $strlen; $z++) {
|
|
$descr .= ' ';
|
|
}
|
|
|
|
if ($i) {
|
|
$stack = ':STACK';
|
|
}
|
|
|
|
$colour = \LibreNMS\Config::get("graph_colours.$colours.$x");
|
|
$rrd_options .= ' DEF:cur' . $x . '=' . $rrd['filename'] . ':current:AVERAGE';
|
|
$rrd_options .= ' DEF:peak' . $x . '=' . $rrd['filename'] . ':peak:MAX';
|
|
$rrd_options .= ' DEF:unique' . $x . '=' . $rrd['filename'] . ':unique:AVERAGE';
|
|
$rrd_options .= ' VDEF:avg' . $x . '=cur' . $x . ',AVERAGE';
|
|
$rrd_options .= ' AREA:cur' . $x . '#' . $colour . ":'" . $descr . "'$stack";
|
|
$rrd_options .= ' GPRINT:cur' . $x . ':LAST:"%6.2lf"';
|
|
$rrd_options .= ' GPRINT:unique' . $x . ':LAST:"%6.2lf%s"';
|
|
$rrd_options .= ' GPRINT:avg' . $x . ':"%6.2lf"';
|
|
$rrd_options .= ' GPRINT:peak' . $x . ':LAST:"%6.2lf"';
|
|
$rrd_options .= ' COMMENT:"\\n"';
|
|
if ($x) {
|
|
$totcur .= ',cur' . $x . ',+';
|
|
$totpeak .= ',peak' . $x . ',+';
|
|
$totunique .= ',unique' . $x . ',+';
|
|
}
|
|
|
|
$x = (($x < count(\LibreNMS\Config::get("graph_colours.$colours")) - 1) ? $x + 1 : 0);
|
|
// $x++;
|
|
}//end foreach
|
|
|
|
if (! $nototal) {
|
|
$strlen = ((strlen($total_text) < $descr_len) ? ($descr_len - strlen($total_text)) : '0');
|
|
$descr = (isset($total_text) ? \LibreNMS\Data\Store\Rrd::fixedSafeDescr($total_text, ($desc_len + $strlen)) : 'Total');
|
|
$colour = \LibreNMS\Config::get("graph_colours.$colours.$x");
|
|
for ($z = 0; $z < $strlen; $z++) {
|
|
$descr .= ' ';
|
|
}
|
|
|
|
$rrd_options .= ' CDEF:totcur=cur0' . $totcur;
|
|
$rrd_options .= ' CDEF:totunique=unique0' . $totunique;
|
|
$rrd_options .= ' CDEF:totpeak=peak0' . $totpeak;
|
|
$rrd_options .= ' VDEF:totavg=totcur,AVERAGE';
|
|
$rrd_options .= ' LINE2:totcur#' . $colour . ":'" . $descr . "'";
|
|
$rrd_options .= ' GPRINT:totcur:LAST:"%6.2lf"';
|
|
$rrd_options .= ' GPRINT:totunique:LAST:"%6.2lf%s"';
|
|
$rrd_options .= ' GPRINT:totavg:"%6.2lf"';
|
|
$rrd_options .= ' GPRINT:totpeak:LAST:"%6.2lf"';
|
|
$rrd_options .= ' COMMENT:"\\n"';
|
|
}
|