lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 00:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: fix and adjust a couple of things for #6231

Browse Source 
Do not "leak" state transitions and also always log them to the
gateway log if they aren't being pushed through the rc.syshook
alarm path.  While here consolidate the logging into the script
and make 10-dpinger script a stub for the "monitor" facility.
This commit is contained in:
Franco Fichtner 2023-05-17 12:25:50 +02:00
parent 49a6b614a3
commit f696930bb3
2 changed files with 47 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/etc/rc.syshook.d/monitor/10-dpinger
View File

@ -1,35 +1,3 @@
#!/bin/sh
# Copyright (c) 2018-2023 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
GATEWAY="${1}"
if [ -z "${GATEWAY}" ]; then
# require a gateway
exit 1
fi
/usr/bin/logger -t dpinger "GATEWAY ALARM: ${GATEWAY} (Addr: ${2} Alarm: ${3} RTT: ${4} RTTd: ${5} Loss: ${6})"
# XXX stub for monitoring facility, functionality moved to gateway_watcher.php

84
src/opnsense/scripts/routes/gateway_watcher.php
View File

@ -31,6 +31,8 @@ require_once 'config.inc';
require_once 'util.inc';
require_once 'interfaces.inc';
openlog('dpinger', LOG_DAEMON, LOG_LOCAL4);
$action = !empty($argv[1]) ? $argv[1] : null;
$poll = 1; /* live poll interval */
@ -46,59 +48,53 @@ while (1) {
OPNsense\Core\Config::getInstance()->forceReload();
$config = parse_config();
$gw_switch_default = isset($config['system']['gw_switch_default']);
$status = return_gateways_status();
/* clear known gateways in first step to flush unknown in second step */
$cleanup = $mode;
foreach ($status as $report) {
unset($cleanup[$report['name']]);
}
foreach (array_keys($cleanup) as $stale) {
unset($mode[$stale]);
}
/* run main watcher pass */
foreach ($status as $report) {
$ralarm = false;
if ($report['loss'] == '~') {
/* wait for valid data before triggering an alarm */
continue;
}
if (empty($mode[$report['name']])) {
/* skip one round for baseline */
$mode[$report['name']] = $report['status'];
continue;
}
$gw_group_member = false;
foreach (config_read_array('gateways', 'gateway_group') as $group) {
foreach ($group['item'] as $item) {
$itemsplit = explode('|', $item);
if ($itemsplit[0] == $report['name']) {
/* XXX consider trigger conditions later on */
$gw_group_member = true;
break;
}
}
}
/* wait for valid data before triggering an alarm */
if ($report['loss'] == '~') {
continue;
}
if ($gw_switch_default) {
if (isset($config['system']['gw_switch_default'])) {
/* only consider down state transition in this case */
if (!empty($mode[$report['name']]) && $mode[$report['name']] != $report['status'] && ($mode[$report['name']] == 'down' || $report['status'] == 'down')) {
$ralarm = true;
}
}
if ($gw_group_member) {
/* consider all state transitions as they depend on individual trigger setting */
if (!empty($mode[$report['name']]) && $mode[$report['name']] != $report['status']) {
$ralarm = true;
foreach (config_read_array('gateways', 'gateway_group') as $group) {
foreach ($group['item'] as $item) {
$itemsplit = explode('|', $item);
if ($itemsplit[0] == $report['name']) {
/* consider all state transitions as they depend on individual trigger setting */
if (!empty($mode[$report['name']]) && $mode[$report['name']] != $report['status']) {
/* XXX consider trigger conditions later on */
$ralarm = true;
break;
}
}
}
}
/* XXX for testing */
echo sprintf(
"/usr/local/etc/rc.syshook monitor %s %s %s %s %s %s\n",
$report['name'],
$report['monitor'],
$mode[$report['name']] . ' -> ' . $report['status'],
$report['delay'],
$report['stddev'],
$report['loss']
);
if ($ralarm) {
/* raise an alarm via the rc.syshook monitor facility */
shell_safe("/usr/local/etc/rc.syshook monitor %s %s %s %s %s %s", [
@ -112,6 +108,22 @@ while (1) {
$alarm = true;
}
if ($mode[$report['name']] != $report['status']) {
syslog(LOG_NOTICE, sprintf(
"%s: %s (Addr: %s Alarm: %s RTT: %s RTTd: %s Loss: %s)",
$ralarm ? 'ALERT' : 'MONITOR',
$report['name'],
$report['monitor'],
$mode[$report['name']] . ' -> ' . $report['status'],
$report['delay'],
$report['stddev'],
$report['loss']
));
/* update cached state now */
$mode[$report['name']] = $report['status'];
}
}
/* react to alarm if backend action was given */
@ -124,8 +136,4 @@ while (1) {
} else {
sleep($poll);
}
foreach ($status as $report) {
$mode[$report['name']] = $report['status'];
}
}