tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-30 01:04:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

SelfService: add Icinga for Windows support...

Browse Source 
...to the Agent tab

fixes #2147
This commit is contained in:
Thomas Gelf 2020-11-30 21:02:45 +01:00
parent 9de84c3a72
commit 62c4c6f44b
2 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
library/Director/IcingaConfig/AgentWizard.php
View File

@ -146,7 +146,23 @@ class AgentWizard
]);
}
public function renderTokenBasedWindowsInstaller($token, $withModule = false)
public function renderIcinga4WindowsWizardCommand($token)
{
$script = "Use-Icinga;\n"
. 'Start-IcingaAgentInstallWizard `' . "\n "
. $this->renderPowershellParameters([
'DirectorUrl' => $this->getDirectorUrl(),
'SelfServiceAPIKey' => $token,
'UseDirectorSelfService' => 1,
'OverrideDirectorVars' => 0,
'Reconfigure',
'RunInstaller'
]);
return $script;
}
public function renderPowershellModuleInstaller($token, $withModule = false)
{
if ($withModule) {
$script = $this->loadPowershellModule() . "\n\n";
@ -217,7 +233,9 @@ class AgentWizard
$vals[] = $this->renderPowershellString($val);
}
$ret .= implode(', ', $vals);
} elseif ($value !== null) {
} elseif (is_int($value)) {
$ret .= $value;
} else {
$ret .= $this->renderPowershellString($value);
}

43
library/Director/Web/SelfService.php
View File

@ -13,6 +13,7 @@ use Icinga\Exception\NotFoundError;
use Icinga\Module\Director\IcingaConfig\AgentWizard;
use Icinga\Module\Director\Objects\IcingaHost;
use Icinga\Module\Director\Util;
use Icinga\Module\Director\Web\Widget\Documentation;
use ipl\Html\Html;
use gipfl\IcingaWeb2\Link;
use gipfl\Translation\TranslationHelper;
@ -100,24 +101,43 @@ class SelfService
]
));
if ($this->hasDocsModuleLoaded()) {
$actions->add(Link::create(
$this->translate('Documentation'),
'doc/module/director/chapter/Self-Service-API',
null,
['class' => 'icon-book']
));
}
$actions->add(Documentation::link(
$this->translate('Documentation'),
'director',
'74-Self-Service-API',
$this->translate('Self Service API')
));
if ($hasKey) {
$wizard = new AgentWizard($host);
$c->add([
Html::tag('p', null, [$this->translate('Api Key:'), ' ', Html::tag('strong', null, $key)]),
Html::tag('h2', $this->translate('Icinga for Windows')),
Html::tag('p', Html::sprintf(
$this->translate('In case you\'re using %s, please run this Script:'),
Html::tag('a', [
'href' => 'https://icinga.com/docs/windows/latest/',
'target' => '_blank',
], $this->translate('Icinga for Windows'))
)),
Html::tag(
'pre',
['class' => 'logfile'],
$wizard->renderTokenBasedWindowsInstaller($key)
$wizard->renderIcinga4WindowsWizardCommand($key)
),
Html::tag('h3', $this->translate('Icinga 2 Powershell Module')),
Html::tag('p', Html::sprintf(
$this->translate('In case you\'re using the legacy %s, please run:'),
Html::tag('a', [
'href' => 'https://github.com/Icinga/icinga2-powershell-module',
'target' => '_blank',
], $this->translate('Icinga 2 Powershell Module'))
)),
Html::tag(
'pre',
['class' => 'logfile'],
$wizard->renderPowershellModuleInstaller($key)
),
Html::tag('h2', null, $this->translate('Generate a new key')),
Hint::warning($this->translate(
@ -136,6 +156,9 @@ class SelfService
Html::tag('p', null, $this->translate(
'You can stop sharing a Template at any time. This will'
. ' immediately invalidate the former key.'
) . ' ' . $this->translate(
'Generated Host keys will continue to work, but you\'ll no'
. ' longer be able to register new Hosts with this key'
)),
IcingaForgetApiKeyForm::load()->setHost($host)->handleRequest()
]);
@ -169,7 +192,7 @@ class SelfService
Html::tag(
'pre',
['class' => 'logfile'],
$wizard->renderTokenBasedWindowsInstaller($key)
$wizard->renderIcinga4WindowsWizardCommand($key)
)
]);
}