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>
103 lines
3.8 KiB
PHP
103 lines
3.8 KiB
PHP
<?php
|
|
|
|
use LibreNMS\RRD\RrdDefinition;
|
|
|
|
$name = 'smart';
|
|
$options = '-Oqv';
|
|
$oid = '.1.3.6.1.4.1.8072.1.3.2.3.1.2.5.115.109.97.114.116';
|
|
$output = snmp_walk($device, $oid, $options);
|
|
|
|
$lines = explode("\n", $output);
|
|
|
|
$rrd_name = ['app', $name, $app->app_id];
|
|
$rrd_def = RrdDefinition::make()
|
|
->addDataset('id5', 'GAUGE', 0)
|
|
->addDataset('id10', 'GAUGE', 0)
|
|
->addDataset('id173', 'GAUGE', 0)
|
|
->addDataset('id177', 'GAUGE', 0)
|
|
->addDataset('id183', 'GAUGE', 0)
|
|
->addDataset('id184', 'GAUGE', 0)
|
|
->addDataset('id187', 'GAUGE', 0)
|
|
->addDataset('id188', 'GAUGE', 0)
|
|
->addDataset('id190', 'GAUGE', 0)
|
|
->addDataset('id194', 'GAUGE', 0)
|
|
->addDataset('id196', 'GAUGE', 0)
|
|
->addDataset('id197', 'GAUGE', 0)
|
|
->addDataset('id198', 'GAUGE', 0)
|
|
->addDataset('id199', 'GAUGE', 0)
|
|
->addDataset('id231', 'GAUGE', 0)
|
|
->addDataset('id233', 'GAUGE', 0)
|
|
->addDataset('completed', 'GAUGE', 0)
|
|
->addDataset('interrupted', 'GAUGE', 0)
|
|
->addDataset('readfailure', 'GAUGE', 0)
|
|
->addDataset('unknownfail', 'GAUGE', 0)
|
|
->addDataset('extended', 'GAUGE', 0)
|
|
->addDataset('short', 'GAUGE', 0)
|
|
->addDataset('conveyance', 'GAUGE', 0)
|
|
->addDataset('selective', 'GAUGE', 0);
|
|
|
|
$int = 0;
|
|
$metrics = [];
|
|
while (isset($lines[$int])) {
|
|
[$disk, $id5, $id10, $id173, $id177, $id183, $id184, $id187, $id188, $id190, $id194,
|
|
$id196, $id197, $id198, $id199, $id231, $id233, $completed, $interrupted, $read_failure,
|
|
$unknown_failure, $extended, $short, $conveyance, $selective] = explode(',', $lines[$int]);
|
|
|
|
$rrd_name = ['app', $name, $app->app_id, $disk];
|
|
|
|
$fields = [
|
|
'id5' => is_numeric($id5) ? $id5 : null,
|
|
'id10' => is_numeric($id10) ? $id10 : null,
|
|
'id173' => is_numeric($id173) ? $id173 : null,
|
|
'id177' => is_numeric($id177) ? $id177 : null,
|
|
'id183' => is_numeric($id183) ? $id183 : null,
|
|
'id184' => is_numeric($id184) ? $id184 : null,
|
|
'id187' => is_numeric($id187) ? $id187 : null,
|
|
'id188' => is_numeric($id188) ? $id188 : null,
|
|
'id190' => is_numeric($id190) ? $id190 : null,
|
|
'id194' => is_numeric($id194) ? $id194 : null,
|
|
'id196' => is_numeric($id196) ? $id196 : null,
|
|
'id197' => is_numeric($id197) ? $id197 : null,
|
|
'id198' => is_numeric($id198) ? $id198 : null,
|
|
'id199' => is_numeric($id199) ? $id199 : null,
|
|
'id231' => is_numeric($id231) ? $id231 : null,
|
|
'id233' => is_numeric($id233) ? $id233 : null,
|
|
'completed' => is_numeric($completed) ? $completed : null,
|
|
'interrupted' => is_numeric($interrupted) ? $interrupted : null,
|
|
'readfailure' => is_numeric($read_failure) ? $read_failure : null,
|
|
'unknownfail' => is_numeric($unknown_failure) ? $unknown_failure : null,
|
|
'extended' => is_numeric($extended) ? $extended : null,
|
|
'short' => is_numeric($short) ? $short : null,
|
|
'conveyance' => is_numeric($conveyance) ? $conveyance : null,
|
|
'selective' => is_numeric($selective) ? $selective : null,
|
|
];
|
|
|
|
$metrics[$disk] = $fields;
|
|
$tags = ['name' => $name, 'app_id' => $app->app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
|
|
data_update($device, 'app', $tags, $fields);
|
|
|
|
$int++;
|
|
}
|
|
|
|
// smart enhancement id9
|
|
$rrd_name = ['app', $name, $app->app_id];
|
|
$rrd_def = RrdDefinition::make()
|
|
->addDataset('id9', 'GAUGE', 0);
|
|
|
|
$int = 0;
|
|
while (isset($lines[$int])) {
|
|
[$disk, , , , , , , , , , , , , , , , , , , , , , , , , $id9] = explode(',', $lines[$int]);
|
|
|
|
$rrd_name = ['app', $name . '_id9', $app->app_id, $disk];
|
|
|
|
$fields = ['id9' => $id9];
|
|
$metrics[$disk]['id9'] = $id9;
|
|
|
|
$tags = ['name' => $name, 'app_id' => $app->app_id, 'rrd_def' => $rrd_def, 'rrd_name' => $rrd_name];
|
|
data_update($device, 'app', $tags, $fields);
|
|
|
|
$int++;
|
|
}
|
|
|
|
update_application($app, $output, $metrics);
|