reports: br19 - merged host and vm charts

Now data is displayed in one chart for memory and one chart for
cores to make comparison more logical.

Change-Id: I5bf86d5783f7956b2308fbe915f3559808f4e2bc

diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ClusterCapactityVsUsageTimelineChartCustomizer.java b/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ClusterCapactityVsUsageTimelineChartCustomizer.java
deleted file mode 100644 (file)
index 0a3b59d..0000000
--- a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ClusterCapactityVsUsageTimelineChartCustomizer.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.ovirt.reports.jasper;
-
-
-import java.awt.BasicStroke;
-import java.awt.Shape;
-import java.awt.geom.Rectangle2D;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import org.jfree.chart.JFreeChart;
-import org.jfree.chart.LegendItem;
-import org.jfree.chart.LegendItemCollection;
-import org.jfree.chart.axis.DateAxis;
-import org.jfree.chart.axis.DateTickMarkPosition;
-import org.jfree.chart.axis.DateTickUnit;
-import org.jfree.chart.axis.NumberAxis;
-import org.jfree.chart.axis.ValueAxis;
-import org.jfree.chart.block.BlockBorder;
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYItemRenderer;
-import net.sf.jasperreports.engine.JRChart;
-import net.sf.jasperreports.engine.JRChartCustomizer;
-
-public class ClusterCapactityVsUsageTimelineChartCustomizer implements JRChartCustomizer {
-
-    public void customize(JFreeChart chart, JRChart jasperChart) {
-            long longerThanMonthInMiliseconds = 3064800000L;
-            XYPlot categoryPlot = chart.getXYPlot();
-            XYItemRenderer renderer = chart.getXYPlot().getRenderer();
-
-            categoryPlot.setNoDataMessage("No Data Available");
-            DateAxis domainaxis = (DateAxis) categoryPlot.getDomainAxis();
-            domainaxis.setAutoTickUnitSelection(false);
-            if (domainaxis.getMaximumDate().getTime() - domainaxis.getMinimumDate().getTime() < longerThanMonthInMiliseconds)
-            {
-                domainaxis.setTickUnit(new DateTickUnit(DateTickUnit.DAY,5,new SimpleDateFormat("dd MMM")));
-            }
-            else
-            {
-                domainaxis.setTickUnit(new DateTickUnit(DateTickUnit.DAY,14,new SimpleDateFormat("dd MMM")));
-            }
-            domainaxis.setTickMarkPosition(DateTickMarkPosition.START);
-            domainaxis.setTickMarksVisible(true);
-            domainaxis.setDateFormatOverride(new SimpleDateFormat("dd MMM"));
-            domainaxis.setLabelAngle(Math.PI / 2);
-            domainaxis.setLabelAngle(0);
-
-            renderer.setBaseStroke(
-
-                    new BasicStroke(2.0f, BasicStroke.JOIN_ROUND, BasicStroke.JOIN_BEVEL)
-
-                    );
-
-            ValueAxis rangeAxis = categoryPlot.getRangeAxis();
-            if (rangeAxis instanceof NumberAxis) {
-                NumberAxis axis = (NumberAxis) rangeAxis;
-                axis.setNumberFormatOverride(new DecimalFormat("###,###,###.#"));
-                double upperBound = axis.getUpperBound();
-                int a = (((int) upperBound / 10) * 10) + 10;
-                upperBound = (double) a;
-                axis.setUpperBound(upperBound);
-                double lowerBound = axis.getLowerBound();
-                int a2 = (((int) lowerBound / 10) * 10) - 10;
-                lowerBound = (double) a2;
-                if (lowerBound < (double) 0)
-                {
-                    axis.setLowerBound((double) 0);
-                }
-                else
-                {
-                    axis.setLowerBound(lowerBound);
-                }
-                axis.setAutoRangeMinimumSize(1.0);
-            }
-            rangeAxis.setTickLabelsVisible(true);
-    }
-}

diff --git a/reports/repository_files/resources/Reports/Executive/cluster_capactity_vs_usage_br19_files/cluster_capactity_vs_usage_br19_jrxml.data b/reports/repository_files/resources/Reports/Executive/cluster_capactity_vs_usage_br19_files/cluster_capactity_vs_usage_br19_jrxml.data
index 9d143bb..ff8f8ad 100644 (file)
--- a/reports/repository_files/resources/Reports/Executive/cluster_capactity_vs_usage_br19_files/cluster_capactity_vs_usage_br19_jrxml.data
+++ b/reports/repository_files/resources/Reports/Executive/cluster_capactity_vs_usage_br19_files/cluster_capactity_vs_usage_br19_jrxml.data
@@ -4,68 +4,7 @@
     <property name="ireport.jasperserver.url" value="http://localhost:8080/jasperserver/services/repository"/>
     <property name="ireport.zoom" value="1.0"/>
     <property name="ireport.x" value="0"/>
