';
- if ($params['compare'] === 'separated') {
+ $output .= $return['chart'];
+ $output .= '
';
+ } else {
+ if ($params['histogram'] === true) {
+ $params['id_agent_module'] = $params['agent_module_id'];
+ $params['dinamic_proc'] = 1;
+
+ $output .= '';
+ if ($params['compare'] === 'separated') {
+ $graph = \reporting_module_histogram_graph(
+ ['datetime' => ($params['begin_date'] - $params['period'])],
+ $params
+ );
+ $output .= $graph['chart'];
+ }
+
$graph = \reporting_module_histogram_graph(
- ['datetime' => ($params['begin_date'] - $params['period'])],
+ ['datetime' => $params['begin_date']],
$params
);
$output .= $graph['chart'];
+ $output .= '
';
+ } else {
+ $output .= grafico_modulo_sparse($params);
}
-
- $graph = \reporting_module_histogram_graph(
- ['datetime' => $params['begin_date']],
- $params
- );
- $output .= $graph['chart'];
- $output .= '';
- } else {
- $output .= grafico_modulo_sparse($params);
}
if (is_metaconsole() === true && empty($server_id) === false) {
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index d7b7fba714..b7ddd509b8 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 = 'PC230905';
+$build_version = 'PC230906';
$pandora_version = 'v7.0NG.773.3';
// Do not overwrite default timezone set if defined.
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index 614c0df43e..a1927bb60a 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -143,6 +143,10 @@ function menu_print_menu(&$menu)
if (empty($new_msg) === false) {
$sec2 = 'operation/messages/message_edit&new_msg='.$new_msg;
}
+ } else if ($sec2 === 'enterprise/godmode/servers/credential_boxes_satellite'
+ || $sec2 === 'enterprise/godmode/servers/manage_credential_boxes'
+ ) {
+ $sec2 = 'enterprise/godmode/servers/list_satellite';
} else {
$sec2 = (string) get_parameter('sec2');
}
diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js
index 14704b3dca..79fde538b4 100644
--- a/pandora_console/include/javascript/pandora_dashboards.js
+++ b/pandora_console/include/javascript/pandora_dashboards.js
@@ -1613,3 +1613,12 @@ function type_change() {
break;
}
}
+
+// Show/Hide period for projection on agent module graph.
+function show_projection_period() {
+ if ($("#projection_switch").is(":checked")) {
+ $("#div_projection_period").show();
+ } else {
+ $("#div_projection_period").hide();
+ }
+}
diff --git a/pandora_console/include/lib/Dashboard/Widget.php b/pandora_console/include/lib/Dashboard/Widget.php
index b9364fcd31..9bedc71f50 100644
--- a/pandora_console/include/lib/Dashboard/Widget.php
+++ b/pandora_console/include/lib/Dashboard/Widget.php
@@ -416,6 +416,10 @@ class Widget
$className .= '\WuxWidget';
break;
+ case 'inventory':
+ $className .= '\InventoryWidget';
+ break;
+
case 'os_quick_report':
$className .= '\OsQuickReportWidget';
break;
diff --git a/pandora_console/include/lib/Dashboard/Widgets/inventory.php b/pandora_console/include/lib/Dashboard/Widgets/inventory.php
new file mode 100644
index 0000000000..67e527dcf0
--- /dev/null
+++ b/pandora_console/include/lib/Dashboard/Widgets/inventory.php
@@ -0,0 +1,1270 @@
+width = $width;
+
+ // Height.
+ $this->height = $height;
+
+ // Grid Width.
+ $this->gridWidth = $gridWidth;
+
+ // Cell Id.
+ $this->cellId = $cellId;
+
+ // Options.
+ $this->values = $this->decoders($this->getOptionsWidget());
+
+ // Positions.
+ $this->position = $this->getPositionWidget();
+
+ // Page.
+ $this->page = basename(__FILE__);
+
+ // ClassName.
+ $class = new \ReflectionClass($this);
+ $this->className = $class->getShortName();
+
+ // Title.
+ $this->title = __('Inventory');
+
+ // Name.
+ if (empty($this->name) === true) {
+ $this->name = 'inventory';
+ }
+
+ // Must be configured before using.
+ $this->configurationRequired = false;
+ }
+
+
+ /**
+ * Decoders hack for retrocompability.
+ *
+ * @param array $decoder Values.
+ *
+ * @return array Returns the values with the correct key.
+ */
+ public function decoders(array $decoder): array
+ {
+ $values = [];
+ // Retrieve global - common inputs.
+ $values = parent::decoders($decoder);
+
+ if (isset($decoder['agentId']) === true) {
+ $values['agentId'] = $decoder['agentId'];
+ }
+
+ if (isset($decoder['agentAlias']) === true) {
+ $values['agentAlias'] = $decoder['agentAlias'];
+ }
+
+ if (isset($decoder['metaconsoleId']) === true) {
+ $values['metaconsoleId'] = $decoder['metaconsoleId'];
+ }
+
+ if (isset($decoder['inventoryModuleId']) === true) {
+ $values['inventoryModuleId'] = $decoder['inventoryModuleId'];
+ }
+
+ if (isset($decoder['freeSearch']) === true) {
+ $values['freeSearch'] = $decoder['freeSearch'];
+ }
+
+ if (isset($decoder['orderByAgent']) === true) {
+ $values['orderByAgent'] = $decoder['orderByAgent'];
+ }
+
+ if (isset($decoder['idGroup']) === true) {
+ $values['idGroup'] = $decoder['idGroup'];
+ }
+
+ if (isset($decoder['utimestamp']) === true) {
+ $values['utimestamp'] = $decoder['utimestamp'];
+ }
+
+ return $values;
+ }
+
+
+ /**
+ * Generates inputs for form (specific).
+ *
+ * @return array Of inputs.
+ *
+ * @throws Exception On error.
+ */
+ public function getFormInputs(): array
+ {
+ $values = $this->values;
+
+ // Retrieve global - common inputs.
+ $inputs = parent::getFormInputs();
+
+ // Format Data.
+ $inputs[] = [
+ 'label' => __('Order by agent'),
+ 'arguments' => [
+ 'name' => 'order_by_agent',
+ 'type' => 'switch',
+ 'value' => $values['orderByAgent'],
+ ],
+ ];
+
+ $inputs[] = [
+ 'label' => __('Free search'),
+ 'arguments' => [
+ 'name' => 'free_search',
+ 'type' => 'text',
+ 'class' => 'w100p',
+ 'input_class' => 'flex-row',
+ 'value' => $values['freeSearch'],
+ 'return' => true,
+ ],
+ ];
+
+ $inputs[] = [
+ 'label' => __('Group'),
+ 'arguments' => [
+ 'type' => 'select_groups',
+ 'privilege' => 'AR',
+ 'name' => 'id_group',
+ 'selected' => $values['idGroup'],
+ 'nothing_value' => __('All'),
+ 'return' => true,
+ 'multiple' => false,
+ ],
+ ];
+
+ $inputs[] = [
+ 'label' => __('Agent'),
+ 'arguments' => [
+ 'type' => 'autocomplete_agent',
+ 'name' => 'agentAlias',
+ 'id_agent_hidden' => $values['agentId'],
+ 'name_agent_hidden' => 'agentId',
+ 'server_id_hidden' => $values['metaconsoleId'],
+ 'name_server_hidden' => 'metaconsoleId',
+ 'return' => true,
+ 'module_input' => true,
+ 'module_name' => 'moduleId',
+ 'module_none' => false,
+ 'size' => 0,
+ ],
+ ];
+
+ $fields = [];
+
+ array_unshift($fields, __('All'));
+
+ $inputs[] = [
+ 'label' => __('Module'),
+ 'arguments' => [
+ 'name' => 'module_inventory',
+ 'id' => 'module_inventory',
+ 'input_class' => 'flex-row',
+ 'type' => 'select',
+ 'selected' => io_safe_output($values['inventoryModuleId']),
+ 'nothing' => __('Basic info'),
+ 'nothing_value' => 'basic',
+ 'fields' => $fields,
+ 'class' => '',
+ 'return' => true,
+ 'sort' => true,
+ ],
+ ];
+
+ // Agent select.
+ if ($is_metaconsole === false) {
+ $agents = [];
+ $sql = 'SELECT id_agente, nombre FROM tagente';
+ if ($inventory_id_group > 0) {
+ $sql .= ' WHERE id_grupo = '.$inventory_id_group;
+ } else {
+ $user_groups = implode(',', array_keys(users_get_groups($config['id_user'])));
+
+ // Avoid errors if there are no groups.
+ if (empty($user_groups) === true) {
+ $user_groups = '"0"';
+ }
+
+ $sql .= ' WHERE id_grupo IN ('.$user_groups.')';
+ }
+
+ $result = db_get_all_rows_sql($sql);
+ if ($result) {
+ foreach ($result as $row) {
+ $agents[$row['id_agente']] = $row['nombre'];
+ }
+ }
+ }
+
+ // Date filter.
+ if (is_metaconsole() === false) {
+ $inputs[] = [
+ 'label' => \__('Date'),
+ 'arguments' => [
+ 'type' => 'select',
+ 'fields' => [],
+ 'name' => 'utimestamp',
+ 'selected' => $values['utimestamp'],
+ 'return' => true,
+ 'nothing' => \__('Last'),
+ 'nothing_value' => 0,
+ 'class' => 'fullwidth',
+ ],
+ ];
+ }
+
+ return $inputs;
+ }
+
+
+ /**
+ * Get Post for widget.
+ *
+ * @return array
+ */
+ public function getPost():array
+ {
+ // Retrieve global - common inputs.
+ $values = parent::getPost();
+
+ $values['agentId'] = (int) \get_parameter('agentId', 0);
+ $values['metaconsoleId'] = (int) \get_parameter('metaconsoleId', 0);
+ $values['inventoryModuleId'] = io_safe_output(\get_parameter('module_inventory', 'basic'));
+ $values['agentAlias'] = \get_parameter('agentAlias', '');
+ $values['freeSearch'] = (string) \get_parameter('free_search', '');
+ $values['orderByAgent'] = \get_parameter('order_by_agent', 0);
+ $values['idGroup'] = \get_parameter('id_group', 0);
+ $values['utimestamp'] = (int) get_parameter('utimestamp');
+
+ return $values;
+ }
+
+
+ /**
+ * Draw widget.
+ *
+ * @return string;
+ */
+ public function load()
+ {
+ global $config;
+
+ $inventory_id_agent = $this->values['agentId'];
+ $inventory_agent = $this->values['agentAlias'];
+
+ if (strlen($inventory_agent) === 0) {
+ $inventory_id_agent = -1;
+ $inventory_agent = __('All');
+ } else if ($inventory_agent == __('All')) {
+ $inventory_id_agent = 0;
+ }
+
+ $inventory_module = io_safe_input($this->values['inventoryModuleId']);
+
+ $inventory_id_group = (int) $this->values['idGroup'];
+ $inventory_search_string = (string) $this->values['freeSearch'];
+ $order_by_agent = (bool) $this->values['orderByAgent'];
+ $utimestamp = (int) $this->values['utimestamp'];
+
+ $pagination_url_parameters = [
+ 'inventory_id_agent' => $inventory_id_agent,
+ 'inventory_agent' => $inventory_agent,
+ 'inventory_id_group' => $inventory_id_group,
+ ];
+
+ $noFilterSelected = false;
+
+ // Get variables.
+ if (is_metaconsole() === true) {
+ $nodes_connection = metaconsole_get_connections();
+ $id_server = (int) $this->values['metaconsoleId'];
+
+ $pagination_url_parameters['id_server'] = $id_server;
+
+ if ($inventory_id_agent > 0) {
+ $inventory_id_server = (int) get_parameter('id_server_agent', -1);
+ $pagination_url_parameters['inventory_id_server'] = $inventory_id_server;
+
+ if ($inventory_id_server !== -1) {
+ $id_server = $inventory_id_server;
+ $pagination_url_parameters['id_server'] = $id_server;
+ }
+ }
+
+ // No filter selected.
+ $noFilterSelected = $inventory_id_agent === -1 && $inventory_id_group === 0 && $id_server === 0;
+
+ $nodo_image_url = $config['homeurl'].'/images/node.png';
+ if ($id_server > 0) {
+ $connection = metaconsole_get_connection_by_id($id_server);
+ $agents_node = metaconsole_get_agents_servers($connection['server_name'], $inventory_id_group);
+ $node = metaconsole_get_servers($id_server);
+ $nodos = [];
+
+ if (metaconsole_connect($connection) !== NOERR) {
+ ui_print_error_message(
+ __('There was a problem connecting with the node')
+ );
+ }
+
+ $sql = 'SELECT DISTINCT name as indexname, name
+ FROM tmodule_inventory, tagent_module_inventory
+ WHERE tmodule_inventory.id_module_inventory = tagent_module_inventory.id_module_inventory';
+
+ if ($inventory_id_agent > 0) {
+ $sql .= ' AND id_agente = '.$inventory_id_agent;
+ $agents_node = [$inventory_id_agent => $inventory_id_agent];
+ }
+
+ $result_module = db_get_all_rows_sql($sql);
+ // Get the data.
+ $rows_meta = inventory_get_datatable(
+ array_keys($agents_node),
+ $inventory_module,
+ $utimestamp,
+ $inventory_search_string,
+ false,
+ false,
+ $order_by_agent,
+ $server,
+ $pagination_url_parameters
+ );
+
+ $data_tmp['server_name'] = $connection['server_name'];
+ $data_tmp['dbhost'] = $connection['dbhost'];
+ $data_tmp['server_uid'] = $connection['server_uid'];
+ $data_tmp['data'] = $rows_meta;
+
+ $nodos[$connection['id']] = $data_tmp;
+ if ($result_data !== ERR_NODATA) {
+ $inventory_data .= $result_data;
+ }
+
+ // Restore db connection.
+ metaconsole_restore_db();
+ } else {
+ $result_module = [];
+ $nodos = [];
+ foreach ($nodes_connection as $key => $server) {
+ $agents_node = metaconsole_get_agents_servers($server['server_name'], $inventory_id_group);
+ $connection = metaconsole_get_connection($server['server_name']);
+ if (metaconsole_connect($connection) !== NOERR) {
+ continue;
+ }
+
+ $sql = 'SELECT DISTINCT name as indexname, name
+ FROM tmodule_inventory, tagent_module_inventory
+ WHERE tmodule_inventory.id_module_inventory = tagent_module_inventory.id_module_inventory';
+ if ($inventory_id_agent > 0) {
+ $sql .= ' AND id_agente = '.$inventory_id_agent;
+ $agents_node = [$inventory_id_agent => $inventory_id_agent];
+ }
+
+ $result = db_get_all_rows_sql($sql);
+ if ($result !== false) {
+ $result_module = array_merge($result_module, $result);
+ // Get the data.
+ $rows_meta = inventory_get_datatable(
+ array_keys($agents_node),
+ $inventory_module,
+ $utimestamp,
+ $inventory_search_string,
+ false,
+ false,
+ $order_by_agent,
+ $server,
+ $pagination_url_parameters
+ );
+
+ $data_tmp['server_name'] = $server['server_name'];
+ $data_tmp['dbhost'] = $server['dbhost'];
+ $data_tmp['server_uid'] = $server['server_uid'];
+ $data_tmp['data'] = $rows_meta;
+ $nodos[$server['id']] = $data_tmp;
+ if ($result_data !== ERR_NODATA) {
+ $inventory_data .= $result_data;
+ }
+ }
+
+ // Restore db connection.
+ metaconsole_restore_db();
+ }
+ }
+
+ $fields = [];
+ foreach ($result_module as $row) {
+ $id = array_shift($row);
+ $value = array_shift($row);
+ $fields[$id] = $value;
+ }
+ }
+
+ // Agent select.
+ if (is_metaconsole() === false) {
+ $agents = [];
+ $sql = 'SELECT id_agente, nombre FROM tagente';
+ if ($inventory_id_group > 0) {
+ $sql .= ' WHERE id_grupo = '.$inventory_id_group;
+ } else {
+ $user_groups = implode(',', array_keys(users_get_groups($config['id_user'])));
+
+ // Avoid errors if there are no groups.
+ if (empty($user_groups) === true) {
+ $user_groups = '"0"';
+ }
+
+ $sql .= ' WHERE id_grupo IN ('.$user_groups.')';
+ }
+
+ $result = db_get_all_rows_sql($sql);
+ if ($result) {
+ foreach ($result as $row) {
+ $agents[$row['id_agente']] = $row['nombre'];
+ }
+ }
+ }
+
+ $filteringFunction = '';
+ if ($inventory_module !== 'basic') {
+ if (is_metaconsole() === true) {
+ if ($order_by_agent === true) {
+ $count_nodos_tmp = [];
+ foreach ($nodos as $count_value) {
+ array_push($count_nodos_tmp, $count_value['server_name']);
+ }
+
+ $count = array_count_values($count_nodos_tmp);
+
+ foreach ($nodos as $nodo) {
+ $agents = '';
+
+ foreach ($nodo['data'] as $agent_rows) {
+ $modules = '';
+
+ foreach ($agent_rows['row'] as $key => $row) {
+ $columns = explode(';', io_safe_output($row['data_format']));
+ array_push($columns, 'Timestamp');
+ $data = [];
+ $data_rows = explode(PHP_EOL, $row['data']);
+ foreach ($data_rows as $data_row) {
+ // Exclude results don't match filter.
+ if ($inventory_search_string && preg_match('/'.io_safe_output($inventory_search_string).'/', ($data_row)) == 0) {
+ continue;
+ }
+
+ $column_data = explode(';', io_safe_output($data_row));
+
+ if ($column_data[0] !== '') {
+ $row_tmp = [];
+ foreach ($column_data as $key => $value) {
+ $row_tmp[$columns[$key]] = $value;
+ }
+
+ $row_tmp['Timestamp'] = $row['timestamp'];
+ array_push($data, (object) $row_tmp);
+ }
+ }
+
+ $id_table = 'id_'.$row['id_module_inventory'].'_'.$nodo['server_uid'];
+ $table = ui_print_datatable(
+ [
+ 'id' => $id_table,
+ 'class' => 'info_table w100p',
+ 'style' => 'width: 100%',
+ 'columns' => $columns,
+ 'column_names' => $columns,
+ 'no_sortable_columns' => [],
+ 'data_element' => $data,
+ 'searching' => true,
+ 'dom_elements' => 'frtilp',
+ 'order' => [
+ 'field' => $columns[0],
+ 'direction' => 'asc',
+ ],
+ 'zeroRecords' => __('No inventory found'),
+ 'emptyTable' => __('No inventory found'),
+ 'return' => true,
+ 'no_sortable_columns' => [-1],
+ 'csv' => 0,
+ 'mini_pagination' => true,
+ 'mini_search' => true,
+ ]
+ );
+
+ $modules .= ui_toggle(
+ $table,
+ '';
- $output .= \grafico_modulo_sparse($params);
+ if ($this->values['projection_switch'] === true) {
+ $params_graphic = [
+ 'period' => $this->values['period'],
+ 'date' => strtotime(date('Y-m-d H:i:s')),
+ 'only_image' => false,
+ 'homeurl' => ui_get_full_url(false, false, false, false).'/',
+ 'height' => ((int) $size['height'] - $trickHight),
+ 'landscape' => $content['landscape'],
+ 'return_img_base_64' => true,
+ ];
+
+ $params_combined = [
+ 'projection' => $this->values['period_projection'],
+ ];
+
+ $return['chart'] = graphic_combined_module(
+ [$this->values['moduleId']],
+ $params_graphic,
+ $params_combined
+ );
+ $output .= $return['chart'];
+ } else {
+ $params = [
+ 'agent_module_id' => $this->values['moduleId'],
+ 'width' => '100%',
+ 'height' => ((int) $size['height'] - $trickHight),
+ 'period' => $this->values['period'],
+ 'title' => $module_name,
+ 'unit' => $units_name,
+ 'homeurl' => $config['homeurl'],
+ 'backgroundColor' => 'transparent',
+ 'show_legend' => $this->values['showLegend'],
+ 'show_title' => $module_name,
+ 'menu' => false,
+ 'dashboard' => true,
+ ];
+ $output .= \grafico_modulo_sparse($params);
+ }
+
$output .= '
';
return $output;
}
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 6b4b293a0c..dc3e1e582d 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -131,7 +131,7 @@
data[6][3] = html_print_checkbox_switch(
- 'fullscale',
+ 'fullscalee',
1,
(bool) $fullscale,
true,
false
);
+
+ $table->data[7][0] = __('Projection graph');
+ $table->data[7][0] .= ui_print_help_tip(
+ __('Projection graph take as begin date the current time'),
+ true
+ );
+ $table->data[7][1] = html_print_checkbox_switch(
+ 'enable_projected_period',
+ 1,
+ (bool) $enable_projected_period,
+ true
+ );
+
+ $table->data[7][2] = __('Projection period');
+ $table->data[7][3] = '
'.html_print_extended_select_for_time(
+ 'period_projected',
+ $period_projected,
+ '',
+ '',
+ 0,
+ 7,
+ true
+ ).'
';
} else {
$table->data[0][0] = __('Begin date');
$table->data[0][1] = html_print_input_text(
@@ -514,27 +539,29 @@ ui_print_message_dialog(
);
$params = [
- 'agent_module_id' => $id,
- 'period' => $period,
- 'show_events' => $draw_events,
- 'title' => $label,
- 'unit_name' => $unit,
- 'show_alerts' => $draw_alerts,
- 'date' => $date,
- 'unit' => $unit,
- 'baseline' => $baseline,
- 'homeurl' => $urlImage,
- 'adapt_key' => 'adapter_'.$graph_type,
- 'compare' => $time_compare,
- 'show_unknown' => $unknown_graph,
- 'percentil' => (($show_percentil) ? $config['percentil'] : null),
- 'type_graph' => $config['type_module_charts'],
- 'fullscale' => $fullscale,
- 'zoom' => $zoom,
- 'height' => 300,
- 'type_mode_graph' => $type_mode_graph,
- 'histogram' => $histogram,
- 'begin_date' => strtotime($start_date.' '.$start_time),
+ 'agent_module_id' => $id,
+ 'period' => $period,
+ 'show_events' => $draw_events,
+ 'title' => $label,
+ 'unit_name' => $unit,
+ 'show_alerts' => $draw_alerts,
+ 'date' => $date,
+ 'unit' => $unit,
+ 'baseline' => $baseline,
+ 'homeurl' => $urlImage,
+ 'adapt_key' => 'adapter_'.$graph_type,
+ 'compare' => $time_compare,
+ 'show_unknown' => $unknown_graph,
+ 'percentil' => (($show_percentil) ? $config['percentil'] : null),
+ 'type_graph' => $config['type_module_charts'],
+ 'fullscale' => $fullscale,
+ 'zoom' => $zoom,
+ 'height' => 300,
+ 'type_mode_graph' => $type_mode_graph,
+ 'histogram' => $histogram,
+ 'begin_date' => strtotime($start_date.' '.$start_time),
+ 'enable_projected_period' => $enable_projected_period,
+ 'period_projected' => $period_projected,
];
// Graph.
diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php
index 6f5154a42c..8d033185af 100644
--- a/pandora_console/operation/agentes/ver_agente.php
+++ b/pandora_console/operation/agentes/ver_agente.php
@@ -69,6 +69,8 @@ if (is_ajax()) {
$id_group = (int) get_parameter('id_group');
$pendingdelete = (bool) get_parameter('pendingdelete');
$get_node_agent = (bool) get_parameter('get_node_agent', false);
+ $get_agent_inventory_modules = (bool) get_parameter('get_agent_inventory_modules', false);
+ $get_agent_inventory_dates = (bool) get_parameter('get_agent_inventory_dates', false);
$refresh_contact = get_parameter('refresh_contact', 0);
@@ -1328,6 +1330,102 @@ if (is_ajax()) {
}
}
+ if ($get_agent_inventory_modules) {
+ $inventory_id_agent = get_parameter('id_agent');
+ $id_node = (int) get_parameter('id_node');
+
+ $sql = 'SELECT DISTINCT(`name`)
+ FROM tmodule_inventory, tagent_module_inventory
+ WHERE tmodule_inventory.id_module_inventory = tagent_module_inventory.id_module_inventory';
+
+ if ($inventory_id_agent > 0) {
+ $sql .= ' AND id_agente = '.$inventory_id_agent;
+ }
+
+ $fields = [];
+
+ // Get results from all nodes if id_node equals to 0.
+ if ($id_node === 0 && is_metaconsole() === true) {
+ $result = [];
+ $nodes_connection = metaconsole_get_connections();
+
+ foreach ($nodes_connection as $key => $server) {
+ $id_node = $server['id'];
+
+ try {
+ if (is_metaconsole() === true) {
+ $node = new Node($id_node);
+ $node->connect();
+ }
+
+ $node_result = db_get_all_rows_sql($sql);
+
+ if ($node_result === false) {
+ continue;
+ }
+
+ $result = array_merge(
+ $result,
+ $node_result
+ );
+
+ if (is_metaconsole() === true) {
+ $node->disconnect();
+ }
+ } catch (Exception $e) {
+ if ($node !== null) {
+ $node->disconnect();
+ }
+
+ return;
+ }
+ }
+ } else {
+ try {
+ if (is_metaconsole() === true) {
+ $node = new Node($id_node);
+ $node->connect();
+ }
+
+ $result = db_get_all_rows_sql($sql);
+
+ if (is_metaconsole() === true) {
+ $node->disconnect();
+ }
+ } catch (Exception $e) {
+ if ($node !== null) {
+ $node->disconnect();
+ }
+
+ return;
+ }
+ }
+
+ if ($result === false) {
+ $result = [];
+ }
+
+ echo json_encode($result);
+
+ return;
+ }
+
+ if ($get_agent_inventory_dates) {
+ $inventory_module = get_parameter('module', 0);
+ $inventory_id_agent = (int) get_parameter('id_agent', 0);
+ $inventory_id_group = (int) get_parameter('id_group', 0);
+
+ $dates = inventory_get_dates(
+ $inventory_module,
+ $inventory_id_agent,
+ $inventory_id_group
+ );
+
+ echo json_encode($dates);
+
+ return;
+ }
+
return;
}
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index bc3184f6ea..3823d30ad6 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.773.3
-%define release 230905
+%define release 230906
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index dee4bc02e8..308686eff8 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.773.3
-%define release 230905
+%define release 230906
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index ce151be738..a0022361c6 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 7.0NG.773.3
-%define release 230905
+%define release 230906
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index e5a7e1c71f..df72528214 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.773.3-230905
+Version: 7.0NG.773.3-230906
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 3b3376eade..7c68242ec8 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-pandora_version="7.0NG.773.3-230905"
+pandora_version="7.0NG.773.3-230906"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index f4e44f9605..d830591889 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -46,7 +46,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.773.3";
-my $pandora_build = "230905";
+my $pandora_build = "230906";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 782447fdc4..0aa20fcffb 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "7.0NG.773.3";
-my $pandora_build = "230905";
+my $pandora_build = "230906";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index e6af575ed6..38e15b7842 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_server
%define version 7.0NG.773.3
-%define release 230905
+%define release 230906
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 0c7de5a3c3..722d9d2f43 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -4,7 +4,7 @@
%global __os_install_post %{nil}
%define name pandorafms_server
%define version 7.0NG.773.3
-%define release 230905
+%define release 230906
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 0d3c5d81e9..7b3751cb8b 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.773.3"
-PI_BUILD="230905"
+PI_BUILD="230906"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 02161fe7f3..08b79de11a 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.773.3 Build 230905";
+my $version = "7.0NG.773.3 Build 230906";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2f20be3928..1a36be5ab9 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "7.0NG.773.3 Build 230905";
+my $version = "7.0NG.773.3 Build 230906";
# save program name for logging
my $progname = basename($0);