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>
142 lines
4.0 KiB
PHP
Executable File
142 lines
4.0 KiB
PHP
Executable File
<?php
|
|
/*
|
|
* Copyright (C) 2015 Daniel Preussker <f0o@devilcode.org>
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
/*
|
|
* GPSD Statistics
|
|
* @author Karl Shea <karl@karlshea.com>
|
|
* @copyright 2016 Karl Shea, LibreNMS
|
|
* @author Mike Centola <mcentola@appliedengdesign.com>
|
|
* @copyright 2019 Mike Centola, LibreNMS
|
|
* @license GPL
|
|
* @package LibreNMS
|
|
* @subpackage Polling
|
|
*/
|
|
|
|
// TODO: Add Metrics for Lat/Long/Altitude (Additions commented out)
|
|
|
|
/* Example Agent Data
|
|
hdop:X.XX
|
|
vdop:X.XX
|
|
satellites:XX
|
|
satellites_used:XX
|
|
*/
|
|
|
|
/*
|
|
Example SNMP Extend Data
|
|
{
|
|
"data": {
|
|
"mode": "X",
|
|
"hdop": "X.XX",
|
|
"vdop": "X.XX",
|
|
"latitude": "XX.XXXXXXXX",
|
|
"longitude": "XX.XXXXXXXXX",
|
|
"altitude": "XXX.X",
|
|
"satellites": "XX",
|
|
"satellites_used": "XX"
|
|
},
|
|
"error:"0", "errorString":"", "version":"X.XX-X"
|
|
}
|
|
*/
|
|
|
|
use LibreNMS\Exceptions\JsonAppException;
|
|
use LibreNMS\Exceptions\JsonAppParsingFailedException;
|
|
use LibreNMS\RRD\RrdDefinition;
|
|
|
|
$name = 'gpsd';
|
|
|
|
if ($app->app_id > 0) {
|
|
if (! empty($agent_data['app'][$name])) {
|
|
$gpsd = $agent_data['app'][$name];
|
|
|
|
$gpsd_parsed = [];
|
|
|
|
foreach (explode("\n", $gpsd) as $line) {
|
|
[$field, $data] = explode(':', $line);
|
|
$gpsd_parsed[$field] = $data;
|
|
}
|
|
|
|
// Set Fields
|
|
|
|
$check_fields = [
|
|
'mode',
|
|
'hdop',
|
|
'vdop',
|
|
'satellites',
|
|
'satellites_used',
|
|
];
|
|
|
|
$fields = [];
|
|
|
|
foreach ($check_fields as $field) {
|
|
if (! empty($gpsd_parsed[$field])) {
|
|
$fields[$field] = $gpsd_parsed[$field];
|
|
}
|
|
}
|
|
} else {
|
|
// Use json_app_get to grab JSON formatted GPSD data
|
|
try {
|
|
$gpsd = json_app_get($device, $name);
|
|
} catch (JsonAppParsingFailedException $e) {
|
|
$legacy = $e->getOutput();
|
|
|
|
$gpsd = [
|
|
'data' => [],
|
|
];
|
|
|
|
[$gpsd['data']['mode'], $gpsd['data']['hdop'], $gpsd['data']['vdop'],
|
|
$gpsd['data']['latitude'], $gpsd['data']['longitude'], $gpsd['data']['altitude'],
|
|
$gpsd['data']['satellites'], $gpsd['data']['satellites_used']] = explode("\n", $legacy);
|
|
} catch (JsonAppException $e) {
|
|
// Set Empty metrics and error message
|
|
|
|
echo PHP_EOL . $name . ':' . $e->getCode() . ':' . $e->getMessage() . PHP_EOL;
|
|
update_application($app, $e->getCode() . ':' . $e->getMessage(), []);
|
|
|
|
return;
|
|
}
|
|
|
|
// Set Fields
|
|
$fields = [
|
|
'mode' => $gpsd['data']['mode'],
|
|
'hdop' => $gpsd['data']['hdop'],
|
|
'vdop' => $gpsd['data']['vdop'],
|
|
'satellites' => $gpsd['data']['satellites'],
|
|
'satellites_used' => $gpsd['data']['satellites_used'],
|
|
];
|
|
}
|
|
|
|
// Generate RRD Def
|
|
|
|
$rrd_name = ['app', $name, $app->app_id];
|
|
$rrd_def = RrdDefinition::make()
|
|
->addDataset('mode', 'GAUGE', 0, 4)
|
|
->addDataset('hdop', 'GAUGE', 0, 100)
|
|
->addDataset('vdop', 'GAUGE', 0, 100)
|
|
->addDataset('satellites', 'GAUGE', 0, 40)
|
|
->addDataset('satellites_used', 'GAUGE', 0, 40);
|
|
|
|
// Update Application
|
|
$tags = compact('name', 'app_id', 'rrd_name', 'rrd_def');
|
|
data_update($device, 'app', $tags, $fields);
|
|
|
|
if (! empty($agent_data['app'][$name])) {
|
|
update_application($app, $gpsd, $fields);
|
|
} else {
|
|
update_application($app, 'OK', $fields);
|
|
}
|
|
}
|