-    <property name="ireport.y" value="0"/>
-    <subDataset name="vm_stats">
-        <parameter name="P_DataCenter_ID" class="java.lang.String">
-            <parameterDescription><![CDATA[Select a DataCenter]]></parameterDescription>
-            <defaultValueExpression><![CDATA["00000000-0000-0000-0000-000000000000"]]></defaultValueExpression>
-        </parameter>
-        <parameter name="P_End_Date" class="java.lang.String">
-            <defaultValueExpression><![CDATA["01/01/2011"]]></defaultValueExpression>
-        </parameter>
-        <parameter name="P_Cluster_ID" class="java.lang.String">
-            <parameterDescription><![CDATA[Select a Cluster]]></parameterDescription>
-            <defaultValueExpression><![CDATA["00000000-0000-0000-0000-000000000000"]]></defaultValueExpression>
-        </parameter>
-        <parameter name="P_Start_Date" class="java.lang.String">
-            <defaultValueExpression><![CDATA["01/01/2011"]]></defaultValueExpression>
-        </parameter>
-        <parameter name="Active_VMs" class="java.lang.String">
-            <defaultValueExpression><![CDATA["AND delete_date IS NULL"]]></defaultValueExpression>
-        </parameter>
-        <queryString>
-            <![CDATA[-- vms CPU Cores Total and vms Physical Memory Total
-SELECT DISTINCT the_date, cpu_cores_total, mem_total
-from (SELECT nested_query.history_datetime, SUM(nested_query.cpu_cores) as cpu_cores_total, SUM(nested_query.mem_total) as mem_total
-      FROM  (SELECT history_datetime,
-                    v3_0_vm_configuration_view.vm_id,
-                    SUM(coalesce(v3_0_vm_configuration_view.cpu_per_socket,0)*coalesce(v3_0_vm_configuration_view.number_of_sockets,0)*minutes_in_status)/SUM(minutes_in_status) AS cpu_cores,
-                    SUM(coalesce(v3_0_vm_configuration_view.memory_size_mb,0)*minutes_in_status)/SUM(minutes_in_status) AS mem_total
-              FROM v3_0_vm_daily_history_view
-                  INNER JOIN v3_0_vm_configuration_view
-                      ON (v3_0_vm_configuration_view.history_id = v3_0_vm_daily_history_view.vm_configuration_version)
-                  INNER JOIN v3_0_vm_configuration_view a
-                      ON (a.vm_id = v3_0_vm_daily_history_view.vm_id)
-              WHERE v3_0_vm_daily_history_view.vm_status = 1
-                    AND v3_0_vm_configuration_view.cluster_id in (SELECT v3_0_cluster_configuration_view.cluster_id
-                                                                  FROM v3_0_cluster_configuration_view
-                                                                   WHERE v3_0_cluster_configuration_view.datacenter_id = cast($P{P_DataCenter_ID} as uuid))
-                    AND v3_0_vm_configuration_view.cluster_id = CASE $P{P_Cluster_ID}
-                                                                    WHEN '11111111-1111-1111-1111-111111111111' then v3_0_vm_configuration_view.cluster_id
-                                                                    ELSE cast($P{P_Cluster_ID} as uuid)
-                                                                END
-                    AND history_datetime >= cast($P{P_Start_Date} as date)
-                    AND history_datetime < cast($P{P_End_Date} as date) + interval '1 day'
-                    AND a.history_id in (SELECT max(b.history_id)
-                                         FROM v3_0_vm_configuration_view b
-                                         GROUP BY b.vm_id)
-                    AND CASE
-                            WHEN $P{Active_VMs} like 'AND%' THEN a.delete_date IS NULL
-                            ELSE a.delete_date IS NULL or a.delete_date IS NOT NULL
-                        END
-                    GROUP BY history_datetime, v3_0_vm_configuration_view.vm_id) as nested_query
-      GROUP BY nested_query.history_datetime) as query_run
-          RIGHT OUTER JOIN calendar
-              ON (query_run.history_datetime = calendar.the_date)
-where the_date >= cast($P{P_Start_Date} as date)
-      AND the_date < cast($P{P_End_Date} as date) + interval '1 day'
-GROUP BY the_date, cpu_cores_total, mem_total
-order by the_date]]>
-        </queryString>
-        <field name="the_date" class="java.sql.Date"/>
-        <field name="cpu_cores_total" class="java.math.BigDecimal"/>
-        <field name="mem_total" class="java.math.BigDecimal"/>
-    </subDataset>
+    <property name="ireport.y" value="37"/>
     <parameter name="P_DataCenter_ID" class="java.lang.String">
         <parameterDescription><![CDATA[Select a DataCenter]]></parameterDescription>
         <defaultValueExpression><![CDATA["f2623846-26dc-4b00-8369-33adceb2a7ea"]]></defaultValueExpression>
