';
$table->data['edit6'][3] = html_print_extended_select_for_unit('unit', '-1', '', '', '0', '15', true, false, false, false, 1);
- // FF stands for Flip-flop
- $table->data['edit7'][0] = __('FF threshold').' '.ui_print_help_icon('ff_threshold', true);
+ // FF stands for Flip-flop.
+ $table->data['edit7'][0] = __('FF threshold').' ';
+ $table->data['edit7'][0] .= ui_print_help_icon(
+ 'ff_threshold',
+ true
+ );
+
$table->colspan['edit7'][1] = 3;
- $table->data['edit7'][1] = __('Mode').' '.html_print_select(['' => __('No change'), '1' => __('Each state changing'), '0' => __('All state changing')], 'each_ff', '', '', '', '', true).'
';
- $table->data['edit7'][1] .= __('All state changing').' : '.html_print_input_text('min_ff_event', '', '', 5, 15, true).'
';
+ $table->data['edit7'][1] = __('Mode').' ';
+ $table->data['edit7'][1] .= html_print_select(
+ [
+ '' => __('No change'),
+ '1' => __('Each state changing'),
+ '0' => __('All state changing'),
+ ],
+ 'each_ff',
+ '',
+ '',
+ '',
+ '',
+ true,
+ false,
+ true,
+ '',
+ false,
+ 'width: 400px;'
+ ).'
';
+
+ $table->data['edit7'][1] .= __('All state changing').' : ';
+ $table->data['edit7'][1] .= html_print_input_text(
+ 'min_ff_event',
+ '',
+ '',
+ 5,
+ 15,
+ true
+ ).'
';
+
$table->data['edit7'][1] .= __('Each state changing').' : ';
- $table->data['edit7'][1] .= __('To normal').html_print_input_text('min_ff_event_normal', '', '', 5, 15, true).' ';
- $table->data['edit7'][1] .= __('To warning').html_print_input_text('min_ff_event_warning', '', '', 5, 15, true).' ';
- $table->data['edit7'][1] .= __('To critical').html_print_input_text('min_ff_event_critical', '', '', 5, 15, true).' ';
+ $table->data['edit7'][1] .= __('To normal').' ';
+ $table->data['edit7'][1] .= html_print_input_text(
+ 'min_ff_event_normal',
+ '',
+ '',
+ 5,
+ 15,
+ true
+ ).' ';
+
+ $table->data['edit7'][1] .= __('To warning').' ';
+ $table->data['edit7'][1] .= html_print_input_text(
+ 'min_ff_event_warning',
+ '',
+ '',
+ 5,
+ 15,
+ true
+ ).' ';
+
+ $table->data['edit7'][1] .= __('To critical').' ';
+ $table->data['edit7'][1] .= html_print_input_text(
+ 'min_ff_event_critical',
+ '',
+ '',
+ 5,
+ 15,
+ true
+ ).'
';
+
+ $table->data['edit7'][1] .= __('Keep counters').' ';
+ $table->data['edit7'][1] .= html_print_select(
+ [
+ '' => __('No change'),
+ '1' => __('Active Counters'),
+ '0' => __('Inactive Counters'),
+ ],
+ 'ff_type',
+ '',
+ '',
+ '',
+ '',
+ true,
+ false,
+ true,
+ '',
+ false,
+ 'width: 400px;'
+ );
$table->data['edit8'][0] = __('FF interval');
- $table->data['edit8'][1] = html_print_input_text('module_ff_interval', '', '', 5, 10, true).ui_print_help_tip(__('Module execution flip flop time interval (in secs).'), true);
+ $table->data['edit8'][1] = html_print_input_text(
+ 'module_ff_interval',
+ '',
+ '',
+ 5,
+ 10,
+ true
+ );
+ $table->data['edit8'][1] .= ui_print_help_tip(
+ __('Module execution flip flop time interval (in secs).'),
+ true
+ );
+
$table->data['edit8'][2] = __('FF timeout');
- $table->data['edit8'][3] = html_print_input_text('ff_timeout', '', '', 5, 10, true).ui_print_help_tip(__('Timeout in secs from start of flip flop counting. If this value is exceeded, FF counter is reset. Set to 0 for no timeout.'), true);
+ $table->data['edit8'][3] = html_print_input_text(
+ 'ff_timeout',
+ '',
+ '',
+ 5,
+ 10,
+ true
+ );
+ $table->data['edit8'][3] .= ui_print_help_tip(
+ __('Timeout in secs from start of flip flop counting. If this value is exceeded, FF counter is reset. Set to 0 for no timeout.'),
+ true
+ );
$table->data['edit9'][0] = __('Historical data');
$table->data['edit9'][1] = html_print_select(['' => __('No change'), '1' => __('Yes'), '0' => __('No')], 'history_data', '', '', '', '', true);
@@ -1685,7 +1787,7 @@ function process_manage_edit($module_name, $agents_select=null, $module_status='
$agents_select = [$agents_select];
}
- // List of fields which can be updated
+ // List of fields which can be updated.
$fields = [
'dynamic_interval',
'dynamic_max',
@@ -1730,6 +1832,7 @@ function process_manage_edit($module_name, $agents_select=null, $module_status='
'min_ff_event_normal',
'min_ff_event_warning',
'min_ff_event_critical',
+ 'ff_type',
'each_ff',
'module_ff_interval',
'ff_timeout',
diff --git a/pandora_console/godmode/modules/manage_network_components.php b/pandora_console/godmode/modules/manage_network_components.php
index f1fae1785d..906f36be15 100644
--- a/pandora_console/godmode/modules/manage_network_components.php
+++ b/pandora_console/godmode/modules/manage_network_components.php
@@ -124,6 +124,7 @@ $pure = get_parameter('pure', 0);
$ff_event_normal = (int) get_parameter('ff_event_normal');
$ff_event_warning = (int) get_parameter('ff_event_warning');
$ff_event_critical = (int) get_parameter('ff_event_critical');
+$ff_type = (int) get_parameter('ff_type');
$each_ff = (int) get_parameter('each_ff');
if (count($id_tag_selected) == 1 && empty($id_tag_selected[0])) {
@@ -261,6 +262,7 @@ if ($create_component) {
'min_ff_event_normal' => $ff_event_normal,
'min_ff_event_warning' => $ff_event_warning,
'min_ff_event_critical' => $ff_event_critical,
+ 'ff_type' => $ff_type,
'each_ff' => $each_ff,
]
);
@@ -355,6 +357,7 @@ if ($update_component) {
'min_ff_event_normal' => $ff_event_normal,
'min_ff_event_warning' => $ff_event_warning,
'min_ff_event_critical' => $ff_event_critical,
+ 'ff_type' => $ff_type,
'each_ff' => $each_ff,
]
);
@@ -496,6 +499,7 @@ $url = ui_get_url_refresh(
'ff_event_warning' => false,
'ff_event_critical' => false,
'each_ff' => false,
+ 'ff_type' => false,
]
);
diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php
index 3f9a33cb8a..fd922046d1 100644
--- a/pandora_console/godmode/modules/manage_network_components_form.php
+++ b/pandora_console/godmode/modules/manage_network_components_form.php
@@ -76,6 +76,7 @@ if ($create_network_from_module) {
$ff_event_normal = $data_module['min_ff_event_normal'];
$ff_event_warning = $data_module['min_ff_event_warning'];
$ff_event_critical = $data_module['min_ff_event_critical'];
+ $ff_type = $data_module['ff_type'];
$each_ff = $data_module['each_ff'];
}
@@ -134,6 +135,7 @@ if (isset($id)) {
$ff_event_normal = $component['min_ff_event_normal'];
$ff_event_warning = $component['min_ff_event_warning'];
$ff_event_critical = $component['min_ff_event_critical'];
+ $ff_type = $component['ff_type'];
$each_ff = $component['each_ff'];
if ($type >= 15 && $type <= 18) {
@@ -192,6 +194,7 @@ if (isset($id)) {
$ff_event_normal = 0;
$ff_event_warning = 0;
$ff_event_critical = 0;
+ $ff_type = 0;
$each_ff = 0;
$snmp_version = 1;
diff --git a/pandora_console/godmode/modules/manage_network_components_form_common.php b/pandora_console/godmode/modules/manage_network_components_form_common.php
index 2e511c6f6f..7b33a0a275 100644
--- a/pandora_console/godmode/modules/manage_network_components_form_common.php
+++ b/pandora_console/godmode/modules/manage_network_components_form_common.php
@@ -233,7 +233,23 @@ $table->data[5][1] .= html_print_checkbox('critical_inverse', 1, $critical_inver
$table->data[6][0] = __('FF threshold').' '.ui_print_help_icon('ff_threshold', true);
$table->colspan[6][1] = 3;
-$table->data[6][1] = html_print_radio_button('each_ff', 0, '', $each_ff, true).' '.__('All state changing').' : ';
+
+$table->data[6][1] = __('Keep counters');
+$table->data[6][1] .= html_print_checkbox(
+ 'ff_type',
+ 1,
+ $ff_type,
+ true
+).'
';
+
+$table->data[6][1] .= html_print_radio_button(
+ 'each_ff',
+ 0,
+ '',
+ $each_ff,
+ true
+).' '.__('All state changing').' : ';
+
$table->data[6][1] .= html_print_input_text(
'ff_event',
$ff_event,
@@ -242,13 +258,40 @@ $table->data[6][1] .= html_print_input_text(
15,
true
).'
';
-$table->data[6][1] .= html_print_radio_button('each_ff', 1, '', $each_ff, true).' '.__('Each state changing').' : ';
+$table->data[6][1] .= html_print_radio_button(
+ 'each_ff',
+ 1,
+ '',
+ $each_ff,
+ true
+).' '.__('Each state changing').' : ';
$table->data[6][1] .= __('To normal');
-$table->data[6][1] .= html_print_input_text('ff_event_normal', $ff_event_normal, '', 5, 15, true).' ';
+$table->data[6][1] .= html_print_input_text(
+ 'ff_event_normal',
+ $ff_event_normal,
+ '',
+ 5,
+ 15,
+ true
+).' ';
$table->data[6][1] .= __('To warning');
-$table->data[6][1] .= html_print_input_text('ff_event_warning', $ff_event_warning, '', 5, 15, true).' ';
+$table->data[6][1] .= html_print_input_text(
+ 'ff_event_warning',
+ $ff_event_warning,
+ '',
+ 5,
+ 15,
+ true
+).' ';
$table->data[6][1] .= __('To critical');
-$table->data[6][1] .= html_print_input_text('ff_event_critical', $ff_event_critical, '', 5, 15, true);
+$table->data[6][1] .= html_print_input_text(
+ 'ff_event_critical',
+ $ff_event_critical,
+ '',
+ 5,
+ 15,
+ true
+);
$table->data[7][0] = __('Historical data');
$table->data[7][1] = html_print_checkbox('history_data', 1, $history_data, true);
diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 62d58c9261..85b5ee128d 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -119,6 +119,20 @@ $visual_format = 0;
// Others
$filter_search = '';
+// Added for select fields.
+$total_time = true;
+$time_failed = true;
+$time_in_ok_status = true;
+$time_in_unknown_status = true;
+$time_of_not_initialized_module = true;
+$time_of_downtime = true;
+$total_checks = true;
+$checks_failed = true;
+$checks_in_ok_status = true;
+$unknown_checks = true;
+$agent_max_value = true;
+$agent_min_value = true;
+
switch ($action) {
case 'new':
$actionParameter = 'save';
@@ -501,6 +515,18 @@ switch ($action) {
$sunday = $item['sunday'];
$time_from = $item['time_from'];
$time_to = $item['time_to'];
+ $total_time = $item['total_time'];
+ $time_failed = $item['time_failed'];
+ $time_in_ok_status = $item['time_in_ok_status'];
+ $time_in_unknown_status = $item['time_in_unknown_status'];
+ $time_of_not_initialized_module = $item['time_of_not_initialized_module'];
+ $time_of_downtime = $item['time_of_downtime'];
+ $total_checks = $item['total_checks'];
+ $checks_failed = $item['checks_failed'];
+ $checks_in_ok_status = $item['checks_in_ok_status'];
+ $unknown_checks = $item['unknown_checks'];
+ $agent_max_value = $item['agent_max_value'];
+ $agent_min_value = $item['agent_min_value'];
break;
case 'group_report':
@@ -1597,20 +1623,6 @@ $class = 'databox filters';
REPORT_EXCEPTION_CONDITION_NOT_OK => __('Not OK'),
];
html_print_select($list_exception_condition, 'exception_condition', $exception_condition);
-
-
- /*
- echo ;
- html_print_radio_button ('radiobutton_exception_condition', 0, '', $exception_condition);
- echo __('>=');
- html_print_radio_button ('radiobutton_exception_condition', 1, '', $exception_condition);
- echo __('<');
- html_print_radio_button ('radiobutton_exception_condition', 2, '', $exception_condition);
- echo __('OK');
- html_print_radio_button ('radiobutton_exception_condition', 3, '', $exception_condition);
- echo __('Not OK');
- html_print_radio_button ('radiobutton_exception_condition', 4, '', $exception_condition);
- */
?>
@@ -1620,6 +1632,65 @@ $class = 'databox filters';
|
+
+ |
+
+ |
+
+
+ |
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+ |
+
|
@@ -1629,7 +1700,7 @@ $class = 'databox filters';
|
|
+
|
|
+
+ |
+ Select fields to show');
+ ?>
+ |
+
+
+ |
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+
+
+
+ |
+
+ |
+ |
+
+
+ |
+ Select fields to show');
+ ?>
+ |
+
+
+ |
+
|
@@ -2625,6 +2769,17 @@ $(document).ready (function () {
}
});
+
+ $("#checkbox-checkbox_show_resume").change(function(){
+ if($(this).is(":checked")){
+ $("#row_select_fields2").show();
+ $("#row_select_fields3").show();
+ }
+ else{
+ $("#row_select_fields2").hide();
+ $("#row_select_fields3").hide();
+ }
+ });
});
@@ -3139,6 +3294,9 @@ function chooseType() {
$("#row_event_type").hide();
$("#row_event_status").hide();
$("#row_source").hide();
+ $('#row_select_fields').hide();
+ $("#row_select_fields2").hide();
+ $("#row_select_fields3").hide();
// SLA list default state
$("#sla_list").hide();
@@ -3547,6 +3705,15 @@ function chooseType() {
$("#row_show_resume").show();
$("#row_working_time").show();
$('#row_hide_notinit_agents').show();
+ $('#row_select_fields').show();
+ if($("#checkbox-checkbox_show_resume").is(":checked")){
+ $("#row_select_fields2").show();
+ $("#row_select_fields3").show();
+ }
+ else{
+ $("#row_select_fields2").hide();
+ $("#row_select_fields3").hide();
+ }
$("#row_historical_db_check").hide();
break;
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 9e40223340..0d591f390f 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -70,7 +70,7 @@ global $config;
// IMPORTANT NOTE: All reporting pages are used also for metaconsole reporting functionality
// So, it's very important to specify full url and paths to resources because metaconsole has a different
// entry point: enterprise/meta/index.php than normal console !!!
-// Login check
+// Login check.
check_login();
enterprise_hook('open_meta_frame');
@@ -89,7 +89,7 @@ if (!$report_r && !$report_w && !$report_m) {
require_once $config['homedir'].'/include/functions_reports.php';
-// Load enterprise extensions
+// Load enterprise extensions.
enterprise_include('operation/reporting/custom_reporting.php');
enterprise_include_once('include/functions_metaconsole.php');
@@ -98,7 +98,7 @@ if (enterprise_include_once('include/functions_reporting.php') !== ENTERPRISE_NO
$enterpriseEnable = true;
}
-// Constant with fonts directory
+// Constant with fonts directory.
define('_MPDF_TTFONTPATH', 'include/fonts/');
$activeTab = get_parameter('tab', 'main');
@@ -117,10 +117,10 @@ if ($schedule_report != '') {
$date = date(DATE_FORMAT);
$time = date(TIME_FORMAT);
$parameters[0] = get_parameter('id_schedule_report');
- // $parameters[1] = db_get_value('schedule_email', 'treport', 'id_report', $id_report);
$parameters[1] = get_parameter('schedule_email_address');
$parameters[2] = get_parameter('schedule_subject', '');
$parameters[3] = get_parameter('schedule_email', '');
+ $parameters[4] = get_parameter('report_type', '');
$parameters['first_execution'] = strtotime($date.' '.$time);
$values = [
@@ -141,7 +141,7 @@ if ($schedule_report != '') {
echo '
';
}
-// Other Checks for the edit the reports
+// Other Checks for the edit the reports.
if ($idReport != 0) {
$report = db_get_row_filter('treport', ['id_report' => $idReport]);
$type_access_selected = reports_get_type_access($report);
@@ -162,6 +162,10 @@ if ($idReport != 0) {
$edit = true;
}
break;
+
+ default:
+ // Default.
+ break;
}
if (! $edit) {
@@ -227,6 +231,10 @@ switch ($action) {
ORDER BY "order"'
);
break;
+
+ default:
+ // Default.
+ break;
}
if ($items === false) {
@@ -234,7 +242,7 @@ switch ($action) {
}
- // Clean the repeated order values
+ // Clean the repeated order values.
$order_temp = 1;
foreach ($items as $item) {
switch ($config['dbtype']) {
@@ -254,6 +262,10 @@ switch ($action) {
['id_rc' => $item['id_rc']]
);
break;
+
+ default:
+ // Default.
+ break;
}
$order_temp++;
@@ -281,6 +293,10 @@ switch ($action) {
ORDER BY "order"'
);
break;
+
+ default:
+ // Default.
+ break;
}
if ($items === false) {
@@ -293,7 +309,7 @@ switch ($action) {
$temp = [];
foreach ($items as $item) {
- // Remove the contents from the block to sort
+ // Remove the contents from the block to sort.
if (array_search($item['id_rc'], $ids) === false) {
$temp[$item['order']] = $item['id_rc'];
}
@@ -344,6 +360,10 @@ switch ($action) {
['id_rc' => $id]
);
break;
+
+ default:
+ // Default.
+ break;
}
}
@@ -415,6 +435,10 @@ switch ($action) {
}
}
break;
+
+ default:
+ // Default.
+ break;
}
}
break;
@@ -444,9 +468,9 @@ switch ($action) {
break;
}
- // Page header for metaconsole
- if ($enterpriseEnable and defined('METACONSOLE')) {
- // Bread crumbs
+ // Page header for metaconsole.
+ if ($enterpriseEnable && defined('METACONSOLE')) {
+ // Bread crumbs.
ui_meta_add_breadcrumb(
[
'link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure,
@@ -456,10 +480,11 @@ switch ($action) {
ui_meta_print_page_header($nav_bar);
- // Print header
+ // Print header.
ui_meta_print_header(__('Reporting'), '', $buttons);
}
- // Page header for normal console
+
+ // Page header for normal console.
else {
ui_print_page_header(__('Custom reporting'), 'images/op_reporting.png', false, '', false, $buttons, false, '', 60);
}
@@ -471,7 +496,7 @@ switch ($action) {
case 'group_view':
if ($config['id_user'] == $report['id_user'] || is_user_admin($config['id_user'])) {
$delete = true;
- // owner can delete
+ // Owner can delete.
} else {
$delete = check_acl(
$config['id_user'],
@@ -484,7 +509,7 @@ switch ($action) {
case 'group_edit':
if ($config['id_user'] == $report['id_user'] || is_user_admin($config['id_user'])) {
$delete = true;
- // owner can delete
+ // Owner can delete.
} else {
$delete = check_acl(
$config['id_user'],
@@ -501,6 +526,10 @@ switch ($action) {
$delete = true;
}
break;
+
+ default:
+ // Default.
+ break;
}
if (! $delete) {
@@ -571,7 +600,7 @@ switch ($action) {
ui_require_jquery_file('bgiframe');
ui_require_jquery_file('autocomplete');
- // Show only selected groups
+ // Show only selected groups.
if ($id_group > 0) {
$group = ["$id_group" => $id_group];
} else {
@@ -595,7 +624,7 @@ switch ($action) {
}
// Fix : group filter was not working
- // Show only selected groups
+ // Show only selected groups.
if ($id_group > 0) {
$group = ["$id_group" => $id_group];
$filter['id_group'] = $id_group;
@@ -603,8 +632,8 @@ switch ($action) {
$group = false;
}
- // Filter normal and metaconsole reports
- if ($config['metaconsole'] == 1 and defined('METACONSOLE')) {
+ // Filter normal and metaconsole reports.
+ if ($config['metaconsole'] == 1 && defined('METACONSOLE')) {
$filter['metaconsole'] = 1;
} else {
$filter['metaconsole'] = 0;
@@ -670,12 +699,12 @@ switch ($action) {
$table->size['csv'] = '5%';
$next = 4;
- // Calculate dinamically the number of the column
+ // Calculate dinamically the number of the column.
if (enterprise_hook('load_custom_reporting_1') !== ENTERPRISE_NOT_HOOK) {
$next = 7;
}
- // Admin options only for RM flag
+ // Admin options only for RM flag.
if (check_acl($config['id_user'], 0, 'RM')) {
$table->head[$next] = __('Private');
$table->size[$next] = '2%';
@@ -743,7 +772,7 @@ switch ($action) {
$data[1] = ui_print_truncate_text($report['description'], 70);
- // Remove html and xml button if items are larger than limit
+ // Remove html and xml button if items are larger than limit.
$item_count = db_get_num_rows('SELECT * FROM treport_content WHERE id_report='.$report['id_report']);
$report['overload'] = $item_count >= $config['report_limit'];
if ($report['overload']) {
@@ -752,7 +781,7 @@ switch ($action) {
} else if (!$report['non_interactive']) {
$data[2] = ''.html_print_image('images/html.png', true, ['title' => __('HTML view')]).'';
$data[3] = ''.html_print_image('images/xml.png', true, ['title' => __('Export to XML')]).'';
- // I chose ajax.php because it's supposed to give XML anyway
+ // I chose ajax.php because it's supposed to give XML anyway.
} else {
$data[2] = html_print_image(
'images/html_disabled.png',
@@ -765,14 +794,14 @@ switch ($action) {
}
- // Calculate dinamically the number of the column
+ // Calculate dinamically the number of the column.
$next = 4;
if (enterprise_hook('load_custom_reporting_2') !== ENTERPRISE_NOT_HOOK) {
$next = 7;
}
- // Admin options only for RM flag
+ // Admin options only for RM flag.
if (check_acl($config['id_user'], 0, 'RM')) {
if ($report['private'] == 1) {
$data[$next] = __('Yes');
@@ -820,6 +849,10 @@ switch ($action) {
$delete = true;
}
break;
+
+ default:
+ // Default.
+ break;
}
if ($edit || $delete) {
@@ -915,7 +948,6 @@ switch ($action) {
}
enterprise_hook('close_meta_frame');
-
return;
break;
@@ -943,6 +975,10 @@ switch ($action) {
$idGroupReport = $report['id_group'];
$description = $report['description'];
break;
+
+ default:
+ // Default.
+ break;
}
break;
@@ -976,6 +1012,10 @@ switch ($action) {
$id_group_edit = 0;
$private = 1;
break;
+
+ default:
+ // Default.
+ break;
}
if ($action == 'update') {
@@ -1026,10 +1066,10 @@ switch ($action) {
$action = 'edit';
} else if ($action == 'save') {
if ($reportName != '' && $idGroupReport != '') {
- // This flag allow to differentiate between normal console and metaconsole reports
+ // This flag allow to differentiate between normal console and metaconsole reports.
$metaconsole_report = (int) is_metaconsole();
- // Juanma (07/05/2014) New feature: Custom front page for reports
+ // Juanma (07/05/2014) New feature: Custom front page for reports.
if ($config['custom_report_front']) {
$custom_font = $config['custom_report_front_font'];
$logo = $config['custom_report_front_logo'];
@@ -1098,7 +1138,6 @@ switch ($action) {
$good_format = false;
switch ($action) {
case 'update':
-
$values = [];
$values['id_report'] = $idReport;
// ---------------------------------------------------
@@ -1132,7 +1171,6 @@ switch ($action) {
break;
case 'event_report_log':
-
$agents_to_report = get_parameter('id_agents3');
$source = get_parameter('source', '');
$search = get_parameter('search', '');
@@ -1154,7 +1192,7 @@ switch ($action) {
$values['top_n_value'] = get_parameter('quantity');
$interval_max = get_parameter('max_interval');
$interval_min = get_parameter('min_interval');
- // Checks intervals fields
+ // Checks intervals fields.
if (preg_match('/^(\-)*[0-9]*\.?[0-9]+$/', $interval_max) and preg_match('/^(\-)*[0-9]*\.?[0-9]+$/', $interval_min)) {
$good_format = true;
}
@@ -1221,9 +1259,21 @@ switch ($action) {
case 'availability':
// HACK it is saved in show_graph field.
- // Show interfaces instead the modules
+ // Show interfaces instead the modules.
$values['show_graph'] = get_parameter('checkbox_show_address_agent');
$values['period'] = get_parameter('period');
+ $values['total_time'] = get_parameter('total_time');
+ $values['time_failed'] = get_parameter('time_failed');
+ $values['time_in_ok_status'] = get_parameter('time_in_ok_status');
+ $values['time_in_unknown_status'] = get_parameter('time_in_unknown_status');
+ $values['time_of_not_initialized_module'] = get_parameter('time_of_not_initialized_module');
+ $values['time_of_downtime'] = get_parameter('time_of_downtime');
+ $values['total_checks'] = get_parameter('total_checks');
+ $values['checks_failed'] = get_parameter('checks_failed');
+ $values['checks_in_ok_status'] = get_parameter('checks_in_ok_status');
+ $values['unknown_checks'] = get_parameter('unknown_checks');
+ $values['agent_max_value'] = get_parameter('agent_max_value');
+ $values['agent_min_value'] = get_parameter('agent_min_value');
$good_format = true;
break;
@@ -1258,6 +1308,7 @@ switch ($action) {
$values['text'] = get_parameter('text');
$values['show_graph'] = get_parameter('combo_graph_options');
$good_format = true;
+ break;
}
$values['id_agent'] = get_parameter('id_agent');
@@ -1282,6 +1333,19 @@ switch ($action) {
$values['friday'] = get_parameter('friday', 0);
$values['saturday'] = get_parameter('saturday', 0);
$values['sunday'] = get_parameter('sunday', 0);
+ $values['total_time'] = get_parameter('total_time', 0);
+ $values['time_failed'] = get_parameter('time_failed', 0);
+ $values['time_in_ok_status'] = get_parameter('time_in_ok_status', 0);
+ $values['time_in_unknown_status'] = get_parameter('time_in_unknown_status', 0);
+ $values['time_of_not_initialized_module'] = get_parameter('time_of_not_initialized_module', 0);
+ $values['time_of_downtime'] = get_parameter('time_of_downtime', 0);
+ $values['total_checks'] = get_parameter('total_checks', 0);
+ $values['checks_failed'] = get_parameter('checks_failed', 0);
+ $values['checks_in_ok_status'] = get_parameter('checks_in_ok_status', 0);
+ $values['unknown_checks'] = get_parameter('unknown_checks', 0);
+ $values['agent_max_value'] = get_parameter('agent_max_value', 0);
+ $values['agent_min_value'] = get_parameter('agent_min_value', 0);
+
switch ($config['dbtype']) {
case 'mysql':
case 'postgresql':
@@ -1293,6 +1357,10 @@ switch ($action) {
$values['time_from'] = '#to_date(\''.get_parameter('time_from').'\',\'hh24:mi:ss\')';
$values['time_to'] = '#to_date(\''.get_parameter('time_to').'\', \'hh24:mi:ss\')';
break;
+
+ default:
+ // Default.
+ break;
}
$values['group_by_agent'] = get_parameter('checkbox_row_group_by_agent');
@@ -1302,7 +1370,6 @@ switch ($action) {
$values['exception_condition_value'] = get_parameter('exception_condition_value');
$values['id_module_group'] = get_parameter('combo_modulegroup');
$values['id_group'] = get_parameter('combo_group');
- $values['show_extended_events'] = get_parameter('include_extended_events');
$values['server_name'] = get_parameter('server_name');
$server_id = (int) get_parameter('server_id');
if ($server_id != 0) {
@@ -1314,7 +1381,7 @@ switch ($action) {
$values['server_name'] = get_parameter('combo_server');
}
- if ((($values['type'] == 'custom_graph') or ($values['type'] == 'automatic_custom_graph')) && ($values['id_gs'] == 0 || $values['id_gs'] == '')) {
+ if ((($values['type'] == 'custom_graph') || ($values['type'] == 'automatic_custom_graph')) && ($values['id_gs'] == 0 || $values['id_gs'] == '')) {
$resultOperationDB = false;
break;
}
@@ -1331,7 +1398,7 @@ switch ($action) {
$event_filter_search = get_parameter('filter_search', '');
- // If metaconsole is activated
+ // If metaconsole is activated.
if ($config['metaconsole'] == 1 && defined('METACONSOLE')) {
if (($values['type'] == 'custom_graph') or ($values['type'] == 'automatic_custom_graph')) {
$id_gs = substr($values['id_gs'], 0, strpos($values['id_gs'], '|'));
@@ -1342,7 +1409,7 @@ switch ($action) {
}
}
- // Get agent and server name
+ // Get agent and server name.
$agent_name_server = io_safe_output(get_parameter('agent'));
if (isset($agent_name_server)) {
@@ -1352,7 +1419,7 @@ switch ($action) {
$server_name = substr($agent_name_server, $separator_pos);
$server_name = str_replace('(', '', $server_name);
$server_name = str_replace(')', '', $server_name);
- // Will update server_name variable
+ // Will update server_name variable.
$values['server_name'] = trim($server_name);
$agent_name = substr($agent_name_server, 0, $separator_pos);
}
@@ -1448,6 +1515,10 @@ switch ($action) {
$style['label'] = '';
}
break;
+
+ default:
+ // Default.
+ break;
}
$values['style'] = io_safe_input(json_encode($style));
@@ -1462,6 +1533,10 @@ switch ($action) {
unset($values['type']);
}
break;
+
+ default:
+ // Default.
+ break;
}
$resultOperationDB = db_process_sql_update(
@@ -1483,7 +1558,7 @@ switch ($action) {
$values['description'] = get_parameter('description');
$label = get_parameter('label', '');
- // Add macros name
+ // Add macros name.
$items_label = [];
$items_label['type'] = get_parameter('type');
$items_label['id_agent'] = get_parameter('id_agent');
@@ -1493,7 +1568,7 @@ switch ($action) {
$values['name'] = reporting_label_macro($items_label, $name_it);
// Support for projection graph, prediction date and SLA reports
- // 'top_n_value', 'top_n' and 'text' fields will be reused for these types of report
+ // 'top_n_value', 'top_n' and 'text' fields will be reused for these types of report.
switch ($values['type']) {
case 'projection_graph':
$values['period'] = get_parameter('period1');
@@ -1595,7 +1670,7 @@ switch ($action) {
case 'availability':
$values['period'] = get_parameter('period');
// HACK it is saved in show_graph field.
- // Show interfaces instead the modules
+ // Show interfaces instead the modules.
$values['show_graph'] = get_parameter('checkbox_show_address_agent');
$good_format = true;
break;
@@ -1670,6 +1745,10 @@ switch ($action) {
$values['only_display_wrong'] = $only_display_wrong_tmp;
}
break;
+
+ default:
+ // Default.
+ break;
}
$values['monday'] = get_parameter('monday', 0);
@@ -1679,6 +1758,18 @@ switch ($action) {
$values['friday'] = get_parameter('friday', 0);
$values['saturday'] = get_parameter('saturday', 0);
$values['sunday'] = get_parameter('sunday', 0);
+ $values['total_time'] = get_parameter('total_time', 0);
+ $values['time_failed'] = get_parameter('time_failed', 0);
+ $values['time_in_ok_status'] = get_parameter('time_in_ok_status', 0);
+ $values['time_in_unknown_status'] = get_parameter('time_in_unknown_status', 0);
+ $values['time_of_not_initialized_module'] = get_parameter('time_of_not_initialized_module', 0);
+ $values['time_of_downtime'] = get_parameter('time_of_downtime', 0);
+ $values['total_checks'] = get_parameter('total_checks', 0);
+ $values['checks_failed'] = get_parameter('checks_failed', 0);
+ $values['checks_in_ok_status'] = get_parameter('checks_in_ok_status', 0);
+ $values['unknown_checks'] = get_parameter('unknown_checks', 0);
+ $values['agent_max_value'] = get_parameter('agent_max_value', 0);
+ $values['agent_min_value'] = get_parameter('agent_min_value', 0);
switch ($config['dbtype']) {
case 'mysql':
case 'postgresql':
@@ -1690,6 +1781,10 @@ switch ($action) {
$values['time_from'] = '#to_date(\''.get_parameter('time_from').'\',\'hh24:mi:ss\')';
$values['time_to'] = '#to_date(\''.get_parameter('time_to').'\', \'hh24:mi:ss\')';
break;
+
+ default:
+ // Default.
+ break;
}
$values['group_by_agent'] = get_parameter('checkbox_row_group_by_agent', 0);
@@ -1699,7 +1794,6 @@ switch ($action) {
$values['exception_condition_value'] = get_parameter('exception_condition_value');
$values['id_module_group'] = get_parameter('combo_modulegroup');
$values['id_group'] = get_parameter('combo_group');
- $values['show_extended_events'] = get_parameter('include_extended_events');
if ((($values['type'] == 'custom_graph') or ($values['type'] == 'automatic_custom_graph')) && ($values['id_gs'] == 0 || $values['id_gs'] == '')) {
@@ -1718,8 +1812,8 @@ switch ($action) {
}
}
- if (($values['type'] == 'sql') or ($values['type'] == 'sql_graph_hbar')
- or ($values['type'] == 'sql_graph_vbar') or ($values['type'] == 'sql_graph_pie')
+ if (($values['type'] == 'sql') || ($values['type'] == 'sql_graph_hbar')
+ || ($values['type'] == 'sql_graph_vbar') || ($values['type'] == 'sql_graph_pie')
) {
$values['treport_custom_sql_id'] = get_parameter('id_custom');
if ($values['treport_custom_sql_id'] == 0) {
@@ -1761,7 +1855,7 @@ switch ($action) {
$event_filter_search = get_parameter('filter_search', '');
- // Added for events items
+ // Added for events items.
$style['show_summary_group'] = $show_summary_group;
$style['filter_event_severity'] = json_encode($filter_event_severity);
$style['filter_event_type'] = json_encode($filter_event_type);
@@ -1783,6 +1877,10 @@ switch ($action) {
$style['label'] = '';
}
break;
+
+ default:
+ // Default.
+ break;
}
break;
@@ -1827,6 +1925,10 @@ switch ($action) {
$style['label'] = '';
}
break;
+
+ default:
+ // Default.
+ break;
}
$values['style'] = io_safe_input(json_encode($style));
@@ -1841,6 +1943,10 @@ switch ($action) {
unset($values['type']);
}
break;
+
+ default:
+ // Default.
+ break;
}
$result = db_process_sql_insert(
@@ -1870,6 +1976,10 @@ switch ($action) {
WHERE id_report = '.$idReport
);
break;
+
+ default:
+ // Default.
+ break;
}
if ($max === false) {
@@ -1895,6 +2005,10 @@ switch ($action) {
['id_rc' => $idItem]
);
break;
+
+ default:
+ // Default.
+ break;
}
$resultOperationDB = true;
@@ -1902,7 +2016,8 @@ switch ($action) {
break;
}
- // If fields dont have good format
+
+ // If fields dont have good format.
else {
$resultOperationDB = false;
}
@@ -1910,7 +2025,7 @@ switch ($action) {
break;
default:
- if ($enterpriseEnable and $activeTab != 'advanced') {
+ if ($enterpriseEnable && $activeTab != 'advanced') {
$resultOperationDB = reporting_enterprise_update_action();
}
break;
@@ -1968,7 +2083,7 @@ switch ($action) {
case 'agent':
case 'type':
- // Sort functionality for normal console
+ // Sort functionality for normal console.
if (!defined('METACONSOLE')) {
switch ($field) {
case 'module':
@@ -2002,6 +2117,10 @@ switch ($action) {
case 'type':
$sql = 'SELECT id_rc FROM treport_content WHERE %s ORDER BY type %s';
break;
+
+ default:
+ // Default.
+ break;
}
$sql = sprintf($sql, 'id_report = '.$idReport, '%s');
@@ -2013,11 +2132,15 @@ switch ($action) {
case 'down':
$sql = sprintf($sql, 'DESC');
break;
+
+ default:
+ // Default.
+ break;
}
$ids = db_get_all_rows_sql($sql);
}
- // Sort functionality for metaconsole
+ // Sort functionality for metaconsole.
else if ($config['metaconsole'] == 1) {
switch ($field) {
case 'agent':
@@ -2035,14 +2158,14 @@ switch ($action) {
foreach ($report_items as $report_item) {
$connection = metaconsole_get_connection($report_item['server_name']);
if (metaconsole_load_external_db($connection) != NOERR) {
- // ui_print_error_message ("Error connecting to ".$server_name);
+ // ui_print_error_message ("Error connecting to ".$server_name);.
}
switch ($field) {
case 'agent':
$agents_name = agents_get_agents(['id_agente' => $report_item['id_agent']], 'nombre');
- // Item without agent
+ // Item without agent.
if (!$agents_name) {
$element_name = '';
} else {
@@ -2054,13 +2177,17 @@ switch ($action) {
case 'module':
$module_name = modules_get_agentmodule_name($report_item['id_agent_module']);
- // Item without module
+ // Item without module.
if (!$module_name) {
$element_name = '';
} else {
$element_name = $module_name;
}
break;
+
+ default:
+ // Default.
+ break;
}
metaconsole_restore_db();
@@ -2068,7 +2195,7 @@ switch ($action) {
$temp_sort[$report_item['id_rc']] = $element_name;
}
- // Performes sorting
+ // Performes sorting.
switch ($dir) {
case 'up':
asort($temp_sort);
@@ -2077,6 +2204,10 @@ switch ($action) {
case 'down':
arsort($temp_sort);
break;
+
+ default:
+ // Default.
+ break;
}
foreach ($temp_sort as $temp_element_key => $temp_element_val) {
@@ -2085,13 +2216,13 @@ switch ($action) {
$i++;
}
- // Free resources
+ // Free resources.
unset($temp_sort);
unset($report_items);
}
break;
- // Type case only depends of local database
+ // Type case only depends of local database.
case 'type':
$sql = 'SELECT id_rc
FROM treport_content
@@ -2110,10 +2241,13 @@ switch ($action) {
case 'down':
$sql = sprintf($sql, 'DESC');
break;
+
+ default:
+ // Default.
+ break;
}
$ids = db_get_all_rows_sql($sql);
-
break;
}
}
@@ -2152,6 +2286,10 @@ switch ($action) {
WHERE id_rc = '.$idItem
);
break;
+
+ default:
+ // Default.
+ break;
}
// db_get_value_filter('order', 'treport_content', array('id_rc' => $idItem));
@@ -2163,6 +2301,10 @@ switch ($action) {
case 'down':
$newOrder = ($oldOrder + 1);
break;
+
+ default:
+ // Default.
+ break;
}
switch ($config['dbtype']) {
@@ -2200,6 +2342,10 @@ switch ($action) {
false
);
break;
+
+ default:
+ // Default.
+ break;
}
if ($resultOperationDB !== false) {
@@ -2229,13 +2375,17 @@ switch ($action) {
false
);
break;
+
+ default:
+ // Default.
+ break;
}
}
break;
}
break;
- // Added for report templates
+ // Added for report templates.
default:
if ($enterpriseEnable) {
$buttons = [
@@ -2259,7 +2409,7 @@ switch ($action) {
break;
}
- // Page header for metaconsole
+ // Page header for metaconsole.
if ($enterpriseEnable and defined('METACONSOLE')) {
// Bread crumbs
ui_meta_add_breadcrumb(
@@ -2271,10 +2421,10 @@ switch ($action) {
ui_meta_print_page_header($nav_bar);
- // Print header
+ // Print header.
ui_meta_print_header(__('Reporting'), '', $buttons);
}
- // Page header for normal console
+ // Page header for normal console.
else {
ui_print_page_header($subsection, 'images/op_reporting.png', false, '', false, $buttons, false, '', 60);
}
@@ -2337,9 +2487,9 @@ if ($idReport != 0) {
$textReportName = __('Create Custom Report');
}
-// Page header for metaconsole
+// Page header for metaconsole.
if ($enterpriseEnable and defined('METACONSOLE')) {
- // Bread crumbs
+ // Bread crumbs.
ui_meta_add_breadcrumb(
[
'link' => 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&pure='.$pure,
@@ -2349,7 +2499,7 @@ if ($enterpriseEnable and defined('METACONSOLE')) {
ui_meta_print_page_header($nav_bar);
- // Print header
+ // Print header.
ui_meta_print_header(__('Reporting').$textReportName, '', $buttons);
} else {
ui_print_page_header(
diff --git a/pandora_console/include/ajax/snmp_browser.ajax.php b/pandora_console/include/ajax/snmp_browser.ajax.php
index 11d233c676..85f8b3e68a 100644
--- a/pandora_console/include/ajax/snmp_browser.ajax.php
+++ b/pandora_console/include/ajax/snmp_browser.ajax.php
@@ -121,6 +121,7 @@ if (is_ajax()) {
'min_ff_event_normal' => 0,
'min_ff_event_warning' => 0,
'min_ff_event_critical' => 0,
+ 'ff_type' => 0,
'each_ff' => 0,
]
);
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index a1b9b6e302..8c2bb2d844 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
/**
* Pandora build version and version
*/
-$build_version = 'PC190328';
+$build_version = 'PC190412';
$pandora_version = 'v7.0NG.733';
// Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_agents.php b/pandora_console/include/functions_agents.php
index a2775f5bfb..67ad7b949c 100644
--- a/pandora_console/include/functions_agents.php
+++ b/pandora_console/include/functions_agents.php
@@ -434,15 +434,15 @@ function agents_get_agents(
$filter_nogroup = $filter;
// Get user groups
- $groups = array_keys(users_get_groups($config['id_user'], $access, true));
+ $groups = array_keys(users_get_groups($config['id_user'], $access, false));
// If no group specified, get all user groups
- if (isset($filter['id_grupo']) === false) {
+ if (empty($filter['id_grupo'])) {
$all_groups = true;
$filter['id_grupo'] = $groups;
} else if (! is_array($filter['id_grupo'])) {
$all_groups = false;
- // If group is specified but not allowed, return false.
+ // If group is specified but not allowed, return false
if (! in_array($filter['id_grupo'], $groups)) {
return false;
}
@@ -466,6 +466,11 @@ function agents_get_agents(
$filter['id_group'] = $filter['id_grupo'];
+ if (in_array(0, $filter['id_grupo'])) {
+ unset($filter['id_grupo']);
+ unset($filter['id_group']);
+ }
+
if (!is_array($fields)) {
$fields = [];
$fields[0] = 'id_agente';
diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index e57dd31013..7903533d74 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -1,19 +1,36 @@
;;;
- * ;;;;;;;;
- * ;;;;;;;
- * ;;;;;;
- * ;;;; in this order
- * and separator char (after text ; ) and separator (pass in param othermode as othermode=url_encode_separator_)
- * example:
- *
- * api.php?op=set&op2=create_network_module&id=pepito&other=prueba|0|7|1|10|15|0|16|18|0|15|0|www.google.es|0||0|180|0|0|0|0|latency%20ping&other_mode=url_encode_separator_|
- *
- * @param $thrash3 Don't use
+ * @param string $id Name of agent to add the module.
+ * @param string $thrash1 Don't use.
+ * @param array $other It's array, $other as param is ;;;
+ * ;;;;;;;;
+ * ;;;;;;;
+ * ;;;;;;
+ * ;;;; in this order
+ * and separator char (after text ; ) and separator (pass in param othermode as othermode=url_encode_separator_).
+ * @param string $thrash3 Don't use.
+ * @example: api.php?op=set&op2=create_network_module&id=pepito&other=prueba|0|7|1|10|15|0|16|18|0|15|0|www.google.es|0||0|180|0|0|0|0|latency%20ping&other_mode=url_encode_separator_|*
+ * @return mixed Return.
*/
function api_set_create_network_module($id, $thrash1, $other, $thrash3)
{
@@ -3090,22 +3106,23 @@ function api_set_create_network_module($id, $thrash1, $other, $thrash3)
'min_ff_event_critical' => $other['data'][27],
'critical_inverse' => $other['data'][28],
'warning_inverse' => $other['data'][29],
+ 'ff_type' => $other['data'][30],
];
if (! $values['descripcion']) {
$values['descripcion'] = '';
- // Column 'descripcion' cannot be null
+ // Column 'descripcion' cannot be null.
}
if (! $values['module_macros']) {
$values['module_macros'] = '';
- // Column 'module_macros' cannot be null
+ // Column 'module_macros' cannot be null.
}
$idModule = modules_create_agent_module($idAgent, $name, $values, true);
if (is_error($idModule)) {
- // TODO: Improve the error returning more info
+ // TODO: Improve the error returning more info.
returnError('error_create_network_module', __('Error in creation network module.'));
} else {
returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -3222,6 +3239,7 @@ function api_set_update_network_module($id_module, $thrash1, $other, $thrash3)
'critical_inverse',
'warning_inverse',
'policy_linked',
+ 'ff_type',
];
$values = [];
@@ -3326,22 +3344,23 @@ function api_set_create_plugin_module($id, $thrash1, $other, $thrash3)
'min_ff_event_critical' => $other['data'][32],
'critical_inverse' => $other['data'][33],
'warning_inverse' => $other['data'][34],
+ 'ff_type' => $other['data'][35],
];
if (! $values['descripcion']) {
$values['descripcion'] = '';
- // Column 'descripcion' cannot be null
+ // Column 'descripcion' cannot be null.
}
if (! $values['module_macros']) {
$values['module_macros'] = '';
- // Column 'module_macros' cannot be null
+ // Column 'module_macros' cannot be null.
}
$idModule = modules_create_agent_module($idAgent, $name, $values, true);
if (is_error($idModule)) {
- // TODO: Improve the error returning more info
+ // TODO: Improve the error returning more info.
returnError('error_create_plugin_module', __('Error in creation plugin module.'));
} else {
returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -3387,7 +3406,7 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
return;
}
- // If we want to change the module to a new agent
+ // If we want to change the module to a new agent.
if ($other['data'][0] != '') {
if (!util_api_check_agent_and_print_error($other['data'][0], 'string', 'AW')) {
return;
@@ -3404,7 +3423,7 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
}
}
- // Check if agent exists
+ // Check if agent exists.
$check_id_agent = db_get_value('id_agente', 'tagente', 'id_agente', $other['data'][0]);
if (!$check_id_agent) {
returnError('error_update_data_module', __('Error updating plugin module. Id_agent doesn\'t exist.'));
@@ -3448,6 +3467,7 @@ function api_set_update_plugin_module($id_module, $thrash1, $other, $thrash3)
'critical_inverse',
'warning_inverse',
'policy_linked',
+ 'ff_type',
];
$values = [];
@@ -3546,22 +3566,23 @@ function api_set_create_data_module($id, $thrash1, $other, $thrash3)
'ff_timeout' => $other['data'][23],
'critical_inverse' => $other['data'][24],
'warning_inverse' => $other['data'][25],
+ 'ff_type' => $other['data'][26],
];
if (! $values['descripcion']) {
$values['descripcion'] = '';
- // Column 'descripcion' cannot be null
+ // Column 'descripcion' cannot be null.
}
if (! $values['module_macros']) {
$values['module_macros'] = '';
- // Column 'module_macros' cannot be null
+ // Column 'module_macros' cannot be null.
}
$idModule = modules_create_agent_module($idAgent, $name, $values, true);
if (is_error($idModule)) {
- // TODO: Improve the error returning more info
+ // TODO: Improve the error returning more info.
returnError('error_create_data_module', __('Error in creation data module.'));
} else {
returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -3818,7 +3839,7 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
return;
}
- // If we want to change the module to a new agent
+ // If we want to change the module to a new agent.
if ($other['data'][0] != '') {
if (!util_api_check_agent_and_print_error($other['data'][0], 'string', 'AW')) {
return;
@@ -3835,7 +3856,7 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
}
}
- // Check if agent exists
+ // Check if agent exists.
$check_id_agent = db_get_value('id_agente', 'tagente', 'id_agente', $other['data'][0]);
if (!$check_id_agent) {
returnError('error_update_data_module', __('Error updating data module. Id_agent doesn\'t exist.'));
@@ -3870,6 +3891,7 @@ function api_set_update_data_module($id_module, $thrash1, $other, $thrash3)
'critical_inverse',
'warning_inverse',
'policy_linked',
+ 'ff_type',
];
$values = [];
@@ -3947,7 +3969,7 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
$disabled_types_event[EVENTS_GOING_UNKNOWN] = (int) !$other['data'][27];
$disabled_types_event = json_encode($disabled_types_event);
- // SNMP version 3
+ // SNMP version 3.
if ($other['data'][14] == '3') {
if ($other['data'][23] != 'AES' and $other['data'][23] != 'DES') {
returnError('error_create_snmp_module', __('Error in creation SNMP module. snmp3_priv_method doesn\'t exist. Set it to \'AES\' or \'DES\'. '));
@@ -4000,6 +4022,7 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
'min_ff_event_normal' => $other['data'][31],
'min_ff_event_warning' => $other['data'][32],
'min_ff_event_critical' => $other['data'][33],
+ 'ff_type' => $other['data'][34],
];
} else {
$values = [
@@ -4032,18 +4055,19 @@ function api_set_create_snmp_module($id, $thrash1, $other, $thrash3)
'min_ff_event_normal' => $other['data'][25],
'min_ff_event_warning' => $other['data'][26],
'min_ff_event_critical' => $other['data'][27],
+ 'ff_type' => $other['data'][28],
];
}
if (! $values['descripcion']) {
$values['descripcion'] = '';
- // Column 'descripcion' cannot be null
+ // Column 'descripcion' cannot be null.
}
$idModule = modules_create_agent_module($idAgent, $name, $values, true);
if (is_error($idModule)) {
- // TODO: Improve the error returning more info
+ // TODO: Improve the error returning more info.
returnError('error_create_snmp_module', __('Error in creation SNMP module.'));
} else {
returnData('string', ['type' => 'string', 'data' => $idModule]);
@@ -4091,7 +4115,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
return;
}
- // If we want to change the module to a new agent
+ // If we want to change the module to a new agent.
if ($other['data'][0] != '') {
if (!util_api_check_agent_and_print_error($other['data'][0], 'string', 'AW')) {
return;
@@ -4108,7 +4132,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
}
}
- // Check if agent exists
+ // Check if agent exists.
$check_id_agent = db_get_value('id_agente', 'tagente', 'id_agente', $other['data'][0]);
if (!$check_id_agent) {
returnError('error_update_data_module', __('Error updating snmp module. Id_agent doesn\'t exist.'));
@@ -4116,7 +4140,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
}
}
- // SNMP version 3
+ // SNMP version 3.
if ($other['data'][13] == '3') {
if ($other['data'][22] != 'AES' and $other['data'][22] != 'DES') {
returnError(
@@ -4180,6 +4204,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
'min_ff_event_warning',
'min_ff_event_critical',
'policy_linked',
+ 'ff_type',
];
} else {
$snmp_module_fields = [
@@ -4211,6 +4236,7 @@ function api_set_update_snmp_module($id_module, $thrash1, $other, $thrash3)
'min_ff_event_warning',
'min_ff_event_critical',
'policy_linked',
+ 'ff_type',
];
}
@@ -4308,6 +4334,7 @@ function api_set_new_network_component($id, $thrash1, $other, $thrash2)
'min_ff_event_normal' => $other['data'][20],
'min_ff_event_warning' => $other['data'][21],
'min_ff_event_critical' => $other['data'][22],
+ 'ff_type' => $other['data'][23],
];
$name_check = db_get_value('name', 'tnetwork_component', 'name', $id);
@@ -4408,6 +4435,7 @@ function api_set_new_plugin_component($id, $thrash1, $other, $thrash2)
'min_ff_event_normal' => $other['data'][24],
'min_ff_event_warning' => $other['data'][25],
'min_ff_event_critical' => $other['data'][26],
+ 'ff_type' => $other['data'][27],
];
$name_check = db_get_value('name', 'tnetwork_component', 'name', $id);
@@ -4543,6 +4571,7 @@ function api_set_new_snmp_component($id, $thrash1, $other, $thrash2)
'min_ff_event_normal' => $other['data'][29],
'min_ff_event_warning' => $other['data'][30],
'min_ff_event_critical' => $other['data'][31],
+ 'ff_type' => $other['data'][32],
];
} else {
$values = [
@@ -4574,6 +4603,7 @@ function api_set_new_snmp_component($id, $thrash1, $other, $thrash2)
'min_ff_event_normal' => $other['data'][25],
'min_ff_event_warning' => $other['data'][26],
'min_ff_event_critical' => $other['data'][27],
+ 'ff_type' => $other['data'][28],
];
}
@@ -4654,6 +4684,7 @@ function api_set_new_local_component($id, $thrash1, $other, $thrash2)
'min_ff_event_warning' => $other['data'][8],
'min_ff_event_critical' => $other['data'][9],
'ff_timeout' => $other['data'][10],
+ 'ff_type' => $other['data'][11],
];
$name_check = enterprise_hook(
@@ -6409,6 +6440,7 @@ function api_set_add_data_module_policy($id, $thrash1, $other, $thrash3)
$values['min_ff_event_warning'] = $other['data'][21];
$values['min_ff_event_critical'] = $other['data'][22];
$values['ff_timeout'] = $other['data'][23];
+ $values['ff_type'] = $other['data'][24];
if ($name_module_policy !== false) {
if ($name_module_policy[0]['name'] == $other['data'][0]) {
@@ -6650,6 +6682,7 @@ function api_set_add_network_module_policy($id, $thrash1, $other, $thrash3)
$values['min_ff_event_normal'] = $other['data'][24];
$values['min_ff_event_warning'] = $other['data'][25];
$values['min_ff_event_critical'] = $other['data'][26];
+ $values['ff_type'] = $other['data'][27];
if ($name_module_policy !== false) {
if ($name_module_policy[0]['name'] == $other['data'][0]) {
@@ -6859,6 +6892,7 @@ function api_set_add_plugin_module_policy($id, $thrash1, $other, $thrash3)
$values['min_ff_event_normal'] = $other['data'][29];
$values['min_ff_event_warning'] = $other['data'][30];
$values['min_ff_event_critical'] = $other['data'][31];
+ $values['ff_type'] = $other['data'][32];
if ($name_module_policy !== false) {
if ($name_module_policy[0]['name'] == $other['data'][0]) {
@@ -7276,6 +7310,7 @@ function api_set_add_snmp_module_policy($id, $thrash1, $other, $thrash3)
'min_ff_event_normal' => $other['data'][30],
'min_ff_event_warning' => $other['data'][31],
'min_ff_event_critical' => $other['data'][32],
+ 'ff_type' => $other['data'][33],
];
} else {
$values = [
@@ -7305,6 +7340,7 @@ function api_set_add_snmp_module_policy($id, $thrash1, $other, $thrash3)
'min_ff_event_normal' => $other['data'][24],
'min_ff_event_warning' => $other['data'][25],
'min_ff_event_critical' => $other['data'][26],
+ 'ff_type' => $other['data'][27],
];
}
@@ -8794,7 +8830,14 @@ function api_set_alert_actions($id, $id2, $other, $trash1)
}
$firesMin = $other['data'][2];
+ if (!$firesMin) {
+ $firesMin = 0;
+ }
+
$firesMax = $other['data'][3];
+ if (!$firesMax) {
+ $firesMax = 0;
+ }
$values = [
'id_alert_template_module' => $idAlertTemplateModule,
@@ -11608,7 +11651,9 @@ function api_set_add_event_comment($id, $thrash2, $other, $thrash3)
global $config;
if (defined('METACONSOLE')) {
- return;
+ $meta = true;
+ } else {
+ $meta = $other['data'][1];
}
if (!check_acl($config['id_user'], 0, 'EW')) {
@@ -11620,8 +11665,7 @@ function api_set_add_event_comment($id, $thrash2, $other, $thrash3)
returnError('error_parameter', 'Error in the parameters.');
return;
} else if ($other['type'] == 'array') {
- $comment = io_safe_input($other['data'][0]);
- $meta = $other['data'][1];
+ $comment = $other['data'][0];
$history = $other['data'][2];
$status = events_comment(
@@ -13268,6 +13312,7 @@ function api_set_apply_module_template($id_template, $id_agent, $thrash3, $thras
'min_ff_event_normal' => $row2['min_ff_event_normal'],
'min_ff_event_warning' => $row2['min_ff_event_warning'],
'min_ff_event_critical' => $row2['min_ff_event_critical'],
+ 'ff_type' => $row2['ff_type'],
];
$name = $row2['name'];
diff --git a/pandora_console/include/functions_cron.php b/pandora_console/include/functions_cron.php
index e56a3d4a52..6a79096175 100644
--- a/pandora_console/include/functions_cron.php
+++ b/pandora_console/include/functions_cron.php
@@ -1,34 +1,51 @@
$module_id]
- );
+ $module_interval = db_get_value(
+ 'module_interval',
+ 'tagente_modulo',
+ 'id_agente_modulo',
+ $module_id
+ );
+
+ if ($cron === '* * * * *') {
return db_process_sql(
'UPDATE tagente_estado SET current_interval = '.$module_interval.' WHERE id_agente_modulo = '.(int) $module_id
);
@@ -41,15 +58,19 @@ function cron_update_module_interval($module_id, $cron)
}
-// Get the number of seconds left to the next execution of the given cron entry.
+/**
+ * Get the number of seconds left to the next execution of the given cron entry.
+ *
+ * @param string $cron String with the Linux cron configuration.
+ * @param integer $module_interval Module interval. Minimum increased time.
+ * @param integer $module_id Module id.
+ *
+ * @return integer Time to next execution time.
+ */
function cron_next_execution($cron, $module_interval, $module_id)
{
// Get day of the week and month from cron config.
$cron_array = explode(' ', $cron);
- $minute = $cron_array[0];
- $hour = $cron_array[1];
- $mday = $cron_array[2];
- $month = $cron_array[3];
$wday = $cron_array[4];
// Get last execution time.
@@ -60,55 +81,35 @@ function cron_next_execution($cron, $module_interval, $module_id)
$module_id
);
$cur_time = ($last_execution !== false) ? $last_execution : time();
-
- // Any day of the way.
- if ($wday == '*') {
- $nex_time = cron_next_execution_date(
- $cron,
- $cur_time,
- $module_interval
- );
- return ($nex_time - $cur_time);
+ $nex_time = cron_next_execution_date($cron, $cur_time, $module_interval);
+ $nex_wday = (int) date('w', $nex_time);
+ // Check the wday values to avoid infinite loop.
+ $wday_int = cron_get_interval($wday);
+ if ($wday_int['down'] !== '*' && ($wday_int['down'] > 6 || ($wday_int['up'] !== false && $wday_int['up'] > 6))) {
+ $wday = '*';
}
- // A specific day of the week.
- $count = 0;
- $nex_time = $cur_time;
- do {
- $nex_time = cron_next_execution_date(
- $cron,
- $nex_time,
- $module_interval
- );
- $nex_time_wd = $nex_time;
+ // Check day of the way.
+ while (!cron_check_interval($nex_wday, $wday)) {
+ // If it does not acomplish the day of the week, go to the next day.
+ $nex_time += SECONDS_1DAY;
+ $nex_time = cron_next_execution_date($cron, $nex_time, 0);
+ $nex_wday = (int) date('w', $nex_time);
+ }
- $array_nex = explode(' ', date('m w', $nex_time_wd));
- $nex_mon = $array_nex[0];
- $nex_wday = $array_nex[1];
-
- do {
- // Check the day of the week.
- if ($nex_wday == $wday) {
- return ($nex_time_wd - $cur_time);
- }
-
- // Move to the next day of the month.
- $nex_time_wd += SECONDS_1DAY;
-
- $array_nex_w = explode(' ', date('m w', $nex_time_wd));
- $nex_mon_wd = $array_nex_w[0];
- $nex_wday = $array_nex_w[1];
- } while ($mday == '*' && $nex_mon_wd == $nex_mon);
-
- $count++;
- } while ($count < SECONDS_1MINUTE);
-
- // Something went wrong, default to 5 minutes.
- return SECONDS_5MINUTES;
+ return ($nex_time - $cur_time);
}
-// Get the next execution date for the given cron entry in seconds since epoch.
+/**
+ * Get the next execution date for the given cron entry in seconds since epoch.
+ *
+ * @param string $cron String with the Linux cron configuration.
+ * @param integer $cur_time Current time in utimestamp.
+ * @param integer $module_interval Module interval. Minimum increased time.
+ *
+ * @return integer Next execution timestamp seing the cron configuration.
+ */
function cron_next_execution_date($cron, $cur_time=false, $module_interval=300)
{
// Get cron configuration.
@@ -127,8 +128,7 @@ function cron_next_execution_date($cron, $cur_time=false, $module_interval=300)
}
// Update minutes.
- $min_s = cron_get_interval($cron_array[0]);
- $nex_time_array[0] = ($min_s['down'] == '*') ? 0 : $min_s['down'];
+ $nex_time_array[0] = cron_get_next_time_element($cron_array[0]);
$nex_time = cron_valid_date($nex_time_array);
if ($nex_time >= $cur_time) {
@@ -166,8 +166,7 @@ function cron_next_execution_date($cron, $cur_time=false, $module_interval=300)
}
// Update the hour if fails.
- $hour_s = cron_get_interval($cron_array[1]);
- $nex_time_array[1] = ($hour_s['down'] == '*') ? 0 : $hour_s['down'];
+ $nex_time_array[1] = cron_get_next_time_element($cron_array[1]);
// When an overflow is passed check the hour update again.
$nex_time = cron_valid_date($nex_time_array);
@@ -199,8 +198,7 @@ function cron_next_execution_date($cron, $cur_time=false, $module_interval=300)
}
// Update the day if fails.
- $mday_s = cron_get_interval($cron_array[2]);
- $nex_time_array[2] = ($mday_s['down'] == '*') ? 1 : $mday_s['down'];
+ $nex_time_array[2] = cron_get_next_time_element($cron_array[2]);
// When an overflow is passed check the hour update in the next execution.
$nex_time = cron_valid_date($nex_time_array);
@@ -226,8 +224,7 @@ function cron_next_execution_date($cron, $cur_time=false, $module_interval=300)
}
// Update the month if fails.
- $mon_s = cron_get_interval($cron_array[3]);
- $nex_time_array[3] = ($mon_s['down'] == '*') ? 1 : $mon_s['down'];
+ $nex_time_array[3] = cron_get_next_time_element($cron_array[3]);
// When an overflow is passed check the hour update in the next execution.
$nex_time = cron_valid_date($nex_time_array);
@@ -245,7 +242,33 @@ function cron_next_execution_date($cron, $cur_time=false, $module_interval=300)
}
-// Get an array with the cron interval.
+/**
+ * Get the next tentative time for a cron value or interval in case of overflow.
+ *
+ * @param string $cron_array_elem Cron element.
+ *
+ * @return integer The tentative time. Ex:
+ * * shold returns 0.
+ * 5 should returns 5.
+ * 10-55 should returns 10.
+ * 55-10 should retunrs 0.
+ */
+function cron_get_next_time_element($cron_array_elem)
+{
+ $interval = cron_get_interval($cron_array_elem);
+ $value = ($interval['down'] == '*' || ($interval['up'] !== false && $interval['down'] > $interval['up'] )) ? 0 : $interval['down'];
+ return $value;
+}
+
+
+/**
+ * Get an array with the cron interval.
+ *
+ * @param string $element String with the elemen cron configuration.
+ *
+ * @return array With up and down elements.
+ * If there is not an interval, up element will be false.
+ */
function cron_get_interval($element)
{
// Not a range.
@@ -263,7 +286,14 @@ function cron_get_interval($element)
}
-// Returns if a date is in a cron. Recursive.
+/**
+ * Returns if a date is in a cron. Recursive.
+ *
+ * @param array $elems_cron Cron configuration in array format.
+ * @param integer $elems_curr_time Time to check if is in cron.
+ *
+ * @return boolean Returns true if is in cron. False if it is outside.
+ */
function cron_is_in_cron($elems_cron, $elems_curr_time)
{
$elem_cron = array_shift($elems_cron);
@@ -275,31 +305,62 @@ function cron_is_in_cron($elems_cron, $elems_curr_time)
}
// Go to last element if current is a wild card.
- if ($elem_cron != '*') {
- $elem_s = cron_get_interval($elem_cron);
- // Check if there is no a range
- if (($elem_s['up'] === false) && ($elem_s['down'] != $elem_curr_time)) {
- return false;
- }
-
- // Check if there is on the range.
- if ($elem_s['up'] !== false) {
- if ($elem_s['down'] < $elem_s['up']) {
- if ($elem_curr_time < $elem_s['down'] || $elem_curr_time > $elem_s['up']) {
- return false;
- }
- } else {
- if ($elem_curr_time > $elem_s['down'] || $elem_curr_time < $elem_s['up']) {
- return false;
- }
- }
- }
+ if (cron_check_interval($elem_curr_time, $elem_cron) === false) {
+ return false;
}
return cron_is_in_cron($elems_cron, $elems_curr_time);
}
+/**
+ * Check if an element is inside the cron interval or not.
+ *
+ * @param integer $elem_curr_time Integer that represents the time to check.
+ * @param string $elem_cron Cron interval (splitted by hypen)
+ * or cron single value (a number).
+ *
+ * @return boolean True if is in interval.
+ */
+function cron_check_interval($elem_curr_time, $elem_cron)
+{
+ // Go to last element if current is a wild card.
+ if ($elem_cron === '*') {
+ return true;
+ }
+
+ $elem_s = cron_get_interval($elem_cron);
+ // Check if there is no a range.
+ if (($elem_s['up'] === false) && ($elem_s['down'] != $elem_curr_time)) {
+ return false;
+ }
+
+ // Check if there is on the range.
+ if ($elem_s['up'] !== false && (int) $elem_s['up'] === (int) $elem_curr_time) {
+ return true;
+ }
+
+ if ($elem_s['down'] < $elem_s['up']) {
+ if ($elem_curr_time < $elem_s['down'] || $elem_curr_time > $elem_s['up']) {
+ return false;
+ }
+ } else {
+ if ($elem_curr_time > $elem_s['down'] || $elem_curr_time < $elem_s['up']) {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+
+/**
+ * Check if a date is correct or not.
+ *
+ * @param array $da Date in array format [year, month, day, hour, minutes].
+ *
+ * @return integer Utimestamp. False if date is incorrect.
+ */
function cron_valid_date($da)
{
$st = sprintf(
@@ -315,7 +376,13 @@ function cron_valid_date($da)
}
-// Check if cron is properly constructed.
+/**
+ * Check if cron is properly constructed.
+ *
+ * @param string $cron String with the Linux cron configuration.
+ *
+ * @return boolean True if is well formed. False otherwise.
+ */
function cron_check_syntax($cron)
{
return preg_match(
@@ -325,6 +392,11 @@ function cron_check_syntax($cron)
}
+/**
+ * Cron list table.
+ *
+ * @return void It prints the HTML table.
+ */
function cron_list_table()
{
global $config;
@@ -429,8 +501,10 @@ function cron_list_table()
}
$email = $args[1];
+ $report_type = $args[4];
$data[2] .= '
- '.__('Report').": ";
$data[2] .= $report['name'].'';
+ $data[2] .= '
- '.__('Report type').': '.$report_type;
$data[2] .= '
- '.__('Email').": ";
$data[2] .= ui_print_truncate_text($email, 60, false).'';
break;
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index dc69af7baf..0182c2141b 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -3167,8 +3167,7 @@ function events_page_general($event)
$table_general->data[] = $data;
- $event['owner_user'] = $event['id_usuario'];
-
+ // $event['owner_user'] = $event['id_usuario'];
$data = [];
$data[0] = __('Owner');
if (empty($event['owner_user'])) {
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 4a24d5a964..30b86478f8 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -2744,28 +2744,7 @@ function html_print_autocomplete_modules(
global $config;
if ($id_agents === false) {
- $groups = [];
- if ($ACL) {
- $groups = users_get_groups($config['id_user'], 'AW', false);
- $groups = array_keys($groups);
-
- if (empty($groups)) {
- $id_groups = 0;
- } else {
- $id_groups = implode(',', $groups);
- }
-
- $agents = db_get_all_rows_sql(
- 'SELECT id_agente
- FROM tagente
- WHERE id_grupo IN ('.$id_groups.')'
- );
- } else {
- $agents = db_get_all_rows_sql(
- 'SELECT id_agente
- FROM tagente'
- );
- }
+ $agents = agents_get_agents();
if ($agents === false) {
$agents = [];
@@ -2777,10 +2756,7 @@ function html_print_autocomplete_modules(
}
} else {
if ($ACL) {
- $groups = users_get_groups($config['id_user'], 'AW', false);
- $groups = array_keys($groups);
-
- $agents = db_get_all_rows_sql('SELECT id_agente FROM tagente WHERE id_grupo IN ('.implode(',', $groups).')');
+ $agents = agents_get_agents();
if ($agents === false) {
$agents = [];
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 9b19dec55a..0dbe1049bc 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -59,11 +59,11 @@ function menu_print_menu(&$menu)
$allsec2 = $sec2;
}
- // Open list of menu
+ // Open list of menu.
echo '