Skip to content

Added type of request (Incident or UserRequest) to API #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added type of request (Incident or UserRequest) to API #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions classes/MonitoringContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ class MonitoringContext
/** @var array */
private $aPerformedActions = array();

public function __construct(string $sName, int $iAlarmState, array $aActionsOnProblem, array $aActionsOnOk)
public function __construct(string $sName, int $iAlarmState, array $aActionsOnProblem, array $aActionsOnOk, string $sItopClass)
{
$this->sName = $sName;
$this->iAlarmState = $iAlarmState;
$this->aActionsOnProblem = $aActionsOnProblem;
$this->aActionsOnOk = $aActionsOnOk;
$this->oStateExecutor = new NotExistStateExecutor($this);
if (MetaModel::IsValidClass('Incident'))
if (MetaModel::IsValidClass($sItopClass))
{
$this->sTicketClass = 'Incident';
$this->sTicketClass = $sItopClass;
}
}

Expand Down Expand Up @@ -364,4 +364,4 @@ public function Execute()
}
}
}
}
}
2 changes: 2 additions & 0 deletions examples/zabbix/media_itop.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ zabbix_export:
json_data.ci_key = params.itop_ci;
json_data.state = params.event_value;
json_data.message = params.alert_subject;
json_data.itop_class = params.itop_class;
json_data.description = params.alert_message.replace('<', '&lt;')
.replace('>', '&gt;')
.replace(/(?:\r\n|\r|\n)/g, '<br>');
Expand All @@ -99,6 +100,7 @@ zabbix_export:
json_data.fields.title = params.alert_subject;
json_data.operation = 'monitoring/alarm';
json_data.ci_key = params.itop_ci;
json_data.itop_class = params.itop_class;
json_data.state = params.event_value;
json_data.message = params.alert_subject + '\n' + params.alert_message;
},
Expand Down
3 changes: 2 additions & 1 deletion main.knowitop-monitoring-api.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public function ExecOperation($sVersion, $sVerb, $oParams)
$sCIKey = RestUtils::GetMandatoryParam($oParams, 'ci_key');
$iAlarmState = (int)RestUtils::GetMandatoryParam($oParams, 'state');
$sAlarmMessage = RestUtils::GetMandatoryParam($oParams, 'message');
$sItopClass = RestUtils::GetOptionalParam($oParams, 'class', 'Incident');
$sDescription = RestUtils::GetOptionalParam($oParams, 'description', $sAlarmMessage);
// $aAlarmFields = (array)RestUtils::GetOptionalParam($oParams, 'fields', array());

Expand All @@ -82,7 +83,7 @@ public function ExecOperation($sVersion, $sVerb, $oParams)
};

$oMonitoringContext = new MonitoringContext($sContextName, $iAlarmState, $aContextConfig['actions_on_problem'],
$aContextConfig['actions_on_ok']);
$aContextConfig['actions_on_ok'], $sItopClass);
$oMonitoringContext->AddQueryParams(array(
'alarm->ci_key' => $sCIKey,
'alarm->state' => $iAlarmState,
Expand Down