nombre())) {
if ($message === true) {
return 'The agent name already exists in DB.';
}
@@ -2064,7 +2064,7 @@ function api_set_new_agent($id_node, $thrash2, $other, $trhash3, $return=false,
}
}
- if ($return === false) {
+ if ($return !== true) {
returnData(
'string',
[
@@ -2266,9 +2266,12 @@ function api_set_delete_agent($id, $thrash1, $other, $returnType)
}
$agent_by_alias = false;
+ $agent_by_id = false;
if ($other['data'][0] === '1') {
$agent_by_alias = true;
+ } else if ($other['data'][0] === '2') {
+ $agent_by_id = true;
}
if (is_metaconsole()) {
@@ -2331,7 +2334,12 @@ function api_set_delete_agent($id, $thrash1, $other, $returnType)
}
}
} else {
- $idAgent = agents_get_agent_id($id, false);
+ if ($agent_by_id === true) {
+ $idAgent = $id;
+ } else {
+ $idAgent = agents_get_agent_id($id, false);
+ }
+
if (!util_api_check_agent_and_print_error($idAgent, 'string', 'AD')) {
return;
}
@@ -13174,6 +13182,12 @@ function api_set_create_event($id, $trash1, $other, $returnType)
$values['id_extra'] = '';
}
+ if ($other['data'][21] != '') {
+ $values['event_custom_id'] = $other['data'][21];
+ }else{
+ $values['event_custom_id'] = '';
+ }
+
$custom_data = base64_decode($values['custom_data']);
$custom_data = mysql_escape_string_sql($custom_data);
@@ -13196,7 +13210,7 @@ function api_set_create_event($id, $trash1, $other, $returnType)
$values['server_id'],
$values['id_extra'],
$ack_utimestamp,
- $values['event_custom_id'] ?? null
+ $values['event_custom_id']
);
if ($other['data'][12] != '') {
diff --git a/pandora_console/include/functions_cron_task.php b/pandora_console/include/functions_cron_task.php
index 40a6e159cc..042d79dad7 100644
--- a/pandora_console/include/functions_cron_task.php
+++ b/pandora_console/include/functions_cron_task.php
@@ -383,6 +383,13 @@ function cron_task_run(
$nameday = strtolower($datetime->format('l'));
}
}
+ } else if (empty($old_args['first_execution']) === false) {
+ $datetime = new DateTime();
+ $datetime->setTimestamp($old_args['first_execution']);
+ $datetime->modify('+7 day');
+ $weekly_date = $datetime->format('Y-m-d');
+ $weekly_time = $datetime->format('H:i:s');
+ $old_args['first_execution'] = strtotime($weekly_date.' '.$weekly_time);
}
} else {
// Add it to next execution.
diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index acbc12d304..cd22b55f1b 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -1318,7 +1318,7 @@ function events_get_all(
if ($tags[0] === $id_tag) {
$_tmp .= ' AND (( ';
} else {
- $_tmp .= ' OR ( ';
+ $_tmp .= ' AND ( ';
}
$_tmp .= sprintf(
@@ -1969,7 +1969,7 @@ function events_get_all(
// -1 For pagination 'All'.
((int) $limit === -1)
? $end = count($data)
- : $end = ((int) $offset !== 0) ? ($offset + $limit) : $limit;
+ : $end = $limit;
$finally = array_slice($data, $offset, $end, true);
$return = [
'buffers' => $buffers,
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 5ac3f05644..f713f68ee0 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -5261,7 +5261,8 @@ function graph_so_by_group($id_group, $width=300, $height=200, $recursive=true,
FROM tagente a
LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente
LEFT JOIN tconfig_os os ON a.id_os = os.id_os
- WHERE a.id_grupo IN (%s) OR g.id_group IN (%s)
+ WHERE (a.id_grupo IN (%s) OR g.id_group IN (%s))
+ AND a.disabled = 0
GROUP BY os.id_os',
implode(',', $id_groups),
implode(',', $id_groups)
@@ -5351,13 +5352,14 @@ function graph_events_agent_by_group($id_group, $width=300, $height=200, $noWate
// with it and then the number of times it occured. GROUP BY statement
// is required if both DISTINCT() and COUNT() are in the statement.
$sql = sprintf(
- 'SELECT DISTINCT(id_agente) AS id_agente,
- COUNT(id_agente) AS count
+ 'SELECT DISTINCT(te.id_agente) AS id_agente,
+ COUNT(te.id_agente) AS count
FROM tevento te
+ LEFT JOIN tagente a ON a.id_agente = te.id_agente
LEFT JOIN tagent_secondary_group g ON g.id_agent = te.id_agente
WHERE 1=1 AND estado = 0
- %s %s
- GROUP BY id_agente
+ %s %s AND a.disabled = 0
+ GROUP BY te.id_agente
ORDER BY count DESC LIMIT 8',
$tags_condition,
$filter_groups
diff --git a/pandora_console/include/functions_groups.php b/pandora_console/include/functions_groups.php
index 78b0804c30..a09baf5d9f 100644
--- a/pandora_console/include/functions_groups.php
+++ b/pandora_console/include/functions_groups.php
@@ -2503,7 +2503,8 @@ function groups_get_heat_map_agents(array $id_group, float $width=0, float $heig
$sql = 'SELECT * FROM tagente a
LEFT JOIN tagent_secondary_group g ON g.id_agent = a.id_agente
- WHERE a.id_grupo IN ('.implode(',', $id_group).') OR g.id_group IN ('.implode(',', $id_group).')';
+ WHERE (a.id_grupo IN ('.implode(',', $id_group).') OR g.id_group IN ('.implode(',', $id_group).'))
+ AND a.disabled = 0';
$all_agents = db_get_all_rows_sql($sql);
if (empty($all_agents)) {
diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index 06ab07598d..bb6a785812 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -774,7 +774,8 @@ function html_print_select(
$select2_multiple_enable_all=false,
$form='',
$order=false,
- $custom_id=null
+ $custom_id=null,
+ $placeholder='',
) {
$output = "\n";
@@ -1013,7 +1014,8 @@ function html_print_select(
$output .= '
\ No newline at end of file
diff --git a/pandora_console/operation/search_agents.getdata.php b/pandora_console/operation/search_agents.getdata.php
index 0284f8e738..7e6128edf5 100644
--- a/pandora_console/operation/search_agents.getdata.php
+++ b/pandora_console/operation/search_agents.getdata.php
@@ -170,12 +170,26 @@ if ($searchAgents) {
}
foreach ($agents as $key => $agent) {
+ $agent_quiet = '';
+ if ((bool) $agent['quiet'] === true) {
+ $agent_quiet = html_print_image(
+ 'images/dot_blue.png',
+ true,
+ [
+ 'border' => '0',
+ 'title' => __('Quiet'),
+ 'alt' => '',
+ 'class' => 'mrgn_lft_5px',
+ ]
+ );
+ }
+
if ($agent['disabled']) {
$agents[$key]['agent'] = '
'.ucfirst(strtolower($agent['alias'])).''.ui_print_help_tip(__('Disabled'), true).'';
+ title="'.$agent['id_agente'].'">
'.ucfirst(strtolower($agent['alias'])).''.ui_print_help_tip(__('Disabled'), true).''.$agent_quiet;
} else {
$agents[$key]['agent'] = '
'.ucfirst(strtolower($agent['alias'])).'';
+ title='.$agent['nombre'].'>
'.ucfirst(strtolower($agent['alias'])).''.$agent_quiet;
}
$agents[$key]['os'] = ui_print_os_icon($agent['id_os'], false, true);
diff --git a/pandora_console/operation/search_results.php b/pandora_console/operation/search_results.php
index 76638e3525..3903ddca19 100644
--- a/pandora_console/operation/search_results.php
+++ b/pandora_console/operation/search_results.php
@@ -33,7 +33,7 @@ foreach ($arrayKeywords as $keyword) {
array_push($temp, '%'.$keyword.'%');
}
-$stringSearchSQL = implode(' ', $temp);
+$stringSearchSQL = implode('', $temp);
$stringSearchSQL = str_replace('_', '\_', $stringSearchSQL);
$_SESSION['stringSearchSQL'] = $stringSearchSQL;
@@ -206,7 +206,7 @@ ui_print_standard_header(
);
$only_count = false;
-
+hd(io_safe_input($_SESSION['stringSearchSQL']), true);
switch ($searchTab) {
case 'main':
$only_count = true;
diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php
index 6f193c05c5..7d44c7b69b 100644
--- a/pandora_console/operation/visual_console/view.php
+++ b/pandora_console/operation/visual_console/view.php
@@ -901,7 +901,7 @@ if ($edit_capable === true) {
draggable: true,
modal: true,
close: false,
- height: 200,
+ height: 210,
width: 480,
overlay: {
opacity: 0.5,
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 395565e1b2..240363e351 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.775
-%define release 240112
+%define release 240123
# 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 b264864bf8..4bc4adcc85 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -6,7 +6,7 @@
%define debug_package %{nil}
%define name pandorafms_console
%define version 7.0NG.775
-%define release 240112
+%define release 240123
# 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 06fb5bbce4..e6969db9dc 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.775
-%define release 240112
+%define release 240123
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 697dd2a3d9..0c2f58120c 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1294,7 +1294,7 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
`section` TEXT,
`data_section` TEXT,
`metaconsole_section` VARCHAR(255) NOT NULL DEFAULT 'Default',
- `metaconsole_data_section` VARCHAR(255) NOT NULL DEFAULT '',
+ `metaconsole_data_section` TEXT,
`force_change_pass` TINYINT UNSIGNED NOT NULL DEFAULT 0,
`last_pass_change` DATETIME,
`last_failed_login` DATETIME,
@@ -1395,6 +1395,7 @@ CREATE TABLE IF NOT EXISTS `tmensajes` (
`subject` VARCHAR(255) NOT NULL DEFAULT '',
`estado` INT UNSIGNED NOT NULL DEFAULT 0,
`url` TEXT,
+ `icon_notification` VARCHAR(250) DEFAULT NULL,
`response_mode` VARCHAR(200) DEFAULT NULL,
`citicity` INT UNSIGNED DEFAULT 0,
`id_source` BIGINT UNSIGNED NOT NULL,
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index a7df8d9764..8fc17246d5 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -2841,8 +2841,8 @@ INSERT INTO `treport_content` (`id_rc`,`id_report`,`id_gs`,`id_agent_module`,`ty
(2,1,0,0,'top_n',28800,0,2,'Top CPU per agent','',0,'<p>This type of report implies loading a lot of data. Therefore it is recommended for scheduled reports, not real-time view.</p>',NULL,0,'','','','00:00:00','00:00:00',1,1,1,1,1,1,1,0,3,10,0,10,0,1,1,0,'{"show_in_same_row":0,"hide_notinit_agents":0,"priority_mode":"1","dyn_height":"250","text_agent":"Lio=","text_agent_module":"Y3B1Lio="}',0,0,'',0,0,300,0,0,NULL,NULL,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,NULL,NULL,1,0,0,NULL),
(3,1,0,0,'event_report_group',21600,0,3,'General event report','This is a sample of not normal events for any agent available in the last 6 hours',0,'<p>This type of report implies loading a lot of data. Therefore it is recommended for scheduled reports, not real-time view.</p>',NULL,0,'','','','00:00:00','00:00:00',1,1,1,1,1,1,1,0,0,10,0,10,0,0,0,0,'{"show_in_same_row":0,"hide_notinit_agents":0,"priority_mode":"1","dyn_height":"250","server_multiple":"\"\"","show_summary_group":0,"filter_event_severity":"[\"20\"]","filter_event_type":"[\"all\"]","filter_event_status":"[\"-1\"]","event_graph_by_agent":"1","event_graph_by_user_validator":"1","event_graph_by_criticity":"1","event_graph_validated_vs_unvalidated":0,"event_filter_search":"","event_filter_exclude":"","custom_data_events":"1","label":""}',0,0,'',0,0,300,0,0,NULL,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,NULL,NULL,1,0,0,NULL);
INSERT INTO `tdashboard` (`id`,`name`,`id_user`,`id_group`,`active`,`cells`,`cells_slideshow`) VALUES
- (1,'Sample Dashboard #1','',0,0,0,0),
- (2,'Sample Dashboard #2','',0,0,0,0);
+ (1,'Sample Dashboard #1','',0,0,7,0),
+ (2,'Sample Dashboard #2','',0,0,10,0);
INSERT INTO `twidget_dashboard` (`id`,`position`,`options`,`order`,`id_dashboard`,`id_widget`,`prop_width`,`prop_height`) VALUES
(1,'{\"x\":\"0\",\"y\":\"0\",\"width\":\"4\",\"height\":\"4\"}','{\"title\":\"Agents hive\",\"background\":\"#ffffff\",\"groups\":[\"12,8,4,9,2,10,13,11\"]}',0,1,1,0.32,0.32),
(2,'{\"x\":\"4\",\"y\":\"0\",\"width\":\"3\",\"height\":\"4\"}','{\"title\":\"Clock\",\"background\":\"#ffffff\",\"clockType\":\"analogic\"}',1,1,12,0.32,0.32),
@@ -2913,7 +2913,7 @@ SET @short_name = 'pandorafms.oracle';
SET @name = 'Oracle';
SET @section = 'app';
SET @description = 'Monitor Oracle databases';
-SET @version = '1.1';
+SET @version = '1.2';
INSERT IGNORE INTO `tdiscovery_apps` (`id_app`, `short_name`, `name`, `section`, `description`, `version`) VALUES ('', @short_name, @name, @section, @description, @version);
SELECT @id_app := `id_app` FROM `tdiscovery_apps` WHERE `short_name` = @short_name;
diff --git a/pandora_console/update_manager_client/resources/styles/um.css b/pandora_console/update_manager_client/resources/styles/um.css
index fe28eaa176..cd88b1d30d 100644
--- a/pandora_console/update_manager_client/resources/styles/um.css
+++ b/pandora_console/update_manager_client/resources/styles/um.css
@@ -321,9 +321,6 @@ a.update_manager_button:after {
margin: 20px;
}
-.ui-widget.ui-widget-content {
- border: none;
-}
#um-update-details {
display: none;
background: #fff;
diff --git a/pandora_console/update_manager_client/views/register.php b/pandora_console/update_manager_client/views/register.php
index 5c05d04678..bfc70570f3 100644
--- a/pandora_console/update_manager_client/views/register.php
+++ b/pandora_console/update_manager_client/views/register.php
@@ -156,7 +156,7 @@ $("#submit-cancel_registration").click(function(e) {
buttons: [
{
text: "No",
- class: "submit-cancel",
+ class: "submit-cancel secondaryButton",
click: function() {
$(this).dialog("close");
}
diff --git a/pandora_console/views/dashboard/formDashboard.php b/pandora_console/views/dashboard/formDashboard.php
index be21a3142e..703d8d3a61 100644
--- a/pandora_console/views/dashboard/formDashboard.php
+++ b/pandora_console/views/dashboard/formDashboard.php
@@ -84,7 +84,7 @@ $inputs = [
],
],
[
- 'block_id' => 'group',
+ 'block_id' => 'group_form',
'direct' => 1,
'hidden' => $private,
'block_content' => [
diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php
index f59391a083..6dce805533 100644
--- a/pandora_console/views/dashboard/header.php
+++ b/pandora_console/views/dashboard/header.php
@@ -214,7 +214,7 @@ $enable_disable['text'] = html_print_div(
);
// New Widget.
-$newWidget['text'] = '
';
+$newWidget['text'] = '';
$newWidget['text'] .= html_print_image(
'images/plus@svg.svg',
true,
diff --git a/pandora_console/views/dashboard/list.php b/pandora_console/views/dashboard/list.php
index aae6778f6d..aaf675e64a 100644
--- a/pandora_console/views/dashboard/list.php
+++ b/pandora_console/views/dashboard/list.php
@@ -112,7 +112,11 @@ if (empty($dashboards) === true) {
'manageDashboards' => $manageDashboards,
],
'default_pagination' => $config['block_size'],
- 'no_sortable_columns' => [],
+ 'no_sortable_columns' => [
+ 4,
+ 5,
+ 6,
+ ],
'order' => [
'field' => 'name',
'direction' => 'desc',
diff --git a/pandora_console/views/dashboard/tipsWindow.php b/pandora_console/views/dashboard/tipsWindow.php
index 573a11abcc..d2714ae1f2 100644
--- a/pandora_console/views/dashboard/tipsWindow.php
+++ b/pandora_console/views/dashboard/tipsWindow.php
@@ -41,7 +41,7 @@ $output .= ''.html_print_checkbox(
false,
'',
($preview === true) ? '' : 'checkbox_tips_startup'
-).__('Show usage tips at startup').'
';
+).' '.__('Show usage tips at startup').'';
$output .= '