Skip to content

Commit

Permalink
Fix notify/sticky parameter handling in 'acknowledge-problem' API action
Browse files Browse the repository at this point in the history
refs #13939
  • Loading branch information
Michael Friedrich committed Jan 12, 2017
1 parent 751ca67 commit 8196523
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions doc/12-icinga2-api.md
Original file line number Diff line number Diff line change
Expand Up @@ -898,9 +898,9 @@ Send a `POST` request to the URL endpoint `/v1/actions/acknowledge-problem`.
----------|-----------|--------------
author | string | **Required.** Name of the author, may be empty.
comment | string | **Required.** Comment text, may be empty.
expiry | timestamp | **Optional.** If set, the acknowledgement will vanish after this timestamp.
sticky | boolean | **Optional.** If `true`, the default, the acknowledgement will remain until the service or host fully recovers.
notify | boolean | **Optional.** If `true`, a notification will be sent out to contacts to indicate this problem has been acknowledged. The default is false.
expiry | timestamp | **Optional.** Whether the acknowledgement will be removed at the timestamp.
sticky | boolean | **Optional.** Whether the acknowledgement will be set until the service or host fully recovers. Defaults to `false`.
notify | boolean | **Optional.** Whether a notification of the `Acknowledgement` type will be sent. Defaults to `false`.

In addition to these parameters a [filter](12-icinga2-api.md#icinga2-api-filters) must be provided. The valid types for this action are `Host` and `Service`.

Expand Down
4 changes: 2 additions & 2 deletions lib/icinga/apiactions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,10 @@ Dictionary::Ptr ApiActions::AcknowledgeProblem(const ConfigObject::Ptr& object,
bool notify = false;
double timestamp = 0.0;

if (params->Contains("sticky"))
if (params->Contains("sticky") && HttpUtility::GetLastParameter(params, "sticky"))
sticky = AcknowledgementSticky;
if (params->Contains("notify"))
notify = true;
notify = HttpUtility::GetLastParameter(params, "notify");
if (params->Contains("expiry"))
timestamp = HttpUtility::GetLastParameter(params, "expiry");
else
Expand Down

0 comments on commit 8196523

Please sign in to comment.