tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix params names

This commit is contained in:
Gianluca Piccolo 2020-10-07 15:55:10 +02:00 committed by Thomas Gelf
parent 6438016ee2
commit dd53e4db9d
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/controllers/ConfigController.php
View File

@ -151,23 +151,23 @@ class ConfigController extends ActionController
$configChecksum = $status->getConfigChecksumForStageName($stageName);
$activeConfiguration = [
'stage_name' => $stageName,
'config_checksum' => ($configChecksum) ? : null,
'activity_log_checksum' => $lastActivityLogChecksum
'config' => ($configChecksum) ? : null,
'activity' => $lastActivityLogChecksum
];
}
$result = [
'active_configuration' => (object) $activeConfiguration,
];
if ($configChecksumsListToVerify = $this->params->get('config_checksums')) {
$result['configuration'] = $status->getDeploymentStatusForConfigChecksums(
if ($configChecksumsListToVerify = $this->params->get('configs')) {
$result['configs'] = $status->getDeploymentStatusForConfigChecksums(
explode(',', $configChecksumsListToVerify),
$configChecksum
);
}
if ($activityLogChecksumsListToVerify = $this->params->get('activity_log_checksums')) {
$result['activity'] = $status->getDeploymentStatusForActivityLogChecksums(
if ($activityLogChecksumsListToVerify = $this->params->get('activities')) {
$result['activities'] = $status->getDeploymentStatusForActivityLogChecksums(
explode(',', $activityLogChecksumsListToVerify),
$lastActivityLogChecksum
);

14
doc/70-REST-API.md
View File

@ -512,9 +512,9 @@ Content-Type: application/json
```json
{
"active_configuration": {
"stage_name": "...",
"config_checksum": "...",
"activity_log_checksum": "..."
"stage_name": "b191211d-05cb-4679-842b-c45170b96421",
"config": "617b9cbad9e141cfc3f4cb636ec684bd60073be1",
"activity": "028b3a19ca7457f5fc9dbb5e4ea527eaf61616a2"
}
}
```
@ -534,14 +534,14 @@ Following an example of how to do it:
{
"active_configuration": {
"stage_name": "b191211d-05cb-4679-842b-c45170b96421",
"config_checksum": "617b9cbad9e141cfc3f4cb636ec684bd60073be1",
"activity_log_checksum": "028b3a19ca7457f5fc9dbb5e4ea527eaf61616a2"
"config": "617b9cbad9e141cfc3f4cb636ec684bd60073be1",
"activity": "028b3a19ca7457f5fc9dbb5e4ea527eaf61616a2"
},
"configuration": {
"configs": {
"617b9cbad9e141cfc3f4cb636ec684bd60073be2": "deployed",
"617b9cbad9e141cfc3f4cb636ec684bd60073be1": "active"
},
"activity": {
"activities": {
"617b9cbad9e141cfc3f4cb636ec684bd60073be1": "undeployed",
"028b3a19ca7457f5fc9dbb5e4ea527eaf61616a2": "active"
}