';
+ $output .= \ui_print_info_message(
+ __('Not found modules'),
+ '',
+ true
+ );
+ $output .= '
';
+ }
+
+ return $output;
+ }
+
+
+ /**
+ * Get info modules.
+ *
+ * @param array $modules Modules.
+ *
+ * @return array Data.
+ */
+ private function getInfoModules(array $modules): array
+ {
+ $where = sprintf(
+ 'tagente_modulo.id_agente_modulo IN (%s)',
+ implode(',', $modules)
+ );
+
+ $sql = sprintf(
+ 'SELECT tagente_modulo.id_agente_modulo AS `id`,
+ tagente_modulo.nombre AS `name`,
+ tagente_modulo.unit AS `unit`,
+ tagente.alias AS `agent_alias`,
+ tagente.id_agente AS `agent_id`
+ FROM tagente_modulo
+ INNER JOIN tagente
+ ON tagente_modulo.id_agente = tagente.id_agente
+ WHERE %s',
+ $where
+ );
+
+ $modules = db_get_all_rows_sql($sql);
+
+ if ($modules === false) {
+ $modules = [];
+ }
+
+ return $modules;
+ }
+
+
+ /**
+ * Draw histogram module.
+ *
+ * @param array $data Info module.
+ * @param boolean $last Last histogram.
+ *
+ * @return string
+ */
+ private function drawHistograms(array $data, bool $last):string
+ {
+ global $config;
+
+ $size = parent::getSize();
+
+ // Desactive scroll bars only this item.
+ $id_agent = $data['agent_id'];
+ $id_module = $data['id'];
+ $period = $this->values['period'];
+ switch ($this->values['label']) {
+ case 'module':
+ $label = ui_print_truncate_text(
+ $data['name'],
+ 25,
+ false,
+ true,
+ true,
+ '[…]',
+ ''
+ );
+ break;
+
+ case 'agent_module':
+ $label = ui_print_truncate_text(
+ $data['agent_alias'].' / '.$data['name'],
+ 25,
+ false,
+ true,
+ true,
+ );
+ break;
+
+ default:
+ case 'agent':
+ $label = ui_print_truncate_text(
+ $data['agent_alias'],
+ 25,
+ false,
+ true,
+ true,
+ '[…]',
+ ''
+ );
+ break;
+ }
+
+ $size_label = 10;
+
+ $id_group = \agents_get_agent_group($id_agent);
+
+ $height_graph = 30;
+ if ($last === true) {
+ if ($period > 86500) {
+ $height_graph = 60;
+ } else {
+ $height_graph = 50;
+ }
+ }
+
+ $content = [
+ 'id_agent_module' => $id_module,
+ 'period' => $period,
+ 'time_from' => '00:00:00',
+ 'time_to' => '00:00:00',
+ 'id_group' => $id_group,
+ 'sizeForTicks' => ($size['width'] - 200),
+ 'showLabelTicks' => ($last === true) ? true : false,
+ 'height_graph' => $height_graph,
+ [
+ ['id_agent_module' => $id_module],
+ ]
+ ];
+
+ $graph = \reporting_module_histogram_graph(
+ ['datetime' => time()],
+ $content
+ );
+
+ $style = 'min-width:200px;';
+ if ($last === false) {
+ if ($period > 86500) {
+ $style .= 'width:calc(100% - 24px); margin-left: 12px;';
+ } else {
+ $style .= 'width:calc(100% - 16px); margin-left: 8px;';
+ }
+ } else {
+ $style .= 'height:60px;';
+ }
+
+ $st = 'font-size:'.$size_label.'px;';
+ if (is_metaconsole() === false) {
+ $st .= 'height: 28px;';
+ }
+
+ $output = '';
+ foreach ($modules as $module) {
+ $output .= $this->drawTabs($module);
+ }
+
+ $output .= '
';
+ } else {
+ $output .= '';
+ $output .= \ui_print_info_message(
+ __('Not found modules'),
+ '',
+ true
+ );
+ $output .= '
';
+ }
+
+ return $output;
+ }
+
+
+ /**
+ * Get info modules.
+ *
+ * @param array $modules Modules.
+ *
+ * @return array Data.
+ */
+ private function getInfoModules(array $modules): array
+ {
+ $where = sprintf(
+ 'tagente_modulo.id_agente_modulo IN (%s)',
+ implode(',', $modules)
+ );
+
+ $sql = sprintf(
+ 'SELECT tagente_modulo.id_agente_modulo AS `id`,
+ tagente_modulo.nombre AS `name`,
+ tagente_modulo.unit AS `unit`,
+ tagente_estado.datos AS `data`,
+ tagente_estado.timestamp AS `timestamp`,
+ tagente_estado.estado AS `status`,
+ tagente.alias
+ FROM tagente_modulo
+ LEFT JOIN tagente_estado
+ ON tagente_modulo.id_agente_modulo = tagente_estado.id_agente_modulo
+ LEFT JOIN tagente
+ ON tagente_modulo.id_agente = tagente.id_agente
+ WHERE %s',
+ $where
+ );
+
+ $modules = db_get_all_rows_sql($sql);
+
+ if ($modules === false) {
+ $modules = [];
+ }
+
+ return $modules;
+ }
+
+
+ /**
+ * Draw tab module.
+ *
+ * @param array $data Info module.
+ *
+ * @return string Output.
+ */
+ private function drawTabs(array $data):string
+ {
+ global $config;
+
+ $background = modules_get_color_status($data['status'], true);
+ $color = modules_get_textcolor_status($data['status']);
+
+ $style = 'background-color:'.$background.'; color:'.$color.';';
+ $output = '';
$data .= ui_print_group_icon(
@@ -393,7 +411,7 @@ class GroupsStatusWidget extends Widget
$table->data[0][0] .= '';
$table->data[0][1] = '
';
$table->data[0][1] .= '';
- $table->data[0][1] .= $stats['monitor_total'];
+ $table->data[0][1] .= $stats['total_checks'];
$table->data[0][1] .= '';
$table->data[0][1] .= '';
diff --git a/pandora_console/include/lib/Dashboard/Widgets/single_graph.php b/pandora_console/include/lib/Dashboard/Widgets/single_graph.php
index 6531c16831..c35681219d 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/single_graph.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/single_graph.php
@@ -1,10 +1,10 @@
__('Module'),
'arguments' => [
'type' => 'autocomplete_module',
- 'fields' => $fields,
'name' => 'moduleId',
'selected' => $values['moduleId'],
'return' => true,
@@ -353,8 +352,8 @@ class SingleGraphWidget extends Widget
include_once $config['homedir'].'/include/functions_agents.php';
include_once $config['homedir'].'/include/functions_modules.php';
- $module_name = \modules_get_agentmodule_name($id_module);
- $units_name = \modules_get_unit($id_module);
+ $module_name = \modules_get_agentmodule_name($this->values['moduleId']);
+ $units_name = \modules_get_unit($this->values['moduleId']);
$trickHight = 10;
if ($this->values['showLegend'] === 1) {
diff --git a/pandora_console/include/lib/Dashboard/Widgets/tactical.php b/pandora_console/include/lib/Dashboard/Widgets/tactical.php
index f5f664fb70..b0a6ffdb03 100755
--- a/pandora_console/include/lib/Dashboard/Widgets/tactical.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/tactical.php
@@ -185,6 +185,7 @@ class TacticalWidget extends Widget
if (empty($this->values['statusMonitor']) === true
&& empty($this->values['serverPerformance']) === true
&& empty($this->values['summary']) === true
+ && empty($this->values['groupId']) === true
) {
$this->configurationRequired = true;
}
@@ -226,6 +227,18 @@ class TacticalWidget extends Widget
$values['summary'] = $decoder['summary'];
}
+ if (isset($decoder['id_groups']) === true) {
+ if (is_array($decoder['id_groups']) === true) {
+ $decoder['id_groups'][0] = implode(',', $decoder['id_groups']);
+ }
+
+ $values['groupId'] = $decoder['id_groups'];
+ }
+
+ if (isset($decoder['groupId']) === true) {
+ $values['groupId'] = $decoder['groupId'];
+ }
+
return $values;
}
@@ -292,6 +305,43 @@ class TacticalWidget extends Widget
],
];
+ // Groups.
+ $return_all_group = false;
+
+ // Restrict access to group.
+ $selected_groups = [];
+ if ($values['groupId']) {
+ $selected_groups = explode(',', $values['groupId'][0]);
+
+ if (users_can_manage_group_all('AR') === true
+ || ($selected_groups[0] !== ''
+ && in_array(0, $selected_groups) === true)
+ ) {
+ // Return all group if user has permissions
+ // or it is a currently selected group.
+ $return_all_group = true;
+ }
+ } else {
+ if (users_can_manage_group_all('AR') === true) {
+ $return_all_group = true;
+ }
+ }
+
+ $inputs[] = [
+ 'label' => __('Groups'),
+ 'arguments' => [
+ 'type' => 'select_groups',
+ 'name' => 'groupId[]',
+ 'returnAllGroup' => true,
+ 'privilege' => 'AR',
+ 'selected' => $selected_groups,
+ 'return' => true,
+ 'multiple' => true,
+ 'returnAllGroup' => $return_all_group,
+ 'required' => true,
+ ],
+ ];
+
return $inputs;
}
@@ -311,6 +361,7 @@ class TacticalWidget extends Widget
'serverPerformance'
);
$values['summary'] = \get_parameter_switch('summary');
+ $values['groupId'] = \get_parameter('groupId', []);
return $values;
}
@@ -327,7 +378,7 @@ class TacticalWidget extends Widget
$output = '';
- $all_data = \tactical_status_modules_agents($config['id_user']);
+ $all_data = \tactical_status_modules_agents($config['id_user'], false, 'AR', $this->values['groupId'][0]);
$data = [];
@@ -503,7 +554,7 @@ class TacticalWidget extends Widget
{
$size = [
'width' => 450,
- 'height' => 370,
+ 'height' => 515,
];
return $size;
diff --git a/pandora_console/include/lib/Event.php b/pandora_console/include/lib/Event.php
index 57584469d7..abee600fec 100644
--- a/pandora_console/include/lib/Event.php
+++ b/pandora_console/include/lib/Event.php
@@ -146,7 +146,7 @@ class Event extends Entity
* @param boolean $return_sql Return sql or execute it.
* @param string $having Having.
*
- * @return array|string|false Found events or SQL query or error.
+ * @return array Found events or SQL query or error.
* @throws \Exception On error.
*/
public static function search(
@@ -160,7 +160,7 @@ class Event extends Entity
bool $return_sql=false,
string $having=''
):array {
- return \events_get_all(
+ $result = \events_get_all(
$fields,
$filter,
$offset,
@@ -171,6 +171,13 @@ class Event extends Entity
$return_sql,
$having
);
+
+ // Always return an array.
+ if (empty($result) === true) {
+ $result = [];
+ }
+
+ return $result;
}
diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css
index 585efe2cdd..6abd72d2a0 100644
--- a/pandora_console/include/styles/dashboards.css
+++ b/pandora_console/include/styles/dashboards.css
@@ -573,6 +573,91 @@ div#main_pure {
margin: 0;
}
+form.modal-dashboard ul.wizard li label {
+ max-width: 30%;
+}
+
+form.modal-dashboard ul.wizard li.agents_select2,
+form.modal-dashboard ul.wizard li.modules_select2 {
+ align-items: center;
+ justify-content: center;
+}
+
+form.modal-dashboard
+ ul.wizard
+ li.agents_select2
+ div.flex-row-center
+ div.flex-column,
+form.modal-dashboard
+ ul.wizard
+ li.modules_select2
+ div.flex-row-center
+ div.flex-column {
+ flex: 0;
+ height: 45px;
+}
+
+.ui-dialog .ui-dialog-title {
+ top: -3px !important;
+}
+
+.select2-container--default
+ .select2-selection--multiple
+ .select2-selection__choice {
+ margin: 0px;
+}
+
+.container-tabs {
+ width: 100%;
+ height: calc(100% + 80px);
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ flex-wrap: wrap;
+}
+
+.widget-module-tabs {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ min-width: 100px;
+ min-height: 95px;
+ margin: 2px;
+ padding: 5px;
+}
+
+.widget-module-tabs-title {
+ word-break: break-word;
+}
+
+.widget-module-tabs-data {
+ font-size: 1.5em;
+ font-weight: bolder;
+}
+
+.widget-module-tabs-unit {
+ font-size: smaller;
+ font-style: italic;
+}
+
+.container-histograms {
+ min-width: 400px;
+}
+.table-container-histograms {
+ width: 100%;
+}
+
+.container-histograms .widget-histogram-chart {
+ height: 28px;
+}
+
+.container-histograms .widget-histogram-label {
+ padding-top: 10px;
+ text-align: initial;
+}
+
.content-widget .dataTables_wrapper {
width: 98%;
margin-top: 5px;
@@ -591,3 +676,7 @@ div#main_pure {
margin-top: 0px !important;
padding: 0.5em 1em 0em 0em !important;
}
+
+.select2-selection__rendered {
+ max-height: 75px !important;
+}
diff --git a/pandora_console/include/styles/heatmap.css b/pandora_console/include/styles/heatmap.css
index bac09b561e..12db5cc399 100644
--- a/pandora_console/include/styles/heatmap.css
+++ b/pandora_console/include/styles/heatmap.css
@@ -159,10 +159,26 @@
fill: #cccccc;
}
+.notinit_10,
+.notinit_9,
+.notinit_8,
.notinit {
fill: #4a83f3;
}
+.notinit_7,
+.notinit_6,
+.notinit_5,
+.notinit_4 {
+ fill: #6695f5;
+}
+
+.notinit_3,
+.notinit_2,
+.notinit_1 {
+ fill: #79a3f6;
+}
+
.hover {
cursor: pointer;
}
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 8e38b9b7b5..eeff4d2fce 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -5625,12 +5625,12 @@ div#bullets_modules div {
}
.agent_details_col_left {
- width: 40%;
- min-width: 300px;
+ width: 49%;
+ min-width: 450px;
}
.agent_details_col_right {
- width: 59%;
- min-width: 480px;
+ width: 49%;
+ min-width: 450px;
}
.agent_access_rate_events {
@@ -5641,14 +5641,15 @@ div#bullets_modules div {
}
.white_table_graph#table_access_rate {
- flex: 1 1 auto;
- min-width: 450px;
- margin-right: 1%;
+ margin-left: 1px;
+ margin-right: 1px;
+ width: 49%;
}
.white_table_graph#table_events {
- flex: 1 1 auto;
- min-width: 450px;
+ margin-left: 1px;
+ margin-right: 1px;
+ width: 49%;
}
@media screen and (max-width: 1150px) {
@@ -5687,7 +5688,7 @@ div#status_pie {
justify-content: flex-end;
align-items: center;
border-bottom: 1px solid #e2e2e2;
- padding: 6px 20px;
+ padding: 8px 20px;
}
.agent_details_content {
@@ -7501,6 +7502,11 @@ div.graph div.legend table {
align-items: center;
}
+.flex_justify {
+ display: flex;
+ justify-content: center;
+}
+
.span_priority {
width: 20px;
height: 10px;
@@ -9083,3 +9089,33 @@ div#err_msg_centralised {
margin-bottom: 4px !important;
padding: 2px 5px !important;
}
+
+.dataTables_wrapper {
+ overflow: auto;
+}
+
+.dataTables_wrapper .dataTables_processing {
+ margin-top: -37px !important;
+ top: 50px !important;
+ padding-top: 0px !important;
+ height: 0px !important;
+ background: transparent !important;
+}
+
+.dataTables_wrapper .dataTables_processing .processing-datatables-inside {
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+}
+
+.dataTables_wrapper .dataTables_processing .processing-datatables-inside img {
+ margin-left: 20px;
+}
+
+.loading-search-datatables-button {
+ float: right;
+ margin-right: -110px;
+ margin-top: 13px;
+}
diff --git a/pandora_console/include/styles/sound_events.css b/pandora_console/include/styles/sound_events.css
new file mode 100644
index 0000000000..7b25e55a63
--- /dev/null
+++ b/pandora_console/include/styles/sound_events.css
@@ -0,0 +1,300 @@
+/*
+ * Css Modal Sound events.
+ */
+#modal-sound {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ padding: 0px 20px !important;
+}
+
+#tabs-sound-modal {
+ margin-top: 20px;
+}
+
+.actions-sound-modal {
+ margin-bottom: 20px;
+}
+
+#tabs-sound-modal h3.console-configuration {
+ color: #000000;
+ font-size: 16px;
+ line-height: 19px;
+ text-align: left;
+ text-transform: none;
+ margin: 0px;
+}
+
+#tabs-sound-modal ul.tabs-sound-modal-options {
+ display: flex;
+ justify-content: flex-end;
+ background-color: transparent;
+ border: 0px;
+ border-bottom: 1px solid #eaeaea;
+ height: 45px;
+}
+
+#tabs-sound-modal ul.tabs-sound-modal-options li {
+ margin: 0px;
+ padding: 0px;
+ border: 0px;
+ background: transparent;
+}
+
+#tabs-sound-modal ul.tabs-sound-modal-options li.ui-tabs-active {
+ border-bottom: 2px solid #82b92e;
+}
+
+#tabs-sound-modal ul.wizard li label {
+ color: #95a3bf;
+ font-size: 13px;
+ line-height: 16px;
+ text-align: left;
+}
+
+#tabs-sound-modal ul.wizard li.interval-sounds,
+#tabs-sound-modal ul.wizard li.test-sounds {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ margin-top: 18px;
+}
+
+#tabs-sound-modal ul.wizard li.interval-sounds label,
+#tabs-sound-modal ul.wizard li.test-sounds label {
+ flex: 0;
+ width: inherit;
+ position: absolute;
+ top: -12px;
+ left: 50%;
+}
+
+#tabs-sound-modal ul.wizard li.interval-sounds label:first-of-type,
+#tabs-sound-modal ul.wizard li.test-sounds label:first-of-type {
+ left: 0;
+}
+
+#tabs-sound-modal ul.wizard li.interval-sounds .select2 {
+ width: 48% !important;
+ max-width: 100% !important;
+}
+
+#tabs-sound-modal ul.wizard li.test-sounds .select2 {
+ width: 70% !important;
+ max-width: 100% !important;
+}
+
+#tabs-sound-modal ul.wizard li.test-sounds input[type="button"] {
+ border: 1px solid #dddddd;
+ border-radius: 4px;
+ width: 131px;
+ height: 38px;
+ color: #95a3bf;
+ font-size: 14px;
+ padding: 0px;
+ padding-right: 40px;
+}
+
+#tabs-sound-modal button.upd,
+input.upd {
+ background-image: url(../../images/sound_wave.png);
+ background-position: 90px 8px;
+}
+
+#tabs-sound-modal ul.wizard .select2 {
+ max-width: 100% !important;
+}
+
+#tabs-sound-modal .select2-selection {
+ border: 0px;
+ border-radius: 0px;
+ border-bottom: 1px solid #aaa;
+}
+
+#tabs-sound-modal .select2-container,
+#tabs-sound-modal .select2-selection__rendered {
+ padding-left: 0px;
+ color: #555555;
+ font-size: 15px;
+ line-height: 25px;
+ text-align: left;
+}
+
+#tabs-sound-modal div h3.title-discovered-alerts {
+ margin: 0px;
+ color: #000000;
+ font-size: 16px;
+ line-height: 19px;
+ text-align: left;
+ text-transform: none;
+ margin-bottom: 10px;
+}
+
+#tabs-sound-modal div span.text-discovered-alerts {
+ color: #95a3bf;
+ font-size: 13px;
+ line-height: 16px;
+ text-align: center;
+}
+
+#tabs-sound-modal div .empty-discovered-alerts {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+ align-items: center;
+ height: 250px;
+}
+
+#tabs-sound-modal div .elements-discovered-alerts {
+ overflow: auto;
+ max-height: 300px;
+}
+
+#tabs-sound-modal div .elements-discovered-alerts ul {
+ width: 99%;
+}
+
+#tabs-sound-modal div .elements-discovered-alerts ul li {
+ border: 1px solid #eaeaea;
+ height: 46px;
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ align-items: center;
+ width: 100%;
+ color: #555555;
+ font-size: 12px;
+ line-height: 20px;
+ text-align: left;
+}
+
+#tabs-sound-modal div .elements-discovered-alerts ul li div.li-priority {
+ flex: 0;
+ padding: 10px;
+}
+
+#tabs-sound-modal
+ div
+ .elements-discovered-alerts
+ ul
+ li
+ div.li-priority
+ .mini-criticity {
+ border-radius: 5px;
+ width: 6px;
+ height: 30px;
+}
+
+#tabs-sound-modal div .elements-discovered-alerts ul li div.li-type {
+ flex: 0;
+ padding-right: 10px;
+}
+
+#tabs-sound-modal div .elements-discovered-alerts ul li div.li-time {
+ flex: 0 1 100px;
+ text-align: end;
+ padding-right: 10px;
+}
+
+#tabs-sound-modal div .elements-discovered-alerts ul li div.li-title {
+ width: 100%;
+}
+
+.actions-sound-modal .buttons-sound-modal {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.actions-sound-modal .buttons-sound-modal input[type="button"] {
+ border: 1px solid #dddddd;
+ border-radius: 4px;
+ width: 107px;
+ height: 50px;
+ font-size: 18px;
+ line-height: 24px;
+ text-align: left;
+}
+
+.actions-sound-modal .buttons-sound-modal button.play,
+.actions-sound-modal .buttons-sound-modal input[type="button"].play {
+ background: url(../../images/play-white.png), transparent;
+ background-repeat: no-repeat;
+ background-position: 70px 17px;
+ color: #ffffff;
+ padding-left: 20px;
+}
+
+.actions-sound-modal .buttons-sound-modal button.stop,
+.actions-sound-modal .buttons-sound-modal input[type="button"].stop {
+ background: url(../../images/stop.png), transparent;
+ background-repeat: no-repeat;
+ background-position: 70px 17px;
+ color: #ffffff;
+ padding-left: 20px;
+}
+
+.actions-sound-modal .buttons-sound-modal button.alerts,
+.actions-sound-modal .buttons-sound-modal input[type="button"].alerts {
+ width: 154px;
+ color: #95a3bf;
+ background: url(../../images/alarm-off.png), transparent;
+ background-repeat: no-repeat;
+ background-position: 108px 9px;
+ padding-left: 20px;
+}
+
+.actions-sound-modal .buttons-sound-modal button.silence-alerts,
+.actions-sound-modal .buttons-sound-modal input[type="button"].silence-alerts {
+ width: 184px;
+ color: #ffffff;
+ background: url(../../images/silence-alerts.png), transparent;
+ background-repeat: no-repeat;
+ background-position: 138px 9px;
+ padding-left: 20px;
+}
+
+.actions-sound-modal .container-button-play {
+ background: radial-gradient(118.26% 33.15%, #82b92e 0%, #1d4e4a 100%);
+ border-radius: 4px;
+}
+
+.actions-sound-modal .container-button-alert.fired {
+ background: #ee2132;
+ border-radius: 4px;
+}
+
+.actions-sound-modal .progressbar {
+ width: 100%;
+ margin: 4px 2px;
+ border-radius: 4px;
+}
+
+.actions-sound-modal .progressbar .inner {
+ height: 10px;
+ border-radius: 4px;
+ animation: progressbar-countdown;
+ /* Placeholder, this will be updated using javascript */
+ animation-duration: 40s;
+ /* We stop in the end */
+ animation-iteration-count: 1;
+ /* Stay on pause when the animation is finished finished */
+ animation-fill-mode: forwards;
+ /* We start paused, we start the animation using javascript */
+ animation-play-state: paused;
+ /* We want a linear animation, ease-out is standard */
+ animation-timing-function: linear;
+}
+
+@keyframes progressbar-countdown {
+ 0% {
+ width: 100%;
+ background: #82b92e;
+ }
+ 100% {
+ width: 0%;
+ background: #e63c52;
+ }
+}
diff --git a/pandora_console/install.php b/pandora_console/install.php
index b05a809879..6ce40111ae 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
isWaitingDoubleAuth()) {
if ($user->validateDoubleAuthCode()) {
- // Logged. Refresh the page
- header('Location: .');
+ $url = ui_get_full_url('');
+ $url = str_replace("\n", '', $url);
+ $url = str_replace('?action=logout', '', $url);
+
+ // Logged. Refresh the page.
+ header('Location: '.$url);
return;
} else {
$user->showDoubleAuthPage();
}
} else {
- // Logged. Refresh the page
- header('Location: .');
+ $url = ui_get_full_url('');
+ $url = str_replace("\n", '', $url);
+ $url = str_replace('?action=logout', '', $url);
+
+ // Logged. Refresh the page.
+ header('Location: '.$url);
return;
}
} else {
@@ -294,6 +302,42 @@ switch ($action) {
$_GET['id'] = $id_map;
break;
+ case 'External link':
+ $full_url = ui_get_full_url();
+ $section_data = io_safe_output($section_data);
+
+ $host_full = parse_url($full_url, PHP_URL_HOST);
+ $host_section = parse_url($section_data, PHP_URL_HOST);
+
+ if ($host_full !== $host_section) {
+ $has_mobile = strpos($section_data, 'mobile');
+ if ($has_mobile === false) {
+ $pos = strpos($section_data, '/index');
+ if ($pos !== false) {
+ $section_data = substr_replace($section_data, '/mobile', $pos, 0);
+ }
+ }
+
+ echo '';
+ } else {
+ if (strpos($full_url, 'event') !== false) {
+ $page = 'events';
+ }
+
+ if (strpos($full_url, 'alert') !== false) {
+ $page = 'alerts';
+ }
+
+ if (strpos($full_url, 'tactical') !== false) {
+ $page = 'tactical';
+ }
+
+ if (strpos($full_url, 'visual_console') !== false) {
+ $page = 'visualmap';
+ }
+ }
+ break;
+
case 'Group view':
default:
// No content.
diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php
index 84e45f3164..4806cfda4d 100644
--- a/pandora_console/mobile/operation/agent.php
+++ b/pandora_console/mobile/operation/agent.php
@@ -363,12 +363,6 @@ class Agent
$events = new Events();
$events->addJavascriptDialog();
- $options = $events->get_event_dialog_options();
- $ui->addDialog($options);
-
- $options = $events->get_event_dialog_error_options($options);
- $ui->addDialog($options);
-
$ui->contentAddHtml("
detail_event_hook");
$ui->contentAddHtml("
detail_event_dialog_error_hook");
diff --git a/pandora_console/mobile/operation/tactical.php b/pandora_console/mobile/operation/tactical.php
index 51709c9abb..3651187833 100755
--- a/pandora_console/mobile/operation/tactical.php
+++ b/pandora_console/mobile/operation/tactical.php
@@ -109,7 +109,7 @@ class Tactical
$ui->beginContent();
$ui->contentBeginGrid('responsive');
// ~ $data = reporting_get_group_stats();
- $all_data = tactical_status_modules_agents($config['id_user'], $user_strict, 'AR', $user_strict);
+ $all_data = tactical_status_modules_agents($config['id_user'], false, 'AR');
$data = [];
diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php
index 57109fa837..42d325e7f0 100755
--- a/pandora_console/operation/agentes/estado_generalagente.php
+++ b/pandora_console/operation/agentes/estado_generalagente.php
@@ -74,9 +74,7 @@ if (! check_acl_one_of_groups($config['id_user'], $all_groups, 'AR')
return;
}
-$alive_animation = agents_get_status_animation(
- agents_get_interval_status($agent, false)
-);
+$alive_animation = agents_get_starmap($id_agente, 200, 50);
/*
* START: TABLE AGENT BUILD.
@@ -170,10 +168,10 @@ $status_img = agents_detail_view_status_img(
$table_agent_header .= '
'.$status_img.'
';
// Fixed width non interactive charts.
-$status_chart_width = 180;
-$graph_width = 180;
+$status_chart_width = 150;
+$graph_width = 150;
-$table_agent_graph = '
';
+$table_agent_graph = '
';
$table_agent_graph .= graph_agent_status(
$id_agente,
$graph_width,
@@ -604,6 +602,7 @@ if ($config['agentaccess'] && $access_agent > 0) {
$table_access_rate .= graphic_agentaccess(
$id_agente,
SECONDS_1DAY,
+ true,
true
);
$table_access_rate .= '
';
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index 9ec0782e1f..a7ab834665 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -167,7 +167,7 @@ if ($total > 0) {
}
if ($total_agentes > 0) {
- // Agents
+ // Agents.
$total_agent_unknown = format_numeric((($agents_unknown * 100) / $total_agentes), 2);
$total_agent_critical = format_numeric((($agents_critical * 100) / $total_agentes), 2);
$total_agent_warning = format_numeric((($agents_warning * 100) / $total_agentes), 2);
@@ -209,7 +209,7 @@ if ($count == 1) {
ui_pagination($count);
-if (!empty($result_groups)) {
+if (empty($result_groups) === false) {
echo '
';
echo '';
echo ' | ';
@@ -235,10 +235,17 @@ if (!empty($result_groups)) {
echo '
';
foreach ($result_groups as $data) {
+ if ((bool) $config['show_empty_groups'] === false
+ && $data['_total_agents_'] === 0
+ && $data['_monitor_checks_'] === 0
+ ) {
+ continue;
+ }
+
$groups_id = $data['_id_'];
- // Calculate entire row color
- if ($groups_id != 0) {
+ // Calculate entire row color.
+ if ($groups_id !== '0') {
if ($data['_monitors_alerts_fired_'] > 0) {
$color_class = 'group_view_alrm';
$status_image = ui_print_status_image('agent_alertsfired_ball.png', '', true);
@@ -265,7 +272,7 @@ if (!empty($result_groups)) {
echo "";
- // Force
+ // Force.
echo "| ";
if (!isset($data['_is_tag_']) && check_acl($config['id_user'], $data['_id_'], 'AW')) {
echo ''.html_print_image(
diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php
index 2b331e6df7..ce334d873e 100755
--- a/pandora_console/operation/agentes/tactical.php
+++ b/pandora_console/operation/agentes/tactical.php
@@ -86,7 +86,7 @@ ui_print_standard_header(
// Currently this function makes loading this page is impossible. Change
// and create new function.
-$all_data = tactical_status_modules_agents($config['id_user'], $user_strict, 'AR', $user_strict);
+$all_data = tactical_status_modules_agents($config['id_user'], false, 'AR');
$data = [];
diff --git a/pandora_console/operation/events/events.php b/pandora_console/operation/events/events.php
index a6d141f82c..781301e2e0 100644
--- a/pandora_console/operation/events/events.php
+++ b/pandora_console/operation/events/events.php
@@ -284,7 +284,6 @@ if (is_ajax() === true) {
'te.event_type',
'te.id_alert_am',
'te.criticity',
- 'te.user_comment',
'te.tags',
'te.source',
'te.id_extra',
@@ -301,6 +300,13 @@ if (is_ajax() === true) {
'ta.direccion',
];
+ if (strpos($config['event_fields'], 'user_comment') !== false
+ || empty($user_comment) === false
+ || empty($search) === false
+ ) {
+ $fields[] = 'te.user_comment';
+ }
+
$order = get_datatable_order(true);
if (is_array($order) === true && $order['field'] === 'mini_severity') {
@@ -388,14 +394,23 @@ if (is_ajax() === true) {
$tmp->meta = is_metaconsole();
// phpcs:disable Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+ $server_url = '';
+ $hashdata = '';
if ($tmp->meta === true) {
if ($tmp->server_name !== null) {
$data_server = metaconsole_get_servers(
$tmp->server_id
);
- $tmp->server_url_hash = metaconsole_get_servers_url_hash(
- $data_server
- );
+
+ // Url to go to node from meta.
+ if (isset($data_server) === true
+ && $data_server !== false
+ ) {
+ $server_url = $data_server['server_url'];
+ $hashdata = metaconsole_get_servers_url_hash(
+ $data_server
+ );
+ }
}
}
@@ -888,19 +903,6 @@ if (is_ajax() === true) {
$tmp->m .= 'class="candeleted chk_val">';
- // Url to go to node from meta.
- $server_url = '';
- $hashdata = '';
- if ($tmp->meta === true) {
- if (isset($data_server) === true
- && $data_server !== false
- && isset($tmp->server_url_hash) === true
- ) {
- $server_url = $data_server['server_url'];
- $hashdata = $tmp->server_url_hash;
- }
- }
-
// Url to agent view.
$url_link = ui_get_full_url(
'index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='
@@ -2213,11 +2215,9 @@ try {
$active_filters_div .= '';
$active_filters_div .= '';
- $table_id = 'events';
+ $table_id = 'table_events';
$form_id = 'events_form';
-
-
// Print datatable.
ui_print_datatable(
[
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index ac80788a7f..adbb82890f 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -342,7 +342,8 @@ var test_sound = false;
function test_sound_button() {
if (!test_sound) {
$("#button_try").attr('src', '../../images/icono_test.png');
- $('body').append(" |