';
+$table_files_section->data[1][0] .= html_print_textarea(
+ 'file_description',
+ 3,
+ 20,
+ '',
+ '',
+ true
+);
+
+$table_files_section->data[2][0] .= '
'.html_print_submit_button(__('Upload'), 'accion', false, 'class="sub wand"', true).'
';
+
+// Incident comments management.
+$upload_comment = get_parameter('upload_comment');
+$comment_description = get_parameter('comment_description');
+
+// Comments section table.
+$table_comments_section = new stdClass();
+$table_comments_section->width = '100%';
+$table_comments_section->id = 'files_section_table';
+$table_comments_section->class = 'databox filters';
+$table_comments_section->head = [];
+
+$table_comments_section->data = [];
+$table_comments_section->size = [];
+
+// Comments list table.
+$table_comments = new stdClass();
+$table_comments->width = '100%';
+$table_comments->class = 'info_table';
+$table_comments->head = [];
+
+$table_comments->head[0] = __('Filename');
+$table_comments->head[1] = __('Timestamp');
+$table_comments->head[2] = __('Description');
+$table_comments->head[3] = __('User');
+$table_comments->head[4] = __('Size');
+$table_comments->head[5] = __('Delete');
+
+$table_comments->data = [];
+
+$comment_disabled = ($array_get_incidents[6] == 7);
+
+if ($comment_disabled === true) {
+ $attribute = 'disabled=disabled';
+}
+
+$table_comments_section->data[0][0] = '
'.__('Description').':
';
+$table_comments_section->data[0][0] .= html_print_textarea(
+ 'comment_description',
+ 3,
+ 20,
+ '',
+ $attribute,
+ true
+);
+
+$table_comments_section->data[1][1] .= '
'.html_print_submit_button(__('Add'), 'accion', $comment_disabled, 'class="sub wand"', true).'
';
+
+// Upload comment. If ticket is closed, this action cannot be performed.
+if ($upload_comment && $array_get_incidents[6] != 7) {
+ $result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'create_workunit', [$incident_id, $comment_description, '0.00', 0, 1, '0']);
+
+ // API method returns id of new comment if success.
+ $comment_added = ($result_api_call >= '0') ? true : false;
+
+ ui_print_result_message(
+ $comment_added,
+ __('Comment successfully added'),
+ __('Comment could not be added')
+ );
+}
+
+// Retrieve comments belonging to incident and create comments table.
+$result_api_call = integria_api_call($config['integria_hostname'], $config['integria_user'], $config['integria_pass'], $config['integria_api_pass'], 'get_incident_workunits', [$incident_id]);
+
+if ($result_api_call != false && strlen($result_api_call) > 0) {
+ $comments = [];
+ $csv_array = explode("\n", $result_api_call);
+
+ foreach ($csv_array as $csv_line) {
+ if (!empty($csv_line)) {
+ $comments[] = explode(',', $csv_line);
+ }
+ }
+}
+
+$comment_table = '';
+
+if (!empty($comments)) {
+ foreach ($comments as $key => $value) {
+ $comment_table .= '';
+ $comment_table .= '
'.$value[4].'
';
+ }
+} else {
+ $comment_table = __('No comments found');
+}
+
+$upload_comment_form = '
';
+
+if (check_acl($config['id_user'], 0, 'IW')) {
+ $upload_comment_form .= '';
+}
+
+$upload_comment_form .= '
'.__('Comments').'
'.$comment_table.'';
+
+// Details box.
+$details_box = '
';
+$details_box .= '
+
'.__('Status').'
+
'.__('Resolution').'
+
'.__('Group').'
+
'.__('Priority').'
+
'.__('Type').'
';
+$details_box .= '
+
'.html_print_image('images/heart.png', true).'
+
'.html_print_image('images/builder.png', true).'
+
'.html_print_image('images/user_green.png', true).'
+
'.ui_print_integria_incident_priority($priority, $priority_text).'
+
'.html_print_image('images/incidents.png', true).'
';
+$details_box .= '
+
'.$status_text.'
+
'.$resolution_text.'
+
'.$group_text.'
+
'.$priority_text.'
+
'.$type_text.'
';
+$details_box .= '
';
+
+
+// People box.
+$people_box = '
';
+$people_box .= '
+
'.html_print_image('images/header_user_green.png', true, ['width' => '21']).'
+
'.html_print_image('images/header_user_green.png', true, ['width' => '21']).'
+
'.html_print_image('images/header_user_green.png', true, ['width' => '21']).'
';
+$people_box .= '
+
'.__('Created by').':
+
'.__('Owned by').':
+
'.__('Closed by').':
';
+$people_box .= '
+
'.$creator.'
+
'.$owner.'
+
'.$closed_by.'
';
+$people_box .= '
';
+
+
+// Dates box.
+$dates_box = '
';
+$dates_box .= '
+
'.html_print_image('images/tick.png', true).'
+
'.html_print_image('images/update.png', true, ['width' => '21']).'
+
'.html_print_image('images/mul.png', true).'
';
+$dates_box .= '
+
'.__('Created at').':
+
'.__('Updated at').':
+
'.__('Closed at').':
';
+$dates_box .= '
+
'.$created_at.'
+
'.$updated_at.'
+
'.$closed_at.'
';
+$dates_box .= '
';
+
+
+// Show details, people and dates.
+echo '
';
+ ui_toggle($details_box, __('Details'), '', 'details_box', false, false, '', 'integria_details_content white-box-content', 'integria_details_shadow box-shadow white_table_graph');
+ ui_toggle($people_box, __('People'), '', 'people_box', false, false, '', 'integria_details_content white-box-content', 'integria_details_shadow box-shadow white_table_graph');
+ ui_toggle($dates_box, __('Dates'), '', 'dates_box', false, false, '', 'integria_details_content white-box-content', 'integria_details_shadow box-shadow white_table_graph');
+echo '
';
+
+ // Show description.
+$description_box = '
'.html_print_textarea(
+ 'integria_details_description',
+ 3,
+ 0,
+ $description,
+ 'disabled="disabled"',
+ true
+).'
';
+ui_toggle($description_box, __('Description'), '', '', false);
+
+echo '
';
+ui_toggle(
+ $upload_file_form,
+ __('Attached files'),
+ '',
+ '',
+ true,
+ false,
+ 'white_box white_box_opened',
+ 'no-border flex'
+);
+echo '
';
+
+echo '
';
+ui_toggle(
+ $upload_comment_form,
+ __('Comments'),
+ '',
+ '',
+ true,
+ false,
+ 'white_box white_box_opened',
+ 'no-border flex'
+);
+echo '
';
+
+?>
+
\ No newline at end of file
diff --git a/pandora_console/operation/incidents/integriaims_export_csv.php b/pandora_console/operation/incidents/integriaims_export_csv.php
new file mode 100644
index 0000000000..03a038e58a
--- /dev/null
+++ b/pandora_console/operation/incidents/integriaims_export_csv.php
@@ -0,0 +1,129 @@
+ $value) {
+ // Status.
+ if ($tickets_csv_array[$key][6] == 0) {
+ $tickets_csv_array[$key][6] = 'None';
+ } else {
+ $tickets_csv_array[$key][6] = $status_incident[$tickets_csv_array[$key][6]];
+ }
+
+ // Priority.
+ $tickets_csv_array[$key][7] = $priority_incident[$tickets_csv_array[$key][7]];
+
+ // Group.
+ $tickets_csv_array[$key][8] = $group_incident[$tickets_csv_array[$key][8]];
+
+ // Resolution.
+ if ($tickets_csv_array[$key][12] == 0) {
+ $tickets_csv_array[$key][12] = 'None';
+ } else {
+ $tickets_csv_array[$key][12] = $resolution_incident[$tickets_csv_array[$key][12]];
+ }
+
+ $tickets_csv_array_filter[$key] = [
+ 'id_incidencia' => $tickets_csv_array[$key][0],
+ 'titulo' => $tickets_csv_array[$key][3],
+ 'id_grupo' => $tickets_csv_array[$key][8],
+ 'estado' => $tickets_csv_array[$key][6],
+ 'resolution' => $tickets_csv_array[$key][12],
+ 'prioridad' => $tickets_csv_array[$key][7],
+ 'actualizacion' => $tickets_csv_array[$key][9],
+ 'inicio' => $tickets_csv_array[$key][1],
+ 'id_creator' => $tickets_csv_array[$key][10],
+ 'owner' => $tickets_csv_array[$key][5],
+ ];
+}
+
+// Header for CSV file.
+$header = [
+ __('ID Ticket'),
+ __('Title'),
+ __('Group/Company'),
+ __('Status'),
+ __('Resolution'),
+ __('Priority'),
+ __('Updated'),
+ __('Started'),
+ __('Creator'),
+ __('Owner'),
+];
+
+$header_csv = '';
+foreach ($header as $key => $value) {
+ $header_csv .= $value.',';
+}
+
+$header_csv = io_safe_output($header_csv).PHP_EOL;
+
+
+// Join header and content.
+$tickets_csv = '';
+foreach ($tickets_csv_array_filter as $key => $value) {
+ $tickets_csv .= implode(',', $tickets_csv_array_filter[$key]).PHP_EOL;
+}
+
+$tickets_csv = $header_csv.$tickets_csv;
+
+
+// Create csv file.
+$filename = 'tickets_export-'.date('Ymd').'-'.date('His').'.csv';
+
+ob_clean();
+
+header('Content-Type: text/csv; charset=utf-8');
+header('Content-Disposition: attachment; filename='.$filename);
+
+// BOM.
+echo pack('C*', 0xEF, 0xBB, 0xBF);
+
+// CSV file.
+echo io_safe_output($tickets_csv);
diff --git a/pandora_console/operation/incidents/list_integriaims_incidents.php b/pandora_console/operation/incidents/list_integriaims_incidents.php
new file mode 100644
index 0000000000..d97276c15e
--- /dev/null
+++ b/pandora_console/operation/incidents/list_integriaims_incidents.php
@@ -0,0 +1,335 @@
+width = '100%';
+$table->class = 'databox filters';
+$table->styleTable = 'margin-bottom:0px';
+$table->cellpadding = '0';
+$table->cellspacing = '0';
+$table->data = [];
+
+$table->data[0][0] = __('Text filter');
+$table->data[0][1] = html_print_input_text('incident_text', $incident_text, '', 30, 100, true);
+
+$table->data[0][2] = __('Status');
+$table->data[0][3] = html_print_select(
+ $status_incident,
+ 'incident_status',
+ $incident_status,
+ '',
+ __('All'),
+ 0,
+ true
+);
+
+$table->data[0][4] = __('Group');
+$table->data[0][5] = html_print_select(
+ $group_incident,
+ 'incident_group',
+ $incident_group,
+ '',
+ __('All'),
+ 1,
+ true
+);
+
+$table->data[1][0] = __('Owner');
+$table->data[1][1] = html_print_autocomplete_users_from_integria('incident_owner', $incident_owner, true);
+
+$table->data[1][2] = __('Creator');
+$table->data[1][3] = html_print_autocomplete_users_from_integria('incident_creator', $incident_creator, true);
+
+$table->data[1][4] = __('Priority');
+$table->data[1][5] = html_print_select(
+ $priority_incident,
+ 'incident_priority',
+ $incident_priority,
+ '',
+ __('All'),
+ -1,
+ true
+);
+
+$table->data[2][0] = __('Resolution');
+$table->data[2][1] = html_print_select(
+ $resolution_incident,
+ 'incident_resolution',
+ $incident_resolution,
+ '',
+ __('All'),
+ '',
+ true
+);
+
+// TODO: field type date.
+$table->data[2][2] = __('Date');
+$table->data[2][3] = html_print_input_text_extended(
+ 'created_from',
+ $created_from,
+ 'created_from',
+ '',
+ 12,
+ 50,
+ false,
+ '',
+ 'placeholder="'.__('Created from').'"',
+ true
+);
+$table->data[2][3] .= html_print_input_text_extended(
+ 'created_to',
+ $created_to,
+ 'created_to',
+ '',
+ 12,
+ 50,
+ false,
+ '',
+ 'style="margin-left:5px;" placeholder="'.__('Created to').'"',
+ true
+);
+
+// TODO: image of Integria IMS.
+$table->data[2][4] = '';
+$table->data[2][5] = '';
+
+
+// Send filters to get_tickets_integriaims().
+$tickets_filters = [
+ 'incident_text' => $incident_text,
+ 'incident_status' => $incident_status,
+ 'incident_group' => $incident_group,
+ 'incident_owner' => $incident_owner,
+ 'incident_creator' => $incident_creator,
+ 'incident_priority' => $incident_priority,
+ 'incident_resolution' => $incident_resolution,
+ 'created_from' => $created_from,
+ 'created_to' => $created_to,
+];
+
+// Data to export to csv file.
+$decode_csv = base64_encode(json_encode($tickets_filters));
+
+
+// ---- PRINT TABLE FILTERS ----
+$integria_incidents_form = '
';
+
+ui_toggle($integria_incidents_form, __('Filter'), '', '', false);
+
+/*
+ * Order api call 'get_incidents'.
+ *
+ * resolution = $array_get_incidents[$key][12]
+ * id_incidencia = $array_get_incidents[$key][0]
+ * titulo = $array_get_incidents[$key][3]
+ * id_grupo = $array_get_incidents[$key][8]
+ * estado = $array_get_incidents[$key][6]
+ * prioridad = $array_get_incidents[$key][7]
+ * actualizacion = $array_get_incidents[$key][9]
+ * id_creator = $array_get_incidents[$key][10]
+ *
+ */
+
+// ---- LIST OF INCIDENTS ----
+// Get list of incidents.
+$array_get_incidents = get_tickets_integriaims($tickets_filters);
+
+// Prepare pagination.
+$incidents_limit = $config['block_size'];
+$incidents_paginated = array_slice($array_get_incidents, $offset, $incidents_limit, true);
+
+// TABLE INCIDENTS.
+$table = new stdClass();
+$table->width = '100%';
+$table->class = 'info_table';
+$table->head = [];
+
+$table->head[0] = __('ID');
+$table->head[1] = __('Ticket');
+$table->head[2] = __('Group/Company');
+$table->head[3] = __('Status/Resolution');
+$table->head[4] = __('Prior');
+$table->head[5] = __('Updated/Started');
+$table->head[6] = __('Creator');
+$table->head[7] = __('Owner');
+if (check_acl($config['id_user'], 0, 'IW') || check_acl($config['id_user'], 0, 'IM')) {
+ $table->head[8] = '';
+}
+
+$table->data = [];
+$i = 0;
+
+foreach ($incidents_paginated as $key => $value) {
+ if ($array_get_incidents[$key][6] == 0) {
+ $status_incident[$array_get_incidents[$key][6]] = __('None');
+ }
+
+ if ($array_get_incidents[$key][12] == 0) {
+ $resolution_incident[$array_get_incidents[$key][12]] = __('None');
+ }
+
+ $table->data[$i][0] = '#'.$array_get_incidents[$key][0];
+ $table->data[$i][1] = '
';
+ $table->data[$i][1] .= $array_get_incidents[$key][3];
+ $table->data[$i][1] .= '';
+ $table->data[$i][2] = $group_incident[$array_get_incidents[$key][8]];
+ $table->data[$i][3] = $status_incident[$array_get_incidents[$key][6]].' / '.$resolution_incident[$array_get_incidents[$key][12]];
+ $table->data[$i][4] = ui_print_integria_incident_priority($array_get_incidents[$key][7], $priority_incident[$array_get_incidents[$key][7]]);
+ $table->data[$i][5] = $array_get_incidents[$key][9].' / '.$array_get_incidents[$key][1];
+ $table->data[$i][6] = $array_get_incidents[$key][10];
+ $table->data[$i][7] = $array_get_incidents[$key][5];
+ $table->data[$i][8] = '';
+ $table->cellclass[$i][8] = 'action_buttons';
+ if (check_acl($config['id_user'], 0, 'IW')) {
+ $table->data[$i][8] .= '
';
+ $table->data[$i][8] .= html_print_image('images/config.png', true, ['title' => __('Edit')]);
+ $table->data[$i][8] .= '';
+ }
+
+ if (check_acl($config['id_user'], 0, 'IM')) {
+ $table->data[$i][8] .= '
';
+ $table->data[$i][8] .= html_print_image('images/cross.png', true, ['title' => __('Delete')]);
+ $table->data[$i][8] .= '';
+ }
+
+ $i++;
+}
+
+// Show table incidents.
+ui_pagination(count($array_get_incidents), $url, $offset);
+if (empty($table->data) === true) {
+ ui_print_info_message(['no_close' => true, 'message' => __('No tickets to show').'.' ]);
+} else {
+ html_print_table($table);
+ ui_pagination(count($array_get_incidents), $url, $offset, 0, false, 'offset', true, 'pagination-bottom');
+}
+
+// Show button to create incident.
+if (check_acl($config['id_user'], 0, 'IR')) {
+ echo '
';
+}
+
+// Datapicker library for show calendar.
+ui_require_jquery_file('ui.datepicker-'.get_user_language(), 'include/javascript/i18n/');
+?>
+
+
+
\ No newline at end of file
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 936cb6a814..58213ed8ee 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -479,6 +479,7 @@ if (check_acl($config['id_user'], 0, 'IR')
$sub2 = [];
$sub2['operation/incidents/incident']['text'] = __('List of Incidents');
$sub2[$sec2sub]['text'] = __('Statistics');
+ $sub2['operation/incidents/list_integriaims_incidents']['text'] = __('Integria IMS Tickets');
$sub[$sec2]['sub2'] = $sub2;
$sec2 = $temp_sec2;
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 01f069b8b6..3f05bd7bf1 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -116,7 +116,29 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'),
('custom_docs_logo', 'default_docs.png'),
('custom_support_logo', 'default_support.png'),
-('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
+('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png'),
+('integria_enabled', 0),
+('integria_user', ''),
+('integria_pass', ''),
+('integria_hostname', ''),
+('integria_api_pass', ''),
+('integria_req_timeout', 5),
+('default_group', ''),
+('default_criticity', ''),
+('default_creator', ''),
+('default_owner', ''),
+('incident_type', ''),
+('incident_status', ''),
+('incident_title', ''),
+('incident_content', ''),
+('cr_default_group', ''),
+('cr_default_criticity', ''),
+('cr_default_creator', ''),
+('cr_default_owner', ''),
+('cr_incident_type', ''),
+('cr_incident_status', ''),
+('cr_incident_title', ''),
+('cr_incident_content', '');
UNLOCK TABLES;
--
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 667cd7c909..644b983a5c 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -1137,7 +1137,9 @@ sub pandora_execute_action ($$$$$$$$$;$) {
load_module_macros ($module->{'module_macros'}, \%macros);
}
- # User defined alerts
+
+ #logger($pa_config, "Clean name ".$clean_name, 10);
+ # User defined alert
if ($action->{'internal'} == 0) {
$macros{_field1_} = subst_alert_macros ($field1, \%macros, $pa_config, $dbh, $agent, $module);
$macros{_field2_} = subst_alert_macros ($field2, \%macros, $pa_config, $dbh, $agent, $module);
@@ -1442,55 +1444,70 @@ sub pandora_execute_action ($$$$$$$$$;$) {
# Integria IMS Ticket
} elsif ($clean_name eq "Integria IMS Ticket") {
+ my $config_api_path = pandora_get_tconfig_token ($dbh, 'integria_hostname', '');
+ my $config_api_pass = pandora_get_tconfig_token ($dbh, 'integria_api_pass', '');
+ my $config_integria_user = pandora_get_tconfig_token ($dbh, 'integria_user', '');
+ my $config_integria_user_pass = pandora_get_tconfig_token ($dbh, 'integria_pass', '');
$field1 = subst_alert_macros ($field1, \%macros, $pa_config, $dbh, $agent, $module);
+ $field2 = subst_alert_macros ($field2, \%macros, $pa_config, $dbh, $agent, $module);
$field3 = subst_alert_macros ($field3, \%macros, $pa_config, $dbh, $agent, $module);
+ $field4 = subst_alert_macros ($field4, \%macros, $pa_config, $dbh, $agent, $module);
$field5 = subst_alert_macros ($field5, \%macros, $pa_config, $dbh, $agent, $module);
+ $field6 = subst_alert_macros ($field6, \%macros, $pa_config, $dbh, $agent, $module);
$field7 = subst_alert_macros ($field7, \%macros, $pa_config, $dbh, $agent, $module);
- $field8 = subst_alert_macros ($field8, \%macros, $pa_config, $dbh, $agent, $module);
- $field9 = subst_alert_macros ($field9, \%macros, $pa_config, $dbh, $agent, $module);
- $field10 = subst_alert_macros ($field10, \%macros, $pa_config, $dbh, $agent, $module);
-
+
# Field 1 (Integria IMS API path)
- my $api_path = $field1;
+ my $api_path = $config_api_path . "/integria/include/api.php";
# Field 2 (Integria IMS API pass)
- my $api_pass = $field2;
+ my $api_pass = $config_api_pass;
# Field 3 (Integria IMS user)
- my $integria_user = $field3;
+ my $integria_user = $config_integria_user;
# Field 4 (Integria IMS user password)
- my $integria_user_pass = $field4;
+ my $integria_user_pass = $config_integria_user_pass;
- # Field 5 (Ticket name)
- my $ticket_name = $field5;
+ # Field 1 (Ticket name)
+ my $ticket_name = safe_output($field1);
if ($ticket_name eq "") {
$ticket_name = $pa_config->{'rb_product_name'} . " alert action created by API";
}
- # Field 6 (Ticket group ID)
- my $ticket_group_id = $field6;
+ # Field 2 (Ticket group ID)
+ my $ticket_group_id = $field2;
if ($ticket_group_id eq '') {
$ticket_group_id = 0;
}
- # Field 7 (Ticket priority);
- my $ticket_priority = $field7;
- if ($ticket_priority eq '') {
- $ticket_priority = 0;
+ # Field 3 (Ticket priority);
+ my $ticket_priority = $field3;
+ if ($ticket_priority eq '0') {
+ $ticket_priority = 1;
+ }
+
+ # Field 4 (Ticket owner)
+ my $ticket_owner = $field4;
+ if ($ticket_owner eq '') {
+ $ticket_owner = 'admin';
}
- # Field 8 (Ticket email)
- my $ticket_email = $field8;
-
- # Field 9 (Ticket owner)
- my $ticket_owner = $field9;
-
- # Field 10 (Ticket description);
- my $ticket_description = $field10;
+ # Field 5 (Ticket type)
+ my $ticket_type = $field5;
+ if ($ticket_type eq '') {
+ $ticket_type = 0;
+ }
- pandora_create_integria_ticket($pa_config, $api_path, $api_pass, $integria_user, $integria_user_pass, $ticket_name, $ticket_group_id, $ticket_priority, $ticket_email, $ticket_owner, $ticket_description);
+ # Field 6 (Ticket status)
+ my $ticket_status = $field6;
+ if ($ticket_status eq '0') {
+ $ticket_status = 1;
+ }
+ # Field 7 (Ticket description);
+ my $ticket_description = safe_output($field7);
+
+ pandora_create_integria_ticket($pa_config, $api_path, $api_pass, $integria_user, $integria_user_pass, $ticket_name, $ticket_group_id, $ticket_priority, $ticket_owner, $ticket_type, $ticket_status, $ticket_description);
# Generate notification
} elsif ($clean_name eq "Generate Notification") {
@@ -5849,55 +5866,21 @@ sub pandora_edit_custom_graph ($$$$$$$$$$$) {
}
sub pandora_create_integria_ticket ($$$$$$$$$$$) {
- my ($pa_config,$api_path,$api_pass,$integria_user,$user_pass,$ticket_name,$group_id,$ticket_priority,$ticket_email,$ticket_owner,$ticket_description) = @_;
-
+ my ($pa_config,$api_path,$api_pass,$integria_user,$user_pass,$ticket_name,$ticket_group_id,$ticket_priority,$ticket_owner,$ticket_type,$ticket_status,$ticket_description) = @_;
+
my $data_ticket;
my $call_api;
- if ($api_path eq "") {
- return 0;
- }
- if ($user_pass eq "") {
- return 0;
- }
- if ($integria_user eq "") {
- $integria_user = "admin";
- }
- if ($ticket_name eq "") {
- $ticket_name = "Ticket created by " . $pa_config->{'rb_product_name'};
- }
- if ($group_id eq "") {
- $group_id = 1;
- }
- if ($ticket_priority eq "") {
- $ticket_priority = 1;
- }
- if ($ticket_owner eq "") {
- $ticket_owner = "admin";
- }
-
- #~ $data_ticket = $ticket_name .
- #~ "|;|" . $group_id .
- #~ "|;|" . $ticket_priority .
- #~ "|;|" . $ticket_description .
- #~ "|;|" . #Id inventory
- #~ "|;|" . #Id incident type
- #~ "|;|" . $ticket_email .
- #~ "|;|" . $ticket_owner .
- #~ "|;|" . #Father ticket id
- #~ "|;|" . #Status
- #~ "|;|" . #Extra info
- #~ "|;|"; #Resolution
$data_ticket = $ticket_name .
- "|;|" . $group_id .
+ "|;|" . $ticket_group_id .
"|;|" . $ticket_priority .
"|;|" . $ticket_description .
"|;|" .
- "|;|" .
- "|;|" . $ticket_email .
+ "|;|" . $ticket_type .
+ "|;|" .
"|;|" . $ticket_owner .
"|;|" .
- "|;|" . '1' .
+ "|;|" . $ticket_status .
"|;|" .
"|;|";
@@ -5908,9 +5891,9 @@ sub pandora_create_integria_ticket ($$$$$$$$$$$) {
'op=create_incident&' .
'params=' . $data_ticket .'&' .
'token=|;|';
- logger($pa_config, "Integria ticket call:" . $call_api . "", 3);
+
my $content = get($call_api);
- logger($pa_config, "Integria ticket res:" . $content . "", 3);
+
if (is_numeric($content) && $content ne "-1") {
return $content;
}
diff --git a/pandora_server/util/integria_rticket.pl b/pandora_server/util/integria_rticket.pl
index 609dd516b0..f296fd9145 100644
--- a/pandora_server/util/integria_rticket.pl
+++ b/pandora_server/util/integria_rticket.pl
@@ -38,6 +38,7 @@ Where options:
Optional parameters:
[-priority
] : 10 Maintance, 0 Informative, 1 Low, 2 Medium, 3 Serious, 4 Very serious
+ [-owner ] : Free text
[-desc ] : Free text
[-type ] : Type ID (must exist in Integria IMS)
[-inventory ] : Inventory ID (must exist in Integria IMS)
@@ -94,6 +95,7 @@ sub tool_api_main () {
my $ticket_name = "";
my $group_id = -1;
my $ticket_priority = 0;
+ my $ticket_owner = '';
my $ticket_description = '';
my $ticket_type = '';
my $ticket_inventory = '';
@@ -155,6 +157,9 @@ sub tool_api_main () {
if ($line eq '-priority') {
$ticket_priority = $ARGV[$i + 1];
}
+ if ($line eq '-owner') {
+ $ticket_owner = $ARGV[$i + 1];
+ }
if ($line eq '-desc') {
$ticket_description = $ARGV[$i + 1];
}
@@ -193,6 +198,7 @@ sub tool_api_main () {
$data_ticket = $ticket_name .
"|;|" . $group_id .
"|;|" . $ticket_priority .
+ "|;|" . $ticket_owner .
"|;|" . $ticket_description .
"|;|" . $ticket_inventory .
"|;|" . $ticket_type .