Yaniv Dary has uploaded a new change for review. Change subject: history: changed vm ip cloumn to text (#953148) ......................................................................
history: changed vm ip cloumn to text (#953148) This is to match the engine type and allow almost unlimited ip amount per vm. Bug-Url: https://bugzilla.redhat.com/953148 Change-Id: Ifdf493916b22cd53fc36b36ec128add43e655941 Signed-off-by: Yaniv Dary <[email protected]> --- M data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item M data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.properties M data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.item M data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.properties M data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.item M data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.properties M data-warehouse/historydbscripts_postgres/create_views_3_0.sql M data-warehouse/historydbscripts_postgres/create_views_3_1.sql A data-warehouse/historydbscripts_postgres/upgrade/03_02_0070_changed_vm_ip_column_to_text.sql 9 files changed, 26 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/37/14437/1 diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item index 14aefd3..f42aec2 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item +++ b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.item @@ -1032,7 +1032,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="memory_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1061,7 +1061,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="memory_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1192,7 +1192,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="max_user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="max_system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1324,7 +1324,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="max_user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="max_system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1343,7 +1343,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="max_user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="max_system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.properties b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.properties index 108f606..d843fa9 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.properties +++ b/data-warehouse/history_etl/tos_project/process/AggregationToDaily_3.2.properties @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"; xmlns:TalendProperties="http://www.talend.org/properties";> - <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" id="_s0iQoFShEeCW44CWrpjEnA" label="AggregationToDaily" creationDate="2011-07-06T14:17:29.833+0300" modificationDate="2013-01-15T14:27:27.192+0200" version="3.2" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToDaily"> + <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" id="_s0iQoFShEeCW44CWrpjEnA" label="AggregationToDaily" creationDate="2011-07-06T14:17:29.833+0300" modificationDate="2013-05-05T15:18:41.945+0300" version="3.2" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToDaily"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_s1bogFShEeCW44CWrpjEnA" path=""/> diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.item b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.item index bed24d0..8e7ea3d 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.item +++ b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.item @@ -1032,7 +1032,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="memory_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1061,7 +1061,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="memory_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1192,7 +1192,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="max_user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="max_system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1324,7 +1324,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="max_user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="max_system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1343,7 +1343,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="max_user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="max_system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> diff --git a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.properties b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.properties index 1a0f793..e7436f8 100644 --- a/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.properties +++ b/data-warehouse/history_etl/tos_project/process/AggregationToHourly_3.2.properties @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"; xmlns:TalendProperties="http://www.talend.org/properties";> - <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" id="_6qsvkEi2EeCv8PaoeAjHHg" label="AggregationToHourly" creationDate="2011-07-06T14:17:18.376+0300" modificationDate="2013-01-15T14:27:03.519+0200" version="3.2" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToHourly"> + <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" id="_6qsvkEi2EeCv8PaoeAjHHg" label="AggregationToHourly" creationDate="2011-07-06T14:17:18.376+0300" modificationDate="2013-05-05T15:19:24.316+0300" version="3.2" statusCode="" item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToHourly"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_6qukwUi2EeCv8PaoeAjHHg" path=""/> diff --git a/data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.item b/data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.item index 52c6a00..41116b8 100644 --- a/data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.item +++ b/data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.item @@ -1043,7 +1043,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="memory_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1275,7 +1275,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="memory_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> @@ -1290,7 +1290,7 @@ <column comment="" defaultValue=""0"" key="false" length="2" name="memory_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="user_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> <column comment="" defaultValue=""0"" key="false" length="2" name="system_cpu_usage_percent" nullable="true" pattern="" precision="0" sourceType="INT2" type="id_Short"/> - <column comment="" key="false" length="255" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> + <column comment="" key="false" name="vm_ip" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="255" name="current_user_name" nullable="true" pattern="" precision="0" sourceType="VARCHAR" type="id_String"/> <column comment="" key="false" length="16" name="currently_running_on_host" nullable="true" pattern="" precision="0" sourceType="POINT" type="id_Object"/> <column comment="" key="false" length="4" name="vm_configuration_version" nullable="true" pattern="" precision="0" sourceType="INT4" type="id_Integer"/> diff --git a/data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.properties b/data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.properties index 142453a..fa77954 100644 --- a/data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.properties +++ b/data-warehouse/history_etl/tos_project/process/StatisticsSync_3.2.properties @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"; xmlns:TalendProperties="http://www.talend.org/properties";> - <TalendProperties:Property xmi:id="_oWT9MVRyEeCEMvYqeevraA" id="_oWT9MFRyEeCEMvYqeevraA" label="StatisticsSync" creationDate="2011-07-06T14:16:52.840+0300" modificationDate="2013-01-02T13:48:17.236+0200" version="3.2" statusCode="" item="_oWT9M1RyEeCEMvYqeevraA" displayName="StatisticsSync"> + <TalendProperties:Property xmi:id="_oWT9MVRyEeCEMvYqeevraA" id="_oWT9MFRyEeCEMvYqeevraA" label="StatisticsSync" creationDate="2011-07-06T14:16:52.840+0300" modificationDate="2013-05-05T15:20:14.762+0300" version="3.2" statusCode="" item="_oWT9M1RyEeCEMvYqeevraA" displayName="StatisticsSync"> <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/> </TalendProperties:Property> <TalendProperties:ItemState xmi:id="_oWT9MlRyEeCEMvYqeevraA" path=""/> diff --git a/data-warehouse/historydbscripts_postgres/create_views_3_0.sql b/data-warehouse/historydbscripts_postgres/create_views_3_0.sql index 19a9bed..23c3040 100644 --- a/data-warehouse/historydbscripts_postgres/create_views_3_0.sql +++ b/data-warehouse/historydbscripts_postgres/create_views_3_0.sql @@ -494,7 +494,7 @@ a.memory_usage_percent as memory_usage_percent, a.user_cpu_usage_percent as user_cpu_usage_percent, a.system_cpu_usage_percent as system_cpu_usage_percent, - a.vm_ip as vm_ip, + cast(a.vm_ip as varchar(255)) as vm_ip, a.currently_running_on_host as currently_running_on_host, a.current_user_name as current_user_name, b.disks_usage as disks_usage, @@ -520,7 +520,7 @@ a.max_user_cpu_usage_percent as max_user_cpu_usage_percent, a.system_cpu_usage_percent as system_cpu_usage_percent, a.max_system_cpu_usage_percent as max_system_cpu_usage_percent, - a.vm_ip as vm_ip, + cast(a.vm_ip as varchar(255)) as vm_ip, a.currently_running_on_host as currently_running_on_host, a.current_user_name as current_user_name, b.disks_usage as disks_usage, @@ -546,7 +546,7 @@ a.max_user_cpu_usage_percent as max_user_cpu_usage_percent, a.system_cpu_usage_percent as system_cpu_usage_percent, a.max_system_cpu_usage_percent as max_system_cpu_usage_percent, - a.vm_ip as vm_ip, + cast(a.vm_ip as varchar(255)) as vm_ip, a.currently_running_on_host as currently_running_on_host, a.current_user_name as current_user_name, b.disks_usage as disks_usage, diff --git a/data-warehouse/historydbscripts_postgres/create_views_3_1.sql b/data-warehouse/historydbscripts_postgres/create_views_3_1.sql index 69c3e9b..98166df 100644 --- a/data-warehouse/historydbscripts_postgres/create_views_3_1.sql +++ b/data-warehouse/historydbscripts_postgres/create_views_3_1.sql @@ -498,7 +498,7 @@ a.memory_usage_percent as memory_usage_percent, a.user_cpu_usage_percent as user_cpu_usage_percent, a.system_cpu_usage_percent as system_cpu_usage_percent, - a.vm_ip as vm_ip, + cast(a.vm_ip as varchar(255)) as vm_ip, a.currently_running_on_host as currently_running_on_host, a.current_user_name as current_user_name, b.disks_usage as disks_usage, @@ -524,7 +524,7 @@ a.max_user_cpu_usage_percent as max_user_cpu_usage_percent, a.system_cpu_usage_percent as system_cpu_usage_percent, a.max_system_cpu_usage_percent as max_system_cpu_usage_percent, - a.vm_ip as vm_ip, + cast(a.vm_ip as varchar(255)) as vm_ip, a.currently_running_on_host as currently_running_on_host, a.current_user_name as current_user_name, b.disks_usage as disks_usage, @@ -550,7 +550,7 @@ a.max_user_cpu_usage_percent as max_user_cpu_usage_percent, a.system_cpu_usage_percent as system_cpu_usage_percent, a.max_system_cpu_usage_percent as max_system_cpu_usage_percent, - a.vm_ip as vm_ip, + cast(a.vm_ip as varchar(255)) as vm_ip, a.currently_running_on_host as currently_running_on_host, a.current_user_name as current_user_name, b.disks_usage as disks_usage, diff --git a/data-warehouse/historydbscripts_postgres/upgrade/03_02_0070_changed_vm_ip_column_to_text.sql b/data-warehouse/historydbscripts_postgres/upgrade/03_02_0070_changed_vm_ip_column_to_text.sql new file mode 100644 index 0000000..d3b76c3 --- /dev/null +++ b/data-warehouse/historydbscripts_postgres/upgrade/03_02_0070_changed_vm_ip_column_to_text.sql @@ -0,0 +1,4 @@ +-- Changed vm_ip type to text to allow match engine and allow more then 18 ip per vm +ALTER TABLE vm_samples_history ALTER COLUMN vm_ip TYPE text; +ALTER TABLE vm_hourly_history ALTER COLUMN vm_ip TYPE text; +ALTER TABLE vm_daily_history ALTER COLUMN vm_ip TYPE text; -- To view, visit http://gerrit.ovirt.org/14437 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifdf493916b22cd53fc36b36ec128add43e655941 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Yaniv Dary <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