@@ -94,43 +33,77 @@ order by the_date]]>
     </parameter>
     <queryString>
         <![CDATA[-- Hosts CPU Cores Total and Hosts Physical Memory Total
-SELECT DISTINCT the_date, cpu_cores, mem_avg
-FROM (SELECT history_datetime,
-             SUM(coalesce(v3_0_host_configuration_view.number_of_cores,0)*minutes_in_status)/SUM(minutes_in_status) AS cpu_cores,
-             SUM(coalesce(v3_0_host_configuration_view.memory_size_mb,0)*minutes_in_status)/SUM(minutes_in_status) AS mem_avg
-       FROM v3_0_host_daily_history_view
-           INNER JOIN v3_0_host_configuration_view
-               ON (v3_0_host_configuration_view.history_id = v3_0_host_daily_history_view.host_configuration_version)
-           INNER JOIN v3_0_host_configuration_view a
-               ON (a.host_id = v3_0_host_daily_history_view.host_id)
-       WHERE v3_0_host_daily_history_view.host_status = 1
-              AND v3_0_host_configuration_view.cluster_id in (SELECT v3_0_cluster_configuration_view.cluster_id
-                                                              FROM v3_0_cluster_configuration_view
-                                                              WHERE v3_0_cluster_configuration_view.datacenter_id = cast($P{P_DataCenter_ID} as uuid))
-              AND v3_0_host_configuration_view.cluster_id = CASE $P{P_Cluster_ID}
-                                                                WHEN '11111111-1111-1111-1111-111111111111' then v3_0_host_configuration_view.cluster_id
-                                                                ELSE cast($P{P_Cluster_ID} as uuid)
-                                                            END
-              AND history_datetime >= cast($P{P_Start_Date} as date)
-              AND history_datetime < cast($P{P_End_Date} as date) + interval '1 day'
-              AND a.history_id in (SELECT max(b.history_id)
-                                   FROM v3_0_host_configuration_view b
-                                   GROUP BY b.host_id)
-              AND CASE
-                      WHEN $P{Active_VMs} like 'AND%' THEN a.delete_date IS NULL
-                      ELSE a.delete_date IS NULL or a.delete_date IS NOT NULL
-                  END
-       GROUP BY history_datetime) as query_run
-           RIGHT OUTER JOIN calendar
-               ON (query_run.history_datetime = calendar.the_date)
+SELECT DISTINCT the_date, host_cpu_cores, host_mem_avg, vm_cpu_cores_total, vm_mem_total
+FROM (SELECT t.history_datetime,
+             host_cpu_cores,
+             host_mem_avg,
+             vm_cpu_cores_total,
+             vm_mem_total
+      FROM (SELECT history_datetime,
+                   SUM(coalesce(v3_0_host_configuration_view.number_of_cores,0)*minutes_in_status)/SUM(minutes_in_status) AS host_cpu_cores,
+                   SUM(coalesce(v3_0_host_configuration_view.memory_size_mb,0)*minutes_in_status)/SUM(minutes_in_status) AS host_mem_avg
+            FROM v3_0_host_daily_history_view
+                     INNER JOIN v3_0_host_configuration_view
+                         ON (v3_0_host_configuration_view.history_id = v3_0_host_daily_history_view.host_configuration_version)
+                     INNER JOIN v3_0_host_configuration_view a
+                         ON (a.host_id = v3_0_host_daily_history_view.host_id)
+            WHERE v3_0_host_daily_history_view.host_status = 1
+                  AND v3_0_host_configuration_view.cluster_id in (SELECT v3_0_cluster_configuration_view.cluster_id
+                                                                  FROM v3_0_cluster_configuration_view
+                                                                  WHERE v3_0_cluster_configuration_view.datacenter_id = cast($P{P_DataCenter_ID} as uuid))
+                  AND v3_0_host_configuration_view.cluster_id = CASE $P{P_Cluster_ID}
+                                                                    WHEN '11111111-1111-1111-1111-111111111111' then v3_0_host_configuration_view.cluster_id
+                                                                    ELSE cast($P{P_Cluster_ID} as uuid)
+                                                                END
+                  AND history_datetime >= cast($P{P_Start_Date} as date)
+                  AND history_datetime < cast($P{P_End_Date} as date) + interval '1 day'
+                  AND a.history_id in (SELECT max(b.history_id)
+                                       FROM v3_0_host_configuration_view b
+                                       GROUP BY b.host_id)
+                  AND CASE
+                          WHEN $P{Active_VMs} like 'AND%' THEN a.delete_date IS NULL
+                          ELSE a.delete_date IS NULL or a.delete_date IS NOT NULL
+                      END
+            GROUP BY history_datetime) as t INNER JOIN
+           (SELECT nested_query.history_datetime, SUM(nested_query.cpu_cores) as vm_cpu_cores_total, SUM(nested_query.mem_total) as vm_mem_total
+            FROM  (SELECT history_datetime,
+                          v3_0_vm_configuration_view.vm_id,
+                          SUM(coalesce(v3_0_vm_configuration_view.cpu_per_socket,0)*coalesce(v3_0_vm_configuration_view.number_of_sockets,0)*minutes_in_status)/SUM(minutes_in_status) AS cpu_cores,
+                          SUM(coalesce(v3_0_vm_configuration_view.memory_size_mb,0)*minutes_in_status)/SUM(minutes_in_status) AS mem_total
+                   FROM v3_0_vm_daily_history_view
+                            INNER JOIN v3_0_vm_configuration_view
+                                ON (v3_0_vm_configuration_view.history_id = v3_0_vm_daily_history_view.vm_configuration_version)
+                            INNER JOIN v3_0_vm_configuration_view a
+                                ON (a.vm_id = v3_0_vm_daily_history_view.vm_id)
+                   WHERE v3_0_vm_daily_history_view.vm_status = 1
+                         AND v3_0_vm_configuration_view.cluster_id in (SELECT v3_0_cluster_configuration_view.cluster_id
+                                                                       FROM v3_0_cluster_configuration_view
+                                                                       WHERE v3_0_cluster_configuration_view.datacenter_id = cast($P{P_DataCenter_ID} as uuid))
+                         AND v3_0_vm_configuration_view.cluster_id = CASE $P{P_Cluster_ID}
+                                                                         WHEN '11111111-1111-1111-1111-111111111111' then v3_0_vm_configuration_view.cluster_id
+                                                                         ELSE cast($P{P_Cluster_ID} as uuid)
+                                                                     END
+                         AND history_datetime >= cast($P{P_Start_Date} as date)
+                         AND history_datetime < cast($P{P_End_Date} as date) + interval '1 day'
+                         AND a.history_id in (SELECT max(b.history_id)
+                                              FROM v3_0_vm_configuration_view b
+                                              GROUP BY b.vm_id)
+                         AND CASE
+                                 WHEN $P{Active_VMs} like 'AND%' THEN a.delete_date IS NULL
+                                 ELSE a.delete_date IS NULL or a.delete_date IS NOT NULL
+                             END
+                   GROUP BY history_datetime, v3_0_vm_configuration_view.vm_id) as nested_query
+            GROUP BY nested_query.history_datetime) as h ON (h.history_datetime = t.history_datetime)) as query_run
+          RIGHT OUTER JOIN calendar ON (query_run.history_datetime = calendar.the_date)
 WHERE the_date >= cast($P{P_Start_Date} as date)
       AND the_date < cast($P{P_End_Date} as date) + interval '1 day'
-GROUP BY the_date, cpu_cores, mem_avg
 ORDER BY the_date]]>
     </queryString>
     <field name="the_date" class="java.sql.Date"/>
