Yaniv Dary has uploaded a new change for review. Change subject: reports: added storage count to webadmin dashboards (#854949) ......................................................................
reports: added storage count to webadmin dashboards (#854949) Webadmin dashboards now display storage domains count in entities counts list in datacenter and system. Bug-Url: https://bugzilla.redhat.com/854949 Change-Id: Ibdfd2a6a215380253fcf7f7db3fd61016bea5c93 Signed-off-by: Yaniv Dary <yd...@redhat.com> --- M reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/dc_entities_counts_list_dr2_files/dc_entities_counts_list_dr2_jrxml.data M reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/system_dashboard/system_entities_counts_list_dr1_files/system_entities_counts_list_dr1_jrxml.data M reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/dc_entities_counts_list_dr2_jrxml.data M reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/system_dashboard_files/system_entities_counts_list_dr1_jrxml.data 4 files changed, 166 insertions(+), 30 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/26/10226/1 diff --git a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/dc_entities_counts_list_dr2_files/dc_entities_counts_list_dr2_jrxml.data b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/dc_entities_counts_list_dr2_files/dc_entities_counts_list_dr2_jrxml.data index 3313f29..ad10a72 100644 --- a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/dc_entities_counts_list_dr2_files/dc_entities_counts_list_dr2_jrxml.data +++ b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/dc_entities_counts_list_dr2_files/dc_entities_counts_list_dr2_jrxml.data @@ -5,6 +5,17 @@ <property name="ireport.y" value="0"/> <property name="ireport.jasperserver.reportUnit" value="/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/dc_entities_counts_list_dr2"/> <property name="ireport.jasperserver.url" value="http://localhost:8080/jasperserver-pro/services/repository"/> + <subDataset name="storage_count" uuid="6b400e6b-94db-4d9e-af5e-48b1d52f3ad3"> + <parameter name="P_DataCenter_ID" class="java.lang.String"> + <defaultValueExpression><![CDATA[]]></defaultValueExpression> + </parameter> + <queryString> + <![CDATA[SELECT count(DISTINCT v3_2_latest_map_datacenters_storage_domains.storage_domain_id) AS storage_count +FROM v3_2_latest_map_datacenters_storage_domains +WHERE v3_2_latest_map_datacenters_storage_domains.datacenter_id = CAST($P{P_DataCenter_ID} as UUID)]]> + </queryString> + <field name="storage_count" class="java.lang.Long"/> + </subDataset> <parameter name="P_DataCenter_ID" class="java.lang.String"> <defaultValueExpression><![CDATA[]]></defaultValueExpression> </parameter> @@ -30,47 +41,72 @@ <imageExpression><![CDATA["repo:statisticBackground.png"]]></imageExpression> </image> <textField> - <reportElement uuid="8d6c9321-cc54-4bcb-9c8c-0cbd26f00733" x="53" y="36" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="8d6c9321-cc54-4bcb-9c8c-0cbd26f00733" x="48" y="49" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.clusters} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="86975072-5897-4e0b-aebf-1e62e8d5d278" x="53" y="65" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="86975072-5897-4e0b-aebf-1e62e8d5d278" x="48" y="78" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.hosts} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="1136c449-cade-4127-a362-56243273bfd7" x="53" y="94" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="1136c449-cade-4127-a362-56243273bfd7" x="48" y="107" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.vms} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="83d3568a-345e-4e3f-947e-86105f8fb7e3" x="238" y="36" width="103" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="83d3568a-345e-4e3f-947e-86105f8fb7e3" x="233" y="49" width="103" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{cluster_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="c7d3954a-6faf-46a5-844b-f9bf5489d6f5" x="238" y="65" width="103" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="c7d3954a-6faf-46a5-844b-f9bf5489d6f5" x="233" y="78" width="103" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{host_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="5de18132-8c05-4a51-be5a-35d35d2cfac0" x="238" y="94" width="103" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="5de18132-8c05-4a51-be5a-35d35d2cfac0" x="233" y="107" width="103" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{vm_count}.toString()]]></textFieldExpression> </textField> + <componentElement> + <reportElement uuid="932508db-67df-4e7b-a749-a06d8d16a5b8" x="48" y="20" width="288" height="29"/> + <jr:list xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components"; xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd";> + <datasetRun subDataset="storage_count" uuid="c277a795-0665-4798-b54c-e68247c4dd03"> + <parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression> + <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression> + </datasetRun> + <jr:listContents height="29" width="288"> + <textField> + <reportElement uuid="8d6c9321-cc54-4bcb-9c8c-0cbd26f00733" x="0" y="0" width="185" height="29" forecolor="#FFFFFF"/> + <textElement verticalAlignment="Middle"> + <font fontName="SansSerif" size="16" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{dr.count.list.storage.domains} + ":"]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="83d3568a-345e-4e3f-947e-86105f8fb7e3" x="185" y="0" width="103" height="29" forecolor="#FFFFFF"/> + <textElement verticalAlignment="Middle"> + <font fontName="SansSerif" size="16" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{storage_count}.toString()]]></textFieldExpression> + </textField> + </jr:listContents> + </jr:list> + </componentElement> </band> </summary> </jasperReport> diff --git a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/system_dashboard/system_entities_counts_list_dr1_files/system_entities_counts_list_dr1_jrxml.data b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/system_dashboard/system_entities_counts_list_dr1_files/system_entities_counts_list_dr1_jrxml.data index fec105f..a36fba5 100644 --- a/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/system_dashboard/system_entities_counts_list_dr1_files/system_entities_counts_list_dr1_jrxml.data +++ b/reports/repository_files/resources/reports_resources/embedded_reports/webadmin_dashboards/system_dashboard/system_entities_counts_list_dr1_files/system_entities_counts_list_dr1_jrxml.data @@ -3,8 +3,15 @@ <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> <property name="ireport.y" value="0"/> - <property name="ireport.jasperserver.reportUnit" value="/reports_resources/webadmin_dashboards/ce/system_dashboard"/> + <property name="ireport.jasperserver.reportUnit" value="/reports_resources/embedded_reports/webadmin_dashboards/system_dashboard/system_entities_counts_list_dr1"/> <property name="ireport.jasperserver.url" value="http://localhost:8080/jasperserver-pro/services/repository"/> + <subDataset name="storage_count" uuid="6b400e6b-94db-4d9e-af5e-48b1d52f3ad3"> + <queryString> + <![CDATA[SELECT count(DISTINCT v3_2_latest_map_datacenters_storage_domains.storage_domain_id) AS storage_count +FROM v3_2_latest_map_datacenters_storage_domains]]> + </queryString> + <field name="storage_count" class="java.lang.Long"/> + </subDataset> <queryString> <![CDATA[SELECT (SELECT count(*) FROM v3_2_latest_configuration_datacenters) as datacenter_count, @@ -29,61 +36,86 @@ <imageExpression><![CDATA["repo:statisticBackground.png"]]></imageExpression> </image> <textField> - <reportElement uuid="d9500157-7619-4087-b69c-8cbff5d32bde" x="72" y="108" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="d9500157-7619-4087-b69c-8cbff5d32bde" x="72" y="122" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.vms} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="fbf312f1-5432-4d15-a63b-331bb6c21f6d" x="72" y="50" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="fbf312f1-5432-4d15-a63b-331bb6c21f6d" x="72" y="64" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.clusters} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="54570099-b6d1-4e65-b8b9-3baec002d4f8" x="72" y="79" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="54570099-b6d1-4e65-b8b9-3baec002d4f8" x="72" y="93" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.hosts} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="398df013-3a8d-4d7c-ae47-44c32c170961" x="72" y="21" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="398df013-3a8d-4d7c-ae47-44c32c170961" x="72" y="35" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.dcs} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="fac2aef7-3c33-4a9e-90b6-8b4847231ac4" x="257" y="108" width="92" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="fac2aef7-3c33-4a9e-90b6-8b4847231ac4" x="257" y="122" width="92" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{vm_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="fefe9984-7161-4d6b-9f85-9a05a52659bb" x="257" y="79" width="92" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="fefe9984-7161-4d6b-9f85-9a05a52659bb" x="257" y="93" width="92" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{host_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="167068e0-f52b-4bd0-93b9-c8ac8d34c994" x="257" y="50" width="92" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="167068e0-f52b-4bd0-93b9-c8ac8d34c994" x="257" y="64" width="92" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{cluster_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="32772ecd-411f-4778-a96e-bfb31ee466eb" x="257" y="21" width="92" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="32772ecd-411f-4778-a96e-bfb31ee466eb" x="257" y="35" width="92" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{datacenter_count}.toString()]]></textFieldExpression> </textField> + <componentElement> + <reportElement uuid="932508db-67df-4e7b-a749-a06d8d16a5b8" x="72" y="6" width="277" height="29"/> + <jr:list xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components"; xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd";> + <datasetRun subDataset="storage_count" uuid="c277a795-0665-4798-b54c-e68247c4dd03"> + <parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression> + <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression> + </datasetRun> + <jr:listContents height="29" width="277"> + <textField> + <reportElement uuid="8d6c9321-cc54-4bcb-9c8c-0cbd26f00733" x="0" y="0" width="185" height="29" forecolor="#FFFFFF"/> + <textElement verticalAlignment="Middle"> + <font fontName="SansSerif" size="16" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{dr.count.list.storage.domains} + ":"]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="83d3568a-345e-4e3f-947e-86105f8fb7e3" x="185" y="0" width="92" height="29" forecolor="#FFFFFF"/> + <textElement verticalAlignment="Middle"> + <font fontName="SansSerif" size="16" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{storage_count}.toString()]]></textFieldExpression> + </textField> + </jr:listContents> + </jr:list> + </componentElement> </band> </summary> </jasperReport> diff --git a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/dc_entities_counts_list_dr2_jrxml.data b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/dc_entities_counts_list_dr2_jrxml.data index 3313f29..ad10a72 100644 --- a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/dc_entities_counts_list_dr2_jrxml.data +++ b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/datacenter_dashboard_files/dc_entities_counts_list_dr2_jrxml.data @@ -5,6 +5,17 @@ <property name="ireport.y" value="0"/> <property name="ireport.jasperserver.reportUnit" value="/reports_resources/embedded_reports/webadmin_dashboards/dc_dashboard/dc_entities_counts_list_dr2"/> <property name="ireport.jasperserver.url" value="http://localhost:8080/jasperserver-pro/services/repository"/> + <subDataset name="storage_count" uuid="6b400e6b-94db-4d9e-af5e-48b1d52f3ad3"> + <parameter name="P_DataCenter_ID" class="java.lang.String"> + <defaultValueExpression><![CDATA[]]></defaultValueExpression> + </parameter> + <queryString> + <![CDATA[SELECT count(DISTINCT v3_2_latest_map_datacenters_storage_domains.storage_domain_id) AS storage_count +FROM v3_2_latest_map_datacenters_storage_domains +WHERE v3_2_latest_map_datacenters_storage_domains.datacenter_id = CAST($P{P_DataCenter_ID} as UUID)]]> + </queryString> + <field name="storage_count" class="java.lang.Long"/> + </subDataset> <parameter name="P_DataCenter_ID" class="java.lang.String"> <defaultValueExpression><![CDATA[]]></defaultValueExpression> </parameter> @@ -30,47 +41,72 @@ <imageExpression><![CDATA["repo:statisticBackground.png"]]></imageExpression> </image> <textField> - <reportElement uuid="8d6c9321-cc54-4bcb-9c8c-0cbd26f00733" x="53" y="36" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="8d6c9321-cc54-4bcb-9c8c-0cbd26f00733" x="48" y="49" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.clusters} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="86975072-5897-4e0b-aebf-1e62e8d5d278" x="53" y="65" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="86975072-5897-4e0b-aebf-1e62e8d5d278" x="48" y="78" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.hosts} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="1136c449-cade-4127-a362-56243273bfd7" x="53" y="94" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="1136c449-cade-4127-a362-56243273bfd7" x="48" y="107" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.vms} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="83d3568a-345e-4e3f-947e-86105f8fb7e3" x="238" y="36" width="103" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="83d3568a-345e-4e3f-947e-86105f8fb7e3" x="233" y="49" width="103" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{cluster_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="c7d3954a-6faf-46a5-844b-f9bf5489d6f5" x="238" y="65" width="103" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="c7d3954a-6faf-46a5-844b-f9bf5489d6f5" x="233" y="78" width="103" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{host_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="5de18132-8c05-4a51-be5a-35d35d2cfac0" x="238" y="94" width="103" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="5de18132-8c05-4a51-be5a-35d35d2cfac0" x="233" y="107" width="103" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{vm_count}.toString()]]></textFieldExpression> </textField> + <componentElement> + <reportElement uuid="932508db-67df-4e7b-a749-a06d8d16a5b8" x="48" y="20" width="288" height="29"/> + <jr:list xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components"; xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd";> + <datasetRun subDataset="storage_count" uuid="c277a795-0665-4798-b54c-e68247c4dd03"> + <parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression> + <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression> + </datasetRun> + <jr:listContents height="29" width="288"> + <textField> + <reportElement uuid="8d6c9321-cc54-4bcb-9c8c-0cbd26f00733" x="0" y="0" width="185" height="29" forecolor="#FFFFFF"/> + <textElement verticalAlignment="Middle"> + <font fontName="SansSerif" size="16" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{dr.count.list.storage.domains} + ":"]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="83d3568a-345e-4e3f-947e-86105f8fb7e3" x="185" y="0" width="103" height="29" forecolor="#FFFFFF"/> + <textElement verticalAlignment="Middle"> + <font fontName="SansSerif" size="16" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{storage_count}.toString()]]></textFieldExpression> + </textField> + </jr:listContents> + </jr:list> + </componentElement> </band> </summary> </jasperReport> diff --git a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/system_dashboard_files/system_entities_counts_list_dr1_jrxml.data b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/system_dashboard_files/system_entities_counts_list_dr1_jrxml.data index fec105f..a36fba5 100644 --- a/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/system_dashboard_files/system_entities_counts_list_dr1_jrxml.data +++ b/reports/repository_files/resources/reports_resources/webadmin_dashboards/ce/system_dashboard_files/system_entities_counts_list_dr1_jrxml.data @@ -3,8 +3,15 @@ <property name="ireport.zoom" value="1.0"/> <property name="ireport.x" value="0"/> <property name="ireport.y" value="0"/> - <property name="ireport.jasperserver.reportUnit" value="/reports_resources/webadmin_dashboards/ce/system_dashboard"/> + <property name="ireport.jasperserver.reportUnit" value="/reports_resources/embedded_reports/webadmin_dashboards/system_dashboard/system_entities_counts_list_dr1"/> <property name="ireport.jasperserver.url" value="http://localhost:8080/jasperserver-pro/services/repository"/> + <subDataset name="storage_count" uuid="6b400e6b-94db-4d9e-af5e-48b1d52f3ad3"> + <queryString> + <![CDATA[SELECT count(DISTINCT v3_2_latest_map_datacenters_storage_domains.storage_domain_id) AS storage_count +FROM v3_2_latest_map_datacenters_storage_domains]]> + </queryString> + <field name="storage_count" class="java.lang.Long"/> + </subDataset> <queryString> <![CDATA[SELECT (SELECT count(*) FROM v3_2_latest_configuration_datacenters) as datacenter_count, @@ -29,61 +36,86 @@ <imageExpression><![CDATA["repo:statisticBackground.png"]]></imageExpression> </image> <textField> - <reportElement uuid="d9500157-7619-4087-b69c-8cbff5d32bde" x="72" y="108" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="d9500157-7619-4087-b69c-8cbff5d32bde" x="72" y="122" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.vms} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="fbf312f1-5432-4d15-a63b-331bb6c21f6d" x="72" y="50" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="fbf312f1-5432-4d15-a63b-331bb6c21f6d" x="72" y="64" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.clusters} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="54570099-b6d1-4e65-b8b9-3baec002d4f8" x="72" y="79" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="54570099-b6d1-4e65-b8b9-3baec002d4f8" x="72" y="93" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.hosts} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="398df013-3a8d-4d7c-ae47-44c32c170961" x="72" y="21" width="185" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="398df013-3a8d-4d7c-ae47-44c32c170961" x="72" y="35" width="185" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$R{dr.count.list.dcs} + ":"]]></textFieldExpression> </textField> <textField> - <reportElement uuid="fac2aef7-3c33-4a9e-90b6-8b4847231ac4" x="257" y="108" width="92" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="fac2aef7-3c33-4a9e-90b6-8b4847231ac4" x="257" y="122" width="92" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{vm_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="fefe9984-7161-4d6b-9f85-9a05a52659bb" x="257" y="79" width="92" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="fefe9984-7161-4d6b-9f85-9a05a52659bb" x="257" y="93" width="92" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{host_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="167068e0-f52b-4bd0-93b9-c8ac8d34c994" x="257" y="50" width="92" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="167068e0-f52b-4bd0-93b9-c8ac8d34c994" x="257" y="64" width="92" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{cluster_count}.toString()]]></textFieldExpression> </textField> <textField> - <reportElement uuid="32772ecd-411f-4778-a96e-bfb31ee466eb" x="257" y="21" width="92" height="29" forecolor="#FFFFFF"/> + <reportElement uuid="32772ecd-411f-4778-a96e-bfb31ee466eb" x="257" y="35" width="92" height="29" forecolor="#FFFFFF"/> <textElement verticalAlignment="Middle"> <font fontName="SansSerif" size="16" isBold="true"/> </textElement> <textFieldExpression><![CDATA[$F{datacenter_count}.toString()]]></textFieldExpression> </textField> + <componentElement> + <reportElement uuid="932508db-67df-4e7b-a749-a06d8d16a5b8" x="72" y="6" width="277" height="29"/> + <jr:list xmlns:jr="http://jasperreports.sourceforge.net/jasperreports/components"; xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports/components http://jasperreports.sourceforge.net/xsd/components.xsd";> + <datasetRun subDataset="storage_count" uuid="c277a795-0665-4798-b54c-e68247c4dd03"> + <parametersMapExpression><![CDATA[$P{REPORT_PARAMETERS_MAP}]]></parametersMapExpression> + <connectionExpression><![CDATA[$P{REPORT_CONNECTION}]]></connectionExpression> + </datasetRun> + <jr:listContents height="29" width="277"> + <textField> + <reportElement uuid="8d6c9321-cc54-4bcb-9c8c-0cbd26f00733" x="0" y="0" width="185" height="29" forecolor="#FFFFFF"/> + <textElement verticalAlignment="Middle"> + <font fontName="SansSerif" size="16" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$R{dr.count.list.storage.domains} + ":"]]></textFieldExpression> + </textField> + <textField> + <reportElement uuid="83d3568a-345e-4e3f-947e-86105f8fb7e3" x="185" y="0" width="92" height="29" forecolor="#FFFFFF"/> + <textElement verticalAlignment="Middle"> + <font fontName="SansSerif" size="16" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$F{storage_count}.toString()]]></textFieldExpression> + </textField> + </jr:listContents> + </jr:list> + </componentElement> </band> </summary> </jasperReport> -- To view, visit http://gerrit.ovirt.org/10226 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibdfd2a6a215380253fcf7f7db3fd61016bea5c93 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <yd...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
