From 169f19bc42cbf32ed0e7c779dd1c00eb6990a31f Mon Sep 17 00:00:00 2001
From: Jorge Rincon <jorge.rincon@pandorafms.com>
Date: Tue, 23 May 2023 09:19:08 +0200
Subject: [PATCH 1/2] #11285 fixed select server creation

---
 .../godmode/reporting/reporting_builder.item_editor.php       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index cc05d9d3f4..64f2c4659c 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1221,9 +1221,7 @@ $class = 'databox filters';
                     $servers,
                     'combo_server',
                     $server_name,
-                    '',
-                    $nothing,
-                    $nothing_value
+                    ''
                 );
                 ?>
             </td>

From 662329793a5594f0237c82f3bfe98f73a3bb968c Mon Sep 17 00:00:00 2001
From: Jorge Rincon <jorge.rincon@pandorafms.com>
Date: Thu, 25 May 2023 14:25:18 +0200
Subject: [PATCH 2/2] fixed bug for different types of SQL reports

---
 .../godmode/reporting/reporting_builder.item_editor.php  | 2 +-
 pandora_console/godmode/reporting/reporting_builder.php  | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index 64f2c4659c..38ac32b635 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1219,7 +1219,7 @@ $class = 'databox filters';
                 <?php
                 html_print_select(
                     $servers,
-                    'combo_server',
+                    'combo_server_sql',
                     $server_name,
                     ''
                 );
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index cd049f1d83..2b8b598755 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -2207,7 +2207,14 @@ switch ($action) {
                             );
                             $values['top_n_value'] = get_parameter('max_items');
 
-                            $values['server_name'] = get_parameter('combo_server');
+                            if ($values['type'] === 'sql_graph_hbar'
+                                || ($values['type'] === 'sql_graph_vbar')
+                                || ($values['type'] === 'sql_graph_pie')
+                            ) {
+                                $values['server_name'] = get_parameter('combo_server_sql');
+                            } else {
+                                $values['server_name'] = get_parameter('combo_server');
+                            }
                         } else if ($values['type'] == 'url') {
                             $values['external_source'] = get_parameter('url');
                         } else if ($values['type'] == 'event_report_group') {