mirror of
https://github.com/librenms/librenms.git
synced 2024-10-07 16:52:45 +00:00
* 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>
179 lines
7.4 KiB
PHP
179 lines
7.4 KiB
PHP
<?php
|
|
|
|
use LibreNMS\RRD\RrdDefinition;
|
|
|
|
$name = 'squid';
|
|
|
|
$oids = [
|
|
'.1.3.6.1.4.1.3495.1.2.5.1.0',
|
|
'.1.3.6.1.4.1.3495.1.2.5.2.0',
|
|
'.1.3.6.1.4.1.3495.1.2.5.3.0',
|
|
'.1.3.6.1.4.1.3495.1.2.5.4.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.1.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.2.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.3.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.4.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.5.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.6.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.7.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.8.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.9.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.10.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.11.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.12.0',
|
|
'.1.3.6.1.4.1.3495.1.3.1.13.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.1.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.2.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.3.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.4.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.5.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.6.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.7.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.8.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.9.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.10.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.11.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.12.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.13.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.14.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.1.15.0',
|
|
'.1.3.6.1.4.1.3495.1.3.2.2.1.9.1',
|
|
'.1.3.6.1.4.1.3495.1.3.2.2.1.9.5',
|
|
'.1.3.6.1.4.1.3495.1.3.2.2.1.9.60',
|
|
'.1.3.6.1.4.1.3495.1.3.2.2.1.10.1',
|
|
'.1.3.6.1.4.1.3495.1.3.2.2.1.10.5',
|
|
'.1.3.6.1.4.1.3495.1.3.2.2.1.10.60',
|
|
];
|
|
$returnedoids = snmp_get_multi_oid($device, $oids);
|
|
|
|
$memmaxsize = $returnedoids['.1.3.6.1.4.1.3495.1.2.5.1.0'];
|
|
$swapmaxsize = $returnedoids['.1.3.6.1.4.1.3495.1.2.5.2.0'];
|
|
$swaphighwm = $returnedoids['.1.3.6.1.4.1.3495.1.2.5.3.0'];
|
|
$swaplowwm = $returnedoids['.1.3.6.1.4.1.3495.1.2.5.4.0'];
|
|
$syspagefaults = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.1.0'];
|
|
$sysnumreads = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.2.0'];
|
|
$memusage = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.3.0'];
|
|
$cputime = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.4.0'];
|
|
$cpuusage = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.5.0'];
|
|
$maxressize = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.6.0'];
|
|
$numobjcount = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.7.0'];
|
|
$currentlruexpiration = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.8.0'];
|
|
$currentunlinkrequests = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.9.0'];
|
|
$currentunusedfdescrcnt = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.10.0'];
|
|
$currentresfiledescrcnt = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.11.0'];
|
|
$currentfiledescrcnt = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.12.0'];
|
|
$currentfiledescrmax = $returnedoids['.1.3.6.1.4.1.3495.1.3.1.13.0'];
|
|
$protoclienthttprequests = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.1.0'];
|
|
$httphits = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.2.0'];
|
|
$httperrors = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.3.0'];
|
|
$httpinkb = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.4.0'];
|
|
$httpoutkb = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.5.0'];
|
|
$icppktssent = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.6.0'];
|
|
$icppktsrecv = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.7.0'];
|
|
$icpkbsent = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.8.0'];
|
|
$icpkbrecv = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.9.0'];
|
|
$serverrequests = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.10.0'];
|
|
$servererrors = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.11.0'];
|
|
$serverinkb = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.12.0'];
|
|
$serveroutkb = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.13.0'];
|
|
$currentswapsize = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.14.0'];
|
|
$clients = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.1.15.0'];
|
|
$requesthitratio1 = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.2.1.9.1'];
|
|
$requesthitratio5 = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.2.1.9.5'];
|
|
$requesthitratio60 = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.2.1.9.60'];
|
|
$requestbyteratio1 = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.2.1.10.1'];
|
|
$requestbyteratio5 = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.2.1.10.5'];
|
|
$requestbyteratio60 = $returnedoids['.1.3.6.1.4.1.3495.1.3.2.2.1.10.60'];
|
|
|
|
$rrd_name = ['app', $name, $app->app_id];
|
|
|
|
$rrd_def = RrdDefinition::make()
|
|
->addDataset('memmaxsize', 'GAUGE', 0)
|
|
->addDataset('swapmaxsize', 'GAUGE', 0)
|
|
->addDataset('swaphighwm', 'GAUGE', 0)
|
|
->addDataset('swaplowwm', 'GAUGE', 0)
|
|
->addDataset('syspagefaults', 'COUNTER', 0)
|
|
->addDataset('sysnumreads', 'COUNTER', 0)
|
|
->addDataset('memusage', 'GAUGE', 0)
|
|
->addDataset('cputime', 'GAUGE', 0)
|
|
->addDataset('cpuusage', 'GAUGE', 0)
|
|
->addDataset('maxressize', 'GAUGE', 0)
|
|
->addDataset('numobjcount', 'GAUGE', 0)
|
|
->addDataset('curunlinkreq', 'GAUGE', 0)
|
|
->addDataset('curunusedfdescrcnt', 'GAUGE', 0)
|
|
->addDataset('curresfiledescrcnt', 'GAUGE', 0)
|
|
->addDataset('curfiledescrcnt', 'GAUGE', 0)
|
|
->addDataset('curfiledescrmax', 'GAUGE', 0)
|
|
->addDataset('protoclienthttpreq', 'COUNTER', 0)
|
|
->addDataset('httphits', 'COUNTER', 0)
|
|
->addDataset('httperrors', 'COUNTER', 0)
|
|
->addDataset('httpinkb', 'COUNTER', 0)
|
|
->addDataset('httpoutkb', 'COUNTER', 0)
|
|
->addDataset('icppktssent', 'COUNTER', 0)
|
|
->addDataset('icppktsrecv', 'COUNTER', 0)
|
|
->addDataset('icpkbsent', 'COUNTER', 0)
|
|
->addDataset('icpkbrecv', 'COUNTER', 0)
|
|
->addDataset('serverrequests', 'COUNTER', 0)
|
|
->addDataset('servererrors', 'COUNTER', 0)
|
|
->addDataset('serverinkb', 'COUNTER', 0)
|
|
->addDataset('serveroutkb', 'COUNTER', 0)
|
|
->addDataset('currentswapsize', 'GAUGE', 0)
|
|
->addDataset('clients', 'GAUGE', 0)
|
|
->addDataset('reqhitratio1', 'GAUGE', 0)
|
|
->addDataset('reqhitratio5', 'GAUGE', 0)
|
|
->addDataset('reqhitratio60', 'GAUGE', 0)
|
|
->addDataset('reqbyteratio1', 'GAUGE', 0)
|
|
->addDataset('reqbyteratio5', 'GAUGE', 0)
|
|
->addDataset('reqbyteratio60', 'GAUGE', 0);
|
|
|
|
$memmaxsize = $memmaxsize * 1000;
|
|
$swapmaxsize = $swapmaxsize * 1000;
|
|
$swaphighwm = $swaphighwm * 1000;
|
|
$swaplowwm = $swaplowwm * 1000;
|
|
|
|
$fields = [
|
|
'memmaxsize' => $memmaxsize,
|
|
'swapmaxsize' => $swapmaxsize,
|
|
'swaphighwm' => $swaphighwm,
|
|
'swaplowwm' => $swaplowwm,
|
|
'syspagefaults' => $syspagefaults,
|
|
'sysnumreads' => $sysnumreads,
|
|
'memusage' => $memusage,
|
|
'cputime' => $cputime,
|
|
'cpuusage' => $cpuusage,
|
|
'maxressize' => $maxressize,
|
|
'numobjcount' => $numobjcount,
|
|
'curunlinkreq' => $currentunlinkrequests,
|
|
'curunusedfdescrcnt' => $currentunusedfdescrcnt,
|
|
'curresfiledescrcnt' => $currentresfiledescrcnt,
|
|
'curfiledescrcnt' => $currentfiledescrcnt,
|
|
'curfiledescrmax' => $currentfiledescrmax,
|
|
'protoclienthttpreq' => $protoclienthttprequests,
|
|
'httphits' => $httphits,
|
|
'httperrors' => $httperrors,
|
|
'httpinkb' => $httpinkb,
|
|
'httpoutkb' => $httpoutkb,
|
|
'icppktssent' => $icppktssent,
|
|
'icppktsrecv' => $icppktsrecv,
|
|
'icpkbsent' => $icpkbsent,
|
|
'icpkbrecv' => $icpkbrecv,
|
|
'serverrequests' => $serverrequests,
|
|
'servererrors' => $servererrors,
|
|
'serverinkb' => $serverinkb,
|
|
'serveroutkb' => $serveroutkb,
|
|
'currentswapsize' => $currentswapsize,
|
|
'clients' => $clients,
|
|
'reqhitratio1' => $requesthitratio1,
|
|
'reqhitratio5' => $requesthitratio5,
|
|
'reqhitratio60' => $requesthitratio60,
|
|
'reqbyteratio1' => $requestbyteratio1,
|
|
'reqbyteratio5' => $requestbyteratio5,
|
|
'reqbyteratio60' => $requestbyteratio60,
|
|
];
|
|
|
|
$tags = ['name' => $name, 'app_id' => $app->app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
|
|
data_update($device, 'app', $tags, $fields);
|
|
|
|
$squid_app_status = ($returnedoids == false) ? false : 'Data ok';
|
|
update_application($app, $squid_app_status, $fields);
|