';
echo '
';
@@ -686,7 +689,7 @@ html_print_div(['id' => 'forced_title_layer', 'class' => 'forced_title_layer', '
});
$("#submit-hide-login-logout").click (function () {
- $("#login_logout").dialog('close');
+ document.location = "";
});
});
break;
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index c1a238d7d5..6ccf36b4a0 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -160,7 +160,7 @@ $pure = get_parameter('pure', 0);
$schedule_report = get_parameter('schbutton', '');
$pagination = (int) get_parameter('pagination', $config['block_size']);
-if ($action == 'edit' && $idReport > 0) {
+if ($action === 'edit' && $idReport > 0) {
$report_group = db_get_value(
'id_group',
'treport',
@@ -451,6 +451,14 @@ switch ($action) {
} else {
$resultOperationDB = false;
}
+
+ header(
+ sprintf(
+ 'Location: %sindex.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=list_items&action=edit&id_report=%d',
+ $config['homeurl'],
+ $idReport
+ )
+ );
break;
case 'delete_items_pos':
@@ -514,6 +522,7 @@ switch ($action) {
}
break;
+ case 'copy_report':
case 'delete_report':
case 'list':
$buttons = [
@@ -666,6 +675,81 @@ switch ($action) {
);
}
+ if ($action === 'copy_report') {
+ $copy = false;
+ switch ($type_access_selected) {
+ case 'group_view':
+ if ($config['id_user'] == $report['id_user']
+ || is_user_admin($config['id_user'])
+ ) {
+ $copy = true;
+ // Owner can delete.
+ } else {
+ $copy = check_acl(
+ $config['id_user'],
+ $report['id_group'],
+ 'RM'
+ );
+ }
+ break;
+
+ case 'group_edit':
+ if ($config['id_user'] == $report['id_user']
+ || is_user_admin($config['id_user'])
+ ) {
+ $copy = true;
+ // Owner can delete.
+ } else {
+ $copy = check_acl(
+ $config['id_user'],
+ $report['id_group'],
+ 'RM'
+ );
+ }
+ break;
+
+ case 'user_edit':
+ if ($config['id_user'] == $report['id_user']
+ || is_user_admin($config['id_user'])
+ ) {
+ $copy = true;
+ }
+ break;
+
+ default:
+ // Default.
+ break;
+ }
+
+ if (! $copy && !empty($type_access_selected)) {
+ db_pandora_audit(
+ 'ACL Violation',
+ 'Trying to access report builder copy'
+ );
+ include 'general/noaccess.php';
+ exit;
+ }
+
+ $result = reports_copy_report($idReport);
+ if ($result !== false) {
+ db_pandora_audit(
+ 'Report management',
+ 'Copy report #'.$idReport
+ );
+ } else {
+ db_pandora_audit(
+ 'Report management',
+ 'Fail try to copy report #'.$idReport
+ );
+ }
+
+ ui_print_result_message(
+ $result,
+ __('Successfully copied'),
+ __('Could not be copied')
+ );
+ }
+
$id_group = (int) get_parameter('id_group', 0);
$search = trim(get_parameter('search', ''));
@@ -1101,6 +1185,27 @@ switch ($action) {
$data[$next] .= '';
}
+ $data[$next] .= '
';
+
if ($delete) {
$data[$next] .= '
';
echo '
'.$tabs_dialog.'
-
';
+
";
diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php
index 923138e88e..a5463283db 100644
--- a/pandora_console/include/functions_graph.php
+++ b/pandora_console/include/functions_graph.php
@@ -1412,6 +1412,14 @@ function graphic_combined_module(
$labels = [];
$modules = [];
foreach ($sources as $source) {
+ $id_agent = agents_get_module_id(
+ $source['id_agent_module']
+ );
+
+ if (!$id_agent) {
+ continue;
+ }
+
if (is_metaconsole() === true) {
metaconsole_restore_db();
$server = metaconsole_get_connection_by_id($source['id_server']);
@@ -1428,9 +1436,6 @@ function graphic_combined_module(
array_push($modules, $modulepush);
array_push($weights, $source['weight']);
if ($source['label'] != '' || $params_combined['labels']) {
- $id_agent = agents_get_module_id(
- $source['id_agent_module']
- );
$agent_description = agents_get_description($id_agent);
$agent_group = agents_get_agent_group($id_agent);
$agent_address = agents_get_address($id_agent);
diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php
index f688ea78b6..b19be7f93c 100755
--- a/pandora_console/include/functions_reports.php
+++ b/pandora_console/include/functions_reports.php
@@ -275,13 +275,12 @@ function reports_get_content($id_report_content, $filter=false, $fields=false)
/**
- * Get all the contents of a report.
+ * Creates the contents of a report.
*
* @param int Report id to get contents.
- * @param array Extra filters for the contents.
- * @param array Fields to be fetched. All fields by default
+ * @param array values to be created.
*
- * @return array All the contents of a report.
+ * @return boolean true id succed, false otherwise.
*/
function reports_create_content($id_report, $values)
{
@@ -305,7 +304,11 @@ function reports_create_content($id_report, $values)
switch ($config['dbtype']) {
case 'mysql':
- unset($values['`order`']);
+ if (isset($values['`order`'])) {
+ unset($values['`order`']);
+ } else {
+ unset($values['order']);
+ }
$order = (int) db_get_value('MAX(`order`)', 'treport_content', 'id_report', $id_report);
$values['`order`'] = ($order + 1);
@@ -907,3 +910,100 @@ function reports_get_report_types($template=false, $not_editor=false)
return $types;
}
+
+
+function reports_copy_report($id_report)
+{
+ $report = reports_get_report($id_report);
+
+ // Unset original report id_report.
+ unset($report['id_report']);
+
+ $original_name = $report['name'];
+ $original_group = $report['id_group'];
+
+ $copy_name = io_safe_input(sprintf(__('copy of %s'), io_safe_output($original_name)));
+
+ $copy_report = reports_create_report($copy_name, $original_group, $report);
+
+ if ($copy_report !== false) {
+ $original_contents = reports_get_contents($id_report);
+ if (empty($original_contents) === false) {
+ foreach ($original_contents as $original_content) {
+ $original_content['id_report'] = $copy_report;
+ $original_id_rc = $original_content['id_rc'];
+ unset($original_content['id_rc']);
+ $result_content = db_process_sql_insert('treport_content', $original_content);
+
+ if ($result_content === false) {
+ $result = false;
+ break;
+ }
+
+ switch (io_safe_output($original_content['type'])) {
+ case 'SLA':
+ case 'SLA_monthly':
+ case 'SLA_weekly':
+ case 'SLA_hourly':
+ case 'availability_graph':
+
+ $slas = db_get_all_rows_field_filter('treport_content_sla_combined', 'id_report_content', $original_id_rc);
+ if ($slas === false) {
+ $slas = [];
+ }
+
+ foreach ($slas as $sla) {
+ unset($sla['id']);
+
+ // Set id report to copy id.
+ $sla['id_report_content'] = $result_content;
+ $sla_copy = db_process_sql_insert('treport_content_sla_combined', $sla);
+
+ if ($sla_copy === false) {
+ reports_delete_content($result_content);
+ $result = false;
+ break;
+ }
+ }
+ break;
+
+ case 'general':
+ case 'top_n':
+ case 'availability':
+ case 'exception':
+
+ $items = db_get_all_rows_field_filter('treport_content_item', 'id_report_content', $original_id_rc);
+ if ($items === false) {
+ $items = [];
+ }
+
+ foreach ($items as $item) {
+ unset($item['id']);
+
+ // Set id report to copy id.
+ $item['id_report_content'] = $result_content;
+ $item_copy = db_process_sql_insert('treport_content_item', $item);
+
+ if ($item_copy === false) {
+ reports_delete_content($result_content);
+ $result = false;
+ break;
+ }
+ }
+ break;
+
+ default:
+ // Empty default.
+ break;
+ }
+ }
+ }
+ }
+
+ if ($result === false) {
+ reports_delete_report($copy_report);
+ return false;
+ }
+
+ return true;
+}
diff --git a/pandora_console/include/get_file.php b/pandora_console/include/get_file.php
index f5ccaecd99..8de031a79b 100644
--- a/pandora_console/include/get_file.php
+++ b/pandora_console/include/get_file.php
@@ -35,7 +35,7 @@ $file = base64_decode(urldecode($file_raw));
$hash = get_parameter('hash', null);
-if ($file === '' || $hash === '' || $hash !== md5($file_raw.$config['dbpass']) || !isset($_SERVER['HTTP_REFERER'])) {
+if ($file === '' || $hash === '' || $hash !== md5($file_raw.$config['server_unique_identifier']) || !isset($_SERVER['HTTP_REFERER'])) {
echo "
".__('Security error. Please contact the administrator.').'
';
} else {
$downloadable_file = '';
diff --git a/pandora_console/include/help/en/help_event_alert.php b/pandora_console/include/help/en/help_event_alert.php
deleted file mode 100644
index 04cf373b38..0000000000
--- a/pandora_console/include/help/en/help_event_alert.php
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
Event Alerts
-
-It is possible to define alerts on events, that allows to work from a completely new approach much more flexible. This is an Enterprise feature.
-
-To create the new event alerts, click on the Create button in the Event alerts menu from the Administration menu.
-
-
-
-
-
- '250px']); ?>
-
-
-
-An event alert is composed by different rules, linked between them by logical operators (and, or, xor, nand, nor, nxor).
-
-
- '550px']); ?>
-
-
-To could work easier with them, the configuration parameters of an event alert are identical to the module alert. Here could be find a detailed explanation of any of them. There are only two specific parameters of the event alerts:
-
-
Rule evaluation mode: There are two options Pass and Drop. Pass means that if a event fullfilled with a alert the alerts bellow are evaluated. Drop means that if a event fullfilled with a alert the alerts bellow stop to evaluated.
-
-
Group by: Allows to group the rules by agent, module, alert or group. For example, if a rule is configured to it fires when we receive two critical events, and it's grouped by agent, there should arrive two critical events from the same agent. It's possible to switch off.
-
-Each rule is configured to fire with an specific kind of event. The alert will be fired when the logical equation defined by the rules and its operators is fulfilled
-
-
-
- '550px']); ?>
-
-
-
-The configuration parameters of one rule that are possible are:
-
-
Name: Name of the rule.
-
User comment: Free comment.
-
Event: Regular expression that matches with the event text.
-
Window: The events that have been generated out of the time window will be rejected
-
Count: Number of events that have to match with the rule to it could be fired.
-
Agent: Regular expression that matches with the name of the agent that generated the event.
-
Module: Regular expression that matches with the name of the module that generated the event.
-
Module alerts: Regular expression that matches with the name of the alert that generated the event.
-
Group: Group the agent belongs to.
-
Criticity: Event criticity.
-
Tag: Tags associated to the event.
-
User: User associated to the event.
-
Event type: Kind of event.
-
-For example, we could configure a rule that matches with the events generated by any module that is named cpu_load of any agent of the Servers group that has associated the tag System when the module goes to critical status:
-
-
-
- '550px']); ?>
-
-
-
Given the high number of events that the database could store, the server works on an event window that is defined in the pandora_server.conf configuration file through the parameter event_window. The events that have been generated out of this time window won't be processed by the server, so it doesn't make sense to specify in a rule a time window higher to the one configured in the server
-
-
diff --git a/pandora_console/include/help/es/help_event_alert.php b/pandora_console/include/help/es/help_event_alert.php
deleted file mode 100644
index 5c326796dd..0000000000
--- a/pandora_console/include/help/es/help_event_alert.php
+++ /dev/null
@@ -1,64 +0,0 @@
-
-
-
Alerta de evento
-
-Desde la versión 4.0 de se pueden definir alertas sobre los eventos, lo que permite trabajar desde una perspectiva completamente nueva y mucho más flexible. Esta es una característica Enterprise.
-
-Las Alertas de evento nuevas se crean pinchando en el botón Create en el menú Event alerts en el menú de Administración.
-
-
-
- '250px']); ?>
-
-
-
-Una alerta de eventos está compuesta por distintas reglas, relacionadas entre sí por operadores lógicos (and, or, xor, nand, nor, nxor).
-
-
- '550px']); ?>
-
-
-Para hacer más fácil trabajar con ellas, los parámetros de configuración de una alerta de eventos son idénticos a los de una alerta de módulo. Aquí se puede encontrar una explicación detallada de cada uno de ellos. Únicamente existen dos parámetros específicos de las alertas de eventos:
-
-
Rule evaluation mode: Hay dos opciones Pass y Drop. Pass significa que en caso de que un evento coincida con una alerta se sigan evaluando el resto de alertas. Drop significa que en caso de que un evento coincida con una alerta no se evaluen el resto de alertas.
-
-
Group by: Permite agrupar las reglas por agente, módulo, alerta o grupo. Por ejemplo, si se configura una regla para que salte cuando se reciban dos eventos críticos y se agrupa por agente, deberán llegar dos eventos críticos de un mismo agente. Se puede desactivar.
-
-Cada regla se configura para saltar ante un determinado tipo de evento, cuando se cumple la ecuación lógica definida por las reglas y sus operadores, la alerta se dispara.
-
-
-
- '550px']); ?>
-
-
-
-Los posibles parámetros de configuración de una regla son:
-
-
Name: Nombre de la regla.
-
User comment: Comentario libre.
-
Event: Expresión regular que casa con el texto del evento.
-
Window: Los eventos que se hayan generado fuera de la ventana de tiempo serán descartados.
-
Count: Número de eventos que tienen que casar con la regla para que ésta se dispare.
-
Agent: Expresión regular que casa con el nombre del agente que generó el evento.
-
Module: Expresión regular que casa con el nombre del módulo que generó el evento.
-
Module alerts: Expresión regular que casa con el nombre de la alerta que generó el evento.
-
Group: Grupo al que pertenece el Agente.
-
Criticity: Criticidad del evento.
-
Tag: Tags asociados al evento.
-
User: Usuario asociado al evento.
-
Event type: Tipo de evento.
-
-Por ejemplo, podríamos configurar una regla que case con los eventos generados por cualquier módulo que se llame cpu_load de cualquier agente del grupo Servers que lleve asociado el tag System cuando el módulo pasa al estado crítico:
-
-
-
- '550px']); ?>
-
-
-
Dado el elevado número de eventos que puede llegar a albergar la base de datos de , el servidor trabaja sobre una ventana de eventos que se define en el fichero de configuración pandora_server.conf mediante el parámetro event_window. Los eventos que se hayan generado fuera de esta ventana de tiempo no serán procesados por el servidor, de modo que no tiene sentido especificar en una regla una ventana de tiempo superior a la configurada en el servidor
-
-
diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js
index 542ce10a2b..faebcaa499 100644
--- a/pandora_console/include/javascript/pandora_dashboards.js
+++ b/pandora_console/include/javascript/pandora_dashboards.js
@@ -843,6 +843,7 @@ function processTreeSearch(settings) {
filters.searchModule = settings.searchModule;
filters.statusModule = settings.statusModule;
filters.groupID = settings.searchGroup;
+ filters.searchHirearchy = 1;
$.ajax({
type: "POST",
diff --git a/pandora_console/include/lib/Dashboard/Widgets/tree_view.php b/pandora_console/include/lib/Dashboard/Widgets/tree_view.php
index edb843bda0..cbeba60d3f 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/tree_view.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/tree_view.php
@@ -418,28 +418,30 @@ class TreeViewWidget extends Widget
AGENT_MODULE_STATUS_NOT_INIT => __('Not init'),
];
- $inputs[] = [
- 'label' => __('Modules status'),
- 'arguments' => [
- 'type' => 'select',
- 'fields' => $fields,
- 'name' => 'moduleStatus',
- 'selected' => $values['moduleStatus'],
- 'return' => true,
- ],
- ];
+ if (is_metaconsole() === false) {
+ $inputs[] = [
+ 'label' => __('Modules status'),
+ 'arguments' => [
+ 'type' => 'select',
+ 'fields' => $fields,
+ 'name' => 'moduleStatus',
+ 'selected' => $values['moduleStatus'],
+ 'return' => true,
+ ],
+ ];
- // Filter modules.
- $inputs[] = [
- 'label' => __('Filter modules'),
- 'arguments' => [
- 'name' => 'filterModule',
- 'type' => 'text',
- 'value' => $values['filterModule'],
- 'return' => true,
- 'size' => 0,
- ],
- ];
+ // Filter modules.
+ $inputs[] = [
+ 'label' => __('Filter modules'),
+ 'arguments' => [
+ 'name' => 'filterModule',
+ 'type' => 'text',
+ 'value' => $values['filterModule'],
+ 'return' => true,
+ 'size' => 0,
+ ],
+ ];
+ }
return $inputs;
}
diff --git a/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php b/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
index f73806967e..6774dd7fbd 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Items/DonutGraph.php
@@ -157,6 +157,14 @@ final class DonutGraph extends Item
if ($isString === true) {
$graphData = \get_donut_module_data($moduleId);
+ if (empty($graphData) || $graphData === null) {
+ $aux = [];
+ $aux[0]['tag_name'] = 'No data to show';
+ $aux[0]['color'] = '#aa3333';
+ $aux[0]['value'] = 1;
+ $aux[0]['percent'] = 100;
+ $graphData = $aux;
+ }
$data['html'] = \d3_donut_graph(
(int) $data['id'],
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 32d559abce..3b37291fe4 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -2563,7 +2563,6 @@ select {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
- font-size: 10pt;
font-family: inherit;
}
diff --git a/pandora_console/index.php b/pandora_console/index.php
index ac14a19818..667c6cfd72 100755
--- a/pandora_console/index.php
+++ b/pandora_console/index.php
@@ -246,6 +246,8 @@ $page = $sec2;
// Reference variable for old time sake.
$sec = get_parameter_get('sec');
$sec = safe_url_extraclean($sec);
+// CSRF Validation.
+$validatedCSRF = validate_csrf_code();
$process_login = false;
@@ -319,7 +321,7 @@ if (! isset($config['id_user'])) {
// Code.
$code = (string) get_parameter_post('auth_code');
- if (!empty($code)) {
+ if (empty($code) === false) {
$result = validate_double_auth_code($nick, $code);
if ($result === true) {
@@ -331,7 +333,7 @@ if (! isset($config['id_user'])) {
// Error message.
$config['auth_error'] = __('Invalid code');
- if (!isset($_SESSION['prepared_login_da']['attempts'])) {
+ if (isset($_SESSION['prepared_login_da']['attempts']) === false) {
$_SESSION['prepared_login_da']['attempts'] = 0;
}
@@ -471,6 +473,18 @@ if (! isset($config['id_user'])) {
}
}
+ // CSRF Validation not pass in login.
+ if ($validatedCSRF === false) {
+ $process_error_message = __(
+ '%s cannot verify the origin of the request. Try again, please.',
+ get_product_name()
+ );
+
+ include_once 'general/login_page.php';
+ // Finish the execution.
+ exit('