-    <field name="cpu_cores" class="java.math.BigDecimal"/>
-    <field name="mem_avg" class="java.math.BigDecimal"/>
+    <field name="host_cpu_cores" class="java.math.BigDecimal"/>
+    <field name="host_mem_avg" class="java.math.BigDecimal"/>
+    <field name="vm_cpu_cores_total" class="java.math.BigDecimal"/>
+    <field name="vm_mem_total" class="java.math.BigDecimal"/>
     <variable name="CURRENT_PAGE_NUMBER" class="java.lang.Integer" resetType="None" incrementType="Page">
         <variableExpression><![CDATA[$V{PAGE_NUMBER}]]></variableExpression>
         <initialValueExpression><![CDATA[]]></initialValueExpression>
@@ -161,7 +134,7 @@ ORDER BY the_date]]>
                     <subreportParameterExpression><![CDATA[$P{Active_VMs}]]></subreportParameterExpression>
                 </subreportParameter>
                 <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-                <subreportExpression><![CDATA["repo:full details br19.jrxml"]]></subreportExpression>
+                <subreportExpression class="java.lang.String"><![CDATA["repo:full details br19.jrxml"]]></subreportExpression>
             </subreport>
             <line>
                 <reportElement x="0" y="43" width="832" height="1"/>
@@ -171,11 +144,11 @@ ORDER BY the_date]]>
                 <textElement textAlignment="Right">
                     <font fontName="DejaVu Sans" size="11" isBold="false"/>
                 </textElement>
