|
@@ -1956,6 +1974,7 @@ $(document).ready (function () {
});
});
+
});
function create_custom_graph() {
@@ -2454,6 +2473,7 @@ function chooseType() {
$("#row_percentil").hide();
$("#agents_row").hide();
$("#modules_row").hide();
+ $("#row_event_type").hide();
// SLA list default state
$("#sla_list").hide();
@@ -2482,6 +2502,7 @@ function chooseType() {
$("#row_event_graph_by_user").show();
$("#row_event_graph_by_criticity").show();
$("#row_event_graph_by_validated").show();
+ $("#row_event_type").show();
$("#row_filter_search").show();
break;
@@ -2751,6 +2772,7 @@ function chooseType() {
$("#row_event_graph_by_user").show();
$("#row_event_graph_by_criticity").show();
$("#row_event_graph_by_validated").show();
+ $("#row_event_type").show();
$('#agent_autocomplete').hide();
$('#agent_autocomplete_events').show();
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 6611fb4178..fcf18d73c2 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1065,6 +1065,7 @@ switch ($action) {
$filter_event_no_validated = get_parameter('filter_event_no_validated', 0);
$filter_event_critical = get_parameter('filter_event_critical', 0);
$filter_event_warning = get_parameter('filter_event_warning', 0);
+ $filter_event_type = get_parameter('filter_event_type', '');
$event_graph_by_agent = get_parameter('event_graph_by_agent', 0);
$event_graph_by_user_validator = get_parameter('event_graph_by_user_validator', 0);
@@ -1135,7 +1136,7 @@ switch ($action) {
$style['filter_event_validated'] = $filter_event_validated;
$style['filter_event_critical'] = $filter_event_critical;
$style['filter_event_warning'] = $filter_event_warning;
-
+ $style['filter_event_type'] = json_encode($filter_event_type);
$style['event_graph_by_agent'] = $event_graph_by_agent;
$style['event_graph_by_user_validator'] = $event_graph_by_user_validator;
$style['event_graph_by_criticity'] = $event_graph_by_criticity;
@@ -1450,6 +1451,7 @@ switch ($action) {
$event_graph_by_user_validator = get_parameter('event_graph_by_user_validator', 0);
$event_graph_by_criticity = get_parameter('event_graph_by_criticity', 0);
$event_graph_validated_vs_unvalidated = get_parameter('event_graph_validated_vs_unvalidated', 0);
+ $filter_event_type = get_parameter('filter_event_type', '');
$event_filter_search = get_parameter('filter_search', '');
@@ -1458,6 +1460,7 @@ switch ($action) {
$style['filter_event_validated'] = $filter_event_validated;
$style['filter_event_critical'] = $filter_event_critical;
$style['filter_event_warning'] = $filter_event_warning;
+ $style['filter_event_type'] = json_encode($filter_event_type);
$style['event_graph_by_agent'] = $event_graph_by_agent;
$style['event_graph_by_user_validator'] = $event_graph_by_user_validator;
diff --git a/pandora_console/godmode/setup/performance.php b/pandora_console/godmode/setup/performance.php
index 7e90a25639..b88b5c33fd 100644
--- a/pandora_console/godmode/setup/performance.php
+++ b/pandora_console/godmode/setup/performance.php
@@ -76,6 +76,11 @@ $table->data[9][1] = html_print_input_text ('days_autodisable_deletion', $config
$table->data[10][0] = __('Retention period of past special days') . ui_print_help_tip(__('This number is days to keep past special days. 0 means never remove.'), true);
$table->data[10][1] = html_print_input_text ('num_past_special_days', $config["num_past_special_days"], '', 5, 5, true);
+if (enterprise_installed ()) {
+ $table->data[11][0] = __('Max. days before delete inventory data');
+ $table->data[11][1] = html_print_input_text ('inventory_purge', $config["inventory_purge"], '', 5, 5, true);
+}
+
$table_other = new stdClass();
$table_other->width = '100%';
$table_other->class = 'databox filters';
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index 318a4ae170..c81e94a7b2 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -447,6 +447,15 @@ $table_chars->data[$row][1] .= __('Line').' ' .
$config["type_module_charts"] != 'area', true);
$row++;
+$table_chars->data[$row][0] = __('Type of interface charts');
+$table_chars->data[$row][1] = __('Area').' ' .
+ html_print_radio_button ('type_interface_charts', 'area', '',
+ $config["type_interface_charts"] == 'area', true).' ';
+$table_chars->data[$row][1] .= __('Line').' ' .
+ html_print_radio_button ('type_interface_charts', 'line', '',
+ $config["type_interface_charts"] != 'area', true);
+$row++;
+
$table_chars->data[$row][0] = __('Show only average');
$table_chars->data[$row][0] .= ui_print_help_tip(__('Allows only show the average in graphs'), true);
$table_chars->data[$row][1] = __('Yes').' ' .
diff --git a/pandora_console/godmode/users/user_list.php b/pandora_console/godmode/users/user_list.php
index eb25c05691..5db36559e0 100644
--- a/pandora_console/godmode/users/user_list.php
+++ b/pandora_console/godmode/users/user_list.php
@@ -273,7 +273,7 @@ $table->head[2] = __('Last contact') . ' ' .
'' . html_print_image("images/sort_up.png", true, array("style" => $selectLastConnectUp )) . '' .
'' . html_print_image("images/sort_down.png", true, array("style" => $selectLastConnectDown)) . '';
$table->head[3] = __('Admin');
-$table->head[4] = __('Profile');
+$table->head[4] = __('Profile / Group');
$table->head[5] = __('Description');
$table->head[6] = '' . __('Op.') . '';
if (!defined('METACONSOLE')) {
@@ -445,8 +445,7 @@ foreach ($info as $user_id => $user_info) {
$data[4] .= " |