'.__('From').':
';
+ $table->data[0][0] = ''.__('From').':
';
$table->data[0][0] .= html_print_input_text('date_init', $date_init, '', 12, 10, true).' ';
$table->data[0][0] .= html_print_input_text('time_init', $time_init, '', 10, 7, true).' ';
$table->data[0][0] .= ''.html_print_table($table_mail_test, true).$submitButton.'
';
}
+
+
+function dot_tab(array $tabs=[], array $jump_to=[])
+{
+ $tabs_link = '';
+ if (isset($tabs) === true) {
+ foreach ($tabs as $value) {
+ $tabs_link .= $value;
+ }
+ }
+
+ $tabs_link .= '
';
+
+ $tabs_jump_to = '';
+ if (isset($jump_to) === true) {
+ foreach ($jump_to as $value) {
+ $tabs_jump_to .= $value;
+ }
+ }
+
+ $output = '
+
+
+
+
+
+
+ ';
+
+ return $output;
+}
\ No newline at end of file
diff --git a/pandora_console/include/functions_inventory.php b/pandora_console/include/functions_inventory.php
index afa61c3811..3fd8c3f198 100644
--- a/pandora_console/include/functions_inventory.php
+++ b/pandora_console/include/functions_inventory.php
@@ -788,22 +788,24 @@ function inventory_get_datatable(
$rows = db_get_all_rows_sql($sql);
if ($order_by_agent === false) {
$modules = [];
- foreach ($rows as $row) {
- if ($row['utimestamp'] !== $row['last_update']) {
- $row['timestamp'] = $row['last_update_timestamp'];
- }
-
- $data_rows = explode(PHP_EOL, $row['data_inventory']);
- foreach ($data_rows as $data_key => $data_value) {
- if (empty($inventory_search_string) !== true) {
- $search_check = strpos(str_replace(' ', ' ', $data_value), $inventory_search_string);
- } else {
- $search_check = true;
+ if ($rows !== false) {
+ foreach ($rows as $row) {
+ if ($row['utimestamp'] !== $row['last_update']) {
+ $row['timestamp'] = $row['last_update_timestamp'];
}
- if (empty($data_value) === false && $search_check !== false) {
- $row['data'] = $data_value;
- $modules[$row['name']][$row['name_agent'].'-'.$data_key.'-'.$data_value] = $row;
+ $data_rows = explode(PHP_EOL, $row['data_inventory']);
+ foreach ($data_rows as $data_key => $data_value) {
+ if (empty($inventory_search_string) !== true) {
+ $search_check = strpos(str_replace(' ', ' ', $data_value), $inventory_search_string);
+ } else {
+ $search_check = true;
+ }
+
+ if (empty($data_value) === false && $search_check !== false) {
+ $row['data'] = $data_value;
+ $modules[$row['name']][$row['name_agent'].'-'.$data_key.'-'.$data_value] = $row;
+ }
}
}
}
@@ -890,6 +892,15 @@ function get_data_basic_info_sql($params, $count=false)
if ($params['id_group'] > 0) {
$where .= sprintf(' AND id_grupo = %d', $params['id_group']);
+ } else {
+ global $config;
+ $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"';
+ }
+
+ $where .= sprintf(' AND id_grupo IN (%s)', $user_groups);
}
if ($params['search'] > 0) {
diff --git a/pandora_console/include/functions_menu.php b/pandora_console/include/functions_menu.php
index aa19f58ded..9e2824f9e4 100644
--- a/pandora_console/include/functions_menu.php
+++ b/pandora_console/include/functions_menu.php
@@ -699,9 +699,9 @@ function menu_get_sec($with_categories=false)
}
$sec_array[$k]['optgroup'] = $category;
- $sec_array[$k]['name'] = $v['text'];
+ $sec_array[$k]['name'] = (isset($v['text']) === true) ? $v['text'] : '';
} else {
- $sec_array[$k] = $v['text'];
+ $sec_array[$k] = (isset($v['text']) === true) ? $v['text'] : '';
}
}
diff --git a/pandora_console/include/functions_modules.php b/pandora_console/include/functions_modules.php
index 2d3b5676ec..06ea8ce480 100755
--- a/pandora_console/include/functions_modules.php
+++ b/pandora_console/include/functions_modules.php
@@ -2700,6 +2700,14 @@ function modules_get_agentmodule_data_for_humans($module)
if ($data_macro !== false) {
$salida = $data_macro;
} else {
+ if (isset($module['current_interval']) === false) {
+ $module['current_interval'] = 0;
+ }
+
+ if (isset($module['module_name']) === false) {
+ $module['module_name'] = 0;
+ }
+
$salida = ui_print_module_string_value(
$module['datos'],
empty($module['id']) ? $module['id_agente_modulo'] : $module['id'],
@@ -5074,3 +5082,28 @@ function modules_made_compatible($id_tipo_modulo)
return true;
}
}
+
+
+/**
+ * Check if module is used by agent for Safe mode.
+ *
+ * @param integer $id_module Id for module to check
+ *
+ * @return boolean
+ */
+function modules_check_safe_mode($id_module)
+{
+ $id_agent = modules_give_agent_id_from_module_id($id_module);
+ if ($id_agent === 0) {
+ // No exist agent with this id.
+ return false;
+ }
+
+ $agent = agents_get_agent($id_agent);
+
+ if (isset($agent['safe_mode_module']) === true && (int) $agent['safe_mode_module'] === (int) $id_module) {
+ return true;
+ } else {
+ return false;
+ }
+}
diff --git a/pandora_console/include/functions_register.php b/pandora_console/include/functions_register.php
index db1bc8bf21..6b1d6ec0a7 100644
--- a/pandora_console/include/functions_register.php
+++ b/pandora_console/include/functions_register.php
@@ -144,7 +144,7 @@ function config_wiz_modal(
'UTC' => __('UTC'),
];
- if ($zone_selected == '') {
+ if (isset($zone_selected) === false) {
if ($config['timezone'] != '') {
$zone_array = explode('/', $config['timezone']);
$zone_selected = $zone_array[0];
diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php
index 7534cb5e23..c5c7090623 100755
--- a/pandora_console/include/functions_reporting.php
+++ b/pandora_console/include/functions_reporting.php
@@ -12546,7 +12546,7 @@ function reporting_get_stats_indicators($data, $width=280, $height=20, $html=tru
$table_ind = html_get_predefined_table();
$servers = [];
- $servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver');
+ $servers['all'] = (int) count((servers_get_info() ?? []));
$servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']);
if ($servers['all'] == 0) {
@@ -12607,7 +12607,7 @@ function reporting_get_stats_indicators_mobile($data, $width=280, $height=20, $h
$table_ind = html_get_predefined_table();
$servers = [];
- $servers['all'] = (int) db_get_value('COUNT(id_server)', 'tserver');
+ $servers['all'] = (int) count((servers_get_info() ?? []));
$servers['up'] = (int) servers_check_status();
$servers['down'] = ($servers['all'] - $servers['up']);
if ($servers['all'] == 0) {
@@ -16206,7 +16206,8 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
// Si viene de no iniciado busco el primer dato del modulo y si es de histórico.
$first_utimestamp = false;
$search_historydb = false;
- $extract_first_data = modules_get_first_date($content['id_agent_module'], 0);
+ // Limitamos el primer dato al rango de tiempo seleccionado por el usuario.
+ $extract_first_data = modules_get_first_date($content['id_agent_module'], $date_start);
if (empty($extract_first_data) === false) {
$first_utimestamp = $extract_first_data['first_utimestamp'];
$search_historydb = (isset($extract_first_data['search_historydb']) === true) ? $extract_first_data['search_historydb'] : false;
@@ -16311,7 +16312,8 @@ function reporting_module_histogram_graph($report, $content, $pdf=0)
$return['data_ok'] = $check_ok;
$return['data_total'] = $check_total;
if ($check_total > 0) {
- $return['percent_ok'] = (($time_ok * 100) / $content['period']);
+ $percent_ok = (($time_ok * 100) / $content['period']);
+ $return['percent_ok'] = ($percent_ok > 100) ? 100 : $percent_ok;
} else {
$return['percent_ok'] = 0;
}
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index bb9f57f5c3..c8e774acc7 100755
--- a/pandora_console/include/functions_reports.php
+++ b/pandora_console/include/functions_reports.php
@@ -1435,7 +1435,7 @@ function custom_fields_macros_report($macro, $key_macro)
$macro['server_id']
);
if (metaconsole_connect($server) != NOERR) {
- continue;
+ break;
}
}
diff --git a/pandora_console/include/functions_servers.php b/pandora_console/include/functions_servers.php
index bdc8a56fc9..8805998232 100644
--- a/pandora_console/include/functions_servers.php
+++ b/pandora_console/include/functions_servers.php
@@ -615,7 +615,7 @@ function servers_get_rate($avg_interval, $num_modules)
* This function will get all the server information in an array
* or a specific server.
*
- * @param integer $id_server An optional integer or array of integers
+ * @param integer|array $id_server An optional integer or array of integers
* to select specific servers.
*
* @return mixed False in case the server doesn't exist or an array with info.
@@ -624,28 +624,63 @@ function servers_get_info($id_server=-1, $sql_limit=-1)
{
global $config;
- if (is_array($id_server)) {
- $select_id = ' WHERE id_server IN ('.implode(',', $id_server).')';
+ $select_id = '';
+ if (is_array($id_server) === true) {
+ $select_id = ' AND id_server IN ('.implode(',', $id_server).')';
} else if ($id_server > 0) {
- $select_id = ' WHERE id_server IN ('.(int) $id_server.')';
- } else {
- $select_id = '';
+ $select_id = ' AND id_server IN ('.(int) $id_server.')';
}
- $sql = '
- SELECT *
- FROM tserver '.$select_id.'
- ORDER BY server_type';
+ $types_sql = sprintf(
+ ' AND (
+ `server_type` != %d AND
+ `server_type` != %d
+ )',
+ SERVER_TYPE_AUTOPROVISION,
+ SERVER_TYPE_MIGRATION
+ );
+ if (is_metaconsole() === true && isset($config['ndbh']) === false) {
+ $types_sql = sprintf(
+ ' AND (
+ `server_type` = %d OR
+ `server_type` = %d OR
+ `server_type` = %d OR
+ `server_type` = %d
+ )',
+ SERVER_TYPE_AUTOPROVISION,
+ SERVER_TYPE_EVENT,
+ SERVER_TYPE_MIGRATION,
+ SERVER_TYPE_PREDICTION
+ );
+ }
+
+ $sql = sprintf(
+ 'SELECT *
+ FROM tserver
+ WHERE 1=1
+ %s
+ %s
+ ORDER BY server_type',
+ $select_id,
+ $types_sql
+ );
if ($sql_limit !== -1) {
- $sql = '
- SELECT *
- FROM tserver '.$select_id.'
- ORDER BY server_type'.$sql_limit;
+ $sql = sprintf(
+ 'SELECT *
+ FROM tserver
+ WHERE 1=1
+ %s
+ %s
+ ORDER BY server_type
+ %s',
+ $select_id,
+ $types_sql,
+ $sql_limit
+ );
}
$result = db_get_all_rows_sql($sql);
- $time = get_system_time();
if (empty($result)) {
return false;
@@ -1445,6 +1480,12 @@ function servers_get_server_string_name(int $server)
case SERVER_TYPE_NCM:
return __('NCM server');
+ case SERVER_TYPE_AUTOPROVISION:
+ return __('Autoprovision server');
+
+ case SERVER_TYPE_MIGRATION:
+ return __('Migration server');
+
default:
return __('N/A');
}
diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php
index 99a0b07612..d545ff102b 100644
--- a/pandora_console/include/functions_snmp_browser.php
+++ b/pandora_console/include/functions_snmp_browser.php
@@ -37,26 +37,27 @@ enterprise_include_once(
// Date format for nfdump.
global $nfdump_date_format;
-$nfdump_date_format = 'Y/m/d.H:i:s';/**
- * Generates a Tree with given $tree information.
- *
- * Selects all netflow filters (array (id_name => id_name)) or filters filtered
- * Used also in Cloud Wizard.
- *
- * @param string $tree SNMP tree returned by snmp_broser_get_tree.
- * @param string $id Level ID. Do not set, used for recursion.
- * @param string $depth Branch depth. Do not set, used for recursion.
- * @param integer $last Last.
- * @param array $last_array Last_array.
- * @param string $sufix Sufix.
- * @param array $checked Checked.
- * @param boolean $descriptive_ids Descriptive_ids.
- * @param string $previous_id Previous_id.
- *
- * @return string HTML code with complete tree.
- */
+$nfdump_date_format = 'Y/m/d.H:i:s';
+/**
+ * Generates a Tree with given $tree information.
+ *
+ * Selects all netflow filters (array (id_name => id_name)) or filters filtered
+ * Used also in Cloud Wizard.
+ *
+ * @param string $tree SNMP tree returned by snmp_broser_get_tree.
+ * @param string $id Level ID. Do not set, used for recursion.
+ * @param string $depth Branch depth. Do not set, used for recursion.
+ * @param integer $last Last.
+ * @param array $last_array Last_array.
+ * @param string $sufix Sufix.
+ * @param array $checked Checked.
+ * @param boolean $descriptive_ids Descriptive_ids.
+ * @param string $previous_id Previous_id.
+ *
+ * @return string HTML code with complete tree.
+ */
function snmp_browser_get_html_tree(
$tree,
$id=0,
@@ -741,7 +742,7 @@ function snmp_browser_print_container(
)
);
- $table->data[0][1] .= html_print_label_input_block(
+ $table->data[0][1] = html_print_label_input_block(
__('Port'),
html_print_input(
[
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 45aa64df22..3999857995 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1445,11 +1445,13 @@ function ui_format_alert_row(
if (is_metaconsole() === true) {
// Do not show link if user cannot access node
if ((bool) can_user_access_node() === true) {
- $url = $server['server_url'].'/index.php?'.'sec=estado&'.'sec2=operation/agentes/ver_agente&'.'id_agente='.$agente['id_agente'];
+ $hashdata = metaconsole_get_server_hashdata($server);
+ $url = $server['server_url'].'/index.php?sec=estado&sec2=operation/agentes/ver_agente&loginhash=auto&loginhash_data='.$hashdata.'&loginhash_user='.str_rot13($config['id_user']).'&id_agente='.$agente['id_agente'];
$data[$index['agent_name']] .= html_print_anchor(
[
'href' => $url,
'content' => ''.$agente['alias'].'',
+ 'target' => '_blank',
],
true
);
@@ -2940,18 +2942,22 @@ function ui_print_help_tip(
$img = 'images/info@svg.svg';
}
- $output = '';
+ $text_title = (strlen($text) >= 60) ? substr($text, 0, 60).'...' : $text;
+
+ $id = random_int(1, 99999);
+ $output = '';
+ $output .= '
';
if ($return) {
return $output;
@@ -4016,19 +4022,21 @@ function ui_print_datatable(array $parameters)
$parameters['order']['order'] = $order;
$parameters['order']['direction'] = $direction;
- foreach ($parameters['no_sortable_columns'] as $key => $find) {
- $found = array_search(
- $parameters['no_sortable_columns'][$key],
- $columns_tmp
- );
+ if (isset($parameters['no_sortable_columns']) === true) {
+ foreach ($parameters['no_sortable_columns'] as $key => $find) {
+ $found = array_search(
+ $parameters['no_sortable_columns'][$key],
+ $columns_tmp
+ );
- if ($found !== false) {
- unset($parameters['no_sortable_columns'][$key]);
- array_push($parameters['no_sortable_columns'], $found);
- }
+ if ($found !== false) {
+ unset($parameters['no_sortable_columns'][$key]);
+ array_push($parameters['no_sortable_columns'], $found);
+ }
- if (is_int($parameters['no_sortable_columns'][$key]) === false) {
- unset($parameters['no_sortable_columns'][$key]);
+ if (is_int($parameters['no_sortable_columns'][$key]) === false) {
+ unset($parameters['no_sortable_columns'][$key]);
+ }
}
}
@@ -4092,11 +4100,13 @@ function ui_print_datatable(array $parameters)
$filter .= ''.$text.'
';
$output .= html_print_image(
$img,
true,
[
- 'title' => $text,
+ 'title' => $text_title,
'class' => $blink === true ? 'blink' : '',
'style' => 'width: 16px; height: 16px;',
],
false,
$is_relative && is_metaconsole()
- ).'';
+ ).'- ';
- foreach ($parameters['form']['inputs'] as $input) {
- if ($input['type'] === 'date_range') {
- $filter .= '
- '.html_print_select_date_range('date', true).' '; - } else { - $filter .= html_print_input(($input + ['return' => true]), 'li'); + if (isset($parameters['form']['inputs']) === true) { + foreach ($parameters['form']['inputs'] as $input) { + if ($input['type'] === 'date_range') { + $filter .= '
- '.html_print_select_date_range('date', true).' '; + } else { + $filter .= html_print_input(($input + ['return' => true]), 'li'); + } } } @@ -4246,7 +4256,7 @@ function ui_print_datatable(array $parameters) } $parameters['phpDate'] = date('Y-m-d'); - $parameters['dataElements'] = json_encode($parameters['data_element']); + $parameters['dataElements'] = (isset($parameters['data_element']) === true) ? json_encode($parameters['data_element']) : ''; // * START JAVASCRIPT. $file_path = $config['homedir'].'/include/javascript/datatablesFunction.js'; @@ -5230,7 +5240,8 @@ function ui_print_standard_header( bool $godmode=false, array $options=[], array $breadcrumbs=[], - array $fav_menu_config=[] + array $fav_menu_config=[], + string $dots='', ) { // For standard breadcrumbs. ui_require_css_file('discovery'); @@ -5269,7 +5280,8 @@ function ui_print_standard_header( '', $headerInformation->printHeader(true), false, - $fav_menu_config + $fav_menu_config, + $dots ); if ($return !== true) { echo $output; @@ -5310,7 +5322,8 @@ function ui_print_page_header( $alias='', $breadcrumbs='', $hide_left_small=false, - $fav_menu_config=[] + $fav_menu_config=[], + $dots='', ) { global $config; @@ -5441,12 +5454,22 @@ function ui_print_page_header( } } - $buffer .= '
'
- )
- );
- } else {
- graphDiv
- .children()
- .append(
- $(
- ''
- )
- );
+ // Create remove button.
+ if (
+ graphDiv
+ .children()
+ .children()
+ .hasClass("parent_graph") === true
+ ) {
+ graphDiv
+ .children()
+ .children()
+ .children(":first-child")
+ .prepend(
+ $(
+ ''
+ )
+ );
+ } else {
+ graphDiv
+ .children()
+ .append(
+ $(
+ ''
+ )
+ );
+ }
}
}
}
@@ -753,7 +758,7 @@ $("#button-share-modal").click(function(e) {
window.open(
configHomeurl +
- "/operation/reporting/graph_analytics_public.php?" +
+ "operation/reporting/graph_analytics_public.php?" +
queryParams
);
});
diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js
index 2c39e69288..46892cca07 100644
--- a/pandora_console/include/javascript/pandora.js
+++ b/pandora_console/include/javascript/pandora.js
@@ -2450,6 +2450,33 @@ $(document).ready(function() {
});
}
}
+
+ $("[id^='div_tip_']").click(function() {
+ var id = $(this)
+ .attr("id")
+ .split("_")[2];
+
+ $("#tip_dialog_" + id).dialog({
+ title: $("#tip_dialog_" + id).data("title"),
+ modal: true,
+ maxWidth: 600,
+ minWidth: 400,
+ show: {
+ effect: "fade",
+ duration: 200
+ },
+ hide: {
+ effect: "fade",
+ duration: 200
+ },
+ closeOnEscape: true,
+ buttons: {
+ Close: function() {
+ $(this).dialog("close");
+ }
+ }
+ });
+ });
});
function close_info_box(id) {
diff --git a/pandora_console/include/javascript/pandora_modules.js b/pandora_console/include/javascript/pandora_modules.js
index b4445e0877..6b697fc2bb 100644
--- a/pandora_console/include/javascript/pandora_modules.js
+++ b/pandora_console/include/javascript/pandora_modules.js
@@ -1011,7 +1011,7 @@ function add_macro_field(macro, row_model_id, type_copy, k) {
$("#" + row_id).show();
}
-function load_plugin_macros_fields(row_model_id, moduleId = 0) {
+function load_plugin_macros_fields(row_model_id, moduleId = 0, is_policy = 0) {
// Get plugin macros when selected and load macros fields
var id_plugin = $("#id_plugin").val();
@@ -1024,6 +1024,7 @@ function load_plugin_macros_fields(row_model_id, moduleId = 0) {
params.push("get_plugin_macros=1");
}
params.push("id_plugin=" + id_plugin);
+ params.push("is_policy=" + is_policy);
jQuery.ajax({
data: params.join("&"),
diff --git a/pandora_console/include/lib/Dashboard/Manager.php b/pandora_console/include/lib/Dashboard/Manager.php
index fc54d29d2c..9c823ead01 100644
--- a/pandora_console/include/lib/Dashboard/Manager.php
+++ b/pandora_console/include/lib/Dashboard/Manager.php
@@ -1266,16 +1266,18 @@ class Manager implements PublicLogin
}
if (empty($cells) === false) {
- $result = array_reduce(
- $cells,
- function ($carry, $item) {
- $carry[$item['order']]['id'] = $item['id'];
- $carry[$item['order']]['position'] = $item['position'];
- $carry[$item['order']]['widgetId'] = $item['id_widget'];
+ $result = array_values(
+ array_reduce(
+ $cells,
+ function ($carry, $item) {
+ $carry[$item['order']]['id'] = $item['id'];
+ $carry[$item['order']]['position'] = $item['position'];
+ $carry[$item['order']]['widgetId'] = $item['id_widget'];
- return $carry;
- },
- []
+ return $carry;
+ },
+ []
+ )
);
}
diff --git a/pandora_console/include/lib/Dashboard/Widgets/maps_status.php b/pandora_console/include/lib/Dashboard/Widgets/maps_status.php
index 2e59af771c..12d0ef9461 100755
--- a/pandora_console/include/lib/Dashboard/Widgets/maps_status.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/maps_status.php
@@ -253,7 +253,7 @@ class MapsStatusWidget extends Widget
$fields = array_reduce(
$dataVc,
function ($carry, $item) {
- $carry[$item['id']] = $item['name'];
+ $carry[$item['id']] = io_safe_output($item['name']);
return $carry;
},
[]
@@ -350,7 +350,7 @@ class MapsStatusWidget extends Widget
// This will give us the group name.
$data[0] = '';
- $data[0] .= $user_layouts[$id_layout]['name'];
+ $data[0] .= io_safe_output($user_layouts[$id_layout]['name']);
$data[0] .= '';
// Status 0 is OK.
diff --git a/pandora_console/include/lib/ITSM/ITSM.php b/pandora_console/include/lib/ITSM/ITSM.php
index 4879ac9f39..14792e99ee 100644
--- a/pandora_console/include/lib/ITSM/ITSM.php
+++ b/pandora_console/include/lib/ITSM/ITSM.php
@@ -43,6 +43,9 @@ class ITSM
$this->userLevelConf = (bool) $config['ITSM_user_level_conf'];
$this->url = ($host ?? $config['ITSM_hostname']);
+ if (isset($config['ITSM_token']) === false) {
+ $config['ITSM_token'] = '';
+ }
$this->userBearer = ($token ?? $config['ITSM_token']);
if ($this->userLevelConf === true) {
diff --git a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
index 06e27e4fd6..02f60f8252 100644
--- a/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
+++ b/pandora_console/include/lib/TacticalView/GeneralTacticalView.php
@@ -144,9 +144,11 @@ class GeneralTacticalView
{
$js = '';
$output .= '';
@@ -58,9 +66,11 @@ if ($files !== false) {
}
}
-if ($files64 !== false) {
- foreach ($files64 as $key => $file) {
- $output .= '
';
+if (isset($files64) === true) {
+ if ($files64 !== false) {
+ foreach ($files64 as $key => $file) {
+ $output .= '';
+ }
}
}
diff --git a/pandora_plugins/Exchange_mail/exchange_mail.py b/pandora_plugins/Exchange_mail/exchange_mail.py
new file mode 100644
index 0000000000..65a6175da6
--- /dev/null
+++ b/pandora_plugins/Exchange_mail/exchange_mail.py
@@ -0,0 +1,400 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+EXCHANGE MAIL PLUGIN
+
+Author: Alejandro Sanchez Carrion
+Copyright: Copyright 2024, PandoraFMS
+Maintainer: Operations Department
+Status: Production
+Version: 1.0
+"""
+
+from exchangelib import Credentials,Configuration, Account, DELEGATE, OAUTH2, IMPERSONATION,Message, Mailbox
+from exchangelib import OAuth2Credentials
+from exchangelib.version import Version, EXCHANGE_O365
+from exchangelib.protocol import BaseProtocol, NoVerifyHTTPAdapter
+
+BaseProtocol.HTTP_ADAPTER_CLS = NoVerifyHTTPAdapter
+
+import urllib3
+urllib3.disable_warnings()
+
+import pandoraPlugintools as ppt
+
+import argparse,sys,re,json,os,traceback
+from datetime import datetime,timedelta,timezone
+
+
+
+__author__ = "Alejandro Sánchez Carrion"
+__copyright__ = "Copyright 2022, PandoraFMS"
+__maintainer__ = "Operations department"
+__status__ = "Production"
+__version__= '1.0'
+
+info = f"""
+Pandora FMS Exchange Mail
+Version = 1.0
+Description = This plugin can search for matches in your mail and find the number of matches, as well as list them.
+
+Manual execution
+
+./exchange_mail \
+--auth \
+--server \
+--smtp_address \
+--client_id \
+--tenant_id \
+--secret \
+[--user ] \
+[--password ] \
+[--subject ] \
+[--sender ] \
+[--date_start ] \
+[--date_end ] \
+[--mail_list ] \
+[--module_prefix ] \
+[--agent_prefix ] \
+[--group ] \
+[--interval ] \
+[--temporal ] \
+[--data_dir ] \
+[--transfer_mode ] \
+[--tentacle_client ] \
+[--tentacle_opts ] \
+[--tentacle_port ] \
+[--tentacle_address ] \
+[--log_file ]
+
+
+there are three parameters with which to filter the mails
+
+subject
+email
+date
+
+You can use only one and filter from that or use the following combinations:
+
+subject
+subject + sender
+subject + sender + date
+"""
+
+parser = argparse.ArgumentParser(description= info, formatter_class=argparse.RawTextHelpFormatter)
+
+parser.add_argument('--server' , help="Server name" , default = "outlook.office365.com" , type=str)
+parser.add_argument('--smtp_address' , help="SMTP address" , required = True , type=str)
+
+parser.add_argument('--user' , help="User name" , default="" , type=str)
+parser.add_argument('--password' , help="Password" , default="" , type=str)
+
+parser.add_argument('--client_id' , help="Client_id" , default="" , type=str)
+parser.add_argument('--tenant_id' , help="Tenant_id" , default="" , type=str)
+parser.add_argument('--secret' , help="Secret" , default="" , type=str)
+
+
+parser.add_argument('--subject' , help="Select match in subjects" , default=None , type=str)
+parser.add_argument('--sender' , help="Select coincidences from email" , default=None , type=str)
+parser.add_argument('--date_start' , help="Search for matches from a certain date,Each date must be separated by a hyphen and in quotation marks, with the following format: 'year-month-day-hour-minute'. example: '2021-1-12-0-0'", default=None, type=str)
+parser.add_argument('--date_end' , help="Search for matches from a certain date,Each date must be separated by a hyphen and in quotation marks, with the following format: 'year-month-day-hour-minute'. example: '2021-6-12-0-0'", default=None, type=str)
+parser.add_argument('--mail_list' , help='List mail coincidences' , default=0 ,type=int )
+
+parser.add_argument('--module_prefix' , help='Prefix for the modules. Example : meraki.' , default="" , type=str )
+parser.add_argument('--agent_prefix' , help='Prefix for the agents. Example : meraki.' , default="" , type=str )
+
+parser.add_argument('--group' , help='PandoraFMS destination group (default exchange)' , default='' , type=str )
+parser.add_argument('--interval' , help='Agent monitoring interval' , default=300 , type=int )
+parser.add_argument('--temporal' , help='PandoraFMS temporal dir' , default='/tmp' , type=str )
+parser.add_argument('--data_dir' , help='PandoraFMS data dir ' , default='/var/spool/pandora/data_in/' , type=str )
+parser.add_argument('--transfer_mode' , help='Data transfer mode, local or tentacle' , default="tentacle" , type=str )
+parser.add_argument('--tentacle_client' , help='Tentacle client path, by default tentacle_client' , default="tentacle_client" , type=str )
+parser.add_argument('--tentacle_opts' , help='Additional tentacle options' , default="" , type=str )
+parser.add_argument('--tentacle_port' , help='Tentacle port' , default=41121 , type=int )
+parser.add_argument('--tentacle_address' , help='Tentacle adress' , default="127.0.0.1" , type=str )
+
+parser.add_argument('--log_file' , help='Log file path' , default='/tmp/exchangemail_logfile.txt' , type=str )
+
+parser.add_argument('--auth', choices=['basic', 'oauth'], help='Auth type', required=True)
+
+args = parser.parse_args()
+
+###############
+## VARIABLES ##
+###############
+
+server = args.server
+smtp_address = args.smtp_address
+
+user = args.user
+password = args.password
+
+client_id = args.client_id
+tenant_id = args.tenant_id
+secret = args.secret
+
+subject = args.subject
+sender = args.sender
+date_start = args.date_start
+date_end = args.date_end
+mail_list = args.mail_list
+
+module_prefix = args.module_prefix
+agent_prefix = args.agent_prefix
+
+temporal = args.temporal
+group = args.group
+interval = args.interval
+data_dir = args.data_dir
+transfer_mode = args.transfer_mode
+
+tentacle_address = args.tentacle_address
+tentacle_port = args.tentacle_port
+tentacle_client = args.tentacle_client
+tentacle_opts = args.tentacle_opts
+
+log_file = args.log_file
+
+###############
+## FUNCTIONS ##
+###############
+
+def Oauth_session(credentials):
+ """
+ Creates an OAuth session with an Exchange server using the provided credentials.
+
+ Args:
+ credentials (Credentials): Credentials object containing information for OAuth authentication.
+
+ Returns:
+ Account: An Account object representing the OAuth session with the Exchange server.
+ """
+ try:
+ config = Configuration(server=server,credentials=credentials, auth_type=OAUTH2,version=Version(build=EXCHANGE_O365),)
+ account = Account(
+ smtp_address,
+ credentials=credentials,
+ config=config,
+ autodiscover=False,
+ access_type=IMPERSONATION)
+ return account
+ except Exception as e:
+ print(0)
+ write_to_log(f"{type(e).__name__}: {e}", log_file)
+ sys.exit()
+
+def basic_session(credentials):
+ """
+ Creates a basic session with an Exchange server using the provided credentials.
+
+ Args:
+ credentials (Credentials): Credentials object containing information for authentication.
+
+ Returns:
+ Account: An Account object representing the basic session with the Exchange server.
+ """
+ try:
+ config = Configuration(server=server, credentials=credentials)
+
+ account = Account(
+ primary_smtp_address=args.smtp_address,
+ autodiscover=False,
+ config=config,
+ access_type=DELEGATE
+ )
+ return account
+ except Exception as e:
+ print(0)
+ write_to_log(f"{type(e).__name__}: {e}", log_file)
+ sys.exit()
+
+def create_module(name, module_type, description, value, unit=""):
+ """
+ Creates a generic module based on a template.
+
+ Args:
+ module_prefix (str): The prefix for the module name.
+ name_suffix (str): The suffix to be appended to the module name.
+ module_type (str): The type of the module.
+ description (str): The description of the module.
+ value: The value of the module.
+ unit (str, optional): The unit of measurement for the module. Defaults to "".
+
+ Returns:
+ dict: A dictionary representing the generic module.
+ """
+ return {
+ "name": f'{module_prefix}{name}',
+ "type": module_type,
+ "desc": description,
+ "value": value,
+ "unit": unit
+ }
+
+def create_agent(count,list_mail = None):
+
+ """
+ Creates an agent with specified parameters and transfers it to a target address.
+
+ Args:
+ count (int): Number of mails matching the filter used in the run.
+ list_mail (str, optional): List of mails matching the filter used in the run. Default is None.
+
+ Returns:
+ None
+ """
+
+ modules = []
+
+ modules.append(create_module(f"{module_prefix}.Coincidences_count", "generic_data", "Number of mails matching the filter used in the run", count))
+
+ if list_mail is not None :
+
+ modules.append(create_module(f"{module_prefix}.Coincidences_list", "generic_data_string", "List of mails matching the filter used in the run", list_mail))
+
+ agent = {
+ "agent_name" : ppt.generate_md5(agent_prefix + smtp_address),
+ "agent_alias" : agent_prefix + smtp_address,
+ "parent_agent_name" : "",
+ "description" : "",
+ "version" : "",
+ "os_name" : "",
+ "os_version" : "",
+ "timestamp" : now(),
+ "address" : server,
+ "group" : group,
+ "interval" : interval,
+ "agent_mode" : "1"
+ }
+
+ xml_content = ppt.print_agent(agent, modules)
+ xml_file = ppt.write_xml(xml_content, agent["agent_name"])
+ ppt.transfer_xml(
+ xml_file,
+ transfer_mode=transfer_mode,
+ tentacle_ip=tentacle_address,
+ tentacle_port=tentacle_port
+ )
+ write_to_log("Agent: " + agent_prefix + smtp_address + " getting mail data.", log_file)
+
+def parse_result(list_email,sep="")-> list:
+
+ """
+ Parses a list of email elements and converts them into a list of dictionaries.
+
+ Args:
+ list_email (list): List of email elements to be parsed.
+ sep (str): Separator to join elements into a string. Default is an empty string.
+
+ Returns:
+ list: A list of dictionaries, where each dictionary has a single key "value" containing the joined string.
+ """
+
+ result=[]
+
+ for line in list_email:
+ str_line=sep.join(str(elem) for elem in line)
+ str_dict={"value":str_line}
+ result.append(str_dict)
+
+ return result
+
+def now(
+ utimestamp: bool = False
+ ):
+ """
+ Get the current time in the specified format or as a Unix timestamp.
+
+ Args:
+ utimestamp (bool): Set to True to get the Unix timestamp (epoch time).
+ print_flag (bool): Set to True to print the time to standard output.
+
+ Returns:
+ str: The current time in the desired format or as a Unix timestamp.
+ """
+
+ today = datetime.today()
+
+ if utimestamp:
+ time = datetime.timestamp(today)
+ else:
+ time = today.strftime('%Y/%m/%d %H:%M:%S')
+
+ return time
+
+def write_to_log(variable_content, log_file_path):
+ """
+ Writes the content of a variable to a log file with timestamp.
+
+ Args:
+ variable_content: Content of the variable to be logged.
+ log_file_path (str): Path to the log file.
+ """
+ timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+ log_entry = f"{timestamp} - {variable_content}\n"
+
+ try:
+ with open(log_file_path, 'a') as log_file:
+ log_file.write(log_entry)
+ except IOError as e:
+ print(f"Error writing to log file: {e}")
+
+if args.auth == 'basic':
+ credentials = Credentials(username=user, password=password)
+ account = basic_session(credentials)
+elif args.auth == 'oauth':
+ credentials = OAuth2Credentials(client_id=client_id, client_secret=secret, tenant_id=tenant_id)
+ account = Oauth_session(credentials)
+else:
+ print(0)
+ write_to_log(f"{type(e).__name__}: {e}", log_file)
+ sys.exit()
+
+try:
+ ## Only one parameter
+ if subject and sender==None and date_start==None and date_end == None:
+ filtered_items = account.inbox.filter(subject__contains=args.subject)
+ if subject==None and sender and date_start==None and date_end == None:
+ filtered_items = account.inbox.filter(sender__icontains=sender)
+ if subject==None and sender==None and date_start and date_end :
+
+ date_start=date_start.split("-")
+ date_end=date_end.split("-")
+ filtered_items = account.inbox.filter(datetime_received__range=(datetime(int(date_start[0].strip()), int(date_start[1].strip()), int(date_start[2].strip()), int(date_start[3].strip()), int(date_start[4].strip())).replace(tzinfo=timezone.utc),datetime(int(date_end[0].strip()), int(date_end[1].strip()), int(date_end[2].strip()), int(date_end[3].strip()), int(date_end[4].strip())).replace(tzinfo=timezone.utc)))
+
+ ## Subject + sender
+ if subject and sender and date_start==None and date_end==None :
+ filtered_items = account.inbox.filter(sender__icontains=sender,subject__contains=subject)
+
+ ## All parameters
+ if subject and sender and date_start and date_end :
+ date_start=date_start.split("-")
+ date_end=date_end.split("-")
+ filtered_items = account.inbox.filter(datetime_received__range=(datetime(int(date_start[0].strip()), int(date_start[1].strip()), int(date_start[2].strip()), int(date_start[3].strip()), int(date_start[4].strip())).replace(tzinfo=timezone.utc),datetime(int(date_end[0].strip()), int(date_end[1].strip()), int(date_end[2].strip()), int(date_end[3].strip()), int(date_end[4].strip())).replace(tzinfo=timezone.utc)),sender__icontains=args.sender,subject__contains=args.subject)
+
+ # List Number email coincidences
+ list_mail=[]
+ # Count number messages coincidences
+ count=0
+
+ for item in filtered_items:
+
+ count=count+1
+
+ if mail_list != 0:
+ list_mail.append("("+str(item.datetime_received) + ") - "+str(item.subject)+" - "+str(item.sender))
+
+ #print(item.subject, item.sender, item.datetime_received)
+
+ if mail_list!= 0:
+ list_mail = parse_result(list_mail)
+ create_agent(count,list_mail)
+ else:
+ create_agent(count)
+except Exception as e:
+ print(0)
+ write_to_log(f"{type(e).__name__}: {e}", log_file)
+ sys.exit()
+
+print(1)
diff --git a/pandora_plugins/web_check/web_check_lwp.pl b/pandora_plugins/web_check/web_check_lwp.pl
new file mode 100644
index 0000000000..73b1c0a028
--- /dev/null
+++ b/pandora_plugins/web_check/web_check_lwp.pl
@@ -0,0 +1,24 @@
+use strict;
+use warnings;
+
+use LWP::UserAgent ();
+use Data::Dumper;
+
+die "Usage: $0 \n" unless @ARGV == 3;
+
+my ($URL, $username, $password) = @ARGV;
+
+my $ua = LWP::UserAgent->new(timeout => 10);
+$ua->protocols_allowed( ['http', 'https'] );
+$ua->ssl_opts("verify_hostname" => 0);
+
+$ua->credentials($URL, "", $username, $password);
+
+my $response = $ua->get($URL);
+
+if ($response->is_success) {
+ print $response->decoded_content;
+}
+else {
+ die print(Dumper($response));
+}
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 89e3bbbb8c..f9be42317e 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.775-240212
+Version: 7.0NG.775-240227
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 0341fc9788..f16c410ee6 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.775-240212"
+pandora_version="7.0NG.775-240227"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new
index 1945cbd08f..f7d4df74aa 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -816,5 +816,8 @@ madeserver_autofit 7d
# Model sensitivity. A lower value triggers less anomalies (PANDORA FMS ENTERPRISE ONLY).
madeserver_sensitivity 0.1
+# If greater than 0, generate an event when more than the specified number of XML data files are queued for an agent.
+too_many_xml 10
+
# Encoding to use on mail subject (MIME-Header by default)
-# mail_subject_encoding MIME-Header-ISO_2022_JP
\ No newline at end of file
+# mail_subject_encoding MIME-Header-ISO_2022_JP
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 87ef38e8e5..6853324266 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.775";
-my $pandora_build = "240212";
+my $pandora_build = "240227";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
@@ -589,6 +589,8 @@ sub pandora_load_config {
$pa_config->{"madeserver"} = 0; # 774.
+ $pa_config->{"too_many_xml"} = 10; # 776.
+
$pa_config->{"mail_subject_encoding"} = 'MIME-Header'; # 776.
# Check for UID0
@@ -1417,6 +1419,9 @@ sub pandora_load_config {
elsif ($parametro =~ m/^madeserver\s+([0-1])/i){
$pa_config->{'madeserver'}= clean_blank($1);
}
+ elsif ($parametro =~ m/^too_many_xml\s+([0-9]*)/i){
+ $pa_config->{'too_many_xml'}= clean_blank($1);
+ }
} # end of loop for parameter #
# The DB host was overridden by pandora_ha.
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index 21ba802908..5d3d34f870 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -2428,7 +2428,7 @@ sub pandora_process_module ($$$$$$$$$;$) {
}
# Active ff interval
- if ($module->{'module_ff_interval'} != 0) {
+ if ($module->{'module_ff_interval'} != 0 && $min_ff_event > 0 && $last_known_status != $status) {
$current_interval = $module->{'module_ff_interval'};
}
}
@@ -7197,12 +7197,15 @@ sub pandora_disable_autodisable_agents ($$) {
SELECT tm.id_agente, count(*) as sync_modules, ta.unknown_count
FROM tagente_modulo tm
JOIN tagente ta ON ta.id_agente = tm.id_agente
+ LEFT JOIN tagente_estado te ON tm.id_agente_modulo = te.id_agente_modulo
WHERE ta.disabled = 0
+ AND ta.modo=2
+ AND te.estado != 4
+ AND tm.delete_pending=0
AND NOT ((id_tipo_modulo >= 21 AND id_tipo_modulo <= 23) OR id_tipo_modulo = 100)
GROUP BY tm.id_agente
) AS subquery
- WHERE subquery.unknown_count >= subquery.sync_modules;';
-
+ WHERE subquery.unknown_count >= subquery.sync_modules;';
my @agents_autodisabled = get_db_rows ($dbh, $sql);
return if ($#agents_autodisabled < 0);
@@ -7767,12 +7770,12 @@ sub safe_mode($$$$$$) {
# Going to critical. Disable the rest of the modules.
if ($new_status == MODULE_CRITICAL) {
logger($pa_config, "Enabling safe mode for agent " . $agent->{'nombre'}, 10);
- db_do($dbh, 'UPDATE tagente_modulo SET disabled=1 WHERE id_agente=? AND id_agente_modulo!=?', $agent->{'id_agente'}, $module->{'id_agente_modulo'});
+ db_do($dbh, 'UPDATE tagente_modulo SET disabled=1, disabled_by_safe_mode=1 WHERE id_agente=? AND id_agente_modulo!=? AND disabled=0', $agent->{'id_agente'}, $module->{'id_agente_modulo'});
}
# Coming back from critical. Enable the rest of the modules.
elsif ($known_status == MODULE_CRITICAL) {
logger($pa_config, "Disabling safe mode for agent " . $agent->{'nombre'}, 10);
- db_do($dbh, 'UPDATE tagente_modulo SET disabled=0 WHERE id_agente=? AND id_agente_modulo!=?', $agent->{'id_agente'}, $module->{'id_agente_modulo'});
+ db_do($dbh, 'UPDATE tagente_modulo SET disabled=0, disabled_by_safe_mode=0 WHERE id_agente=? AND id_agente_modulo!=? AND disabled_by_safe_mode=1', $agent->{'id_agente'}, $module->{'id_agente_modulo'});
# Prevent the modules from becoming unknown!
db_do ($dbh, 'UPDATE tagente_estado SET utimestamp = ? WHERE id_agente = ? AND id_agente_modulo!=?', time(), $agent->{'id_agente'}, $module->{'id_agente_modulo'});
@@ -7798,7 +7801,7 @@ sub pandora_safe_mode_modules_update {
# If status is critical, disable the rest of the modules.
if ($status == MODULE_CRITICAL) {
logger($pa_config, "Update modules for safe mode agent with alias:" . $agent->{'alias'} . ".", 10);
- db_do($dbh, 'UPDATE tagente_modulo SET disabled=1 WHERE id_agente=? AND id_agente_modulo!=?', $agent_id, $agent->{'safe_mode_module'});
+ db_do($dbh, 'UPDATE tagente_modulo SET disabled=1, disabled_by_safe_mode=1 WHERE id_agente=? AND id_agente_modulo!=? AND disabled=0', $agent_id, $agent->{'safe_mode_module'});
}
}
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 6125a68e20..cb2c5afc4c 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -56,6 +56,7 @@ our @ISA = qw(PandoraFMS::ProducerConsumerServer);
my @TaskQueue :shared;
my %PendingTasks :shared;
my %Agents :shared;
+my %AgentCounts;
my $Sem :shared;
my $TaskSem :shared;
my $AgentSem :shared;
@@ -73,6 +74,7 @@ sub new ($$;$) {
@TaskQueue = ();
%PendingTasks = ();
%Agents = ();
+ %AgentCounts = ();
$Sem = Thread::Semaphore->new;
$TaskSem = Thread::Semaphore->new (0);
$AgentSem = Thread::Semaphore->new (1);
@@ -142,6 +144,9 @@ sub data_producer ($) {
opendir (DIR, $pa_config->{'incomingdir'})
|| die "[FATAL] Cannot open Incoming data directory at " . $pa_config->{'incomingdir'} . ": $!";
+ # Reset agent XML file counts
+ %AgentCounts = ();
+
# Do not read more than max_queue_files files
my $file_count = 0;
while (my $file = readdir (DIR)) {
@@ -177,11 +182,21 @@ sub data_producer ($) {
next if ($file !~ /^(.*)[\._]\d+\.data$/);
my $agent_name = $1;
+ $AgentCounts{$agent_name} = defined($AgentCounts{$agent_name}) ? $AgentCounts{$agent_name} + 1 : 1;
next if (agent_lock($pa_config, $dbh, $agent_name) == 0);
push (@tasks, $file);
}
+ # Generate an event if there are too many XML files for a given agent.
+ if ($pa_config->{'too_many_xml'} > 0) {
+ while (my ($agent_name, $xml_count) = each(%AgentCounts)) {
+ if ($xml_count > $pa_config->{'too_many_xml'}) {
+ pandora_timed_event(300, $pa_config, "More than " . $pa_config->{'too_many_xml'} . " XML files queued for agent $agent_name", 0, 0, 0, 0, 0, 'warning', 0, $dbh);
+ }
+ }
+ }
+
return @tasks;
}
@@ -200,6 +215,9 @@ sub data_producer_smart_queue ($) {
opendir (DIR, $pa_config->{'incomingdir'})
|| die "[FATAL] Cannot open Incoming data directory at " . $pa_config->{'incomingdir'} . ": $!";
+ # Reset agent XML file counts
+ %AgentCounts = ();
+
# Do not read more than max_queue_files files
my $smart_queue = {};
while (my $file = readdir (DIR)) {
@@ -209,6 +227,9 @@ sub data_producer_smart_queue ($) {
next if ($file !~ /^(.*)[\._]\d+\.data$/);
my $agent_name = $1;
+ # Update per agent XML counts.
+ $AgentCounts{$agent_name} = defined($AgentCounts{$agent_name}) ? $AgentCounts{$agent_name} + 1 : 1;
+
# Queue a new file.
if (!defined($smart_queue->{$agent_name})) {
$smart_queue->{$agent_name} = $file;
@@ -229,6 +250,15 @@ sub data_producer_smart_queue ($) {
push (@tasks, $file);
}
+ # Generate an event if there are too many XML files for a given agent.
+ if ($pa_config->{'too_many_xml'} > 0) {
+ while (my ($agent_name, $xml_count) = each(%AgentCounts)) {
+ if ($xml_count > $pa_config->{'too_many_xml'}) {
+ pandora_timed_event(300, $pa_config, "More than " . $pa_config->{'too_many_xml'} . " XML files queued for agent $agent_name", 0, 0, 0, 0, 0, 'warning', 0, $dbh);
+ }
+ }
+ }
+
return @tasks;
}
@@ -377,19 +407,7 @@ sub process_xml_data ($$$$$) {
# Modify the timestamp with the timezone_offset
logger($pa_config, "Applied a timezone offset of $timestamp to agent " . $data->{'agent_name'}, 10);
-
- # Calculate the start date to add the offset
- my $utimestamp = 0;
- eval {
- if ($timestamp =~ /(\d+)[\/|\-](\d+)[\/|\-](\d+) +(\d+):(\d+):(\d+)/) {
- $utimestamp = strftime("%s", $6, $5, $4, $3, $2 -1 , $1 - 1900);
- }
- };
-
- # Apply the offset if there were no errors
- if (! $@ && $utimestamp != 0) {
- $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime($utimestamp + ($timezone_offset * 3600)));
- }
+ $timestamp = apply_timezone_offset($timestamp, $timezone_offset);
}
# Check some variables
@@ -637,6 +655,11 @@ sub process_xml_data ($$$$$) {
# Single data
if (! defined ($module_data->{'datalist'})) {
my $data_timestamp = get_tag_value ($module_data, 'timestamp', $timestamp);
+ if ($pa_config->{'use_xml_timestamp'} eq '0' && defined($timestamp)) {
+ $data_timestamp = $timestamp;
+ }
+ $data_timestamp = apply_timezone_offset($data_timestamp, $timezone_offset);
+
process_module_data ($pa_config, $module_data, $server_id, $agent, $module_name, $module_type, $interval, $data_timestamp, $dbh, $new_agent);
next;
}
@@ -654,10 +677,10 @@ sub process_xml_data ($$$$$) {
$module_data->{'data'} = $data->{'value'};
my $data_timestamp = get_tag_value ($data, 'timestamp', $timestamp);
-
if ($pa_config->{'use_xml_timestamp'} eq '0' && defined($timestamp)) {
$data_timestamp = $timestamp;
}
+ $data_timestamp = apply_timezone_offset($data_timestamp, $timezone_offset);
process_module_data ($pa_config, $module_data, $server_id, $agent, $module_name,
$module_type, $interval, $data_timestamp, $dbh, $new_agent);
diff --git a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
index 1e64879373..972f259bb5 100644
--- a/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
+++ b/pandora_server/lib/PandoraFMS/DiscoveryServer.pm
@@ -477,7 +477,7 @@ sub exec_recon_app ($$$) {
# No output message.
if (!defined($output_json)) {
- push(@summary, "The execution returned no output.");
+ push(@summary, "The execution returned no output. Is the server out of memory?");
next;
}
@@ -1118,6 +1118,30 @@ sub PandoraFMS::Recon::Base::create_interface_modules($$) {
return unless ($self->is_snmp_discovered($device));
my $community = $self->get_community($device);
+ my $snmp3_creds = undef;
+ if(defined($self->{'snmp3_auth_key'}{$device})) {
+ $snmp3_creds = $self->snmp3_credentials($self->{'snmp3_auth_key'}{$device});
+ }
+ my $snmp3_params = {
+ 'custom_string_1' => '',
+ 'custom_string_2' => '',
+ 'custom_string_3' => '',
+ 'plugin_parameter' => '',
+ 'plugin_user' => '',
+ 'plugin_pass' => ''
+ };
+ if(defined($snmp3_creds)) {
+ $community = $snmp3_creds->{'community'};
+ $snmp3_params = {
+ 'custom_string_1' => $snmp3_creds->{'snmp_privacy_method'},
+ 'custom_string_2' => $snmp3_creds->{'snmp_privacy_pass'},
+ 'custom_string_3' => $snmp3_creds->{'snmp_security_level'},
+ 'plugin_parameter' => $snmp3_creds->{'snmp_auth_method'},
+ 'plugin_user' => $snmp3_creds->{'snmp_auth_user'},
+ 'plugin_pass' => $snmp3_creds->{'snmp_auth_pass'}
+ };
+ }
+
my @output = $self->snmp_get_value_array($device, $PandoraFMS::Recon::Base::IFINDEX);
foreach my $if_index (@output) {
next unless ($if_index =~ /^[0-9]+$/);
@@ -1153,12 +1177,12 @@ sub PandoraFMS::Recon::Base::create_interface_modules($$) {
),
'ip_target' => $device,
'tcp_send' => $self->{'task_data'}{'snmp_version'},
- 'custom_string_1' => $self->{'task_data'}{'snmp_privacy_method'},
- 'custom_string_2' => $self->{'task_data'}{'snmp_privacy_pass'},
- 'custom_string_3' => $self->{'task_data'}{'snmp_security_level'},
- 'plugin_parameter' => $self->{'task_data'}{'snmp_auth_method'},
- 'plugin_user' => $self->{'task_data'}{'snmp_auth_user'},
- 'plugin_pass' => $self->{'task_data'}{'snmp_auth_pass'},
+ 'custom_string_1' => $snmp3_params->{'snmp_privacy_method'},
+ 'custom_string_2' => $snmp3_params->{'snmp_privacy_pass'},
+ 'custom_string_3' => $snmp3_params->{'snmp_security_level'},
+ 'plugin_parameter' => $snmp3_params->{'snmp_auth_method'},
+ 'plugin_user' => $snmp3_params->{'snmp_auth_user'},
+ 'plugin_pass' => $snmp3_params->{'snmp_auth_pass'},
'snmp_community' => $community,
'snmp_oid' => "$PandoraFMS::Recon::Base::IFOPERSTATUS.$if_index",
'unit' => ''
@@ -1183,12 +1207,12 @@ sub PandoraFMS::Recon::Base::create_interface_modules($$) {
),
'ip_target' => $device,
'tcp_send' => $self->{'task_data'}{'snmp_version'},
- 'custom_string_1' => $self->{'task_data'}{'snmp_privacy_method'},
- 'custom_string_2' => $self->{'task_data'}{'snmp_privacy_pass'},
- 'custom_string_3' => $self->{'task_data'}{'snmp_security_level'},
- 'plugin_parameter' => $self->{'task_data'}{'snmp_auth_method'},
- 'plugin_user' => $self->{'task_data'}{'snmp_auth_user'},
- 'plugin_pass' => $self->{'task_data'}{'snmp_auth_pass'},
+ 'custom_string_1' => $snmp3_params->{'snmp_privacy_method'},
+ 'custom_string_2' => $snmp3_params->{'snmp_privacy_pass'},
+ 'custom_string_3' => $snmp3_params->{'snmp_security_level'},
+ 'plugin_parameter' => $snmp3_params->{'snmp_auth_method'},
+ 'plugin_user' => $snmp3_params->{'snmp_auth_user'},
+ 'plugin_pass' => $snmp3_params->{'snmp_auth_pass'},
'snmp_community' => $community,
'snmp_oid' => "$PandoraFMS::Recon::Base::IFHCINOCTECTS.$if_index",
'unit' => safe_input('bytes/s')
@@ -1210,12 +1234,12 @@ sub PandoraFMS::Recon::Base::create_interface_modules($$) {
),
'ip_target' => $device,
'tcp_send' => $self->{'task_data'}{'snmp_version'},
- 'custom_string_1' => $self->{'task_data'}{'snmp_privacy_method'},
- 'custom_string_2' => $self->{'task_data'}{'snmp_privacy_pass'},
- 'custom_string_3' => $self->{'task_data'}{'snmp_security_level'},
- 'plugin_parameter' => $self->{'task_data'}{'snmp_auth_method'},
- 'plugin_user' => $self->{'task_data'}{'snmp_auth_user'},
- 'plugin_pass' => $self->{'task_data'}{'snmp_auth_pass'},
+ 'custom_string_1' => $snmp3_params->{'snmp_privacy_method'},
+ 'custom_string_2' => $snmp3_params->{'snmp_privacy_pass'},
+ 'custom_string_3' => $snmp3_params->{'snmp_security_level'},
+ 'plugin_parameter' => $snmp3_params->{'snmp_auth_method'},
+ 'plugin_user' => $snmp3_params->{'snmp_auth_user'},
+ 'plugin_pass' => $snmp3_params->{'snmp_auth_pass'},
'snmp_community' => $community,
'snmp_oid' => "$PandoraFMS::Recon::Base::IFINOCTECTS.$if_index",
'unit' => safe_input('bytes/s')
@@ -1241,12 +1265,12 @@ sub PandoraFMS::Recon::Base::create_interface_modules($$) {
),
'ip_target' => $device,
'tcp_send' => $self->{'task_data'}{'snmp_version'},
- 'custom_string_1' => $self->{'task_data'}{'snmp_privacy_method'},
- 'custom_string_2' => $self->{'task_data'}{'snmp_privacy_pass'},
- 'custom_string_3' => $self->{'task_data'}{'snmp_security_level'},
- 'plugin_parameter' => $self->{'task_data'}{'snmp_auth_method'},
- 'plugin_user' => $self->{'task_data'}{'snmp_auth_user'},
- 'plugin_pass' => $self->{'task_data'}{'snmp_auth_pass'},
+ 'custom_string_1' => $snmp3_params->{'snmp_privacy_method'},
+ 'custom_string_2' => $snmp3_params->{'snmp_privacy_pass'},
+ 'custom_string_3' => $snmp3_params->{'snmp_security_level'},
+ 'plugin_parameter' => $snmp3_params->{'snmp_auth_method'},
+ 'plugin_user' => $snmp3_params->{'snmp_auth_user'},
+ 'plugin_pass' => $snmp3_params->{'snmp_auth_pass'},
'snmp_community' => $community,
'snmp_oid' => "$PandoraFMS::Recon::Base::IFHCOUTOCTECTS.$if_index",
'unit' => safe_input('bytes/s')
@@ -1268,12 +1292,12 @@ sub PandoraFMS::Recon::Base::create_interface_modules($$) {
),
'ip_target' => $device,
'tcp_send' => $self->{'task_data'}{'snmp_version'},
- 'custom_string_1' => $self->{'task_data'}{'snmp_privacy_method'},
- 'custom_string_2' => $self->{'task_data'}{'snmp_privacy_pass'},
- 'custom_string_3' => $self->{'task_data'}{'snmp_security_level'},
- 'plugin_parameter' => $self->{'task_data'}{'snmp_auth_method'},
- 'plugin_user' => $self->{'task_data'}{'snmp_auth_user'},
- 'plugin_pass' => $self->{'task_data'}{'snmp_auth_pass'},
+ 'custom_string_1' => $snmp3_params->{'snmp_privacy_method'},
+ 'custom_string_2' => $snmp3_params->{'snmp_privacy_pass'},
+ 'custom_string_3' => $snmp3_params->{'snmp_security_level'},
+ 'plugin_parameter' => $snmp3_params->{'snmp_auth_method'},
+ 'plugin_user' => $snmp3_params->{'snmp_auth_user'},
+ 'plugin_pass' => $snmp3_params->{'snmp_auth_pass'},
'snmp_community' => $community,
'snmp_oid' => "$PandoraFMS::Recon::Base::IFOUTOCTECTS.$if_index",
'unit' => safe_input('bytes/s')
@@ -1305,19 +1329,19 @@ sub PandoraFMS::Recon::Base::create_interface_modules($$) {
# Interface index filter.
$macros->{'5'}->{'value'} = $if_index;
# SecurityName.
- $macros->{'6'}->{'value'} = $self->{'task_data'}->{'snmp_auth_user'};
+ $macros->{'6'}->{'value'} = $snmp3_params->{'snmp_auth_user'};
# SecurityContext.
$macros->{'7'}->{'value'} = $community;
# SecurityLevel.
- $macros->{'8'}->{'value'} = $self->{'task_data'}->{'snmp_security_level'};
+ $macros->{'8'}->{'value'} = $snmp3_params->{'snmp_security_level'};
# AuthProtocol.
- $macros->{'9'}->{'value'} = $self->{'task_data'}->{'snmp_auth_method'};
+ $macros->{'9'}->{'value'} = $snmp3_params->{'snmp_auth_method'};
# AuthKey.
- $macros->{'10'}->{'value'} = $self->{'task_data'}->{'snmp_auth_pass'};
+ $macros->{'10'}->{'value'} = $snmp3_params->{'snmp_auth_pass'};
# PrivProtocol.
- $macros->{'11'}->{'value'} = $self->{'task_data'}->{'snmp_privacy_method'};
+ $macros->{'11'}->{'value'} = $snmp3_params->{'snmp_privacy_method'};
# PrivKey.
- $macros->{'12'}->{'value'} = $self->{'task_data'}->{'snmp_privacy_pass'};
+ $macros->{'12'}->{'value'} = $snmp3_params->{'snmp_privacy_pass'};
# Hash identifier.
$macros->{'13'}->{'value'} = PandoraFMS::Tools::generate_agent_name_hash($if_name, $device);
# Get input usage.
@@ -1429,6 +1453,7 @@ sub PandoraFMS::Recon::Base::create_wmi_modules {
{
'ip_target' => $target,
'snmp_oid' => "SELECT LoadPercentage FROM Win32_Processor WHERE DeviceId=\'$cpu\'",
+ 'tcp_send' => $creds->{'extra_1'},
'plugin_user' => $creds->{'username'},
'plugin_pass' => $creds->{'password'},
'tcp_port' => 1,
@@ -1449,6 +1474,7 @@ sub PandoraFMS::Recon::Base::create_wmi_modules {
{
'ip_target' => $target,
'snmp_oid' => "SELECT FreePhysicalMemory, TotalVisibleMemorySize FROM Win32_OperatingSystem",
+ 'tcp_send' => $creds->{'extra_1'},
'plugin_user' => $creds->{'username'},
'plugin_pass' => $creds->{'password'},
'tcp_port' => 0,
@@ -1469,6 +1495,7 @@ sub PandoraFMS::Recon::Base::create_wmi_modules {
{
'ip_target' => $target,
'snmp_oid' => "SELECT FreeSpace FROM Win32_LogicalDisk WHERE DeviceID='$unit'",
+ 'tcp_send' => $creds->{'extra_1'},
'plugin_user' => $creds->{'username'},
'plugin_pass' => $creds->{'password'},
'tcp_port' => 1,
@@ -1510,14 +1537,7 @@ sub PandoraFMS::Recon::Base::create_network_profile_modules($$) {
# 1. Retrieve template info.
my $template = get_nc_profile_advanced($self->{'dbh'}, $t_id);
- # 2. Verify Private Enterprise Number matches (PEN)
- if (defined($template->{'pen'})) {
- my @pens = split(',', $template->{'pen'});
-
- next unless (is_in_array(\@pens, $self->get_pen($device)));
- }
-
- # 3. Retrieve module list from target template.
+ # 2. Retrieve module list from target template.
my @np_components = get_db_rows(
$self->{'dbh'},
'SELECT * FROM tnetwork_profile_component WHERE id_np = ?',
@@ -1525,7 +1545,7 @@ sub PandoraFMS::Recon::Base::create_network_profile_modules($$) {
);
foreach my $np_component (@np_components) {
- # 4. Register each module (candidate). 'add_module' will test them.
+ # 3. Register each module (candidate). 'add_module' will test them.
my $component = get_db_single_row(
$self->{'dbh'},
'SELECT * FROM tnetwork_component WHERE id_nc = ?',
@@ -1543,18 +1563,45 @@ sub PandoraFMS::Recon::Base::create_network_profile_modules($$) {
}
$component->{'name'} = safe_output($component->{'name'});
- if ($component->{'type'} >= 15 && $component->{'type'} <= 18) {
- $component->{'snmp_community'} = safe_output($self->get_community($device));
+ # SNMP Modules
+ if ($self->is_snmp_discovered($device) && $component->{'type'} >= 15 && $component->{'type'} <= 18) {
+ my $snmp3_creds = undef;
+ my $community = safe_output($self->get_community($device));
+ if(defined($self->{'snmp3_auth_key'}{$device})) {
+ $snmp3_creds = $self->snmp3_credentials($self->{'snmp3_auth_key'}{$device});
+ }
+ my $snmp3_params = {
+ 'custom_string_1' => '',
+ 'custom_string_2' => '',
+ 'custom_string_3' => '',
+ 'plugin_parameter' => '',
+ 'plugin_user' => '',
+ 'plugin_pass' => ''
+ };
+ if(defined($snmp3_creds)) {
+ $community = $snmp3_creds->{'community'};
+ $snmp3_params = {
+ 'custom_string_1' => $snmp3_creds->{'snmp_privacy_method'},
+ 'custom_string_2' => $snmp3_creds->{'snmp_privacy_pass'},
+ 'custom_string_3' => $snmp3_creds->{'snmp_security_level'},
+ 'plugin_parameter' => $snmp3_creds->{'snmp_auth_method'},
+ 'plugin_user' => $snmp3_creds->{'snmp_auth_user'},
+ 'plugin_pass' => $snmp3_creds->{'snmp_auth_pass'}
+ };
+ }
+
+ $component->{'snmp_community'} = $community;
$component->{'tcp_send'} = $self->{'snmp_version'};
- $component->{'custom_string_1'} = $self->{'snmp_privacy_method'};
- $component->{'custom_string_2'} = $self->{'snmp_privacy_pass'};
- $component->{'custom_string_3'} = $self->{'snmp_security_level'};
- $component->{'plugin_parameter'} = $self->{'snmp_auth_method'};
- $component->{'plugin_user'} = $self->{'snmp_auth_user'};
- $component->{'plugin_pass'} = $self->{'snmp_auth_pass'};
+ $component->{'custom_string_1'} = $snmp3_params->{'snmp_privacy_method'};
+ $component->{'custom_string_2'} = $snmp3_params->{'snmp_privacy_pass'};
+ $component->{'custom_string_3'} = $snmp3_params->{'snmp_security_level'};
+ $component->{'plugin_parameter'} = $snmp3_params->{'snmp_auth_method'};
+ $component->{'plugin_user'} = $snmp3_params->{'snmp_auth_user'};
+ $component->{'plugin_pass'} = $snmp3_params->{'snmp_auth_pass'};
}
- if ($component->{'type'} >= 34 && $component->{'type'} <= 37) {
+ # RCMD Modules
+ if ($self->rcmd_responds($device) && $component->{'type'} >= 34 && $component->{'type'} <= 37) {
# Update module credentials.
$component->{'custom_string_1'} = $self->rcmd_credentials_key($device);
$component->{'custom_string_2'} = pandora_get_os_by_id(
@@ -1563,9 +1610,18 @@ sub PandoraFMS::Recon::Base::create_network_profile_modules($$) {
);
}
+ # WMI Modules
+ if ($self->wmi_responds($device) && $component->{'id_modulo'} == 6) {
+ my $key = $self->wmi_credentials_key($device);
+ my $creds = $self->call('get_credentials', $key);
+ $component->{'tcp_send'} = $creds->{'extra_1'};
+ $component->{'plugin_user'} = $creds->{'username'};
+ $component->{'plugin_pass'} = $creds->{'password'};
+ }
+
$component->{'__module_component'} = 1;
- # 3. Try to register module into monitoring list.
+ # 4. Try to register module into monitoring list.
$self->call('add_module', $device, $component);
}
}
@@ -1576,13 +1632,23 @@ sub PandoraFMS::Recon::Base::create_network_profile_modules($$) {
# Retrieve a key from credential store.
################################################################################
sub PandoraFMS::Recon::Base::get_credentials {
- my ($self, $key_index) = @_;
+ my ($self, $key_index, $product) = @_;
- return credential_store_get_key(
+ my $cred = credential_store_get_key(
$self->{'pa_config'},
$self->{'dbh'},
$key_index
);
+
+ if(defined($product)) {
+ if($product eq $cred->{'product'}) {
+ return $cred;
+ } else {
+ return undef;
+ }
+ }
+
+ return $cred;
}
################################################################################
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 5cf159ff28..a621790a38 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.775";
-my $pandora_build = "240212";
+my $pandora_build = "240227";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/lib/PandoraFMS/Recon/Base.pm b/pandora_server/lib/PandoraFMS/Recon/Base.pm
index f21f13de4f..a84149c4dc 100644
--- a/pandora_server/lib/PandoraFMS/Recon/Base.pm
+++ b/pandora_server/lib/PandoraFMS/Recon/Base.pm
@@ -1352,10 +1352,9 @@ sub snmp_responds_v122c($$) {
sub snmp_responds_v3($$) {
my ($self, $device) = @_;
- my $command = $self->snmp_get_command($device, ".0");
- `$command`;
+ $self->snmp3_credentials_calculation($device);
- if ($? == 0) {
+ if ($self->snmp3_credentials_calculation($device)) {
$self->mark_discovered($device);
return 1;
}
@@ -1363,6 +1362,81 @@ sub snmp_responds_v3($$) {
return 0;
}
+################################################################################
+# Get SNMP3 credentials info in HASH
+################################################################################
+sub snmp3_credentials {
+ my ($self, $key) = @_;
+
+ my $cred = $self->call('get_credentials', $key, 'SNMP');
+ return undef if !defined($cred);
+ return undef if ref($cred) ne 'HASH';
+
+ my $extra1 = {};
+ eval {
+ local $SIG{__DIE__};
+ $extra1 = p_decode_json($self->{'pa_config'}, $cred->{'extra_1'});
+ };
+ if ($@) {
+ $self->call('message', "[".$key."] Credentials ERROR JSON: $@", 10);
+ return undef;
+ }
+
+ return undef if $extra1->{'version'} ne '3';
+
+ return {
+ 'snmp_security_level' => $extra1->{'securityLevelV3'},
+ 'snmp_privacy_method' => $extra1->{'privacyMethodV3'},
+ 'snmp_privacy_pass' => $extra1->{'privacyPassV3'},
+ 'snmp_auth_method' => $extra1->{'authMethodV3'},
+ 'snmp_auth_user' => $extra1->{'authUserV3'},
+ 'snmp_auth_pass' => $extra1->{'authPassV3'},
+ 'community' => $extra1->{'community'}
+ };
+}
+
+################################################################################
+# Calculate WMI credentials for target, 1 if calculated, undef if cannot
+# connect to target. Credentials could be empty (-N)
+################################################################################
+sub snmp3_credentials_calculation {
+ my ($self, $target) = @_;
+
+ # Test all credentials selected.
+ foreach my $key_index (@{$self->{'auth_strings_array'}}) {
+ my $cred = snmp3_credentials($key_index);
+ next if !defined($cred);
+ next if ref($cred) ne 'HASH';
+
+ my $auth = '';
+ if ($cred->{'community'}) { # Context
+ $auth .= " -N \'$cred->{'community'}\' ";
+ }
+ $auth .= " -l$cred->{'snmp_security_level'} ";
+ if ($cred->{'snmp_security_level'} ne "noAuthNoPriv") {
+ $auth .= " -u$cred->{'snmp_auth_user'} -a $cred->{'snmp_auth_method'} -A \'$cred->{'snmp_auth_pass'}\' ";
+ }
+ if ($cred->{'snmp_security_level'} eq "authPriv") {
+ $auth .= " -x$cred->{'snmp_privacy_method'} -X \'$cred->{'snmp_privacy_pass'}\' ";
+ }
+
+ $self->{'snmp3_auth'}{$target} = $auth;
+ $self->{'snmp3_auth_key'}{$target} = $key_index;
+
+ my $command = $self->snmp_get_command($target, ".0");
+ `$command`;
+
+ if ($? == 0) {
+ return 1;
+ }
+ }
+
+ delete($self->{'snmp3_auth'}{$target});
+ delete($self->{'snmp3_auth_key'}{$target});
+
+ return 0;
+}
+
################################################################################
# Parse the local ARP cache.
################################################################################
@@ -2198,16 +2272,7 @@ sub snmp_get_command {
my $command = "snmpwalk -M$DEVNULL -r$self->{'snmp_checks'} -t$self->{'snmp_timeout'} -v$self->{'snmp_version'} -On -Oe ";
if ($self->{'snmp_version'} eq "3") {
- if ($self->{'community'}) { # Context
- $command .= " -N \'$self->{'community'}\' ";
- }
- $command .= " -l$self->{'snmp_security_level'} ";
- if ($self->{'snmp_security_level'} ne "noAuthNoPriv") {
- $command .= " -u$self->{'snmp_auth_user'} -a $self->{'snmp_auth_method'} -A \'$self->{'snmp_auth_pass'}\' ";
- }
- if ($self->{'snmp_security_level'} eq "authPriv") {
- $command .= " -x$self->{'snmp_privacy_method'} -X \'$self->{'snmp_privacy_pass'}\' ";
- }
+ $command .= " $self->{'snmp3_auth'}{$device} ";
} else {
$command .= " -c\'$community\'$vlan ";
}
@@ -2353,7 +2418,8 @@ sub wmi_credentials_calculation {
# Test all credentials selected.
foreach my $key_index (@{$self->{'auth_strings_array'}}) {
- my $cred = $self->call('get_credentials', $key_index);
+ my $cred = $self->call('get_credentials', $key_index, 'WMI');
+ next if !defined($cred);
next if ref($cred) ne 'HASH';
my $auth = $cred->{'username'}.'%'.$cred->{'password'};
@@ -2431,7 +2497,8 @@ sub rcmd_credentials_calculation {
# Test all credentials selected.
foreach my $key_index (@{$self->{'auth_strings_array'}}) {
- my $cred = $self->call('get_credentials', $key_index);
+ my $cred = $self->call('get_credentials', $key_index, 'CUSTOM');
+ next if !defined($cred);
next if ref($cred) ne 'HASH';
$rcmd->clean_ssh_lib();
diff --git a/pandora_server/lib/PandoraFMS/Tools.pm b/pandora_server/lib/PandoraFMS/Tools.pm
index 543ea45556..1c8bd087c2 100755
--- a/pandora_server/lib/PandoraFMS/Tools.pm
+++ b/pandora_server/lib/PandoraFMS/Tools.pm
@@ -182,6 +182,7 @@ our @EXPORT = qw(
check_cron_element
cron_check
p_pretty_json
+ apply_timezone_offset
);
# ID of the different servers
@@ -716,19 +717,23 @@ sub credential_store_get_key($$$) {
my $sql = 'SELECT * FROM tcredential_store WHERE identifier = ?';
my $key = PandoraFMS::DB::get_db_single_row($dbh, $sql, $identifier);
- return {
- 'username' => PandoraFMS::Core::pandora_output_password(
- $pa_config,
- $key->{'username'}
- ),
- 'password' => PandoraFMS::Core::pandora_output_password(
- $pa_config,
- $key->{'password'}
- ),
- 'extra_1' => $key->{'extra_1'},
- 'extra_2' => $key->{'extra_2'},
- };
+ if(defined($key)) {
+ return {
+ 'product' => $key->{'product'},
+ 'username' => PandoraFMS::Core::pandora_output_password(
+ $pa_config,
+ $key->{'username'}
+ ),
+ 'password' => PandoraFMS::Core::pandora_output_password(
+ $pa_config,
+ $key->{'password'}
+ ),
+ 'extra_1' => $key->{'extra_1'},
+ 'extra_2' => $key->{'extra_2'},
+ };
+ }
+ return undef;
}
################################################################################
@@ -2991,6 +2996,33 @@ sub p_pretty_json {
return $output;
}
+
+################################################################################
+# Apply a timezone offset to the given timestamp.
+################################################################################
+sub apply_timezone_offset {
+ my ($timestamp, $timezone_offset) = @_;
+
+ # Nothing to be done.
+ return $timestamp if (!defined($timezone_offset) || $timezone_offset == 0);
+
+ # Convert the timestamp to seconds.
+ my $utimestamp = 0;
+ eval {
+ if ($timestamp =~ /(\d+)[\/|\-](\d+)[\/|\-](\d+) +(\d+):(\d+):(\d+)/) {
+ $utimestamp = strftime("%s", $6, $5, $4, $3, $2 -1 , $1 - 1900);
+ }
+ };
+
+ # Something went wrong.
+ return $timestamp if ($@);
+
+ # Apply the offset and convert back to timestamp.
+ $timestamp = strftime ("%Y-%m-%d %H:%M:%S", localtime($utimestamp + ($timezone_offset * 3600)));
+
+ return $timestamp;
+}
+
1;
__END__
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 81c643ab67..99b49a7b32 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -7,7 +7,7 @@
%define debug_package %{nil}
%define name pandorafms_server
%define version 7.0NG.775
-%define release 240212
+%define release 240227
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index eaaa04c5dd..173fa201c2 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.775
-%define release 240212
+%define release 240227
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index c3b3e3f82c..31b4517e22 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
# **********************************************************************
PI_VERSION="7.0NG.775"
-PI_BUILD="240212"
+PI_BUILD="240227"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 7582caff5b..b1e26bd473 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -38,7 +38,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.775 Build 240212";
+my $version = "7.0NG.775 Build 240227";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_ha.pl b/pandora_server/util/pandora_ha.pl
index 829cf78505..28ae0df795 100755
--- a/pandora_server/util/pandora_ha.pl
+++ b/pandora_server/util/pandora_ha.pl
@@ -58,6 +58,9 @@ my $Restart = 0;
# Controlled exit
my $Running = 0;
+# License
+my $License;
+
########################################################################
# Print the given message with a preceding timestamp.
########################################################################
@@ -359,6 +362,27 @@ sub ha_update_server($$) {
}
+###############################################################################
+# Restart pandora server on demand.
+###############################################################################
+sub ha_restart_server($$) {
+ my ($config, $dbh) = @_;
+ my $OSNAME = $^O;
+
+ my $current_license;
+ if (!defined($License)) {
+ $License = get_db_value($dbh, 'SELECT `value` FROM `tupdate_settings` WHERE `key` = "customer_key"');
+ $current_license = $License;
+ } else {
+ $current_license = get_db_value($dbh, 'SELECT `value` FROM `tupdate_settings` WHERE `key` = "customer_key"');
+ }
+
+ if($License ne $current_license) {
+ ha_restart_pandora($config);
+ $License = $current_license;
+ }
+}
+
################################################################################
# Dump the list of known databases to disk.
################################################################################
@@ -418,16 +442,6 @@ sub ha_database_connect_pandora($) {
# Select a new master database.
my ($dbh, $utimestamp, $max_utimestamp) = (undef, undef, -1);
- my @disabled_nodes = get_disabled_nodes($conf);
-
- # If there are disabled nodes ignore them from the HA_DB_Hosts.
- if(scalar @disabled_nodes ne 0){
- @HA_DB_Hosts = grep { my $item = $_; !grep { $_ eq $item } @disabled_nodes } @HA_DB_Hosts;
-
- my $data = join(",", @disabled_nodes);
- log_message($conf, 'LOG', "Ignoring disabled hosts: " . $data);
- }
-
foreach my $ha_dbhost (@HA_DB_Hosts) {
# Retry each database ha_connect_retries times.
@@ -454,6 +468,13 @@ sub ha_database_connect_pandora($) {
# No luck. Try the next database.
next unless defined($dbh);
+ # Check if database is disabled.
+ if (defined(get_db_value($dbh, 'SELECT `id` FROM `tdatabase` WHERE `host` = "' . $ha_dbhost . '" AND disabled = 1')))
+ {
+ log_message($conf, 'LOG', "Ignoring disabled host: " . $ha_dbhost);
+ db_disconnect($dbh);
+ next;
+ }
eval {
# Get the most recent utimestamp from the database.
$utimestamp = get_db_value($dbh, 'SELECT UNIX_TIMESTAMP(MAX(keepalive)) FROM tserver');
@@ -518,36 +539,6 @@ sub ha_restart_pandora($) {
`$config->{'pandora_service_cmd'} $control_command 2>/dev/null`;
}
-###############################################################################
-# Get ip of the disabled nodes.
-###############################################################################
-sub get_disabled_nodes($) {
- my ($conf) = @_;
-
- my $dbh = db_connect('mysql',
- $conf->{'dbname'},
- $conf->{'dbhost'},
- $conf->{'dbport'},
- $conf->{'ha_dbuser'},
- $conf->{'ha_dbpass'});
-
- my $disabled_nodes = get_db_value($dbh, "SELECT value FROM tconfig WHERE token = 'ha_disabled_nodes'");
-
- if(!defined($disabled_nodes) || $disabled_nodes eq ""){
- $disabled_nodes = ',';
- }
-
- my @disabled_nodes = split(',', $disabled_nodes);
-
- if(scalar @disabled_nodes ne 0){
- $disabled_nodes = join(",", @disabled_nodes);
- @disabled_nodes = get_db_rows($dbh, "SELECT host FROM tdatabase WHERE id IN ($disabled_nodes)");
- @disabled_nodes = map { $_->{host} } @disabled_nodes;
- }
-
- return @disabled_nodes;
-}
-
###############################################################################
# Main (Pacemaker)
###############################################################################
@@ -691,6 +682,9 @@ sub ha_main_pandora($) {
# Check if there are updates pending.
ha_update_server($conf, $dbh);
+ # Check restart server on demand.
+ ha_restart_server($conf, $dbh);
+
# Keep pandora running
ha_keep_pandora_running($conf, $dbh);
@@ -716,6 +710,9 @@ sub ha_main_pandora($) {
# Execute resync actions.
enterprise_hook('pandoraha_resync_dbs', [$conf, $dbh, $DB_Host, \@HA_DB_Hosts]);
+ # Update and push HA databases info to Metaconsole or nodes.
+ enterprise_hook('pandoraha_update_and_push_databases_info', [$conf, $dbh]);
+
# Synchronize nodes.
enterprise_hook('pandoraha_sync_node', [$conf, $dbh]);
};
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index bdd263b1a8..3200b71f46 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.775 Build 240212";
+my $version = "7.0NG.775 Build 240227";
# save program name for logging
my $progname = basename($0);
@@ -5398,7 +5398,7 @@ sub cli_get_agent_status() {
##############################################################################
sub cli_get_agents_id_name_by_alias() {
- my $agent_alias = @ARGV[2];
+ my $agent_alias = safe_input(@ARGV[2]);
my $strict = @ARGV[3];
my @agents;
my $where_value;
@@ -5418,14 +5418,13 @@ sub cli_get_agents_id_name_by_alias() {
print "[ERROR] No agents retrieved.\n\n";
} else {
if(is_metaconsole($conf) == 1) {
- print "alias, id_agente, id_tagente, id_server, server_name\n";
+ print "id_agente, alias, id_tagente, id_server, server_name\n";
foreach my $agent (@agents) {
-
- print safe_output($agent->{'alias'}).", ".$agent->{'id_agente'}.", ".$agent->{'id_tagente'}.", ".$agent->{'id_server'}.", ".$agent->{'server_name'}."\n";
+ print $agent->{'id_agente'}.", ".safe_output($agent->{'alias'}).", ".$agent->{'id_tagente'}.", ".$agent->{'id_server'}.", ".$agent->{'server_name'}."\n";
}
} else {
- print "alias, id_agente\n";
+ print "id_agente, alias\n";
foreach my $agent (@agents) {
print $agent->{'id_agente'}.",".safe_output($agent->{'alias'})."\n";