-                <textFieldExpression><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
+                <textFieldExpression class="java.lang.String"><![CDATA[DateFormat.getDateInstance(DateFormat.LONG, $P{REPORT_LOCALE}).format(new Date())]]></textFieldExpression>
             </textField>
             <image>
                 <reportElement x="0" y="0" width="228" height="42"/>
-                <imageExpression><![CDATA["repo:ovirt-icon"]]></imageExpression>
+                <imageExpression class="java.lang.String"><![CDATA["repo:ovirt-icon"]]></imageExpression>
             </image>
         </band>
     </title>
@@ -186,15 +159,15 @@ ORDER BY the_date]]>
                 <textElement textAlignment="Center" verticalAlignment="Middle">
                     <font fontName="DejaVu Sans" size="10"/>
                 </textElement>
-                <textFieldExpression><![CDATA[msg($R{footer.pagination}, $V{CURRENT_PAGE_NUMBER}, $V{PAGE_NUMBER})]]></textFieldExpression>
+                <textFieldExpression class="java.lang.String"><![CDATA[msg($R{footer.pagination}, $V{CURRENT_PAGE_NUMBER}, $V{PAGE_NUMBER})]]></textFieldExpression>
             </textField>
         </band>
     </pageFooter>
     <summary>
         <band height="434">
             <timeSeriesChart>
-                <chart isShowLegend="false" evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.ClusterCapactityVsUsageTimelineChartCustomizer" renderType="draw" theme="ReportsLineBarChartTheme">
-                    <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="220" width="410" height="213"/>
+                <chart isShowLegend="true" evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.FullNameTimelineChartCustomizer" renderType="draw" theme="ReportsLineBarChartTheme">
+                    <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="221" width="832" height="213"/>
                     <box>
                         <pen lineWidth="1.0" lineColor="#3A5F7D"/>
                         <topPen lineWidth="1.0" lineColor="#3A5F7D"/>
@@ -204,7 +177,7 @@ ORDER BY the_date]]>
                     </box>
                     <chartTitle>
                         <font fontName="DejaVu Sans" size="11"/>
-                        <titleExpression><![CDATA[$R{br19.chart.vms.vcores}]]></titleExpression>
+                        <titleExpression><![CDATA[$R{br19.chart.memory.size}]]></titleExpression>
                     </chartTitle>
                     <chartSubtitle>
                         <font fontName="DejaVu Sans"/>
@@ -214,77 +187,22 @@ ORDER BY the_date]]>
                     </chartLegend>
                 </chart>
                 <timeSeriesDataset>
-                    <dataset>
-                        <datasetRun subDataset="vm_stats">
-                            <parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression>
-                            <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-                        </datasetRun>
-                    </dataset>
                     <timeSeries>
-                        <seriesExpression><![CDATA["Average Number of vCores"]]></seriesExpression>
+                        <seriesExpression><![CDATA["Average Host Memory Size (GB)"]]></seriesExpression>
                         <timePeriodExpression><![CDATA[$F{the_date}]]></timePeriodExpression>
