tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

the itil type is removed in the report types

This commit is contained in:
marcos.alconada 2019-09-25 16:12:57 +02:00
parent 0a6c5352e6
commit 93941f334a
7 changed files with 122 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/extensions/resource_exportation.php
View File

@ -239,17 +239,18 @@ function output_xml_report($id)
echo '<column_separator><![CDATA['.io_safe_output($item['header_definition']).']]></column_separator>'; echo '<column_separator><![CDATA['.io_safe_output($item['header_definition']).']]></column_separator>';
break; break;
case 'TTRT': /*
break; case 'TTRT':
break;
case 'TTO': case 'TTO':
break; break;
case 'MTBF': case 'MTBF':
break; break;
case 'MTTR': case 'MTTR':
break; break;*/
} }
echo "</item>\n"; echo "</item>\n";

17
pandora_console/extensions/resource_registration.php
View File

@ -376,17 +376,18 @@ function process_upload_xml_report($xml, $group_filter=0)
$values['column_separator'] = io_safe_input($item['column_separator']); $values['column_separator'] = io_safe_input($item['column_separator']);
break; break;
case 'TTRT': /*
break; case 'TTRT':
break;
case 'TTO': case 'TTO':
break; break;
case 'MTBF': case 'MTBF':
break; break;
case 'MTTR': case 'MTTR':
break; break;*/
} }
if (empty($agents_item)) { if (empty($agents_item)) {

44
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -480,7 +480,8 @@ switch ($action) {
$period = $item['period']; $period = $item['period'];
break; break;
case 'TTRT': /*
case 'TTRT':
$description = $item['description']; $description = $item['description'];
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter( $idAgent = db_get_value_filter(
@ -489,9 +490,9 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule] ['id_agente_modulo' => $idAgentModule]
); );
$period = $item['period']; $period = $item['period'];
break; break;
case 'TTO': case 'TTO':
$description = $item['description']; $description = $item['description'];
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter( $idAgent = db_get_value_filter(
@ -500,9 +501,9 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule] ['id_agente_modulo' => $idAgentModule]
); );
$period = $item['period']; $period = $item['period'];
break; break;
case 'MTBF': case 'MTBF':
$description = $item['description']; $description = $item['description'];
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter( $idAgent = db_get_value_filter(
@ -511,9 +512,9 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule] ['id_agente_modulo' => $idAgentModule]
); );
$period = $item['period']; $period = $item['period'];
break; break;
case 'MTTR': case 'MTTR':
$description = $item['description']; $description = $item['description'];
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter( $idAgent = db_get_value_filter(
@ -522,8 +523,8 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule] ['id_agente_modulo' => $idAgentModule]
); );
$period = $item['period']; $period = $item['period'];
break; break;
*/
case 'alert_report_module': case 'alert_report_module':
$description = $item['description']; $description = $item['description'];
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
@ -788,10 +789,11 @@ switch ($action) {
case 'avg_value': case 'avg_value':
case 'projection_graph': case 'projection_graph':
case 'prediction_date': case 'prediction_date':
case 'TTRT': /*
case 'TTO': case 'TTRT':
case 'MTBF': case 'TTO':
case 'MTTR': case 'MTBF':
case 'MTTR':*/
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'event_report_log': case 'event_report_log':
case 'increment': case 'increment':
@ -3738,10 +3740,10 @@ $(document).ready (function () {
case 'event_report_module': case 'event_report_module':
case 'simple_graph': case 'simple_graph':
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'TTRT': /* case 'TTRT':
case 'TTO': case 'TTO':
case 'MTBF': case 'MTBF':
case 'MTTR': case 'MTTR':*/
case 'prediction_date': case 'prediction_date':
case 'projection_graph': case 'projection_graph':
case 'avg_value': case 'avg_value':
@ -3779,10 +3781,10 @@ $(document).ready (function () {
case 'event_report_module': case 'event_report_module':
case 'simple_graph': case 'simple_graph':
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'TTRT': /* case 'TTRT':
case 'TTO': case 'TTO':
case 'MTBF': case 'MTBF':
case 'MTTR': case 'MTTR':*/
case 'prediction_date': case 'prediction_date':
case 'projection_graph': case 'projection_graph':
case 'avg_value': case 'avg_value':
@ -4814,7 +4816,7 @@ function chooseType() {
$("#row_period").show(); $("#row_period").show();
$("#row_historical_db_check").hide(); $("#row_historical_db_check").hide();
break; break;
/*
case 'TTRT': case 'TTRT':
$("#row_description").show(); $("#row_description").show();
$("#row_agent").show(); $("#row_agent").show();
@ -4845,7 +4847,7 @@ function chooseType() {
$("#row_module").show(); $("#row_module").show();
$("#row_period").show(); $("#row_period").show();
$("#row_historical_db_check").hide(); $("#row_historical_db_check").hide();
break; break;*/
case 'alert_report_module': case 'alert_report_module':
$("#row_description").show(); $("#row_description").show();
@ -5199,10 +5201,10 @@ function chooseType() {
case 'min_value': case 'min_value':
case 'max_value': case 'max_value':
case 'avg_value': case 'avg_value':
case 'TTRT': /* case 'TTRT':
case 'TTO': case 'TTO':
case 'MTBF': case 'MTBF':
case 'MTTR': case 'MTTR':*/
case 'simple_baseline_graph': case 'simple_baseline_graph':
$("#row_label").show(); $("#row_label").show();
break; break;

18
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -2006,10 +2006,11 @@ switch ($action) {
case 'avg_value': case 'avg_value':
case 'projection_graph': case 'projection_graph':
case 'prediction_date': case 'prediction_date':
case 'TTRT': /*
case 'TTO': case 'TTRT':
case 'MTBF': case 'TTO':
case 'MTTR': case 'MTBF':
case 'MTTR':*/
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'nt_top_n': case 'nt_top_n':
if ($label != '') { if ($label != '') {
@ -2612,10 +2613,11 @@ switch ($action) {
case 'avg_value': case 'avg_value':
case 'projection_graph': case 'projection_graph':
case 'prediction_date': case 'prediction_date':
case 'TTRT': /*
case 'TTO': case 'TTRT':
case 'MTBF': case 'TTO':
case 'MTTR': case 'MTBF':
case 'MTTR':*/
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'nt_top_n': case 'nt_top_n':
if ($label != '') { if ($label != '') {

70
pandora_console/include/functions_reporting.php
View File

@ -505,42 +505,43 @@ function reporting_make_reporting_data(
); );
break; break;
case 'MTTR': /*
case 'MTTR':
$report['contents'][] = reporting_value( $report['contents'][] = reporting_value(
$report, $report,
$content, $content,
'MTTR', 'MTTR',
$pdf $pdf
); );
break; break;
case 'MTBF': case 'MTBF':
$report['contents'][] = reporting_value( $report['contents'][] = reporting_value(
$report, $report,
$content, $content,
'MTBF', 'MTBF',
$pdf $pdf
); );
break; break;
case 'TTO': case 'TTO':
$report['contents'][] = reporting_value( $report['contents'][] = reporting_value(
$report, $report,
$content, $content,
'TTO', 'TTO',
$pdf $pdf
); );
break; break;
case 'TTRT': case 'TTRT':
$report['contents'][] = reporting_value( $report['contents'][] = reporting_value(
$report, $report,
$content, $content,
'TTRT', 'TTRT',
$pdf $pdf
); );
break; break;
*/
case 'agent_configuration': case 'agent_configuration':
$report['contents'][] = io_safe_output( $report['contents'][] = io_safe_output(
reporting_agent_configuration( reporting_agent_configuration(
@ -4691,21 +4692,22 @@ function reporting_value($report, $content, $type, $pdf=false)
$return['type'] = 'sumatory'; $return['type'] = 'sumatory';
break; break;
case 'MTTR': /*
case 'MTTR':
$return['type'] = 'MTTR'; $return['type'] = 'MTTR';
break; break;
case 'MTBF': case 'MTBF':
$return['type'] = 'MTBF'; $return['type'] = 'MTBF';
break; break;
case 'TTO': case 'TTO':
$return['type'] = 'TTO'; $return['type'] = 'TTO';
break; break;
case 'TTRT': case 'TTRT':
$return['type'] = 'TTRT'; $return['type'] = 'TTRT';
break; break;*/
} }
if (empty($content['name'])) { if (empty($content['name'])) {
@ -4726,21 +4728,22 @@ function reporting_value($report, $content, $type, $pdf=false)
$content['name'] = __('Summatory'); $content['name'] = __('Summatory');
break; break;
case 'MTTR': /*
case 'MTTR':
$content['name'] = __('MTTR'); $content['name'] = __('MTTR');
break; break;
case 'MTBF': case 'MTBF':
$content['name'] = __('MTBF'); $content['name'] = __('MTBF');
break; break;
case 'TTO': case 'TTO':
$content['name'] = __('TTO'); $content['name'] = __('TTO');
break; break;
case 'TTRT': case 'TTRT':
$content['name'] = __('TTRT'); $content['name'] = __('TTRT');
break; break;*/
} }
} }
@ -4913,25 +4916,26 @@ function reporting_value($report, $content, $type, $pdf=false)
} }
break; break;
case 'MTTR': /*
case 'MTTR':
$value = reporting_get_agentmodule_mttr( $value = reporting_get_agentmodule_mttr(
$content['id_agent_module'], $content['id_agent_module'],
$content['period'], $content['period'],
$report['datetime'] $report['datetime']
); );
$formated_value = null; $formated_value = null;
break; break;
case 'MTBF': case 'MTBF':
$value = reporting_get_agentmodule_mtbf( $value = reporting_get_agentmodule_mtbf(
$content['id_agent_module'], $content['id_agent_module'],
$content['period'], $content['period'],
$report['datetime'] $report['datetime']
); );
$formated_value = null; $formated_value = null;
break; break;
case 'TTO': case 'TTO':
$value = reporting_get_agentmodule_tto( $value = reporting_get_agentmodule_tto(
$content['id_agent_module'], $content['id_agent_module'],
$content['period'], $content['period'],
@ -4942,9 +4946,9 @@ function reporting_value($report, $content, $type, $pdf=false)
} else { } else {
$formated_value = human_time_description_raw($value); $formated_value = human_time_description_raw($value);
} }
break; break;
case 'TTRT': case 'TTRT':
$value = reporting_get_agentmodule_ttr( $value = reporting_get_agentmodule_ttr(
$content['id_agent_module'], $content['id_agent_module'],
$content['period'], $content['period'],
@ -4955,7 +4959,7 @@ function reporting_value($report, $content, $type, $pdf=false)
} else { } else {
$formated_value = human_time_description_raw($value); $formated_value = human_time_description_raw($value);
} }
break; break;*/
} }
$return['data'] = [ $return['data'] = [

46
pandora_console/include/functions_reporting_html.php
View File

@ -287,22 +287,23 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
reporting_html_sum_value($table, $item, $mini); reporting_html_sum_value($table, $item, $mini);
break; break;
case 'MTTR': /*
case 'MTTR':
reporting_html_MTTR_value($table, $item, $mini, true, true); reporting_html_MTTR_value($table, $item, $mini, true, true);
break; break;
case 'MTBF': case 'MTBF':
reporting_html_MTBF_value($table, $item, $mini, true, true); reporting_html_MTBF_value($table, $item, $mini, true, true);
break; break;
case 'TTO': case 'TTO':
reporting_html_TTO_value($table, $item, $mini, false, true); reporting_html_TTO_value($table, $item, $mini, false, true);
break; break;
case 'TTRT': case 'TTRT':
reporting_html_TTRT_value($table, $item, $mini, false, true); reporting_html_TTRT_value($table, $item, $mini, false, true);
break; break;
*/
case 'agent_configuration': case 'agent_configuration':
reporting_html_agent_configuration($table, $item); reporting_html_agent_configuration($table, $item);
break; break;
@ -2728,29 +2729,30 @@ function reporting_html_agent_configuration(
} }
function reporting_html_TTRT_value(&$table, $item, $mini, $only_value=false, $check_empty=false) /*
{ function reporting_html_TTRT_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
reporting_html_value($table, $item, $mini, $only_value, $check_empty); reporting_html_value($table, $item, $mini, $only_value, $check_empty);
} }
function reporting_html_TTO_value(&$table, $item, $mini, $only_value=false, $check_empty=false) function reporting_html_TTO_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{ {
reporting_html_value($table, $item, $mini, $only_value, $check_empty); reporting_html_value($table, $item, $mini, $only_value, $check_empty);
} }
function reporting_html_MTBF_value(&$table, $item, $mini, $only_value=false, $check_empty=false) function reporting_html_MTBF_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{ {
reporting_html_value($table, $item, $mini, $only_value, $check_empty); reporting_html_value($table, $item, $mini, $only_value, $check_empty);
} }
function reporting_html_MTTR_value(&$table, $item, $mini, $only_value=false, $check_empty=false) function reporting_html_MTTR_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{ {
reporting_html_value($table, $item, $mini, $only_value, $check_empty); reporting_html_value($table, $item, $mini, $only_value, $check_empty);
} }
*/
function reporting_html_sum_value(&$table, $item, $mini) function reporting_html_sum_value(&$table, $item, $mini)
{ {

19
pandora_console/include/functions_reports.php
View File

@ -679,23 +679,24 @@ function reports_get_report_types($template=false, $not_editor=false)
'name' => __('Module Histogram graph'), 'name' => __('Module Histogram graph'),
]; ];
$types['TTRT'] = [ /*
$types['TTRT'] = [
'optgroup' => __('ITIL'), 'optgroup' => __('ITIL'),
'name' => __('TTRT'), 'name' => __('TTRT'),
]; ];
$types['TTO'] = [ $types['TTO'] = [
'optgroup' => __('ITIL'), 'optgroup' => __('ITIL'),
'name' => __('TTO'), 'name' => __('TTO'),
]; ];
$types['MTBF'] = [ $types['MTBF'] = [
'optgroup' => __('ITIL'), 'optgroup' => __('ITIL'),
'name' => __('MTBF'), 'name' => __('MTBF'),
]; ];
$types['MTTR'] = [ $types['MTTR'] = [
'optgroup' => __('ITIL'), 'optgroup' => __('ITIL'),
'name' => __('MTTR'), 'name' => __('MTTR'),
]; ];
*/
$types['SLA'] = [ $types['SLA'] = [
'optgroup' => __('SLA'), 'optgroup' => __('SLA'),
'name' => __('S.L.A.'), 'name' => __('S.L.A.'),