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>
88 lines
3.2 KiB
PHP
88 lines
3.2 KiB
PHP
<?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/>.
|
|
*/
|
|
|
|
/*
|
|
* TinyDNS Statistics
|
|
* @author Daniel Preussker <f0o@devilcode.org>
|
|
* @copyright 2015 f0o, LibreNMS
|
|
* @license GPL
|
|
* @package LibreNMS
|
|
* @subpackage Polling
|
|
*/
|
|
|
|
use LibreNMS\RRD\RrdDefinition;
|
|
|
|
$name = 'tinydns';
|
|
|
|
if (! empty($agent_data['app'][$name]) && $app->app_id > 0) {
|
|
echo ' tinydns';
|
|
$rrd_name = ['app', $name, $app->app_id];
|
|
$rrd_def = RrdDefinition::make()
|
|
->addDataset('a', 'COUNTER', 0, 125000000000)
|
|
->addDataset('ns', 'COUNTER', 0, 125000000000)
|
|
->addDataset('cname', 'COUNTER', 0, 125000000000)
|
|
->addDataset('soa', 'COUNTER', 0, 125000000000)
|
|
->addDataset('ptr', 'COUNTER', 0, 125000000000)
|
|
->addDataset('hinfo', 'COUNTER', 0, 125000000000)
|
|
->addDataset('mx', 'COUNTER', 0, 125000000000)
|
|
->addDataset('txt', 'COUNTER', 0, 125000000000)
|
|
->addDataset('rp', 'COUNTER', 0, 125000000000)
|
|
->addDataset('sig', 'COUNTER', 0, 125000000000)
|
|
->addDataset('key', 'COUNTER', 0, 125000000000)
|
|
->addDataset('aaaa', 'COUNTER', 0, 125000000000)
|
|
->addDataset('axfr', 'COUNTER', 0, 125000000000)
|
|
->addDataset('any', 'COUNTER', 0, 125000000000)
|
|
->addDataset('total', 'COUNTER', 0, 125000000000)
|
|
->addDataset('other', 'COUNTER', 0, 125000000000)
|
|
->addDataset('notauth', 'COUNTER', 0, 125000000000)
|
|
->addDataset('notimpl', 'COUNTER', 0, 125000000000)
|
|
->addDataset('badclass', 'COUNTER', 0, 125000000000)
|
|
->addDataset('noquery', 'COUNTER', 0, 125000000000);
|
|
|
|
[
|
|
$a, $ns, $cname, $soa, $ptr, $hinfo, $mx, $txt, $rp, $sig, $key, $aaaa, $axfr, $any,
|
|
$total, $other, $notauth, $notimpl, $badclass, $noquery
|
|
] = explode(':', $agent_data['app'][$name]);
|
|
|
|
$fields = [
|
|
'a' => $a,
|
|
'ns' => $ns,
|
|
'cname' => $cname,
|
|
'soa' => $soa,
|
|
'ptr' => $ptr,
|
|
'hinfo' => $hinfo,
|
|
'mx' => $mx,
|
|
'txt' => $txt,
|
|
'rp' => $rp,
|
|
'sig' => $sig,
|
|
'key' => $key,
|
|
'aaaa' => $aaaa,
|
|
'axfr' => $axfr,
|
|
'any' => $any,
|
|
'total' => $total,
|
|
'other' => $other,
|
|
'notauth' => $notauth,
|
|
'notimpl' => $notimpl,
|
|
'badclass' => $badclass,
|
|
'noquery' => $noquery,
|
|
];
|
|
|
|
$tags = compact('name', 'app_id', 'rrd_name', 'rrd_def');
|
|
data_update($device, 'app', $tags, $fields);
|
|
update_application($app, $name, $fields);
|
|
}//end if
|