Merge pull request #5237 from imtayadeway/reporting/fix-watermark-per…

…formance-timeframe Change watermark timeframe to 3 months/add region
ManageIQ · Nov 3, 2015 · 472b0c5 · 472b0c5
2 parents ab6f400 + 96cc935
commit 472b0c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...rts/120_Configuration Management - Providers/040_Watermark Host Sockets per Provider.yaml b/...rts/120_Configuration Management - Providers/040_Watermark Host Sockets per Provider.yaml
@@ -9,6 +9,7 @@ rpt_group: Custom
 priority:
 col_order:
 - v_month
+- region_description
 - resource_name
 - derived_host_sockets__max
 timeline:
@@ -20,6 +21,7 @@ include: {}
 db: ExtManagementSystemPerformance
 cols:
 - v_month
+- region_description
 - resource_name
 - derived_host_sockets
 template_type: report
@@ -29,20 +31,22 @@ sortby:
 - resource_name
 headers:
 - Activity Sample - Month (YYYY/MM)
+- Region
 - Asset Name
 - Host Sockets (Max)
 where_clause:
 db_options:
   :interval: daily
   :calc_avgs_by: time_interval
   :end_offset: 0
-  :start_offset: 172800
+  :start_offset: 7776000
 generate_cols:
 generate_rows:
 col_formats:
 -
 -
 -
+-
 tz: UTC
 time_profile_id: 1
 display_filter:

diff --git a/product/reports/120_Configuration Management - Providers/050_Watermark Vms per Provider.yaml b/product/reports/120_Configuration Management - Providers/050_Watermark Vms per Provider.yaml
@@ -9,6 +9,7 @@ rpt_group: Custom
 priority:
 col_order:
 - v_month
+- region_description
 - resource_name
 - derived_vm_count_total__max
 timeline:
@@ -20,6 +21,7 @@ include: {}
 db: ExtManagementSystemPerformance
 cols:
 - v_month
+- region_description
 - resource_name
 - derived_vm_count_total
 template_type: report
@@ -31,18 +33,20 @@ headers:
 - Activity Sample - Month (YYYY/MM)
 - Asset Name
 - VM Count Total (Max)
+- Region
 where_clause:
 db_options:
   :interval: daily
   :calc_avgs_by: time_interval
   :end_offset: 0
-  :start_offset: 172800
+  :start_offset: 7776000
 generate_cols:
 generate_rows:
 col_formats:
 -
 -
 -
+-
 tz:
 time_profile_id:
 display_filter: