Shirly Radco has uploaded a new change for review. Change subject: reports: Fixed date range in reports queries ......................................................................
reports: Fixed date range in reports queries Fixed the date range so it will not include the end date (excluded). Change-Id: Ibc1a798aa9b7319d89490ca4ef859ab4dda26598 Bug-Url: https://bugzilla.redhat.com/1085820 Signed-off-by: Shirly Radco <[email protected]> --- M packaging/ovirt-reports/resources/Reports/Executive/active_vms_by_os_br18_files/active_vms_by_os_br18_jrxml.data M packaging/ovirt-reports/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/cluster_capacity_vs_usage_br19_jrxml.data M packaging/ovirt-reports/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data M packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7_table.jrxml.data M packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/cluster_uptime_br7_jrxml.data M packaging/ovirt-reports/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data M packaging/ovirt-reports/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/cluster_quality_of_service_vms_br13_jrxml.data M packaging/ovirt-reports/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data M packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/multiple_vms_resource_usage_over_time_br16_files/multiple_vms_resource_usage_over_time_br16_jrxml.data M packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/single_vm_resources_over_time_BR10A_files/single_vm_resources_over_time_BR10A_jrxml.data M packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/Host_OS_Break_Down_BR22B_for_inventory_files/Host_OS_Break_Down_BR22B_for_inventory_jrxml.data M packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/active_entities_by_os_BR18A_files/active_entities_by_os_BR18A_jrxml.data M packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/storage_domain_by_Datacenter_BR23_files/storage_domain_by_Datacenter_BR23_jrxml.data M packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/datacenter_quality_of_service_hosts_br6b_files/datacenter_quality_of_service_hosts_br6b_jrxml.data M packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data M packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/Five_most_utilized_hosts_over_time_files/Five_most_utilized_hosts_over_time_jrxml.data M packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/five_most_utilized_vms_over_time_br11_files/five_most_utilized_vms_over_time_br11_jrxml.data M packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/cluster_uptime_by_datacenter_br7a_files/cluster_uptime_by_datacenter_br7a_jrxml.data M packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/virtual_servers_uptime_by_cluster_br14a_files/virtual_servers_uptime_by_cluster_br14a_jrxml.data 19 files changed, 29 insertions(+), 29 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/11/27711/1 diff --git a/packaging/ovirt-reports/resources/Reports/Executive/active_vms_by_os_br18_files/active_vms_by_os_br18_jrxml.data b/packaging/ovirt-reports/resources/Reports/Executive/active_vms_by_os_br18_files/active_vms_by_os_br18_jrxml.data index 14bff13..abe1323 100644 --- a/packaging/ovirt-reports/resources/Reports/Executive/active_vms_by_os_br18_files/active_vms_by_os_br18_jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Executive/active_vms_by_os_br18_files/active_vms_by_os_br18_jrxml.data @@ -121,7 +121,7 @@ GROUP BY b.vm_id ) AND history_datetime >= CAST ( $P{P_Start_Date} AS date ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS timestamp ) + interval '1 day' @@ -291,7 +291,7 @@ GROUP BY b.vm_id ) AND history_datetime >= CAST ( $P{P_Start_Date} AS date ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS timestamp ) + interval '1 day' diff --git a/packaging/ovirt-reports/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/cluster_capacity_vs_usage_br19_jrxml.data b/packaging/ovirt-reports/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/cluster_capacity_vs_usage_br19_jrxml.data index c288624..4dea22f 100644 --- a/packaging/ovirt-reports/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/cluster_capacity_vs_usage_br19_jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Executive/cluster_capacity_vs_usage_br19_files/cluster_capacity_vs_usage_br19_jrxml.data @@ -99,7 +99,7 @@ ELSE cast ( $P{P_Cluster_ID} as uuid ) END AND history_datetime >= cast ( $P{P_Start_Date} as date ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN cast ( $P{P_Start_Date} as TIMESTAMP ) + interval '1 day' @@ -175,7 +175,7 @@ ELSE cast ( $P{P_Cluster_ID} as uuid ) END AND history_datetime >= cast ( $P{P_Start_Date} as date ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN cast ( $P{P_Start_Date} as TIMESTAMP ) + interval '1 day' diff --git a/packaging/ovirt-reports/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data b/packaging/ovirt-reports/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data index 7a98e1a..ad83004 100644 --- a/packaging/ovirt-reports/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Executive/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data @@ -90,7 +90,7 @@ ELSE CAST ( $P{P_Cluster_ID} AS uuid ) END AND history_datetime >= CAST ( $P{P_Start_Date} AS date ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS timestamp ) + interval '1 day' diff --git a/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7_table.jrxml.data b/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7_table.jrxml.data index 1c577e9..b8266a0 100644 --- a/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7_table.jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/br7_table.jrxml.data @@ -133,7 +133,7 @@ GROUP BY a.host_id ) AND history_datetime >= CAST ( $P{P_Start_Date} AS timestamp ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS timestamp ) + interval '1 day' diff --git a/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/cluster_uptime_br7_jrxml.data b/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/cluster_uptime_br7_jrxml.data index e03c26c..679801e 100644 --- a/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/cluster_uptime_br7_jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/cluster_uptime_br7_files/cluster_uptime_br7_jrxml.data @@ -122,7 +122,7 @@ GROUP BY a.host_id ) AND history_datetime >= CAST ( $P{P_Start_Date} AS timestamp ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS timestamp ) + interval '1 day' diff --git a/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data b/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data index a59aee1..baa4b7e 100644 --- a/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Service_level/Hosts/single_host_uptime_br8_files/single_host_uptime_br8_jrxml.data @@ -94,7 +94,7 @@ ELSE CAST ( $P{P_Host_ID} AS uuid ) END AND history_datetime >= CAST ( $P{P_Start_Date} AS timestamp ) -AND history_datetime <= +AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS timestamp ) + interval '1 day' diff --git a/packaging/ovirt-reports/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/cluster_quality_of_service_vms_br13_jrxml.data b/packaging/ovirt-reports/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/cluster_quality_of_service_vms_br13_jrxml.data index c5fd8c1..eb4c3a3 100644 --- a/packaging/ovirt-reports/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/cluster_quality_of_service_vms_br13_jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Service_level/VMs/cluster_quality_of_service_vms_br13_files/cluster_quality_of_service_vms_br13_jrxml.data @@ -136,7 +136,7 @@ GROUP BY a.vm_id ) AND history_datetime >= CAST ( $P{P_Start_Date} AS timestamp ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS timestamp ) + interval '1 day' @@ -290,7 +290,7 @@ ) AND v3_5_statistics_vms_resources_usage_hourly.history_datetime >= CAST ( $P{P_Start_Date} AS timestamp ) - AND v3_5_statistics_vms_resources_usage_hourly.history_datetime <= + AND v3_5_statistics_vms_resources_usage_hourly.history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS timestamp ) + interval '1 day' diff --git a/packaging/ovirt-reports/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data b/packaging/ovirt-reports/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data index bf50213..55eec8c 100644 --- a/packaging/ovirt-reports/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Service_level/VMs/single_vm_uptime_br46_files/single_vm_uptime_br46_jrxml.data @@ -97,7 +97,7 @@ ELSE CAST ( $P{P_VM_ID} AS uuid ) END AND history_datetime >= CAST ( $P{P_Start_Date} AS TIMESTAMP ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS TIMESTAMP ) + interval '1 day' diff --git a/packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/multiple_vms_resource_usage_over_time_br16_files/multiple_vms_resource_usage_over_time_br16_jrxml.data b/packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/multiple_vms_resource_usage_over_time_br16_files/multiple_vms_resource_usage_over_time_br16_jrxml.data index 2070042..060c765 100644 --- a/packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/multiple_vms_resource_usage_over_time_br16_files/multiple_vms_resource_usage_over_time_br16_jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/multiple_vms_resource_usage_over_time_br16_files/multiple_vms_resource_usage_over_time_br16_jrxml.data @@ -86,7 +86,7 @@ -- This condition will filter the vm's based on the vm list the user chose $X{IN, CAST ( v3_5_configuration_history_vms.vm_id AS varchar ), P_VM_ListID} AND history_datetime >= CAST ( $P{P_Start_Date} AS timestamp ) - AND history_datetime <= + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST ( $P{P_Start_Date} AS timestamp ) + interval '1 day' diff --git a/packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/single_vm_resources_over_time_BR10A_files/single_vm_resources_over_time_BR10A_jrxml.data b/packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/single_vm_resources_over_time_BR10A_files/single_vm_resources_over_time_BR10A_jrxml.data index e490b3f..bbedf6e 100644 --- a/packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/single_vm_resources_over_time_BR10A_files/single_vm_resources_over_time_BR10A_jrxml.data +++ b/packaging/ovirt-reports/resources/Reports/Trend/Virtual_machines/single_vm_resources_over_time_BR10A_files/single_vm_resources_over_time_BR10A_jrxml.data @@ -56,7 +56,7 @@ ELSE cast($P{P_VM_ID} as uuid) END AND history_datetime >= cast($P{P_Start_Date} as date) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' @@ -125,7 +125,7 @@ INNER JOIN v3_5_configuration_history_vms_disks ON (v3_5_configuration_history_vms_disks.vm_disk_id = v3_5_statistics_vms_disks_resources_usage_$P!{table_name}.vm_disk_id) WHERE history_datetime >= cast($P{P_Start_Date} as timestamp) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' @@ -157,7 +157,7 @@ GROUP BY a.vm_id, a.device_id) $P!{is_deleted}) AND history_datetime >= cast($P{P_Start_Date} as timestamp) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' @@ -234,7 +234,7 @@ FROM v3_5_statistics_vms_interfaces_resources_usage_$P!{table_name} INNER JOIN v3_5_configuration_history_vms_interfaces ON (v3_5_configuration_history_vms_interfaces.vm_interface_id = v3_5_statistics_vms_interfaces_resources_usage_$P!{table_name}.vm_interface_id) WHERE history_datetime >= cast($P{P_Start_Date} as timestamp) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' @@ -267,7 +267,7 @@ GROUP BY a.vm_id, a.device_id) $P!{is_deleted}) AND history_datetime >= cast($P{P_Start_Date} as timestamp) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' @@ -351,7 +351,7 @@ ELSE cast($P{P_VM_ID} as uuid) END AND history_datetime >= cast($P{P_Start_Date} as timestamp) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' diff --git a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/Host_OS_Break_Down_BR22B_for_inventory_files/Host_OS_Break_Down_BR22B_for_inventory_jrxml.data b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/Host_OS_Break_Down_BR22B_for_inventory_files/Host_OS_Break_Down_BR22B_for_inventory_jrxml.data index c1cccfa..2b054e5 100644 --- a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/Host_OS_Break_Down_BR22B_for_inventory_files/Host_OS_Break_Down_BR22B_for_inventory_jrxml.data +++ b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/Host_OS_Break_Down_BR22B_for_inventory_files/Host_OS_Break_Down_BR22B_for_inventory_jrxml.data @@ -58,7 +58,7 @@ ELSE cast($P{P_Cluster_ID} as uuid) END AND history_datetime >= cast($P{P_Start_Date} as timestamp) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' diff --git a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/active_entities_by_os_BR18A_files/active_entities_by_os_BR18A_jrxml.data b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/active_entities_by_os_BR18A_files/active_entities_by_os_BR18A_jrxml.data index 676ce4f..a803cfa 100644 --- a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/active_entities_by_os_BR18A_files/active_entities_by_os_BR18A_jrxml.data +++ b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/active_entities_by_os_BR18A_files/active_entities_by_os_BR18A_jrxml.data @@ -72,7 +72,7 @@ FROM v3_5_configuration_history_vms b GROUP BY b.vm_id) AND history_datetime >= cast($P{P_Start_Date} as timestamp) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' diff --git a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/storage_domain_by_Datacenter_BR23_files/storage_domain_by_Datacenter_BR23_jrxml.data b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/storage_domain_by_Datacenter_BR23_files/storage_domain_by_Datacenter_BR23_jrxml.data index 58cc838..10eb4e1 100644 --- a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/storage_domain_by_Datacenter_BR23_files/storage_domain_by_Datacenter_BR23_jrxml.data +++ b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Inventory_Dashboard/storage_domain_by_Datacenter_BR23_files/storage_domain_by_Datacenter_BR23_jrxml.data @@ -47,7 +47,7 @@ WHEN $P{P_Period} = 3 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 year' END) AND history_datetime >= cast($P{P_Start_Date} as timestamp) -AND history_datetime <= CASE +AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' diff --git a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/datacenter_quality_of_service_hosts_br6b_files/datacenter_quality_of_service_hosts_br6b_jrxml.data b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/datacenter_quality_of_service_hosts_br6b_files/datacenter_quality_of_service_hosts_br6b_jrxml.data index e1c938f..8159a61 100644 --- a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/datacenter_quality_of_service_hosts_br6b_files/datacenter_quality_of_service_hosts_br6b_jrxml.data +++ b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/datacenter_quality_of_service_hosts_br6b_files/datacenter_quality_of_service_hosts_br6b_jrxml.data @@ -78,7 +78,7 @@ FROM v3_5_configuration_history_clusters WHERE datacenter_id = cast($P{P_DataCenter_ID} as uuid)) AND v3_5_statistics_hosts_resources_usage_hourly.history_datetime >= cast($P{P_Start_Date} as timestamp) - AND v3_5_statistics_hosts_resources_usage_hourly.history_datetime <= CASE + AND v3_5_statistics_hosts_resources_usage_hourly.history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' diff --git a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data index 9fe6a65..eb92287 100644 --- a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data +++ b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/System_Overview_Dashboard/summary_of_host_usage_resources_br17_files/summary_of_host_usage_resources_br17_jrxml.data @@ -54,7 +54,7 @@ ELSE cast($P{P_Cluster_ID} as uuid) END AND history_datetime >= cast($P{P_Start_Date} as date) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' diff --git a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/Five_most_utilized_hosts_over_time_files/Five_most_utilized_hosts_over_time_jrxml.data b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/Five_most_utilized_hosts_over_time_files/Five_most_utilized_hosts_over_time_jrxml.data index c5af141..e489327 100644 --- a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/Five_most_utilized_hosts_over_time_files/Five_most_utilized_hosts_over_time_jrxml.data +++ b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/Five_most_utilized_hosts_over_time_files/Five_most_utilized_hosts_over_time_jrxml.data @@ -51,7 +51,7 @@ INNER JOIN v3_5_configuration_history_hosts ON (v3_5_configuration_history_hosts.host_id = v3_5_statistics_hosts_resources_usage_$P!{table_name}.host_id) WHERE v3_5_statistics_hosts_resources_usage_$P!{table_name}.history_datetime >= cast($P{P_Start_Date} as timestamp) - AND v3_5_statistics_hosts_resources_usage_$P!{table_name}.history_datetime <= CASE + AND v3_5_statistics_hosts_resources_usage_$P!{table_name}.history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' @@ -79,7 +79,7 @@ ELSE $P{P_Host_Type} END AND a.history_datetime >= cast($P{P_Start_Date} as timestamp) - AND a.history_datetime <= CASE + AND a.history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' diff --git a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/five_most_utilized_vms_over_time_br11_files/five_most_utilized_vms_over_time_br11_jrxml.data b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/five_most_utilized_vms_over_time_br11_files/five_most_utilized_vms_over_time_br11_jrxml.data index f9a7104..68ddafe 100644 --- a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/five_most_utilized_vms_over_time_br11_files/five_most_utilized_vms_over_time_br11_jrxml.data +++ b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Trends_Dashboard/five_most_utilized_vms_over_time_br11_files/five_most_utilized_vms_over_time_br11_jrxml.data @@ -51,7 +51,7 @@ INNER JOIN v3_5_configuration_history_vms ON (v3_5_configuration_history_vms.vm_id = v3_5_statistics_vms_resources_usage_$P!{table_name}.vm_id) WHERE v3_5_statistics_vms_resources_usage_$P!{table_name}.history_datetime >= cast($P{P_Start_Date} as timestamp) - AND v3_5_statistics_vms_resources_usage_$P!{table_name}.history_datetime <= CASE + AND v3_5_statistics_vms_resources_usage_$P!{table_name}.history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' @@ -84,7 +84,7 @@ FROM v3_5_configuration_history_vms as g GROUP BY g.vm_id) AND a.history_datetime >= cast($P{P_Start_Date} as timestamp) - AND a.history_datetime <= CASE + AND a.history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' diff --git a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/cluster_uptime_by_datacenter_br7a_files/cluster_uptime_by_datacenter_br7a_jrxml.data b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/cluster_uptime_by_datacenter_br7a_files/cluster_uptime_by_datacenter_br7a_jrxml.data index 9f99b16..31519ea 100644 --- a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/cluster_uptime_by_datacenter_br7a_files/cluster_uptime_by_datacenter_br7a_jrxml.data +++ b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/cluster_uptime_by_datacenter_br7a_files/cluster_uptime_by_datacenter_br7a_jrxml.data @@ -58,7 +58,7 @@ FROM v3_5_configuration_history_clusters Where datacenter_id = cast($P{P_DataCenter_ID} as uuid)) AND history_datetime >= cast($P{P_Start_Date} as timestamp) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' diff --git a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/virtual_servers_uptime_by_cluster_br14a_files/virtual_servers_uptime_by_cluster_br14a_jrxml.data b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/virtual_servers_uptime_by_cluster_br14a_files/virtual_servers_uptime_by_cluster_br14a_jrxml.data index 41f9006..4b1ca77 100644 --- a/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/virtual_servers_uptime_by_cluster_br14a_files/virtual_servers_uptime_by_cluster_br14a_jrxml.data +++ b/packaging/ovirt-reports/resources/reports_resources/embedded_reports/Uptime_Dashboard/virtual_servers_uptime_by_cluster_br14a_files/virtual_servers_uptime_by_cluster_br14a_jrxml.data @@ -60,7 +60,7 @@ AND v3_5_configuration_history_vms.vm_type = 1 AND high_availability = TRUE AND history_datetime >= cast($P{P_Start_Date} as timestamp) - AND history_datetime <= CASE + AND history_datetime < CASE WHEN $P{P_Period} = 0 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 day' WHEN $P{P_Period} = 1 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '1 month' WHEN $P{P_Period} = 2 THEN CAST($P{P_Start_Date} as TIMESTAMP) + interval '3 month' -- To view, visit http://gerrit.ovirt.org/27711 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc1a798aa9b7319d89490ca4ef859ab4dda26598 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Shirly Radco <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
