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

HostController: fix agent tab activation

Browse Source
This commit is contained in:
Thomas Gelf 2017-07-06 18:59:34 +02:00
parent 5931c4ee5e
commit 7a1dbd5334
2 changed files with 86 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/HostController.php
View File

@ -419,7 +419,7 @@ class HostController extends ObjectController
)
));
$this->gracefullyActivateTab('agent');
$this->tabs()->activate('agent');
$this->addTitle('Agent deployment instructions');
$certname = $this->object->object_name;

177
application/forms/SelfServiceSettingsForm.php
View File

@ -64,100 +64,9 @@ class SelfServiceSettingsForm extends DirectorForm
);
if ($downloadType) {
$this->addElement('text', 'download_url', [
'label' => $this->translate('Source Path'),
'description' => $this->translate(
'Define a download Url or local directory from which the a specific'
. ' Icinga 2 Agent MSI Installer package should be fetched. Please'
. ' ensure to only define the base download Url or Directory. The'
. ' Module will generate the MSI file name based on your operating'
. ' system architecture and the version to install. The Icinga 2 MSI'
. ' Installer name is internally build as follows:'
. ' Icinga2-v[InstallAgentVersion]-[OSArchitecture].msi (full example:'
. ' Icinga2-v2.6.3-x86_64.msi)'
),
'value' => $settings->getStoredOrDefaultValue('self-service/download_url'),
]);
// TODO: offer to check for available versions
if ($downloadType === 'icinga') {
$el = $this->getElement('download_url');
$el->setAttrib('disabled', 'disabled');
$value = 'https://packages.icinga.com/windows/';
$el->setValue($value);
$this->setSentValue('download_url', $value);
}
if ($downloadType === 'director') {
$el = $this->getElement('download_url');
$el->setAttrib('disabled', 'disabled');
$r = $this->getRequest();
$scheme = $r->getServer('HTTP_X_FORWARDED_PROTO', $r->getScheme());
$value = sprintf(
'%s://%s%s/director/download/windows/',
$scheme,
$r->getHttpHost(),
$this->getRequest()->getBaseUrl()
);
$el->setValue($value);
$this->setSentValue('download_url', $value);
}
$this->addElement('text', 'agent_version', [
'label' => $this->translate('Agent Version'),
'description' => $this->translate(
'In case the Icinga 2 Agent should be automatically installed,'
. ' this has to be a string value like: 2.6.3'
),
'value' => $settings->getStoredOrDefaultValue('self-service/agent_version'),
'required' => true,
]);
$hashes = $settings->getStoredOrDefaultValue('self-service/installer_hashes');
if ($hashes) {
$hashes = json_decode($hashes);
} else {
$hashes = null;
}
$this->addElement('extensibleSet', 'installer_hashes', [
'label' => $this->translate('Installer Hashes'),
'description' => $this->translate(
'To ensure downloaded packages are build by the Icinga Team'
. ' and not compromised by third parties, you will be able'
. ' to provide an array of SHA1 hashes here. In case you have'
. ' defined any hashses, the module will not continue with'
. ' updating / installing the Agent in case the SHA1 hash of'
. ' the downloaded MSI package is not matching one of the'
. ' provided hashes of this setting'
),
'value' => $hashes,
]);
$this->addBoolean('allow_updates', [
'label' => $this->translate('Allow Updates'),
'description' => $this->translate(
'In case the Icinga 2 Agent is already installed on the system,'
. ' this parameter will allow you to configure if you wish to'
. ' upgrade / downgrade to a specified version with the as well.'
),
'value' => $settings->getStoredOrDefaultValue('self-service/allow_updates'),
'required' => true,
], true);
$this->addInstallSettings($downloadType, $settings);
}
/*
// This is managed through the template
$this->addBoolean('accept_config', [
'label' => $this->translate('Accept Config'),
'description' => $this->translate(
'Whether this Agent should accept configuration from it\'s Icinga'
. ' parent Zone'
),
'required' => true,
], true);
*/
$this->addBoolean('flush_api_dir', [
'label' => $this->translate('Flush API directory'),
'description' => $this->translate(
@ -170,6 +79,90 @@ class SelfServiceSettingsForm extends DirectorForm
], true);
}
protected function addInstallSettings($downloadType, Settings $settings)
{
$this->addElement('text', 'download_url', [
'label' => $this->translate('Source Path'),
'description' => $this->translate(
'Define a download Url or local directory from which the a specific'
. ' Icinga 2 Agent MSI Installer package should be fetched. Please'
. ' ensure to only define the base download Url or Directory. The'
. ' Module will generate the MSI file name based on your operating'
. ' system architecture and the version to install. The Icinga 2 MSI'
. ' Installer name is internally build as follows:'
. ' Icinga2-v[InstallAgentVersion]-[OSArchitecture].msi (full example:'
. ' Icinga2-v2.6.3-x86_64.msi)'
),
'value' => $settings->getStoredOrDefaultValue('self-service/download_url'),
]);
// TODO: offer to check for available versions
if ($downloadType === 'icinga') {
$el = $this->getElement('download_url');
$el->setAttrib('disabled', 'disabled');
$value = 'https://packages.icinga.com/windows/';
$el->setValue($value);
$this->setSentValue('download_url', $value);
}
if ($downloadType === 'director') {
$el = $this->getElement('download_url');
$el->setAttrib('disabled', 'disabled');
$r = $this->getRequest();
$scheme = $r->getServer('HTTP_X_FORWARDED_PROTO', $r->getScheme());
$value = sprintf(
'%s://%s%s/director/download/windows/',
$scheme,
$r->getHttpHost(),
$this->getRequest()->getBaseUrl()
);
$el->setValue($value);
$this->setSentValue('download_url', $value);
}
$this->addElement('text', 'agent_version', [
'label' => $this->translate('Agent Version'),
'description' => $this->translate(
'In case the Icinga 2 Agent should be automatically installed,'
. ' this has to be a string value like: 2.6.3'
),
'value' => $settings->getStoredOrDefaultValue('self-service/agent_version'),
'required' => true,
]);
$hashes = $settings->getStoredOrDefaultValue('self-service/installer_hashes');
if ($hashes) {
$hashes = json_decode($hashes);
} else {
$hashes = null;
}
$this->addElement('extensibleSet', 'installer_hashes', [
'label' => $this->translate('Installer Hashes'),
'description' => $this->translate(
'To ensure downloaded packages are build by the Icinga Team'
. ' and not compromised by third parties, you will be able'
. ' to provide an array of SHA1 hashes here. In case you have'
. ' defined any hashses, the module will not continue with'
. ' updating / installing the Agent in case the SHA1 hash of'
. ' the downloaded MSI package is not matching one of the'
. ' provided hashes of this setting'
),
'value' => $hashes,
]);
$this->addBoolean('allow_updates', [
'label' => $this->translate('Allow Updates'),
'description' => $this->translate(
'In case the Icinga 2 Agent is already installed on the system,'
. ' this parameter will allow you to configure if you wish to'
. ' upgrade / downgrade to a specified version with the as well.'
),
'value' => $settings->getStoredOrDefaultValue('self-service/allow_updates'),
'required' => true,
], true);
}
public static function create(Db $db, Settings $settings)
{
return static::load()->setDb($db)->setSettings($settings);