Take snmp_query_id into account when previewing Report Data Items

Super-Visions · Oct 24, 2013 · f54c56f · f54c56f
1 parent 5664891
commit f54c56f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/autom8_utilities.php b/autom8_utilities.php
@@ -70,12 +70,12 @@ function display_ds_list($rule) {
 LEFT JOIN reportit_data_items AS rdi 
 	ON( dtd.local_data_id = rdi.id AND rdi.report_id = %d ) 
 JOIN data_local AS dl 
-	ON( dl.id = dtd.local_data_id ) 
+	ON( dl.id = dtd.local_data_id AND dl.snmp_query_id = %d ) 
 JOIN ' . $database_idquote . 'host' . $database_idquote .' 
 	ON( host.id = dl.host_id ) 
 JOIN host_template 
 	ON ( host.host_template_id = host_template.id )	
-', $report['id'] );
+', $report['id'], $rule['snmp_query_id'] );
 
 	// build SQL query SELECT part
 	$sql_select = '

diff --git a/setup.php b/setup.php
@@ -305,12 +305,12 @@ function autom8reportit_data_source_action($selected_items){
 LEFT JOIN reportit_data_items AS rdi 
 	ON( dtd.local_data_id = rdi.id AND rdi.report_id = %d ) 
 JOIN data_local AS dl 
-	ON( dl.id = dtd.local_data_id ) 
+	ON( dl.id = dtd.local_data_id AND dl.snmp_query_id = %d ) 
 JOIN ' . $database_idquote . 'host' . $database_idquote .' 
 	ON( host.id = dl.host_id ) 
 JOIN host_template 
 	ON ( host.host_template_id = host_template.id )	
-', $report_rule['report_id'] );
+', $report_rule['report_id'], $report_rule['snmp_query_id'] );
 
 		// build SQL query SELECT part
 		$sql_select = '
@@ -433,12 +433,12 @@ function autom8reportit_autorrdlist($report_settings){
 LEFT JOIN reportit_data_items AS rdi 
 	ON( dtd.local_data_id = rdi.id AND rdi.report_id = %d ) 
 JOIN data_local AS dl 
-	ON( dl.id = dtd.local_data_id ) 
+	ON( dl.id = dtd.local_data_id AND dl.snmp_query_id = %d ) 
 JOIN ' . $database_idquote . 'host' . $database_idquote .' 
 	ON( host.id = dl.host_id ) 
 JOIN host_template 
 	ON ( host.host_template_id = host_template.id )	
-', $report_rule['report_id'] );
+', $report_rule['report_id'], $report_rule['snmp_query_id'] );
 
 		// build SQL query SELECT part
 		$sql_select = '