From 9deccd7d29a7d8f563eaddcd7720e676fd3fc6b0 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Thu, 7 Sep 2023 12:41:37 +0200
Subject: [PATCH] Fix OS stats for group report

---
 .../reporting_builder.item_editor.php         | 69 ++++++++++++-------
 .../godmode/reporting/reporting_builder.php   |  4 +-
 .../include/functions_reporting_html.php      |  6 +-
 3 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index adb54f89fe..6343fabe1d 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1272,36 +1272,58 @@ $class = 'databox filters';
         }
         ?>
 
+<?php
+if (is_metaconsole() === true) {
+    ?>
+        <tr id="row_servers_all"   class="datos">
+            <td class="bolder"><?php echo __('Server'); ?></td>
+            <td  >
         <?php
-        if ($meta) {
-            ?>
+        html_print_select(
+            $servers,
+            'combo_server_all',
+            $server_name,
+            '',
+            __('All nodes'),
+            'all'
+        );
+        ?>
+            </td>
+        </tr>
+    <?php
+}
+?>
+
+    <?php
+    if ($meta) {
+        ?>
                 <tr id="row_multiple_servers"   class="datos">
                     <td class="bolder"><?php echo __('Server'); ?></td>
                     <td  >
-                <?php
-                $server_ids = [];
-                $server_ids[0] = __('Local metaconsole');
-                $get_servers = metaconsole_get_servers();
-                foreach ($get_servers as $key => $server) {
-                    $server_ids[$server['id']] = $server['server_name'];
-                }
+            <?php
+            $server_ids = [];
+            $server_ids[0] = __('Local metaconsole');
+            $get_servers = metaconsole_get_servers();
+            foreach ($get_servers as $key => $server) {
+                $server_ids[$server['id']] = $server['server_name'];
+            }
 
-                html_print_select(
-                    $server_ids,
-                    'server_multiple[]',
-                    $server_multiple,
-                    '',
-                    '',
-                    0,
-                    false,
-                    true
-                );
-                ?>
+            html_print_select(
+                $server_ids,
+                'server_multiple[]',
+                $server_multiple,
+                '',
+                '',
+                0,
+                false,
+                true
+            );
+            ?>
                     </td>
                 </tr>
             <?php
-        }
-        ?>
+    }
+    ?>
 
         <tr id="row_label"   class="datos">
             <td class="bolder">
@@ -6545,6 +6567,7 @@ function chooseType() {
     $("#row_alert_actions").hide();
     $("#row_servers").hide();
     $("#row_servers_all_opt").hide();
+    $("#row_servers_all").hide();
     $("#row_multiple_servers").hide();
     $("#row_sort").hide();
     $("#row_date").hide();
@@ -7109,7 +7132,7 @@ function chooseType() {
 
         case 'group_report':
             $("#row_group").show();
-            $("#row_servers_all_opt").show();
+            $("#row_servers_all").show();
             $("#row_description").show();
             $("#row_historical_db_check").hide();
             break;
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 2b3a425767..eeee7aa1b4 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -1986,7 +1986,7 @@ switch ($action) {
                             break;
 
                             case 'group_report':
-                                $values['server_name'] = get_parameter('combo_server_sql');
+                                $values['server_name'] = get_parameter('combo_server_all');
                                 $good_format = true;
                             break;
 
@@ -2862,7 +2862,7 @@ switch ($action) {
                             break;
 
                             case 'group_report':
-                                $values['server_name'] = get_parameter('combo_server_sql');
+                                $values['server_name'] = get_parameter('combo_server_all');
                                 $good_format = true;
                             break;
 
diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 0e9082c347..754a9badb2 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -2862,8 +2862,10 @@ function reporting_html_group_report($table, $item, $pdf=0)
     $options = [];
     $labels = [];
     foreach ($group_os as $value) {
-        $data[$value['name_os']] = $value['count_os'];
-        $labels[] = io_safe_output($value['name_os']);
+        $data[$value['name_os']] += $value['count_os'];
+        if (array_search($value['name_os'], $labels) === false) {
+            $labels[] = io_safe_output($value['name_os']);
+        }
     }
 
     $options = [