Jingga/oms-Monitoring
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Monitoring.git synced 2026-02-13 07:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

doc fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-04-21 23:52:00 +02:00
parent be9021d795
commit d39e6ff816
4 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -16,7 +16,7 @@ Generally, the development philosophy is result orientated. This means that anyo
Developers are encouraged to pick open tasks with high priorities according to their own skill level. Senior developers may directly assign tasks to developers based on their importance. New developers may find it easier to start with a task that has a low priority as they often also have a lower difficulty. Developers are encouraged to pick open tasks with high priorities according to their own skill level. Senior developers may directly assign tasks to developers based on their importance. New developers may find it easier to start with a task that has a low priority as they often also have a lower difficulty.
Open tasks can be found in the project overview: [PROJECT.md](../Project/PROJECT.md) Open tasks can be found in the project overview: [PROJECT.md](https://github.com/Karaka-Management/Organization-Guide/blob/master/Project/PROJECT.md)
Tasks currently in development are prefixed in the priority column with an asterisk `*` and a name tag in the task description of the developer who is working on the task. Tasks currently in development are prefixed in the priority column with an asterisk `*` and a name tag in the task description of the developer who is working on the task.

8
Controller/BackendController.php
View File

@ -42,7 +42,7 @@ final class BackendController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function viewMonitoringGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewMonitoringGeneral(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-dashboard'); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-dashboard');
@ -65,7 +65,7 @@ final class BackendController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function viewMonitoringLogList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewMonitoringLogList(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs'); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs');
@ -88,7 +88,7 @@ final class BackendController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function viewMonitoringLogEntry(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewMonitoringLogEntry(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs-single'); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs-single');
@ -111,7 +111,7 @@ final class BackendController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function viewMonitoringSecurityDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function viewMonitoringSecurityDashboard(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-security'); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-security');

5
Controller/CliController.php
View File

@ -45,10 +45,11 @@ final class CliController extends Controller
* @since 1.0.0 * @since 1.0.0
* @codeCoverageIgnore * @codeCoverageIgnore
*/ */
public function cliLogReport(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface public function cliLogReport(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface
{ {
//return new NullView(); //return new NullView();
/** @var array<string, \Model\Setting> $emailSettings */
$emailSettings = $this->app->appSettings->get( $emailSettings = $this->app->appSettings->get(
names: [ names: [
SettingsEnum::MAIL_SERVER_ADDR, SettingsEnum::MAIL_SERVER_ADDR,
@ -60,8 +61,10 @@ final class CliController extends Controller
module: 'Admin' module: 'Admin'
); );
/** @var \Modules\Admin\Models\Account $account */
$account = AccountMapper::get()->where('id', 1)->execute(); $account = AccountMapper::get()->where('id', 1)->execute();
/** @var \phpOMS\Message\Mail\MailHandler $mailHandler */
$mailHandler = $this->app->moduleManager->get('Admin', 'Api')->setUpServerMailHandler(); $mailHandler = $this->app->moduleManager->get('Admin', 'Api')->setUpServerMailHandler();
$mail = new Email(); $mail = new Email();

42
Theme/Backend/monitoring-logs-single.tpl.php
View File

@ -18,18 +18,16 @@ declare(strict_types=1);
$logger = $this->getData('logger'); $logger = $this->getData('logger');
$log = $logger->getByLine((int) $this->request->getData('id') ?? 1); $log = $logger->getByLine((int) $this->request->getData('id') ?? 1);
$temp = \trim($log[9]);
$log['backtrace'] = \json_decode($temp, true);
$details = '* Uri: `' . \trim($log[8]) . "`\n" $details = '* Uri: `' . \trim($log[8] ?? '') . "`\n"
. '* Level: `' . \trim($log[1]) . "`\n" . '* Level: `' . \trim($log[1] ?? '') . "`\n"
. '* File: `' . \trim($log[8]) . "`\n" . '* File: `' . \trim($log[8] ?? '') . "`\n"
. '* Line: `' . \trim($log[3]) . "`\n" . '* Line: `' . \trim($log[3] ?? '') . "`\n"
. '* Version: `' . \trim($log[4]) . "`\n" . '* Version: `' . \trim($log[4] ?? '') . "`\n"
. '* OS: `' . \trim($log[5]) . "`\n\n" . '* OS: `' . \trim($log[5] ?? '') . "`\n\n"
. "**Message:**\n\n```\n" . \trim($log[7]) . "\n```\n\n" . "**Message:**\n\n```\n" . \trim($log[7] ?? '') . "\n```\n\n"
. "**Backtrace:**\n\n```\n" . \json_encode(\json_decode($log[9]), \JSON_PRETTY_PRINT) . "\n"; . "**Backtrace:**\n\n```\n" . \json_encode(\json_decode($log[9] ?? '{}'), \JSON_PRETTY_PRINT) . "\n";
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>
@ -45,52 +43,52 @@ echo $this->getData('nav')->render(); ?>
<div class="form-group"> <div class="form-group">
<label><i class="fa fa-clock-o"></i <?= $this->getHtml('Time'); ?>></label> <label><i class="fa fa-clock-o"></i <?= $this->getHtml('Time'); ?>></label>
<label><?= $this->printHtml($log[0]); ?></label> <label><?= $this->printHtml($log[0] ?? ''); ?></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><i class="fa fa-globe"></i> <?= $this->getHtml('Uri'); ?></label> <label><i class="fa fa-globe"></i> <?= $this->getHtml('Uri'); ?></label>
<label><?= $this->printHtml($log[8]); ?></label> <label><?= $this->printHtml($log[8] ?? ''); ?></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><i class="fa fa-wifi"></i> <?= $this->getHtml('Source'); ?></label> <label><i class="fa fa-wifi"></i> <?= $this->getHtml('Source'); ?></label>
<label><?= $this->printHtml($log[2]); ?></label> <label><?= $this->printHtml($log[2] ?? ''); ?></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><i class="fa fa-<?= $this->printHtml(\in_array($log[1], ['notice', 'info', 'debug']) ? 'info-circle' : 'warning'); ?>"></i> <?= $this->getHtml('Level'); ?></label> <label><i class="fa fa-<?= $this->printHtml(\in_array($log[1] ?? '', ['notice', 'info', 'debug']) ? 'info-circle' : 'warning'); ?>"></i> <?= $this->getHtml('Level'); ?></label>
<label><?= $this->printHtml($log[1]); ?></label> <label><?= $this->printHtml($log[1] ?? ''); ?></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><i class="fa fa-commenting"></i> <?= $this->getHtml('Message'); ?></label> <label><i class="fa fa-commenting"></i> <?= $this->getHtml('Message'); ?></label>
<label><?= $this->printHtml($log[7]); ?></label> <label><?= $this->printHtml($log[7] ?? ''); ?></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><i class="fa fa-file-o"></i> <?= $this->getHtml('File'); ?></label> <label><i class="fa fa-file-o"></i> <?= $this->getHtml('File'); ?></label>
<label><?= $this->printHtml($log[8]); ?></label> <label><?= $this->printHtml($log[8] ?? ''); ?></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><i class="fa fa-commenting"></i> <?= $this->getHtml('Line'); ?></label> <label><i class="fa fa-commenting"></i> <?= $this->getHtml('Line'); ?></label>
<label><?= $this->printHtml($log[3]); ?></label> <label><?= $this->printHtml($log[3] ?? ''); ?></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><i class="fa fa-laptop"></i> <?= $this->getHtml('OS'); ?></label> <label><i class="fa fa-laptop"></i> <?= $this->getHtml('OS'); ?></label>
<label><?= $this->printHtml($log[5]); ?></label> <label><?= $this->printHtml($log[5] ?? ''); ?></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><i class="fa fa-pencil"></i> <?= $this->getHtml('Version'); ?></label> <label><i class="fa fa-pencil"></i> <?= $this->getHtml('Version'); ?></label>
<label><?= $this->printHtml($log[4]); ?></label> <label><?= $this->printHtml($log[4] ?? ''); ?></label>
</div> </div>
<div class="form-group"> <div class="form-group">
<label><?= $this->getHtml('Backtrace'); ?></label> <label><?= $this->getHtml('Backtrace'); ?></label>
<pre><?= $this->printHtml(\json_encode($log[9], \JSON_PRETTY_PRINT)); ?></pre> <pre><?= $this->printHtml(\json_encode(\json_decode($log[9] ?? '{}'), \JSON_PRETTY_PRINT)); ?></pre>
</div> </div>
<div class="portlet-foot"> <div class="portlet-foot">
<a tabindex="0" class="button" target="_blank" <a tabindex="0" class="button" target="_blank"