mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Alert transport cleanup, no_proxy support and other proxy cleanups (#14763)

Browse Source 
* Add no_proxy and other proxy related settings
Set user agent on all http client requests
Unify http client usage

* Style fixes

* Remove useless use statements

* Correct variable, good job phpstan

* Add tests
fix https_proxy bug
add tcp:// to the config settings format

* style and lint fixes

* Remove guzzle from the direct dependencies

* Use built in Laravel testing functionality

* update baseline
This commit is contained in:
Tony Murray
2023-05-23 09:25:17 -05:00
committed by GitHub
parent 02896172bd
commit 04bb75f5f3
78 changed files with 1545 additions and 2314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AlertTransportController.php
+6 -28
View File
@@ -5,41 +5,19 @@ namespace App\Http\Controllers;
use App\Models\AlertTransport;
use App\Models\Device;
use Illuminate\Http\Request;
use LibreNMS\Alert\AlertUtil;
use LibreNMS\Config;
use LibreNMS\Alert\AlertData;
use LibreNMS\Exceptions\AlertTransportDeliveryException;
class AlertTransportController extends Controller
{
public function test(Request $request, AlertTransport $transport): \Illuminate\Http\JsonResponse
{
/** @var Device $device */
$device = Device::with('location')->first();
$obj = [
'hostname' => $device->hostname,
'device_id' => $device->device_id,
'sysDescr' => $device->sysDescr,
'version' => $device->version,
'hardware' => $device->hardware,
'location' => $device->location,
'title' => 'Testing transport from ' . Config::get('project_name'),
'elapsed' => '11s',
'alert_id' => '000',
'id' => '000',
'faults' => [],
'uid' => '000',
'severity' => 'critical',
'rule' => 'macros.device = 1',
'name' => 'Test-Rule',
'string' => '#1: test => string;',
'timestamp' => date('Y-m-d H:i:s'),
'contacts' => AlertUtil::getContacts($device->toArray()),
'state' => '1',
'msg' => 'This is a test alert',
];
$alert_data = AlertData::testData($device);
$opts = Config::get('alert.transports.' . $transport->transport_type);
try {
$result = $transport->instance()->deliverAlert($obj, $opts);
$result = $transport->instance()->deliverAlert($alert_data);
if ($result === true) {
return response()->json(['status' => 'ok']);
@@ -47,7 +25,7 @@ class AlertTransportController extends Controller
} catch (AlertTransportDeliveryException $e) {
return response()->json([
'status' => 'error',
'message' => $e->getMessage(),
'message' => strip_tags($e->getMessage()),
]);
} catch (\Exception $e) {
\Log::error($e);
@@ -56,7 +34,7 @@ class AlertTransportController extends Controller
return response()->json([
'status' => 'error',
'message' => $result,
'message' => strip_tags($result),
]);
}
}