-                        <valueExpression><![CDATA[$F{cpu_cores_total}]]></valueExpression>
-                        <labelExpression><![CDATA["Average Number of vCores"]]></labelExpression>
+                        <valueExpression><![CDATA[($F{host_mem_avg}/1024)]]></valueExpression>
+                        <labelExpression><![CDATA["Average Host Memory Size (GB)"]]></labelExpression>
                         <itemHyperlink>
-                            <hyperlinkTooltipExpression><![CDATA[$F{cpu_cores_total}.setScale(2, RoundingMode.HALF_UP).toString()]]></hyperlinkTooltipExpression>
+                            <hyperlinkTooltipExpression><![CDATA[($F{host_mem_avg}/1024).setScale(2, RoundingMode.HALF_UP).toString()]]></hyperlinkTooltipExpression>
                         </itemHyperlink>
                     </timeSeries>
-                </timeSeriesDataset>
-                <timeSeriesPlot isShowLines="true" isShowShapes="false">
-                    <plot orientation="Horizontal" labelRotation="-45.0"/>
-                    <timeAxisLabelExpression><![CDATA[$R{axis.date}]]></timeAxisLabelExpression>
-                    <timeAxisFormat>
-                        <axisFormat labelColor="#666666" verticalTickLabels="false">
-                            <labelFont>
-                                <font fontName="DejaVu Sans" isBold="true"/>
-                            </labelFont>
-                            <tickLabelFont>
-                                <font fontName="SansSerif"/>
-                            </tickLabelFont>
-                        </axisFormat>
-                    </timeAxisFormat>
-                    <valueAxisLabelExpression><![CDATA[$R{axis.number.of.vm.cores}]]></valueAxisLabelExpression>
-                    <valueAxisFormat>
-                        <axisFormat labelColor="#666666" verticalTickLabels="false">
-                            <labelFont>
-                                <font fontName="DejaVu Sans"/>
-                            </labelFont>
-                            <tickLabelFont>
-                                <font fontName="DejaVu Sans"/>
-                            </tickLabelFont>
-                        </axisFormat>
-                    </valueAxisFormat>
-                </timeSeriesPlot>
-            </timeSeriesChart>
-            <timeSeriesChart>
-                <chart isShowLegend="false" evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.ClusterCapactityVsUsageTimelineChartCustomizer" renderType="draw" theme="ReportsLineBarChartTheme">
-                    <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="422" y="1" width="410" height="213"/>
-                    <box>
-                        <pen lineWidth="1.0" lineColor="#3A5F7D"/>
-                        <topPen lineWidth="1.0" lineColor="#3A5F7D"/>
-                        <leftPen lineWidth="1.0" lineColor="#3A5F7D"/>
-                        <bottomPen lineWidth="1.0" lineColor="#3A5F7D"/>
-                        <rightPen lineWidth="1.0" lineColor="#3A5F7D"/>
-                    </box>
-                    <chartTitle>
-                        <font fontName="DejaVu Sans" size="11"/>
-                        <titleExpression><![CDATA[$R{br19.chart.hosts.memory.size}]]></titleExpression>
-                    </chartTitle>
-                    <chartSubtitle>
-                        <font fontName="DejaVu Sans"/>
-                    </chartSubtitle>
-                    <chartLegend position="Bottom">
-                        <font fontName="DejaVu Sans"/>
-                    </chartLegend>
-                </chart>
-                <timeSeriesDataset>
                     <timeSeries>
-                        <seriesExpression><![CDATA["Average Hosts Memory Size (GB)"]]></seriesExpression>
+                        <seriesExpression><![CDATA["Average Virtual Machine Memory Size (GB)"]]></seriesExpression>
                         <timePeriodExpression><![CDATA[$F{the_date}]]></timePeriodExpression>
-                        <valueExpression><![CDATA[($F{mem_avg}/1024)]]></valueExpression>
-                        <labelExpression><![CDATA["Average Hosts Memory Size (GB)"]]></labelExpression>
+                        <valueExpression><![CDATA[($F{vm_mem_total}/1024)]]></valueExpression>
+                        <labelExpression><![CDATA["Average Virtual Machine Memory Size (GB)"]]></labelExpression>
                         <itemHyperlink>
-                            <hyperlinkTooltipExpression><![CDATA[($F{mem_avg}/1024).setScale(2, RoundingMode.HALF_UP).toString()]]></hyperlinkTooltipExpression>
+                            <hyperlinkTooltipExpression><![CDATA[($F{vm_mem_total}/1024).setScale(2, RoundingMode.HALF_UP).toString()]]></hyperlinkTooltipExpression>
                         </itemHyperlink>
                     </timeSeries>
                 </timeSeriesDataset>
