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>
70 lines
2.7 KiB
PHP
70 lines
2.7 KiB
PHP
<?php
|
|
|
|
// Polls Apache statistics from script via SNMP
|
|
use LibreNMS\RRD\RrdDefinition;
|
|
|
|
$name = 'apache';
|
|
|
|
if (! empty($agent_data['app'][$name])) {
|
|
$apache = $agent_data['app'][$name];
|
|
} else {
|
|
$options = '-Oqv';
|
|
$oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.6.97.112.97.99.104.101';
|
|
$apache = snmp_get($device, $oid, $options);
|
|
}
|
|
|
|
[$total_access, $total_kbyte, $cpuload, $uptime, $reqpersec, $bytespersec,
|
|
$bytesperreq, $busyworkers, $idleworkers, $score_wait, $score_start,
|
|
$score_reading, $score_writing, $score_keepalive, $score_dns,
|
|
$score_closing, $score_logging, $score_graceful, $score_idle, $score_open] = explode("\n", $apache);
|
|
|
|
$rrd_name = ['app', $name, $app->app_id];
|
|
$rrd_def = RrdDefinition::make()
|
|
->addDataset('access', 'DERIVE', 0, 125000000000)
|
|
->addDataset('kbyte', 'DERIVE', 0, 125000000000)
|
|
->addDataset('cpu', 'GAUGE', 0, 125000000000)
|
|
->addDataset('uptime', 'GAUGE', 0, 125000000000)
|
|
->addDataset('reqpersec', 'GAUGE', 0, 125000000000)
|
|
->addDataset('bytespersec', 'GAUGE', 0, 125000000000)
|
|
->addDataset('byesperreq', 'GAUGE', 0, 125000000000)
|
|
->addDataset('busyworkers', 'GAUGE', 0, 125000000000)
|
|
->addDataset('idleworkers', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_wait', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_start', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_reading', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_writing', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_keepalive', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_dns', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_closing', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_logging', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_graceful', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_idle', 'GAUGE', 0, 125000000000)
|
|
->addDataset('sb_open', 'GAUGE', 0, 125000000000);
|
|
|
|
$fields = [
|
|
'access' => intval(trim($total_access, '"')),
|
|
'kbyte' => $total_kbyte,
|
|
'cpu' => $cpuload,
|
|
'uptime' => $uptime,
|
|
'reqpersec' => $reqpersec,
|
|
'bytespersec' => $bytespersec,
|
|
'byesperreq' => $bytesperreq,
|
|
'busyworkers' => $busyworkers,
|
|
'idleworkers' => $idleworkers,
|
|
'sb_wait' => $score_wait,
|
|
'sb_start' => $score_start,
|
|
'sb_reading' => $score_reading,
|
|
'sb_writing' => $score_writing,
|
|
'sb_keepalive' => $score_keepalive,
|
|
'sb_dns' => $score_dns,
|
|
'sb_closing' => $score_closing,
|
|
'sb_logging' => $score_logging,
|
|
'sb_graceful' => $score_graceful,
|
|
'sb_idle' => $score_idle,
|
|
'sb_open' => intval(trim($score_open, '"')),
|
|
];
|
|
|
|
$tags = compact('name', 'app_id', 'rrd_name', 'rrd_def');
|
|
data_update($device, 'app', $tags, $fields);
|
|
update_application($app, $apache, $fields);
|