upstream/icingadb-web
1
0
Fork 0
mirror of https://github.com/Icinga/icingadb-web.git synced 2026-05-28 04:36:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't depend on ipl as a module anymore

Browse source
This commit is contained in:
Johannes Meyer 2020-11-19 08:56:27 +01:00
parent 51b7e825fb
commit a6baa35e05
3 changed files with 3 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
configuration.php
View file

@ -4,20 +4,12 @@
namespace Icinga\Module\Icingadb
{
use Icinga\Application\Icinga;
use Icinga\Application\Logger;
use Icinga\Authentication\Auth;
/** @var \Icinga\Application\Modules\Module $this */
$this->provideSetupWizard('Icinga\Module\Icingadb\Setup\IcingaDbWizard');
if (! Icinga::app()->getModuleManager()->hasLoaded('ipl')) {
// TODO: Replace this once we have proper dependency management
Logger::warning(t('Module "ipl" is not enabled. This module is mandatory for Icinga DB Web'));
return;
}
if (! $this::exists('monitoring')) {
/**
* Search urls
@ -225,8 +217,6 @@ namespace Icinga\Module\Icingadb
'url' => 'config/security'
]);
$this->requireCssFile('balls.less', 'ipl');
$this->provideCssFile('common.less');
$this->provideCssFile('lists.less');
$this->provideCssFile('mixins.less');

20
library/Icingadb/ProvidedHook/ApplicationState.php
View file

@ -6,7 +6,6 @@ namespace Icinga\Module\Icingadb\ProvidedHook;
use Exception;
use Icinga\Application\Hook\ApplicationStateHook;
use Icinga\Application\Icinga;
use Icinga\Module\Icingadb\Common\Database;
use Icinga\Module\Icingadb\Common\IcingaRedis;
use Icinga\Module\Icingadb\Model\Instance;
@ -19,25 +18,6 @@ class ApplicationState extends ApplicationStateHook
public function collectMessages()
{
if (! Icinga::app()->getModuleManager()->hasLoaded('ipl')) {
// TODO: Replace this once we have proper dependency management
$noIplSince = Session::getSession()->getNamespace('icingadb')->get('icingadb.no-ipl-since');
if ($noIplSince === null) {
$noIplSince = time();
Session::getSession()->getNamespace('icingadb')->set('icingadb.no-ipl-since', $noIplSince);
}
$this->addError(
'icingadb/ipl-missing',
$noIplSince,
t('Module "ipl" is not enabled. This module is mandatory for Icinga DB Web')
);
return;
} else {
Session::getSession()->getNamespace('icingadb')->delete('db.no-ipl-since');
}
$instance = Instance::on($this->getDb())->with(['endpoint'])->first();
if ($instance === null) {

4
module.info
View file

@ -1,5 +1,7 @@
Module: icingadb
Version: 1.0.0-rc1
Depends: monitoring (>=2.8.0), ipl (>=0.5.0)
Requires:
Libraries: ipl (>=0.5.0)
Modules: monitoring (>=2.8.0)
Description: Icinga DB Web
UI for Icinga DB – Provides a graphical interface to your Icinga monitoring