@@ -315,8 +233,8 @@ ORDER BY the_date]]>
                 </timeSeriesPlot>
             </timeSeriesChart>
             <timeSeriesChart>
-                <chart isShowLegend="false" evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.ClusterCapactityVsUsageTimelineChartCustomizer" renderType="draw" theme="ReportsLineBarChartTheme">
-                    <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="1" width="410" height="213"/>
+                <chart isShowLegend="true" evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.FullNameTimelineChartCustomizer" renderType="draw" theme="ReportsLineBarChartTheme">
+                    <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="0" y="1" width="832" height="213"/>
                     <box>
                         <pen lineWidth="1.0" lineColor="#3A5F7D"/>
                         <topPen lineWidth="1.0" lineColor="#3A5F7D"/>
@@ -326,7 +244,7 @@ ORDER BY the_date]]>
                     </box>
                     <chartTitle>
                         <font fontName="DejaVu Sans" size="11"/>
-                        <titleExpression><![CDATA[$R{br19.chart.hosts.cores}]]></titleExpression>
+                        <titleExpression><![CDATA[$R{br19.chart.cores}]]></titleExpression>
                     </chartTitle>
                     <chartSubtitle>
                         <font fontName="DejaVu Sans"/>
@@ -337,76 +255,21 @@ ORDER BY the_date]]>
                 </chart>
                 <timeSeriesDataset>
                     <timeSeries>
-                        <seriesExpression><![CDATA["Cores"]]></seriesExpression>
+                        <seriesExpression><![CDATA["Host Cores"]]></seriesExpression>
                         <timePeriodExpression><![CDATA[$F{the_date}]]></timePeriodExpression>
-                        <valueExpression><![CDATA[$F{cpu_cores}]]></valueExpression>
-                        <labelExpression><![CDATA["Cores"]]></labelExpression>
+                        <valueExpression><![CDATA[$F{host_cpu_cores}]]></valueExpression>
+                        <labelExpression><![CDATA["Host Cores"]]></labelExpression>
                         <itemHyperlink>
-                            <hyperlinkTooltipExpression><![CDATA[$F{cpu_cores}.setScale(2, RoundingMode.HALF_UP).toString()]]></hyperlinkTooltipExpression>
+                            <hyperlinkTooltipExpression><![CDATA[$F{host_cpu_cores}.setScale(2, RoundingMode.HALF_UP).toString()]]></hyperlinkTooltipExpression>
                         </itemHyperlink>
                     </timeSeries>
-                </timeSeriesDataset>
-                <timeSeriesPlot isShowLines="true" isShowShapes="false">
-                    <plot orientation="Horizontal" labelRotation="-45.0"/>
-                    <timeAxisLabelExpression><![CDATA[$R{axis.date}]]></timeAxisLabelExpression>
-                    <timeAxisFormat>
-                        <axisFormat labelColor="#666666" verticalTickLabels="false">
-                            <labelFont>
-                                <font fontName="DejaVu Sans" isBold="true"/>
-                            </labelFont>
-                            <tickLabelFont>
-                                <font fontName="SansSerif"/>
-                            </tickLabelFont>
-                        </axisFormat>
-                    </timeAxisFormat>
-                    <valueAxisLabelExpression><![CDATA[$R{axis.number.of.host.cores}]]></valueAxisLabelExpression>
-                    <valueAxisFormat>
-                        <axisFormat labelColor="#666666" verticalTickLabels="false">
-                            <labelFont>
-                                <font fontName="DejaVu Sans"/>
-                            </labelFont>
-                            <tickLabelFont>
-                                <font fontName="DejaVu Sans"/>
-                            </tickLabelFont>
-                        </axisFormat>
-                    </valueAxisFormat>
-                </timeSeriesPlot>
-            </timeSeriesChart>
-            <timeSeriesChart>
-                <chart isShowLegend="false" evaluationTime="Report" customizerClass="com.ovirt.reports.jasper.ClusterCapactityVsUsageTimelineChartCustomizer" renderType="draw" theme="ReportsLineBarChartTheme">
-                    <reportElement stretchType="RelativeToBandHeight" mode="Opaque" x="422" y="220" width="410" height="213"/>
-                    <box>
-                        <pen lineWidth="1.0" lineColor="#3A5F7D"/>
-                        <topPen lineWidth="1.0" lineColor="#3A5F7D"/>
-                        <leftPen lineWidth="1.0" lineColor="#3A5F7D"/>
-                        <bottomPen lineWidth="1.0" lineColor="#3A5F7D"/>
-                        <rightPen lineWidth="1.0" lineColor="#3A5F7D"/>
-                    </box>
-                    <chartTitle>
-                        <font fontName="DejaVu Sans" size="11"/>
-                        <titleExpression><![CDATA[$R{br19.chart.vms.memory.size}]]></titleExpression>
-                    </chartTitle>
-                    <chartSubtitle>
-                        <font fontName="DejaVu Sans"/>
-                    </chartSubtitle>
-                    <chartLegend position="Bottom">
-                        <font fontName="DejaVu Sans"/>
-                    </chartLegend>
-                </chart>
-                <timeSeriesDataset>
-                    <dataset>
-                        <datasetRun subDataset="vm_stats">
-                            <parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression>
-                            <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression>
-                        </datasetRun>
-                    </dataset>
                     <timeSeries>
