";
// Set some containers to legend, graph, timestamp tooltip, etc.
if($params['show_legend']){
$return .= "
";
diff --git a/pandora_console/include/help/en/help_linked_map_status_calc.php b/pandora_console/include/help/en/help_linked_map_status_calc.php
new file mode 100644
index 0000000000..96602eb262
--- /dev/null
+++ b/pandora_console/include/help/en/help_linked_map_status_calc.php
@@ -0,0 +1,36 @@
+
+
Ways to calculate the status of the linked visual console
+
+
By Default
+
+ It calculates the status based on the status of all elements, as an agent would do.
+
+
+
By weight
+
+ It calculates the status of the elements that have a visual console, a module or an agent assigned in relation to a percentage of elements configured by the user. This percentage is the one that has to exceed the number of elements of a non-normal status with respect to the number of elements taken into account in the calculation for that status to change.
+
+
+
+ For example, given an element with a percentage of 50% and a visual console linked with 5 elements:
+
+
+ - 1 critical, 1 warning y 3 normal -> Status normal.
+ - 2 critical, 2 warning y 1 normal -> Status normal.
+ - 1 critical, 3 warning y 1 normal -> Status warning.
+ - 3 critical, 1 warning y 1 normal -> Status critical.
+ - 1 critical, 1 warning y 3 unknown -> Status unknown.
+
+
+
+ If several statuses exceed the weight, the priority is the same as in the rest of the status calculation (critical > warning > unknown). If there are no elements to perform the calculation, the status becomes unknown.
+
+
+
By critical elements
+
+ It calculates the status using the elements in critical status and the percentages of the thresholds defined by the user. If the number of elements in critical status with respect to the number of elements taken into account in the calculation exceeds the percentage assigned as warning, the status becomes warning. The same applies to the percentage assigned as critical, which also has preference.
+
diff --git a/pandora_console/include/help/es/help_linked_map_status_calc.php b/pandora_console/include/help/es/help_linked_map_status_calc.php
new file mode 100644
index 0000000000..40c5682d7a
--- /dev/null
+++ b/pandora_console/include/help/es/help_linked_map_status_calc.php
@@ -0,0 +1,36 @@
+
+
Formas de calcular el estado de la consola visual enlazada
+
+
Por defecto
+
+ Calcula el estado a partir del estado de todos los elementos, como lo haría un agente.
+
+
+
Por peso
+
+ Calcula el estado de los elementos que tienen asignados una consola visual, un módulo o un agente en relación a un porcentaje de elementos configurado por el usuario. Este porcentaje es el que tiene que superar el número de elementos de un estado no normal respecto al número de elementos tenidos en cuenta en el cálculo para que el ese estado cambie.
+
+
+
+ Por ejemplo, dado un elemento con un porcentaje del 50% y una consola visual enlazada con 5 elementos:
+
+
+ - 1 critical, 1 warning y 3 normal -> Estado normal.
+ - 2 critical, 2 warning y 1 normal -> Estado normal.
+ - 1 critical, 3 warning y 1 normal -> Estado warning.
+ - 3 critical, 1 warning y 1 normal -> Estado critical.
+ - 1 critical, 1 warning y 3 unknown -> Estado unknown.
+
+
+
+ Si varios estados superan el peso, la prioridad es igual que en el resto de cálculo de estados (critical > warning > unknown). Si no hay elementos para realizar el cálculo, el estado pasa a ser unknown.
+
+
+
Por elementos críticos
+
+ Calcula el estado usando los elementos en estado critical y los porcentajes de los umbrales definidos por el usuario. Si el número de los elementos en estado critical respecto al número de elementos tenidos en cuenta en el cálculo supera el porcentaje asignado como warning, el estado pasa a ser warning. Lo mismo para el porcentaje asignado como critical, que además tiene preferencia.
+
diff --git a/pandora_console/install.php b/pandora_console/install.php
index 091becd2b7..d70cc355fc 100755
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -70,8 +70,8 @@
show();
break;
- case 'networkmaps':
- $networkmaps = new Networkmaps();
- $networkmaps->show();
- break;
- case 'networkmap':
- $networkmap = new Networkmap();
- $networkmap->show();
- break;
case 'visualmaps':
$visualmaps = new Visualmaps();
$visualmaps->show();
diff --git a/pandora_console/mobile/operation/groups.php b/pandora_console/mobile/operation/groups.php
index 14567cc2b5..e371c56986 100644
--- a/pandora_console/mobile/operation/groups.php
+++ b/pandora_console/mobile/operation/groups.php
@@ -179,29 +179,14 @@ class Groups {
$ui->endContent();
$ui->showPage();
}
-
+
private function getListGroups() {
$return = array();
-
+
$system = System::getInstance();
$user = User::getInstance();
-
- $all_data = groupview_status_modules_agents ($system->getConfig('id_user'), false, 'AR', false);
- $result_groups = groupview_get_groups_list($system->getConfig('id_user'),'AR');
-
- foreach ($all_data as $group_all_data) {
- $result_groups[0]['_total_agents_'] += $group_all_data["_total_agents_"];
- $result_groups[0]['_monitors_ok_'] += $group_all_data["_monitors_ok_"];
- $result_groups[0]['_monitors_warning_'] += $group_all_data["_monitors_warning_"];
- $result_groups[0]['_monitors_critical_'] += $group_all_data["_monitors_critical_"];
- $result_groups[0]['_monitors_unknown_'] += $group_all_data["_monitors_unknown_"];
- $result_groups[0]['_monitors_not_init_'] += $group_all_data["_monitors_not_init_"];
- $result_groups[0]['_agents_unknown_'] += $group_all_data["_agents_unknown_"];
- $result_groups[0]['_agents_not_init_'] += $group_all_data["_agents_not_init_"];
- $result_groups[0]['_agents_critical_'] += $group_all_data["_agents_critical_"];
- $result_groups[0]['_monitors_alerts_fired_'] += $group_all_data["_monitors_alerts_fired_"];
- }
-
- return $result_groups;
+ $result_groups = groupview_get_groups_list($system->getConfig('id_user'),'AR', true);
+
+ return $result_groups['groups'];
}
}
diff --git a/pandora_console/mobile/operation/home.php b/pandora_console/mobile/operation/home.php
index 59728010a5..1a1ff12110 100644
--- a/pandora_console/mobile/operation/home.php
+++ b/pandora_console/mobile/operation/home.php
@@ -73,13 +73,6 @@ class Home {
'menu_item' => true,
'icon' => 'modules'
);
-
- $items['networkmaps'] = array(
- 'name' => __('Networkmaps'),
- 'filename' => 'networkmaps.php',
- 'menu_item' => true,
- 'icon' => 'network_maps'
- );
$items['visualmaps'] = array(
'name' => __('Visual consoles'),
'filename' => 'visualmaps.php',
@@ -100,12 +93,6 @@ class Home {
'menu_item' => false,
'icon' => ''
);
- $items['networkmap'] = array(
- 'name' => __('Networkmap'),
- 'filename' => 'networkmap.php',
- 'menu_item' => false,
- 'icon' => ''
- );
$items['visualmap'] = array(
'name' => __('Visualmap'),
'filename' => 'visualmap.php',
diff --git a/pandora_console/mobile/operation/networkmap.php b/pandora_console/mobile/operation/networkmap.php
deleted file mode 100755
index 9595efaa87..0000000000
--- a/pandora_console/mobile/operation/networkmap.php
+++ /dev/null
@@ -1,246 +0,0 @@
-getFilters();
- else
- $this->id = $id;
-
- $store_group = db_get_value('store_group',
- 'tnetwork_map', 'id_networkmap', $this->id);
-
- if ($store_group !== false
- && $system->checkACL($this->acl, $store_group))
- $this->correct_acl = true;
- }
-
- public function ajax($parameter2 = false) {
- $system = System::getInstance();
-
- if (!$this->correct_acl) {
- return;
- }
- else {
- switch ($parameter2) {
- case 'xxx':
- //$this->getFilters();
- //$page = $system->getRequest('page', 0);
- break;
- }
- }
- }
-
- private function getFilters() {
- $system = System::getInstance();
-
- $this->id = (int)$system->getRequest('id', 0);
- }
-
- public function show() {
- if (!$this->correct_acl) {
- $this->show_fail_acl();
- }
- else {
- $this->getFilters();
-
- $this->networkmap = db_get_row('tnetwork_map',
- 'id_networkmap', $this->id);
-
- $this->show_networkmap();
- }
- }
-
- private function show_fail_acl() {
- $error['type'] = 'onStart';
- $error['title_text'] = __('You don\'t have access to this page');
- $error['content_text'] = System::getDefaultACLFailText();
- if (class_exists("HomeEnterprise"))
- $home = new HomeEnterprise();
- else
- $home = new Home();
- $home->show($error);
- }
-
- private function show_networkmap() {
- $ui = Ui::getInstance();
- $system = System::getInstance();
-
- $ui->createPage();
- $ui->createDefaultHeader(
- sprintf("%s",
- $this->networkmap['name']),
- $ui->createHeaderButton(
- array('icon' => 'back',
- 'pos' => 'left',
- 'text' => __('Back'),
- 'href' => 'index.php?page=networkmaps')));
- $ui->showFooter(false);
- $ui->beginContent();
-
- //Hack for mobile
- global $hack_networkmap_mobile;
- $hack_networkmap_mobile = true;
-
- switch ($this->networkmap['type']) {
- case 'groups':
- $graph = networkmap_generate_dot_groups (
- __('Pandora FMS'),
- $this->networkmap['id_group'],
- $this->networkmap['simple'],
- $this->networkmap['font_size'],
- $this->networkmap['layout'],
- (bool)$this->networkmap['nooverlap'],
- $this->networkmap['zoom'],
- $this->networkmap['distance_nodes'],
- $this->networkmap['center'], 1, 0,
- $this->networkmap['only_modules_with_alerts'],
- $this->networkmap['id_module_group'],
- $this->networkmap['hide_policy_modules'],
- $this->networkmap['depth'],
- $this->networkmap['id_networkmap']);
- break;
- case 'policies':
- $enterprise = enterprise_include('/include/functions_policies.php');
-
- if ($enterprise != ENTERPRISE_NOT_HOOK) {
- $graph = policies_generate_dot_graph (__('Pandora FMS'),
- $this->networkmap['id_group'],
- $this->networkmap['simple'],
- $this->networkmap['font_size'],
- $this->networkmap['layout'],
- (bool)$this->networkmap['nooverlap'],
- $this->networkmap['zoom'],
- $this->networkmap['distance_nodes'],
- $this->networkmap['center'], 1, 0,
- $this->networkmap['only_modules_with_alerts'],
- $this->networkmap['id_module_group'],
- $this->networkmap['depth'],
- $this->networkmap['id_networkmap']);
- }
- break;
- default:
- case 'topology':
- $graph = networkmap_generate_dot (__('Pandora FMS'),
- $this->networkmap['id_group'],
- $this->networkmap['simple'],
- $this->networkmap['font_size'],
- $this->networkmap['layout'],
- (bool)$this->networkmap['nooverlap'],
- $this->networkmap['zoom'],
- $this->networkmap['distance_nodes'],
- $this->networkmap['center'], 1, 0,
- $this->networkmap['id_networkmap'],
- $this->networkmap['show_snmp_modules'], true,
- true);
- break;
- }
-
-
-
- if ($graph === false) {
- $ui->contentAddHtml('
' . __('No networkmaps') . '
');
-
- $ui->endContent();
- $ui->showPage();
-
- return;
- }
-
-
- $filter = networkmap_get_filter($this->networkmap['layout']);
-
- // Generate image and map
- // If image was generated just a few minutes ago, then don't regenerate (it takes long) unless regen checkbox is set
- $filename_map = safe_url_extraclean (
- $system->getConfig('attachment_store')) . "/networkmap_" . $filter;
- $filename_img = safe_url_extraclean (
- $system->getConfig('attachment_store')) . "/networkmap_" .
- $filter . "_" . $this->networkmap['font_size'];
- $url_img = "../attachment/networkmap_" .
- $filter . "_" . $this->networkmap['font_size'];
- $filename_dot = safe_url_extraclean(
- $system->getConfig("attachment_store")) . "/networkmap_" . $filter;
- if ($this->networkmap['simple']) {
- $filename_map .= "_simple";
- $filename_img .= "_simple";
- $url_img .= "_simple";
- $filename_dot .= "_simple";
- }
- if ($this->networkmap['nooverlap']) {
- $filename_map .= "_nooverlap";
- $filename_img .= "_nooverlap";
- $url_img .= "_nooverlap";
- $filename_dot .= "_nooverlap";
- }
- $filename_map .= "_" . $this->networkmap['id_networkmap'] . ".map";
- $filename_img .= "_" . $this->networkmap['id_networkmap'] . ".png";
- $url_img .= "_" . $this->networkmap['id_networkmap'] . ".png";
- $filename_dot .= "_" . $this->networkmap['id_networkmap'] . ".dot";
-
- if ($this->networkmap['regenerate'] != 1 && file_exists($filename_img) && filemtime($filename_img) > get_system_time () - 300) {
- $result = true;
- }
- else {
- $fh = @fopen ($filename_dot, 'w');
- if ($fh === false) {
- $result = false;
- }
- else {
- fwrite ($fh, $graph);
- $cmd = $filter . " -Tcmapx -o" . $filename_map." -Tpng -o".$filename_img." ".$filename_dot;
- $result = system ($cmd);
- fclose ($fh);
- //unlink ($filename_dot);
- }
- }
-
- if ($result !== false) {
- if (! file_exists ($filename_map)) {
- $ui->contentAddHtml('
' . __('Map could not be generated') . '
');
-
- $ui->endContent();
- $ui->showPage();
-
- return;
- }
- $ui->contentAddHtml('
');
- $ui->contentAddHtml('
');
- $ui->contentAddHtml('
');
- }
- else {
- $ui->contentAddHtml('
' . __('Map could not be generated') . '
');
-
- $ui->endContent();
- $ui->showPage();
-
- return;
- }
-
- $ui->endContent();
- $ui->showPage();
- }
-}
-?>
diff --git a/pandora_console/mobile/operation/networkmaps.php b/pandora_console/mobile/operation/networkmaps.php
deleted file mode 100755
index f8f533cc84..0000000000
--- a/pandora_console/mobile/operation/networkmaps.php
+++ /dev/null
@@ -1,250 +0,0 @@
-checkACL($this->acl)) {
- $this->correct_acl = true;
- }
- else {
- $this->correct_acl = false;
- }
- }
-
- public function ajax($parameter2 = false) {
- $system = System::getInstance();
-
- if (!$this->correct_acl) {
- return;
- }
- else {
- switch ($parameter2) {
- case 'xxx':
- //$this->getFilters();
- //$page = $system->getRequest('page', 0);
- break;
- }
- }
- }
-
- private function getFilters() {
- $system = System::getInstance();
- $user = User::getInstance();
-
- $this->default_filters['group'] = true;
- $this->default_filters['type'] = true;
-
- $this->group = (int)$system->getRequest('group', __("Group"));
- if (!$user->isInGroup($this->acl, $this->group)) {
- $this->group = 0;
- }
- if (($this->group === __("Group")) || ($this->group == 0)) {
- $this->group = 0;
- }
- else {
- $this->default = false;
- $this->default_filters['group'] = false;
- }
-
- $this->type = $system->getRequest('type', __("Type"));
- if (($this->type === __("Type")) || ($this->type === '0')) {
- $this->type = '0';
- }
- else {
- $this->default = false;
- $this->default_filters['type'] = false;
- }
- }
-
- public function show() {
- if (!$this->correct_acl) {
- $this->show_fail_acl();
- }
- else {
- $this->getFilters();
- $this->show_networkmaps();
- }
- }
-
- private function show_fail_acl() {
- $error['type'] = 'onStart';
- $error['title_text'] = __('You don\'t have access to this page');
- $error['content_text'] = System::getDefaultACLFailText();
- if (class_exists("HomeEnterprise"))
- $home = new HomeEnterprise();
- else
- $home = new Home();
- $home->show($error);
- }
-
- private function show_networkmaps() {
- $ui = Ui::getInstance();
-
- $ui->createPage();
- $ui->createDefaultHeader(__("Networkmaps"),
- $ui->createHeaderButton(
- array('icon' => 'back',
- 'pos' => 'left',
- 'text' => __('Back'),
- 'href' => 'index.php?page=home')));
- $ui->showFooter(false);
- $ui->beginContent();
- $filter_title = sprintf(__('Filter Networkmaps by %s'),
- $this->filterNetworkmapsGetString());
- $ui->contentBeginCollapsible($filter_title);
- $ui->beginForm("index.php?page=networkmaps");
- $system = System::getInstance();
- $groups = users_get_groups_for_select(
- $system->getConfig('id_user'), "AR", true, true, false, 'id_grupo');
- $options = array(
- 'name' => 'group',
- 'title' => __('Group'),
- 'label' => __('Group'),
- 'items' => $groups,
- 'selected' => $this->group
- );
- $ui->formAddSelectBox($options);
-
- $networkmap_types = networkmap_get_filter_types();
- $networkmap_types[0] = __('All');
- $options = array(
- 'name' => 'type',
- 'title' => __('Type'),
- 'label' => __('Type'),
- 'items' => $networkmap_types,
- 'selected' => $this->type
- );
- $ui->formAddSelectBox($options);
-
- $options = array(
- 'icon' => 'refresh',
- 'icon_pos' => 'right',
- 'text' => __('Apply Filter')
- );
- $ui->formAddSubmitButton($options);
- $html = $ui->getEndForm();
- $ui->contentCollapsibleAddItem($html);
- $ui->contentEndCollapsible();
- $this->listNetworkmapsHtml();
- $ui->endContent();
- $ui->showPage();
- }
-
- private function listNetworkmapsHtml() {
- $system = System::getInstance();
- $ui = Ui::getInstance();
-
- // Create filter
- $where = array();
- // Order by type field
- $where['order'] = 'type';
-
- if ($this->group != '0') {
- $where['store_group'] = $this->group;
- }
- else {
- $where['store_group'] = array_keys(users_get_groups());
- }
-
- if ($this->type != '0')
- $where['type'] = $this->type;
-
- $network_maps = db_get_all_rows_filter('tnetwork_map',
- $where);
- if (empty($network_maps)) {
- $network_maps = array();
- }
- $list = array();
- foreach ($network_maps as $networkmap) {
- // ACL
- if (! $system->checkACL("AR", $networkmap['store_group']))
- continue;
-
- // If enterprise not loaded then skip this code
- if ($networkmap['type'] == 'policies' and (!defined('PANDORA_ENTERPRISE')))
- continue;
- $row = array();
- $row[__('Name')] = '
' . io_safe_output($networkmap['name']) . '';
- $row[__('Type')] = $networkmap['type'];
- $row[__('Group')] = ui_print_group_icon($networkmap["store_group"], true, "groups_small", "" , false);
- $list[] = $row;
- }
-
- if (count($network_maps) == 0) {
- $ui->contentAddHtml('
' . __('No networkmaps') . '
');
- }
- else {
- $table = new Table();
- $table->id = 'list_networkmaps';
- $table->importFromHash($list);
- $ui->contentAddHtml($table->getHTML());
- }
-
- $ui->contentAddLinkListener('list_networkmaps');
- }
-
- private function filterNetworkmapsGetString() {
- if ($this->default) {
- return __("(Default)");
- }
- else {
- $filters_to_serialize = array();
-
- if (!$this->default_filters['group']) {
- $filters_to_serialize[] = sprintf(__("Group: %s"),
- groups_get_name($this->group, true));
- }
- if (!$this->default_filters['type']) {
- $networkmap_types = networkmap_get_filter_types();
- $networkmap_types[0] = __('All');
-
- $filters_to_serialize[] = sprintf(__("Type: %s"),
- $networkmap_types[$this->type]);
- }
-
- $string = '(' . implode(' - ', $filters_to_serialize) . ')';
-
-
- //~ $networkmap_types = networkmap_get_filter_types();
- //~ $networkmap_types[0] = __('All');
- //~ $type = $networkmap_types[$this->type];
- //~ $group = groups_get_name($this->group, true);
- //~
- //~
- //~ $string = sprintf(
- //~ __("(Type: %s - Group: %s)"),
- //~ $type, $group);
-
- return $string;
- }
- }
-}
-?>
diff --git a/pandora_console/operation/agentes/alerts_status.php b/pandora_console/operation/agentes/alerts_status.php
index 12c7fd5d8d..753baf56bb 100755
--- a/pandora_console/operation/agentes/alerts_status.php
+++ b/pandora_console/operation/agentes/alerts_status.php
@@ -187,77 +187,37 @@ if ($alert_validate) {
enterprise_hook('open_meta_frame');
if ($free_search != '') {
- switch ($config["dbtype"]) {
- case "mysql":
- $whereAlertSimple = 'AND (' .
- 'id_alert_template IN (
- SELECT id
- FROM talert_templates
- WHERE name LIKE "%' . $free_search . '%") OR ' .
- 'id_alert_template IN (
- SELECT id
- FROM talert_templates
- WHERE id_alert_action IN (
- SELECT id
- FROM talert_actions
- WHERE name LIKE "%' . $free_search . '%")) OR ' .
- 'talert_template_modules.id IN (
- SELECT id_alert_template_module
- FROM talert_template_module_actions
- WHERE id_alert_action IN (
- SELECT id
- FROM talert_actions
- WHERE name LIKE "%' . $free_search . '%")) OR ' .
- 'id_agent_module IN (
- SELECT id_agente_modulo
- FROM tagente_modulo
- WHERE nombre LIKE "%' . $free_search . '%") OR ' .
- 'id_agent_module IN (
- SELECT id_agente_modulo
- FROM tagente_modulo
- WHERE id_agente IN (
- SELECT id_agente
- FROM tagente
- WHERE nombre LIKE "%' . $free_search . '%") OR alias LIKE "%' . $free_search . '%")' .
- ')';
-
- break;
- case "postgresql":
- case "oracle":
- $whereAlertSimple = 'AND (' .
- 'id_alert_template IN (
- SELECT id
- FROM talert_templates
- WHERE name LIKE \'%' . $free_search . '%\') OR ' .
- 'id_alert_template IN (
- SELECT id
- FROM talert_templates
- WHERE id_alert_action IN (
- SELECT id
- FROM talert_actions
- WHERE name LIKE \'%' . $free_search . '%\')) OR ' .
- 'talert_template_modules.id IN (
- SELECT id_alert_template_module
- FROM talert_template_module_actions
- WHERE id_alert_action IN (
- SELECT id
- FROM talert_actions
- WHERE name LIKE \'%' . $free_search . '%\')) OR ' .
- 'id_agent_module IN (
- SELECT id_agente_modulo
- FROM tagente_modulo
- WHERE nombre LIKE \'%' . $free_search . '%\') OR ' .
- 'id_agent_module IN (
- SELECT id_agente_modulo
- FROM tagente_modulo
- WHERE id_agente IN (
- SELECT id_agente
- FROM tagente
- WHERE nombre LIKE \'%' . $free_search . '%\' OR alias LIKE \'%' . $free_search . '%\'))' .
- ')';
-
- break;
- }
+ $whereAlertSimple = 'AND (' .
+ 'id_alert_template IN (
+ SELECT id
+ FROM talert_templates
+ WHERE name LIKE "%' . $free_search . '%") OR ' .
+ 'id_alert_template IN (
+ SELECT id
+ FROM talert_templates
+ WHERE id_alert_action IN (
+ SELECT id
+ FROM talert_actions
+ WHERE name LIKE "%' . $free_search . '%")) OR ' .
+ 'talert_template_modules.id IN (
+ SELECT id_alert_template_module
+ FROM talert_template_module_actions
+ WHERE id_alert_action IN (
+ SELECT id
+ FROM talert_actions
+ WHERE name LIKE "%' . $free_search . '%")) OR ' .
+ 'id_agent_module IN (
+ SELECT id_agente_modulo
+ FROM tagente_modulo
+ WHERE nombre LIKE "%' . $free_search . '%") OR ' .
+ 'id_agent_module IN (
+ SELECT id_agente_modulo
+ FROM tagente_modulo
+ WHERE id_agente IN (
+ SELECT id_agente
+ FROM tagente
+ WHERE nombre LIKE "%' . $free_search . '%") OR alias LIKE "%' . $free_search . '%")' .
+ ')';
}
else {
$whereAlertSimple = '';
diff --git a/pandora_console/operation/agentes/gis_view.php b/pandora_console/operation/agentes/gis_view.php
index c67a97037a..1b7d341917 100644
--- a/pandora_console/operation/agentes/gis_view.php
+++ b/pandora_console/operation/agentes/gis_view.php
@@ -36,7 +36,6 @@ $agentId = (int)get_parameter('id_agente');
$id_agente = $agentId;
$agent_name = agents_get_name($id_agente);
$agent_alias = agents_get_alias($id_agente);
-$agentData = gis_get_data_last_position_agent($id_agente);
//Avoid the agents with characters that fails the div.
$agent_name_original = $agent_name;
@@ -83,35 +82,22 @@ switch ($config["dbtype"]) {
gis_activate_ajax_refresh(null, $timestampLastOperation);
gis_activate_select_control();
-if ($agentData === false) {
- ui_print_info_message (
- __("There is no GIS data for this agent, so it's positioned in default position of map.") );
-}
-
-$dataLastPosition = gis_get_data_last_position_agent($agentId);
-if ($dataLastPosition !== false) {
- echo "
" . __("Last position in ") .
- $dataLastPosition['start_timestamp'] . ": " .
- $dataLastPosition['stored_longitude'] . ", " . $dataLastPosition['stored_latitude'] . ", " . $dataLastPosition['stored_altitude'];
-}
-
+echo "
";
echo "
";
-echo "
" . __("Positional data from the last") . " " . human_time_description_raw ($period) ."
";
/* Get the total number of Elements for the pagination */
$sqlCount = sprintf ("SELECT COUNT(*)
FROM tgis_data_history
WHERE tagente_id_agente = %d AND end_timestamp > FROM_UNIXTIME(%d)
ORDER BY end_timestamp DESC", $agentId, get_system_time () - $period);
-$countData = db_get_value_sql($sqlCount);
-
+$countData = (int) db_get_value_sql($sqlCount);
/* Get the elements to present in this page */
switch ($config["dbtype"]) {
@@ -141,9 +127,7 @@ switch ($config["dbtype"]) {
$result = db_get_all_rows_sql ($sql, true);
-
if ($result === false) {
-
$sql2 = sprintf ("
SELECT current_longitude AS longitude, current_latitude AS latitude, current_altitude AS altitude,
start_timestamp, description, number_of_packages, manual_placement
@@ -163,10 +147,11 @@ if ($result === false) {
}
if ($result !== false) {
- if(!$countData){
- $countData = 1;
- }
- ui_pagination ($countData, false) ;
+ echo "
" . __("Positional data from the last") . " " . human_time_description_raw($period) ."
";
+
+ if ($countData > 0) ui_pagination($countData, false);
+
+ $table = new StdClass();
$table->data = array();
foreach ($result as $key => $row) {
$distance = 0;
@@ -187,9 +172,13 @@ if ($result !== false) {
$rowdata = array(
$row['longitude'],
$row['latitude'],
- $row['altitude'],
- $row['start_timestamp'],
- $row['end_timestamp'],
+ (int) $row['altitude'] . " m",
+ is_numeric($row['start_timestamp'])
+ ? date($config["date_format"], $row['start_timestamp'])
+ : date_w_fixed_tz($row['start_timestamp']),
+ is_numeric($row['end_timestamp'])
+ ? date($config["date_format"], $row['end_timestamp'])
+ : date_w_fixed_tz($row['end_timestamp']),
$row['description'],
sprintf(__('%s Km'), $distance),
$row['number_of_packages'],
@@ -206,13 +195,12 @@ if ($result !== false) {
__('Distance'),
__("# of Packages"),
__("Manual placement"));
- $table->class = 'position_data_table';
+ $table->class = 'databox data';
$table->id = $agent_name.'_position_data_table';
- $table->title = $agent_alias . " " . __("positional data");
- $table->titlestyle = "background-color:#799E48;";
- html_print_table($table); unset($table);
+ $table->width = '100%';
+ html_print_table($table);
+ unset($table);
- ui_pagination ($countData, false) ;
- echo "
" . __('Total') . ' ' . $countData . ' ' . __('Data') . "
";
+ if ($countData > 0) ui_pagination($countData, false);
}
?>
diff --git a/pandora_console/operation/agentes/group_view.php b/pandora_console/operation/agentes/group_view.php
index 1c6a8d49e3..abc31b4ea4 100644
--- a/pandora_console/operation/agentes/group_view.php
+++ b/pandora_console/operation/agentes/group_view.php
@@ -30,7 +30,6 @@ if (!$agent_a && !$agent_w) {
require ("general/noaccess.php");
exit;
}
-$offset = get_parameter('offset', 0);
// Update network modules for this group
// Check for Network FLAG change request
// Made it a subquery, much faster on both the database and server side
@@ -81,12 +80,12 @@ $agents_notinit = 0;
$all_alerts_fired = 0;
//Groups and tags
-$result_groups = groupview_get_groups_list(
+$result_groups_info = groupview_get_groups_list(
$config['id_user'],
($agent_a == true) ? 'AR' : (($agent_w == true) ? 'AW' : 'AR')
);
-
-$count = count($result_groups);
+$result_groups = $result_groups_info['groups'];
+$count = $result_groups_info['counter'];
if ($result_groups[0]["_id_"] == 0) {
$total_agentes = $result_groups[0]["_total_agents_"];
@@ -187,10 +186,7 @@ if (!empty($result_groups)) {
echo "
" . __("Alert fired") . " | ";
echo "";
- $result_groups = array_slice($result_groups, $offset, $config['block_size']);
-
foreach ($result_groups as $data) {
-
$groups_id = $data["_id_"];
// Calculate entire row color
@@ -454,4 +450,4 @@ if (!empty($result_groups)) {
} else {
ui_print_info_message ( __('There are no defined agents'));
}
-?>
\ No newline at end of file
+?>
diff --git a/pandora_console/operation/agentes/tactical.php b/pandora_console/operation/agentes/tactical.php
index 7c41cf8565..578c0c6af4 100755
--- a/pandora_console/operation/agentes/tactical.php
+++ b/pandora_console/operation/agentes/tactical.php
@@ -56,7 +56,6 @@ ui_print_page_header (__("Tactical view"), "", false, "", false, $updated_time);
//Currently this function makes loading this page is impossible. Change
//and create new function.
-//$all_data = group_get_groups_list($config['id_user'], $user_strict, 'AR', true, false, 'tactical');
$all_data = tactical_status_modules_agents($config['id_user'], $user_strict, 'AR', $user_strict);
diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index eabefebbfe..de453a5a81 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -108,6 +108,9 @@ $layers = gis_get_layers($idMap);
// Render map
+$has_management_acl = check_acl($config["id_user"], $map['group_id'], "MW")
+ || check_acl ($config["id_user"], $map['group_id'], "MM");
+
$buttons = array();
if ($config["pure"] == 0) {
@@ -119,22 +122,14 @@ else {
html_print_image ("images/normalscreen.png", true, array ("title" => __('Back to normal mode'))) . "";
}
-if (check_acl ($config["id_user"], $map['group_id'], "MW") || check_acl ($config["id_user"], $map['group_id'], "MM")) {
- $buttons['setup']['text'] = '
'.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).'';
- $buttons['setup']['godmode'] = 1;
-
-
+if ($has_management_acl) {
$hash = md5($config["dbpass"] . $idMap . $config["id_user"]);
-
$buttons['public_link']['text'] = '
'.
html_print_image ("images/camera_mc.png", true, array ("title" => __('Show link to public Visual Console'))).'';
}
-$buttonsString = '
' .
- html_print_image("images/bricks.png", true, array("class" => "top", "border" => '0')) . ' Agent - test_gis1';
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index 921fdf3af6..0859fb64dd 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -2,8 +2,8 @@
# Pandora FMS Console
#
%define name pandorafms_console
-%define version 7.0NG.726
-%define release 180906
+%define version 7.0NG.727
+%define release 180917
# 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 d0a1fa42c9..fd63d12eae 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -2,8 +2,8 @@
# Pandora FMS Console
#
%define name pandorafms_console
-%define version 7.0NG.726
-%define release 180906
+%define version 7.0NG.727
+%define release 180917
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/pandora_console_install b/pandora_console/pandora_console_install
index a9c44bc998..8e48a00720 100644
--- a/pandora_console/pandora_console_install
+++ b/pandora_console/pandora_console_install
@@ -9,7 +9,7 @@
# This code is licensed under GPL 2.0 license.
# **********************************************************************
-PI_VERSION="7.0NG.726"
+PI_VERSION="7.0NG.727"
FORCE=0
DESTDIR=""
LOG_TIMESTAMP=`date +"%Y/%m/%d %H:%M:%S"`
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index 0a0227b4ac..57c5e8b9fb 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -1242,6 +1242,7 @@ CREATE TABLE IF NOT EXISTS `treport` (
`id_group_edit` mediumint(8) unsigned NULL DEFAULT 0,
`metaconsole` tinyint(1) DEFAULT 0,
`non_interactive` tinyint(1) UNSIGNED NOT NULL default 0,
+ `hidden` tinyint(1) DEFAULT 0,
PRIMARY KEY(`id_report`)
) ENGINE = InnoDB DEFAULT CHARSET=utf8;
@@ -1381,6 +1382,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_data` (
`border_color` varchar(200) DEFAULT "",
`fill_color` varchar(200) DEFAULT "",
`show_statistics` tinyint(2) NOT NULL default '0',
+ `linked_layout_node_id` INT(10) NOT NULL default 0,
`linked_layout_status_type` ENUM ('default', 'weight', 'service') DEFAULT 'default',
`id_layout_linked_weight` int(10) NOT NULL default '0',
`linked_layout_status_as_service_warning` FLOAT(20, 3) NOT NULL default 0,
@@ -2363,6 +2365,7 @@ CREATE TABLE IF NOT EXISTS `tpolicy_modules_inventory` (
`username` varchar(100) default '',
`password` varchar(100) default '',
`pending_delete` tinyint(1) default '0',
+ `custom_fields` MEDIUMBLOB NOT NULL,
PRIMARY KEY (`id`),
FOREIGN KEY (`id_policy`) REFERENCES tpolicies(`id`)
ON UPDATE CASCADE ON DELETE CASCADE,
@@ -3315,6 +3318,7 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` (
`border_color` varchar(200) DEFAULT "",
`fill_color` varchar(200) DEFAULT "",
`show_statistics` tinyint(2) NOT NULL default '0',
+ `linked_layout_node_id` INT(10) NOT NULL default 0,
`linked_layout_status_type` ENUM ('default', 'weight', 'service') DEFAULT 'default',
`id_layout_linked_weight` int(10) NOT NULL default '0',
`linked_layout_status_as_service_warning` FLOAT(20, 3) NOT NULL default 0,
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 7ab1986d09..07fd6acd64 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -112,7 +112,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('MR', 19),
('identification_reminder', 1),
('identification_reminder_timestamp', 0),
-('current_package_enterprise', '726'),
+('current_package_enterprise', '727'),
('post_process_custom_values', '{"0.00000038580247":"Seconds to months","0.00000165343915":"Seconds to weeks","0.00001157407407":"Seconds to days","0.01666666666667":"Seconds to minutes","0.00000000093132":"Bytes to Gigabytes","0.00000095367432":"Bytes to Megabytes","0.0009765625":"Bytes to Kilobytes","0.00000001653439":"Timeticks to weeks","0.00000011574074":"Timeticks to days"}'),
('custom_docs_logo', 'default_docs.png'),
('custom_support_logo', 'default_support.png'),
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 205d389bd7..a236fd3c35 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 7.0NG.726-180906
+Version: 7.0NG.727-180917
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 c1337b23bf..0745faf6e3 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.726-180906"
+pandora_version="7.0NG.727-180917"
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 c4982acf77..53490bdf11 100644
--- a/pandora_server/conf/pandora_server.conf.new
+++ b/pandora_server/conf/pandora_server.conf.new
@@ -1,7 +1,7 @@
#############################################################################
# Pandora FMS Server Parameters
# Pandora FMS, the Flexible Monitoring System.
-# Version 7.0NG.726
+# Version 7.0NG.727
# Licensed under GPL license v2,
# (c) 2003-2017 Artica Soluciones Tecnologicas
# http://www.pandorafms.com
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 5148faa971..3614e0cade 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -44,8 +44,8 @@ our @EXPORT = qw(
);
# version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.726";
-my $pandora_build = "180906";
+my $pandora_version = "7.0NG.727";
+my $pandora_build = "180917";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm
index a8a26e6ad2..05cd5ab9e1 100644
--- a/pandora_server/lib/PandoraFMS/Core.pm
+++ b/pandora_server/lib/PandoraFMS/Core.pm
@@ -4635,97 +4635,93 @@ Process groups statistics for statistics table
##########################################################################
sub pandora_group_statistics ($$) {
my ($pa_config, $dbh) = @_;
-
- # Variable init
- my $modules = 0;
- my $normal = 0;
- my $critical = 0;
- my $warning = 0;
- my $unknown = 0;
- my $non_init = 0;
- my $alerts = 0;
- my $alerts_fired = 0;
- my $agents = 0;
- my $agents_unknown = 0;
- my $utimestamp = 0;
- my $group = 0;
+ my $is_meta = is_metaconsole($pa_config);
- # Get all groups
- my @groups = get_db_rows ($dbh, 'SELECT id_grupo FROM tgrupo');
- my $table = is_metaconsole($pa_config) ? 'tmetaconsole_agent' : 'tagente';
- my $sec_table = is_metaconsole($pa_config)
- ? 'tmetaconsole_agent_secondary_group'
- : 'tagent_secondary_group';
+ logger($pa_config, "Updating no realtime group stats.", 10);
- # For each valid group get the stats: Simple uh?
- foreach my $group_row (@groups) {
+ my $total_alerts_condition = $is_meta
+ ? "0"
+ : "COUNT(tatm.id)";
+ my $joins_alerts = $is_meta
+ ? ""
+ : "LEFT JOIN tagente_modulo tam
+ ON tam.id_agente = ta.id_agente
+ INNER JOIN talert_template_modules tatm
+ ON tatm.id_agent_module = tam.id_agente_modulo";
+ my $agent_table = $is_meta
+ ? "tmetaconsole_agent"
+ : "tagente";
+ my $agent_seconsary_table = $is_meta
+ ? "tmetaconsole_agent_secondary_group"
+ : "tagent_secondary_group";
- $group = $group_row->{'id_grupo'};
-
- # NOTICE - Calculations done here MUST BE the same than used in PHP code to have
- # the same criteria. PLEASE, double check any changes here and in functions_groups.php
- $agents_unknown = get_db_value ($dbh, "SELECT COUNT(DISTINCT(id_agente))
- FROM $table LEFT JOIN $sec_table ON id_agente=id_agent
- WHERE disabled=0 AND critical_count=0 AND warning_count=0 AND unknown_count>0 AND (id_grupo=? OR id_group=?)", $group, $group);
- $agents_unknown = 0 unless defined ($agents_unknown);
-
- $agents = get_db_value ($dbh, "SELECT COUNT(DISTINCT(id_agente))
- FROM $table LEFT JOIN $sec_table ON id_agente=id_agent
- WHERE(id_grupo=$group OR id_group=$group) AND disabled=0");
- $agents = 0 unless defined ($agents);
-
- $modules = get_db_value ($dbh, "SELECT SUM(total_count) FROM
+ # Update the record.
+ db_do ($dbh, "REPLACE INTO tgroup_stat(
+ `id_group`, `modules`, `normal`, `critical`, `warning`, `unknown`,
+ `non-init`, `alerts`, `alerts_fired`, `agents`,
+ `agents_unknown`, `utimestamp`
+ )
+ SELECT
+ tg.id_grupo AS id_group,
+ IF (SUM(modules_total) IS NULL,0,SUM(modules_total)) AS modules,
+ IF (SUM(modules_ok) IS NULL,0,SUM(modules_ok)) AS normal,
+ IF (SUM(modules_critical) IS NULL,0,SUM(modules_critical)) AS critical,
+ IF (SUM(modules_warning) IS NULL,0,SUM(modules_warning)) AS warning,
+ IF (SUM(modules_unknown) IS NULL,0,SUM(modules_unknown)) AS unknown,
+ IF (SUM(modules_not_init) IS NULL,0,SUM(modules_not_init)) AS `non-init`,
+ IF (SUM(alerts_total) IS NULL,0,SUM(alerts_total)) AS alerts,
+ IF (SUM(alerts_fired) IS NULL,0,SUM(alerts_fired)) AS alerts_fired,
+ IF (SUM(agents_total) IS NULL,0,SUM(agents_total)) AS agents,
+ IF (SUM(agents_unknown) IS NULL,0,SUM(agents_unknown)) AS agents_unknown,
+ UNIX_TIMESTAMP() AS utimestamp
+ FROM
(
- SELECT DISTINCT(id_agente), total_count
- FROM $table LEFT JOIN $sec_table ON id_agente=id_agent
- WHERE disabled=0 AND (id_grupo=? OR id_group=?)
- ) AS t1", $group, $group);
- $modules = 0 unless defined ($modules);
+ SELECT SUM(ta.normal_count) AS modules_ok,
+ SUM(ta.critical_count) AS modules_critical,
+ SUM(ta.warning_count) AS modules_warning,
+ SUM(ta.unknown_count) AS modules_unknown,
+ SUM(ta.notinit_count) AS modules_not_init,
+ SUM(ta.total_count) AS modules_total,
+ SUM(ta.fired_count) AS alerts_fired,
+ $total_alerts_condition AS alerts_total,
+ SUM(IF(ta.critical_count > 0, 1, 0)) AS agents_critical,
+ SUM(IF(ta.critical_count = 0 AND ta.warning_count = 0 AND ta.unknown_count > 0, 1, 0)) AS agents_unknown,
+ SUM(IF(ta.total_count = ta.notinit_count, 1, 0)) AS agents_not_init,
+ COUNT(ta.id_agente) AS agents_total,
+ ta.id_grupo AS g
+ FROM $agent_table ta
+ $joins_alerts
+ WHERE ta.disabled = 0
+ GROUP BY g
- $normal = get_db_value ($dbh, "SELECT COUNT(DISTINCT(id_agente))
- FROM $table LEFT JOIN $sec_table ON id_agente=id_agent
- WHERE disabled=0 AND critical_count=0 AND warning_count=0 AND unknown_count=0 AND normal_count>0 AND (id_grupo=? OR id_group=?)", $group, $group);
- $normal = 0 unless defined ($normal);
+ UNION ALL
- $critical = get_db_value ($dbh, "SELECT COUNT(DISTINCT(id_agente))
- FROM $table LEFT JOIN $sec_table ON id_agente=id_agent
- WHERE disabled=0 AND critical_count>0 AND (id_grupo=? OR id_group=?)", $group, $group);
- $critical = 0 unless defined ($critical);
-
- $warning = get_db_value ($dbh, "SELECT COUNT(DISTINCT(id_agente))
- FROM $table LEFT JOIN $sec_table ON id_agente=id_agent
- WHERE disabled=0 AND critical_count=0 AND warning_count>0 AND (id_grupo=? OR id_group=?)", $group, $group);
- $warning = 0 unless defined ($warning);
-
- $unknown = get_db_value ($dbh, "SELECT COUNT(DISTINCT(id_agente))
- FROM $table LEFT JOIN $sec_table ON id_agente=id_agent
- WHERE disabled=0 AND critical_count=0 AND warning_count=0 AND unknown_count>0 AND (id_grupo=? OR id_group=?)", $group, $group);
- $unknown = 0 unless defined ($unknown);
-
- $non_init = get_db_value ($dbh, "SELECT COUNT(DISTINCT(id_agente))
- FROM $table LEFT JOIN $sec_table ON id_agente=id_agent
- WHERE disabled=0 AND total_count=notinit_count AND (id_grupo=? OR id_group=?)", $group, $group);
- $non_init = 0 unless defined ($non_init);
-
- # Total alert count not available on the meta console.
- if ($table eq 'tagente') {
- $alerts = get_db_value ($dbh, "SELECT COUNT(talert_template_modules.id)
- FROM talert_template_modules, tagente_modulo, tagente
- WHERE tagente.id_grupo = $group AND tagente_modulo.id_agente = tagente.id_agente
- AND tagente_modulo.disabled = 0 AND tagente.disabled = 0
- AND talert_template_modules.disabled = 0
- AND talert_template_modules.id_agent_module = tagente_modulo.id_agente_modulo");
- }
- $alerts = 0 unless defined ($alerts);
-
- $alerts_fired = get_db_value ($dbh, "SELECT SUM(fired_count) FROM $table WHERE disabled=0 AND id_grupo=?", $group);
- $alerts_fired = 0 unless defined ($alerts_fired);
-
- # Update the record.
- db_do ($dbh, "REPLACE INTO tgroup_stat (id_group, modules, normal, critical, warning, unknown, " . $PandoraFMS::DB::RDBMS_QUOTE . 'non-init' . $PandoraFMS::DB::RDBMS_QUOTE . ", alerts, alerts_fired, agents, agents_unknown, utimestamp) VALUES ($group, $modules, $normal, $critical, $warning, $unknown, $non_init, $alerts, $alerts_fired, $agents, $agents_unknown, UNIX_TIMESTAMP())");
-
- }
+ SELECT SUM(ta.normal_count) AS modules_ok,
+ SUM(ta.critical_count) AS modules_critical,
+ SUM(ta.warning_count) AS modules_warning,
+ SUM(ta.unknown_count) AS modules_unknown,
+ SUM(ta.notinit_count) AS modules_not_init,
+ SUM(ta.total_count) AS modules_total,
+ SUM(ta.fired_count) AS alerts_fired,
+ $total_alerts_condition AS alerts_total,
+ SUM(IF(ta.critical_count > 0, 1, 0)) AS agents_critical,
+ SUM(IF(ta.critical_count = 0 AND ta.warning_count = 0 AND ta.unknown_count > 0, 1, 0)) AS agents_unknown,
+ SUM(IF(ta.total_count = ta.notinit_count, 1, 0)) AS agents_not_init,
+ COUNT(ta.id_agente) AS agents_total,
+ tasg.id_group AS g
+ FROM $agent_table ta
+ LEFT JOIN $agent_seconsary_table tasg
+ ON ta.id_agente = tasg.id_agent
+ $joins_alerts
+ WHERE ta.disabled = 0
+ GROUP BY g
+ ) counters
+ RIGHT JOIN tgrupo tg
+ ON counters.g = tg.id_grupo
+ GROUP BY tg.id_grupo"
+ );
+ logger($pa_config, "No realtime group stats updated.", 6);
}
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 4f4a2e39b4..ff15f60fe5 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -31,8 +31,8 @@ use base 'Exporter';
our @ISA = qw(Exporter);
# version: Defines actual version of Pandora Server for this module only
-my $pandora_version = "7.0NG.726";
-my $pandora_build = "180906";
+my $pandora_version = "7.0NG.727";
+my $pandora_build = "180917";
our $VERSION = $pandora_version." ".$pandora_build;
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index c4acf995e2..143c57bf27 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -2,8 +2,8 @@
# Pandora FMS Server
#
%define name pandorafms_server
-%define version 7.0NG.726
-%define release 180906
+%define version 7.0NG.727
+%define release 180917
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 7f338028c0..31f9abd260 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -2,8 +2,8 @@
# Pandora FMS Server
#
%define name pandorafms_server
-%define version 7.0NG.726
-%define release 180906
+%define version 7.0NG.727
+%define release 180917
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 74036a3011..1b766a7217 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -8,8 +8,8 @@
# This code is licensed under GPL 2.0 license.
# **********************************************************************
-PI_VERSION="7.0NG.726"
-PI_BUILD="180906"
+PI_VERSION="7.0NG.727"
+PI_BUILD="180917"
MODE=$1
if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 052fb836db..2e1a13f5f8 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -34,7 +34,7 @@ use PandoraFMS::Config;
use PandoraFMS::DB;
# version: define current version
-my $version = "7.0NG.726 PS180906";
+my $version = "7.0NG.727 PS180917";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index b9cb771727..42732f4763 100644
--- 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.726 PS180906";
+my $version = "7.0NG.727 PS180917";
# save program name for logging
my $progname = basename($0);
diff --git a/pandora_server/util/pandora_server b/pandora_server/util/pandora_server
index 601946edf4..89beee8e55 100755
--- a/pandora_server/util/pandora_server
+++ b/pandora_server/util/pandora_server
@@ -100,7 +100,8 @@ case "$1" in
echo "$PANDORA_RB_PRODUCT_NAME Server is currently running on this machine with PID ($PANDORA_PID)."
rc_exit # running start on a service already running
fi
-
+
+ export PERL_LWP_SSL_VERIFY_HOSTNAME=0
$PANDORA_DAEMON $PANDORA_HOME -D
sleep 1