Ability to execute "Manual event actions" on Zabbix Problems panel (#2024)

This PR resolves the below issues:
#2022 #1465 

Specifically, when executing a script on the problems panel, we do check
if the script scope is event or host.
Based on the script scope, the Zabbix API call is constructed
differently.

---------

Co-authored-by: Zoltán Bedi <zoltan.bedi@gmail.com>

.changeset/silent-shrimps-carry.md

@@ -0,0 +1,5 @@
+---
+'grafana-zabbix': minor
+---
+
+Add possibility to run "Manual event actions"

src/datasource/zabbix/connectors/zabbix_api/types.ts

@@ -44,6 +44,7 @@ export interface ZBXScript {
   confirmation?: string;
   type?: string;
   execute_on?: string;
+  scope?: string;
 }
 
 export interface APIExecuteScriptResponse {

src/datasource/zabbix/connectors/zabbix_api/zabbixAPIConnector.ts

@@ -930,11 +930,14 @@ export class ZabbixAPIConnector {
     return this.request('script.get', params).then(utils.mustArray);
   }
 
-  executeScript(hostid: string, scriptid: string): Promise<APIExecuteScriptResponse> {
+  executeScript(scriptid: string, hostid?: string, eventid?: string): Promise<APIExecuteScriptResponse> {
-    const params: any = {
+    const params: { scriptid: string; hostid?: string; eventid?: string } = { scriptid };
-      hostid,
+    if (hostid) {
-      scriptid,
+      params.hostid = hostid;
-    };
+    }
+    if (eventid) {
+      params.eventid = eventid;
+    }
 
     return this.request('script.execute', params);
   }

src/panel-triggers/ProblemsPanel.tsx

@@ -190,10 +190,22 @@ export const ProblemsPanel = (props: ProblemsPanelProps): JSX.Element => {
     return ds.zabbix.getScripts([hostid]);
   };
 
-  const onExecuteScript = async (problem: ProblemDTO, scriptid: string): Promise<APIExecuteScriptResponse> => {
+  const onExecuteScript = async (
+    problem: ProblemDTO,
+    scriptid: string,
+    scope: string
+  ): Promise<APIExecuteScriptResponse> => {
     const hostid = problem.hosts?.length ? problem.hosts[0].hostid : null;
     const ds: any = await getDataSourceSrv().get(problem.datasource);
-    return ds.zabbix.executeScript(hostid, scriptid);
+
+    switch (scope) {
+      case '4': // Event action
+        return ds.zabbix.executeScript(scriptid, undefined, problem.eventid);
+      case '2': // Host action
+        return ds.zabbix.executeScript(scriptid, hostid, undefined);
+      default:
+        return ds.zabbix.executeScript(scriptid);
+    }
   };
 
   const onProblemAck = async (problem: ProblemDTO, data: AckProblemData) => {

src/panel-triggers/components/ExecScriptModal.tsx

@@ -24,6 +24,7 @@ interface State {
 
 export interface ExecScriptData {
   scriptid: string;
+  scope: string;
 }
 
 export class ExecScriptModalUnthemed extends PureComponent<Props, State> {
@@ -83,6 +84,7 @@ export class ExecScriptModalUnthemed extends PureComponent<Props, State> {
 
     const data: ExecScriptData = {
       scriptid: selectedScript.value,
+      scope: this.state.script.scope,
     };
 
     this.props

src/panel-triggers/components/Problems/ProblemDetails.tsx

@@ -29,7 +29,7 @@ interface Props extends RTRow<ProblemDTO> {
   getProblemEvents: (problem: ProblemDTO) => Promise<ZBXEvent[]>;
   getProblemAlerts: (problem: ProblemDTO) => Promise<ZBXAlert[]>;
   getScripts: (problem: ProblemDTO) => Promise<ZBXScript[]>;
-  onExecuteScript(problem: ProblemDTO, scriptid: string): Promise<APIExecuteScriptResponse>;
+  onExecuteScript(problem: ProblemDTO, scriptid: string, scope: string): Promise<APIExecuteScriptResponse>;
   onProblemAck?: (problem: ProblemDTO, data: AckProblemData) => Promise<any> | any;
   onTagClick?: (tag: ZBXTag, datasource: DataSourceRef | string, ctrlKey?: boolean, shiftKey?: boolean) => void;
 }
@@ -90,9 +90,9 @@ export const ProblemDetails = ({
     return getScripts(problem);
   };
 
-  const onExecuteScriptInternal = (data: ExecScriptData) => {
+  const onExecuteScriptInternal = ({ scriptid, scope }: ExecScriptData) => {
     const problem = original as ProblemDTO;
-    return onExecuteScript(problem, data.scriptid);
+    return onExecuteScript(problem, scriptid, scope);
   };
 
   const problem = original as ProblemDTO;

src/panel-triggers/components/Problems/Problems.tsx

@@ -28,7 +28,7 @@ export interface ProblemListProps {
   getProblemEvents: (problem: ProblemDTO) => Promise<ZBXEvent[]>;
   getProblemAlerts: (problem: ProblemDTO) => Promise<ZBXAlert[]>;
   getScripts: (problem: ProblemDTO) => Promise<ZBXScript[]>;
-  onExecuteScript: (problem: ProblemDTO, scriptid: string) => Promise<APIExecuteScriptResponse>;
+  onExecuteScript: (problem: ProblemDTO, scriptid: string, scope: string) => Promise<APIExecuteScriptResponse>;
   onProblemAck?: (problem: ProblemDTO, data: AckProblemData) => void;
   onTagClick?: (tag: ZBXTag, datasource: DataSourceRef, ctrlKey?: boolean, shiftKey?: boolean) => void;
   onPageSizeChange?: (pageSize: number, pageIndex: number) => void;