Alert Subsys to OOP and SNMPTraps trigger Alert Rules (#9765)

* Changed snmptrap.php and handlers to allow for alerts.

* Moved RunRules() to Dispatcher.php

* Modified includes, passes pre-commit tests locally.

* Converted RunRules to OO, fixed formatting in files found by TravisCI

* rebase, covert alert subsy to oop

* Modified init.php to call new Alert subsystem

* fixed dependencies

* Resolved undefined functions

* Fixed PingCheck.php not triggering

* Changed runAlerts to __construct

* Fixes
Can't have Config inside empty()
incorrectly named function (my fault)
poller.php missing shebang
organize imports
This commit is contained in:
Heath Barnhart
2019-07-18 08:36:02 -05:00
committed by Tony Murray
parent 6986711a72
commit 851994cfb8
10 changed files with 1057 additions and 915 deletions

View File

@@ -14,26 +14,31 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
*
* Alerts Cronjob
* @author f0o <f0o@devilcode.org>
* @copyright 2014 f0o, LibreNMS
* @license GPL
* @package LibreNMS
* @subpackage Alerts
* Edited 4/1/19
* Changed to OOP
* @author: Heath Barnhart <hbarnhart@kanren.net>
*/
use LibreNMS\Util\FileLock;
use LibreNMS\Alert\RunAlerts;
$init_modules = ['alerts', 'laravel'];
$init_modules = ['alerts','laravel'];
require __DIR__ . '/includes/init.php';
$options = getopt('d::');
$alerts_lock = FileLock::lockOrDie('alerts');
$alerts = new RunAlerts();
if (set_debug(isset($options['d']))) {
echo "DEBUG!\n";
}
@@ -41,13 +46,13 @@ if (set_debug(isset($options['d']))) {
if (!defined('TEST') && \LibreNMS\Config::get('alert.disable') != 'true') {
echo 'Start: '.date('r')."\r\n";
echo "ClearStaleAlerts():" . PHP_EOL;
ClearStaleAlerts();
$alerts->clearStaleAlerts();
echo "RunFollowUp():\r\n";
RunFollowUp();
$alerts->runFollowUp();
echo "RunAlerts():\r\n";
RunAlerts();
$alerts->runAlerts();
echo "RunAcks():\r\n";
RunAcks();
$alerts->runAcks();
echo 'End : '.date('r')."\r\n";
}