-                        <seriesExpression><![CDATA["Average Virtual Machines Memory Size (GB)"]]></seriesExpression>
+                        <seriesExpression><![CDATA["Virtual Machines VCores"]]></seriesExpression>
                         <timePeriodExpression><![CDATA[$F{the_date}]]></timePeriodExpression>
-                        <valueExpression><![CDATA[$F{mem_total}/1024]]></valueExpression>
-                        <labelExpression><![CDATA["Average Virtual Machines Memory Size (GB)"]]></labelExpression>
+                        <valueExpression><![CDATA[$F{vm_cpu_cores_total}]]></valueExpression>
+                        <labelExpression><![CDATA["Virtual Machines VCores"]]></labelExpression>
                         <itemHyperlink>
-                            <hyperlinkTooltipExpression><![CDATA[($F{mem_total}/1024).setScale(2, RoundingMode.HALF_UP).toString()]]></hyperlinkTooltipExpression>
+                            <hyperlinkTooltipExpression><![CDATA[$F{vm_cpu_cores_total}.setScale(2, RoundingMode.HALF_UP).toString()]]></hyperlinkTooltipExpression>
                         </itemHyperlink>
                     </timeSeries>
                 </timeSeriesDataset>
@@ -423,7 +286,7 @@ ORDER BY the_date]]>
                             </tickLabelFont>
                         </axisFormat>
                     </timeAxisFormat>
-                    <valueAxisLabelExpression><![CDATA[$R{axis.memory.size.gb}]]></valueAxisLabelExpression>
+                    <valueAxisLabelExpression><![CDATA[$R{axis.number.of.host.cores}]]></valueAxisLabelExpression>
                     <valueAxisFormat>
                         <axisFormat labelColor="#666666" verticalTickLabels="false">
                             <labelFont>

diff --git a/reports/repository_files/resources/Resources/localization/ovirt_reports_bundle_en_US.properties.data b/reports/repository_files/resources/Resources/localization/ovirt_reports_bundle_en_US.properties.data
index a59ff01..e99ace3 100644 (file)
--- a/reports/repository_files/resources/Resources/localization/ovirt_reports_bundle_en_US.properties.data
+++ b/reports/repository_files/resources/Resources/localization/ovirt_reports_bundle_en_US.properties.data
@@ -49,10 +49,8 @@ br9.title=Virtual Machines Inventory in <b>{0}</b> of <b>Data Center {1}</b>
 axis.number.of.host.cores=#Cores
 axis.number.of.vm.cores=#vCores
 axis.memory.size.gb=Memory Size (GB)
-br19.chart.hosts.cores=Average Number of Host Cores (Over Time)
-br19.chart.hosts.memory.size=Average Host Memory Size (Over Time)
-br19.chart.vms.vcores=Average Number of Virtual Machines vCores (Over Time)
-br19.chart.vms.memory.size=Average Virtual Machines Memory Size (Over Time)
+br19.chart.cores=Average Number of Host Cores vs Virtual Machines vCores (Over Time)
+br19.chart.memory.size=Average Host vs Virtual Machines Memory Size (Over Time)
 full.details.show.deleted.entities=Show Deleted Entities
 br19.title=Cluster Capacity Vs. Usage in <b>{0}</b> of <b>Data Center {1}</b>
 br22.table.date=Date