Shirly Radco has uploaded a new change for review.

Change subject: history: change date format in aggregation
......................................................................

history: change date format in aggregation

Format lastDayAggr and lastHourAggr timezones
in the aggregation queries, as digits and not as text.

Change-Id: Ic6cb94a248013b1bce8ee9ebd0bc0a2c91b7cbdd
Bug-Url:https://bugzilla.redhat.com/1164125
Signed-off-by: Shirly Radco <sra...@redhat.com>
---
M etl_export/src/ovirt_engine_dwh/aggregationtodaily_3_6/AggregationToDaily.java
M 
etl_export/src/ovirt_engine_dwh/aggregationtohourly_3_6/AggregationToHourly.java
M tos_project/process/AggregationToDaily_3.6.item
M tos_project/process/AggregationToDaily_3.6.properties
M tos_project/process/AggregationToHourly_3.6.item
M tos_project/process/AggregationToHourly_3.6.properties
M tos_project/process/DailyTimeKeepingJob_3.6.item
M tos_project/process/DailyTimeKeepingJob_3.6.properties
8 files changed, 221 insertions(+), 207 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/34/40234/1

diff --git 
a/etl_export/src/ovirt_engine_dwh/aggregationtodaily_3_6/AggregationToDaily.java
 
b/etl_export/src/ovirt_engine_dwh/aggregationtodaily_3_6/AggregationToDaily.java
index c6da51b..d393cdb 100644
--- 
a/etl_export/src/ovirt_engine_dwh/aggregationtodaily_3_6/AggregationToDaily.java
+++ 
b/etl_export/src/ovirt_engine_dwh/aggregationtodaily_3_6/AggregationToDaily.java
@@ -2122,9 +2122,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_1 = "SELECT \n  
history_id, \n  history_datetime, \n  datacenter_id, \n  datacenter_status, \n  
minutes_in_status, \n  datacenter_configuration_version\nFROM 
datacenter_hourly_history\nWHERE history_datetime >= '"
-                                               + context.lastDayAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastDayAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastDayAggr, 1, "dd")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(context.lastDayAggr,
+                                                                               
1, "dd"))
                                                + "'\nORDER BY 
history_datetime,\n               datacenter_id,\n        datacenter_status";
 
                                globalMap.put("tJDBCInput_1_QUERY", 
dbquery_tJDBCInput_1);
@@ -5218,9 +5221,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_2 = "SELECT \n  
history_id, \n  history_datetime, \n  host_id, \n  host_status, \n  
minutes_in_status, \n  memory_usage_percent, \n  ksm_shared_memory_mb,\n  
cpu_usage_percent, \n  ksm_cpu_percent,  \n  active_vms,  \n  total_vms, \n  
total_vms_vcpus, \n  cpu_load, \n  system_cpu_usage_percent,  \n  
user_cpu_usage_percent, \n  swap_used_mb,  \n  host_configuration_version\nFROM 
host_hourly_history\nWHERE history_datetime >= '"
-                                               + context.lastDayAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastDayAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastDayAggr, 1, "dd")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(context.lastDayAggr,
+                                                                               
1, "dd"))
                                                + "'\nORDER BY 
history_datetime,\n               host_id,\n              host_status";
 
                                globalMap.put("tJDBCInput_2_QUERY", 
dbquery_tJDBCInput_2);
@@ -7792,9 +7798,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_3 = "SELECT \n 
history_id, \n history_datetime, \n host_interface_id, \n receive_rate_percent, 
 \n transmit_rate_percent,  \n host_interface_configuration_version\nFROM 
host_interface_hourly_history\nWHERE history_datetime >= '"
-                                               + context.lastDayAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastDayAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastDayAggr, 1, "dd")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(context.lastDayAggr,
+                                                                               
1, "dd"))
                                                + "'\nORDER BY 
history_datetime,\n               host_interface_id";
 
                                globalMap.put("tJDBCInput_3_QUERY", 
dbquery_tJDBCInput_3);
@@ -10514,9 +10523,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_4 = "SELECT \n  
history_id, \n  history_datetime, \n  vm_id, \n  vm_status, \n  
minutes_in_status, \n  cpu_usage_percent,  \n  memory_usage_percent, \n  
user_cpu_usage_percent, \n  system_cpu_usage_percent,\n  vm_ip, \n  
current_user_id,\n  currently_running_on_host, \n  vm_configuration_version, \n 
 current_host_configuration_version\nFROM vm_hourly_history\nWHERE 
history_datetime >= '"
-                                               + context.lastDayAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastDayAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastDayAggr, 1, "dd")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(context.lastDayAggr,
+                                                                               
1, "dd"))
                                                + "'\nORDER BY 
history_datetime,\n               vm_id,\n                vm_status";
 
                                globalMap.put("tJDBCInput_4_QUERY", 
dbquery_tJDBCInput_4);
@@ -12752,9 +12764,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_5 = "SELECT \n  
history_id, \n  history_datetime, \n  vm_interface_id, \n  
receive_rate_percent,  \n  transmit_rate_percent,  \n  
vm_interface_configuration_version\nFROM vm_interface_hourly_history\nWHERE 
history_datetime >= '"
-                                               + context.lastDayAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastDayAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastDayAggr, 1, "dd")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(context.lastDayAggr,
+                                                                               
1, "dd"))
                                                + "'\nORDER BY 
history_datetime,\n               vm_interface_id";
 
                                globalMap.put("tJDBCInput_5_QUERY", 
dbquery_tJDBCInput_5);
@@ -14641,9 +14656,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_11 = "SELECT \n  
history_id, \n  history_datetime, \n  storage_domain_id, \n  
storage_domain_status,\n  minutes_in_status,\n  available_disk_size_gb, \n  
used_disk_size_gb, \n  storage_configuration_version\nFROM 
storage_domain_hourly_history\nWHERE history_datetime >= '"
-                                               + context.lastDayAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastDayAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastDayAggr, 1, "dd")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(context.lastDayAggr,
+                                                                               
1, "dd"))
                                                + "'\nORDER BY 
history_datetime,\n               storage_domain_id";
 
                                globalMap.put("tJDBCInput_11_QUERY", 
dbquery_tJDBCInput_11);
@@ -17285,9 +17303,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_13 = "SELECT 
history_datetime,\n              vm_disk_id,\n        image_id,\n               
 vm_disk_status, \n              minutes_in_status,\n            
vm_disk_actual_size_mb,\n               read_rate_bytes_per_second,\n           
read_latency_seconds,\n         write_rate_bytes_per_second,\n          
write_latency_seconds,\n                flush_latency_seconds,\n                
vm_disk_configuration_version \nFROM vm_disk_hourly_history\nWHERE 
history_datetime >= '"
-                                               + context.lastDayAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastDayAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastDayAggr, 1, "dd")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(context.lastDayAggr,
+                                                                               
1, "dd"))
                                                + "'\nORDER BY 
history_datetime,\n               vm_disk_id, \n                  
vm_disk_status";
 
                                globalMap.put("tJDBCInput_13_QUERY", 
dbquery_tJDBCInput_13);
@@ -20112,9 +20133,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_9 = "SELECT\n  
history_datetime,\n  vm_id,\n  disks_usage\nFROM 
vm_disks_usage_hourly_history\nWHERE history_datetime >= '"
-                                               + context.lastDayAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastDayAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastDayAggr, 1, "dd")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(context.lastDayAggr,
+                                                                               
1, "dd"))
                                                + "'\nORDER BY history_id 
DESC,\n         vm_id";
 
                                globalMap.put("tJDBCInput_9_QUERY", 
dbquery_tJDBCInput_9);
@@ -23372,9 +23396,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_10 = "SELECT\n  
history_id,\n  history_datetime,\n  user_id,\n  user_name,\n  
cast(user_logged_in_to_guest as int),\n  vm_id,\n  session_time_in_minutes,\n  
cpu_usage_percent,\n  memory_usage_percent,\n  user_cpu_usage_percent,\n  
system_cpu_usage_percent,\n  vm_ip,\n  vm_client_ip,\n  
currently_running_on_host,\n  vm_configuration_version,\n  
current_host_configuration_version\nFROM 
statistics_vms_users_usage_hourly\nWHERE history_datetime >= '"
-                                               + context.lastDayAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastDayAggr)
                                                + "'\n  AND history_datetime < 
'"
-                                               + 
TalendDate.addDate(context.lastDayAggr, 1, "dd")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(context.lastDayAggr,
+                                                                               
1, "dd"))
                                                + "'\nORDER BY\n    
history_datetime,\n    user_name,\n    vm_id";
 
                                globalMap.put("tJDBCInput_10_QUERY", 
dbquery_tJDBCInput_10);
@@ -26033,6 +26060,6 @@
        ResumeUtil resumeUtil = null;
 }
 
/************************************************************************************************
- * 741181 characters generated by Talend Open Studio for Data Integration on 
the
- * April 1, 2015 5:03:47 PM IDT
+ * 742261 characters generated by Talend Open Studio for Data Integration on 
the
+ * April 26, 2015 2:31:46 PM IDT
  
************************************************************************************************/
diff --git 
a/etl_export/src/ovirt_engine_dwh/aggregationtohourly_3_6/AggregationToHourly.java
 
b/etl_export/src/ovirt_engine_dwh/aggregationtohourly_3_6/AggregationToHourly.java
index ff0696b..526f9aa 100644
--- 
a/etl_export/src/ovirt_engine_dwh/aggregationtohourly_3_6/AggregationToHourly.java
+++ 
b/etl_export/src/ovirt_engine_dwh/aggregationtohourly_3_6/AggregationToHourly.java
@@ -2155,9 +2155,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_1 = "SELECT 
history_id,\n             history_datetime,\n             datacenter_id,\n      
  datacenter_status,\n            minutes_in_status,\n            
datacenter_configuration_version\nFROM datacenter_samples_history\nWHERE 
history_datetime >= '"
-                                               + context.lastHourAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastHourAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastHourAggr, 1, "HH")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(
+                                                                               
context.lastHourAggr, 1, "HH"))
                                                + "'\nORDER BY 
history_datetime,\n               datacenter_id,\n        datacenter_status";
 
                                globalMap.put("tJDBCInput_1_QUERY", 
dbquery_tJDBCInput_1);
@@ -5251,9 +5254,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_2 = "SELECT \n  
history_id, \n  history_datetime, \n  host_id, \n  host_status, \n  
minutes_in_status, \n  memory_usage_percent, \n  ksm_shared_memory_mb,\n  
cpu_usage_percent, \n  ksm_cpu_percent, \n  active_vms, \n  total_vms, \n  
total_vms_vcpus, \n  cpu_load, \n  system_cpu_usage_percent, \n  
user_cpu_usage_percent, \n  swap_used_mb, \n  host_configuration_version\nFROM 
host_samples_history\nWHERE history_datetime >= '"
-                                               + context.lastHourAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastHourAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastHourAggr, 1, "HH")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(
+                                                                               
context.lastHourAggr, 1, "HH"))
                                                + "'\nORDER BY 
history_datetime,\n               host_id,\n              host_status";
 
                                globalMap.put("tJDBCInput_2_QUERY", 
dbquery_tJDBCInput_2);
@@ -7825,9 +7831,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_3 = "SELECT \n  
history_id, \n  history_datetime, \n  host_interface_id, \n  
receive_rate_percent, \n  transmit_rate_percent, \n  
host_interface_configuration_version\nFROM 
host_interface_samples_history\nWHERE history_datetime >= '"
-                                               + context.lastHourAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastHourAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastHourAggr, 1, "HH")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(
+                                                                               
context.lastHourAggr, 1, "HH"))
                                                + "'\nORDER BY 
history_datetime,\n               host_interface_id";
 
                                globalMap.put("tJDBCInput_3_QUERY", 
dbquery_tJDBCInput_3);
@@ -10571,9 +10580,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_4 = "SELECT \n  
history_id, \n  history_datetime, \n  vm_id, \n  vm_status, \n  
minutes_in_status, \n  cpu_usage_percent, \n  memory_usage_percent, \n  
user_cpu_usage_percent, \n  system_cpu_usage_percent,\n  vm_ip, \n  
current_user_id,\n  user_logged_in_to_guest,\n  currently_running_on_host, \n  
vm_configuration_version, \n  current_host_configuration_version\nFROM 
vm_samples_history\nWHERE history_datetime >= '"
-                                               + context.lastHourAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastHourAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastHourAggr, 1, "HH")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(
+                                                                               
context.lastHourAggr, 1, "HH"))
                                                + "'\nORDER BY 
history_datetime,\n               vm_id,\n                vm_status";
 
                                globalMap.put("tJDBCInput_4_QUERY", 
dbquery_tJDBCInput_4);
@@ -12820,9 +12832,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_5 = "SELECT \n  
history_id, \n  history_datetime, \n  vm_interface_id, \n  
receive_rate_percent, \n  transmit_rate_percent, \n  
vm_interface_configuration_version\nFROM vm_interface_samples_history\nWHERE 
history_datetime >= '"
-                                               + context.lastHourAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastHourAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastHourAggr, 1, "HH")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(
+                                                                               
context.lastHourAggr, 1, "HH"))
                                                + "'\nORDER BY 
history_datetime,\n               vm_interface_id";
 
                                globalMap.put("tJDBCInput_5_QUERY", 
dbquery_tJDBCInput_5);
@@ -14709,9 +14724,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_11 = "SELECT \n  
history_id,\n  history_datetime, \n  storage_domain_id, \n  
storage_domain_status,\n  minutes_in_status,\n  available_disk_size_gb, \n  
used_disk_size_gb, \n  storage_configuration_version\nFROM 
storage_domain_samples_history\nWHERE history_datetime >= '"
-                                               + context.lastHourAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastHourAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastHourAggr, 1, "HH")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(
+                                                                               
context.lastHourAggr, 1, "HH"))
                                                + "'\nORDER BY 
history_datetime,\n               storage_domain_id";
 
                                globalMap.put("tJDBCInput_11_QUERY", 
dbquery_tJDBCInput_11);
@@ -17353,9 +17371,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_13 = "SELECT 
history_datetime,\n              vm_disk_id,\n        image_id,\n               
 vm_disk_status, \n              minutes_in_status,\n            
vm_disk_actual_size_mb,\n               read_rate_bytes_per_second,\n           
read_latency_seconds,\n         write_rate_bytes_per_second,\n          
write_latency_seconds,\n                flush_latency_seconds,\n                
vm_disk_configuration_version \nFROM vm_disk_samples_history\nWHERE 
history_datetime >= '"
-                                               + context.lastHourAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastHourAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastHourAggr, 1, "HH")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(
+                                                                               
context.lastHourAggr, 1, "HH"))
                                                + "'\nORDER BY 
history_datetime,\n               vm_disk_id, \n                  
vm_disk_status";
 
                                globalMap.put("tJDBCInput_13_QUERY", 
dbquery_tJDBCInput_13);
@@ -20693,9 +20714,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_9 = "SELECT\n  
history_datetime,\n  vm_id,\n  disks_usage\nFROM 
vm_disks_usage_samples_history\nWHERE history_datetime >= '"
-                                               + context.lastHourAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastHourAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastHourAggr, 1, "HH")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(
+                                                                               
context.lastHourAggr, 1, "HH"))
                                                + "'\nORDER BY history_id 
DESC,\n         vm_id";
 
                                globalMap.put("tJDBCInput_9_QUERY", 
dbquery_tJDBCInput_9);
@@ -23912,9 +23936,12 @@
                                                .createStatement();
 
                                String dbquery_tJDBCInput_10 = "SELECT \n  
history_id,\n  history_datetime,\n  current_user_id,\n  current_user_name,\n  
cast(user_logged_in_to_guest as int),\n  vm_id,\n  minutes_in_status,\n  
cpu_usage_percent,\n  memory_usage_percent,\n  user_cpu_usage_percent,\n  
system_cpu_usage_percent,\n  vm_ip,\n  vm_client_ip,\n  
currently_running_on_host,\n  vm_configuration_version,\n  
current_host_configuration_version\nFROM vm_samples_history\nWHERE vm_status = 
1\nAND history_datetime >= '"
-                                               + context.lastHourAggr
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(context.lastHourAggr)
                                                + "'\nAND history_datetime < '"
-                                               + 
TalendDate.addDate(context.lastHourAggr, 1, "HH")
+                                               + new 
SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSSSSSZ")
+                                                               
.format(TalendDate.addDate(
+                                                                               
context.lastHourAggr, 1, "HH"))
                                                + "'\nORDER BY 
history_datetime,\n         current_user_name,\n          vm_id";
 
                                globalMap.put("tJDBCInput_10_QUERY", 
dbquery_tJDBCInput_10);
@@ -26570,6 +26597,6 @@
        ResumeUtil resumeUtil = null;
 }
 
/************************************************************************************************
- * 756086 characters generated by Talend Open Studio for Data Integration on 
the
- * April 1, 2015 5:03:45 PM IDT
+ * 757166 characters generated by Talend Open Studio for Data Integration on 
the
+ * April 26, 2015 2:31:45 PM IDT
  
************************************************************************************************/
diff --git a/tos_project/process/AggregationToDaily_3.6.item 
b/tos_project/process/AggregationToDaily_3.6.item
index 034d74d..6da739e 100644
--- a/tos_project/process/AggregationToDaily_3.6.item
+++ b/tos_project/process/AggregationToDaily_3.6.item
@@ -133,7 +133,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
datacenter_id, &#xD;&#xA;  datacenter_status, &#xD;&#xA;  minutes_in_status, 
&#xD;&#xA;  datacenter_configuration_version&#xD;&#xA;FROM 
datacenter_hourly_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastDayAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;)+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; datacenter_id,&#xD;&#xA;      &#x9; datacenter_status&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
datacenter_id, &#xD;&#xA;  datacenter_status, &#xD;&#xA;  minutes_in_status, 
&#xD;&#xA;  datacenter_configuration_version&#xD;&#xA;FROM 
datacenter_hourly_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastDayAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;))+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; datacenter_id,&#xD;&#xA;      &#x9; datacenter_status&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -326,7 +326,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  host_id, 
&#xD;&#xA;  host_status, &#xD;&#xA;  minutes_in_status, &#xD;&#xA;  
memory_usage_percent, &#xA;  ksm_shared_memory_mb,&#xD;&#xA;  
cpu_usage_percent, &#xD;&#xA;  ksm_cpu_percent,  &#xD;&#xA;  active_vms,  
&#xD;&#xA;  total_vms, &#xD;&#xA;  total_vms_vcpus, &#xD;&#xA;  cpu_load, 
&#xD;&#xA;  system_cpu_usage_percent,  &#xD;&#xA;  user_cpu_usage_percent, 
&#xD;&#xA;  swap_used_mb,  &#xD;&#xA;  host_configuration_version&#xD;&#xA;FROM 
host_hourly_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastDayAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;)+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; host_id,&#xD;&#xA;      &#x9; 
host_status&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  host_id, 
&#xD;&#xA;  host_status, &#xD;&#xA;  minutes_in_status, &#xD;&#xA;  
memory_usage_percent, &#xA;  ksm_shared_memory_mb,&#xD;&#xA;  
cpu_usage_percent, &#xD;&#xA;  ksm_cpu_percent,  &#xD;&#xA;  active_vms,  
&#xD;&#xA;  total_vms, &#xD;&#xA;  total_vms_vcpus, &#xD;&#xA;  cpu_load, 
&#xD;&#xA;  system_cpu_usage_percent,  &#xD;&#xA;  user_cpu_usage_percent, 
&#xD;&#xA;  swap_used_mb,  &#xD;&#xA;  host_configuration_version&#xD;&#xA;FROM 
host_hourly_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastDayAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;))+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; host_id,&#xD;&#xA!
 ;      &#x9; host_status&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -849,7 +849,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA; history_id, &#xD;&#xA; history_datetime, &#xD;&#xA; 
host_interface_id, &#xD;&#xA; receive_rate_percent,  &#xD;&#xA; 
transmit_rate_percent,  &#xD;&#xA; 
host_interface_configuration_version&#xD;&#xA;FROM 
host_interface_hourly_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastDayAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;)+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; host_interface_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA; history_id, &#xD;&#xA; history_datetime, &#xD;&#xA; 
host_interface_id, &#xD;&#xA; receive_rate_percent,  &#xD;&#xA; 
transmit_rate_percent,  &#xD;&#xA; 
host_interface_configuration_version&#xD;&#xA;FROM 
host_interface_hourly_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastDayAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;))+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; host_interface_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -1068,7 +1068,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  vm_id, 
&#xD;&#xA;  vm_status, &#xD;&#xA;  minutes_in_status, &#xD;&#xA;  
cpu_usage_percent,  &#xD;&#xA;  memory_usage_percent, &#xD;&#xA;  
user_cpu_usage_percent, &#xD;&#xA;  system_cpu_usage_percent,&#xD;&#xA;  vm_ip, 
&#xA;  current_user_id,&#xD;&#xA;  currently_running_on_host, &#xD;&#xA;  
vm_configuration_version, &#xD;&#xA;  
current_host_configuration_version&#xD;&#xA;FROM 
vm_hourly_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastDayAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;)+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; vm_id,&#xD;&#xA;&#x9;&#x9; vm_status&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  vm_id, 
&#xD;&#xA;  vm_status, &#xD;&#xA;  minutes_in_status, &#xD;&#xA;  
cpu_usage_percent,  &#xD;&#xA;  memory_usage_percent, &#xD;&#xA;  
user_cpu_usage_percent, &#xD;&#xA;  system_cpu_usage_percent,&#xD;&#xA;  vm_ip, 
&#xA;  current_user_id,&#xD;&#xA;  currently_running_on_host, &#xD;&#xA;  
vm_configuration_version, &#xD;&#xA;  
current_host_configuration_version&#xD;&#xA;FROM 
vm_hourly_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastDayAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;))+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; vm_id,&#xD;&#xA;&#x9;&#x9; vm_status&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -1453,7 +1453,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
vm_interface_id, &#xD;&#xA;  receive_rate_percent,  &#xD;&#xA;  
transmit_rate_percent,  &#xD;&#xA;  
vm_interface_configuration_version&#xD;&#xA;FROM 
vm_interface_hourly_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastDayAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;)+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; vm_interface_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
vm_interface_id, &#xD;&#xA;  receive_rate_percent,  &#xD;&#xA;  
transmit_rate_percent,  &#xD;&#xA;  
vm_interface_configuration_version&#xD;&#xA;FROM 
vm_interface_hourly_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastDayAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;))+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; vm_interface_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -1672,7 +1672,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
storage_domain_id, &#xA;  storage_domain_status,&#xA;  
minutes_in_status,&#xD;&#xA;  available_disk_size_gb, &#xD;&#xA;  
used_disk_size_gb, &#xD;&#xA;  storage_configuration_version&#xD;&#xA;FROM 
storage_domain_hourly_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastDayAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;)+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; storage_domain_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
storage_domain_id, &#xA;  storage_domain_status,&#xA;  
minutes_in_status,&#xD;&#xA;  available_disk_size_gb, &#xD;&#xA;  
used_disk_size_gb, &#xD;&#xA;  storage_configuration_version&#xD;&#xA;FROM 
storage_domain_hourly_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastDayAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;))+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; storage_domain_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -1901,7 +1901,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
history_datetime,&#xA;&#x9;&#x9;vm_disk_id,&#xA;        
image_id,&#xA;&#x9;&#x9;vm_disk_status, 
&#xA;&#x9;&#x9;minutes_in_status,&#xA;&#x9;&#x9;vm_disk_actual_size_mb,&#xA;&#x9;&#x9;read_rate_bytes_per_second,&#xA;&#x9;&#x9;read_latency_seconds,&#xA;&#x9;&#x9;write_rate_bytes_per_second,&#xA;&#x9;&#x9;write_latency_seconds,&#xA;&#x9;&#x9;flush_latency_seconds,&#xA;&#x9;&#x9;vm_disk_configuration_version
 &#xA;FROM vm_disk_hourly_history&#xA;WHERE history_datetime >= 
'&quot;+context.lastDayAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;)+&quot;'&#xA;ORDER BY history_datetime,&#xA;&#x9;&#x9; 
vm_disk_id, &#xA;  &#x9;&#x9; vm_disk_status&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
history_datetime,&#xA;&#x9;&#x9;vm_disk_id,&#xA;        
image_id,&#xA;&#x9;&#x9;vm_disk_status, 
&#xA;&#x9;&#x9;minutes_in_status,&#xA;&#x9;&#x9;vm_disk_actual_size_mb,&#xA;&#x9;&#x9;read_rate_bytes_per_second,&#xA;&#x9;&#x9;read_latency_seconds,&#xA;&#x9;&#x9;write_rate_bytes_per_second,&#xA;&#x9;&#x9;write_latency_seconds,&#xA;&#x9;&#x9;flush_latency_seconds,&#xA;&#x9;&#x9;vm_disk_configuration_version
 &#xA;FROM vm_disk_hourly_history&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastDayAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;))+&quot;'&#xA;ORDER BY history_datetime,&#xA;&#x9;&#x9; 
vm_disk_id, &#xA;  &#x9;&#x9; vm_disk_status&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -2286,7 +2286,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT&#xA;  
history_datetime,&#xA;  vm_id,&#xA;  disks_usage&#xA;FROM 
vm_disks_usage_hourly_history&#xA;WHERE history_datetime >= 
'&quot;+context.lastDayAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;)+&quot;'&#xA;ORDER BY history_id DESC,&#xA;         
vm_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT&#xA;  
history_datetime,&#xA;  vm_id,&#xA;  disks_usage&#xA;FROM 
vm_disks_usage_hourly_history&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastDayAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;))+&quot;'&#xA;ORDER BY history_id DESC,&#xA;         
vm_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -2330,7 +2330,7 @@
       <column comment="" key="false" length="2147483647" name="disks_usage" 
nullable="true" pattern="" precision="0" sourceType="TEXT" type="id_String" 
usefulColumn="true"/>
     </metadata>
     <nodeData xsi:type="MapperData">
-      <uiProperties shellMaximized="true"/>
+      <uiProperties/>
       <varTables sizeState="INTERMEDIATE" name="Var" minimized="true"/>
       <outputTables sizeState="INTERMEDIATE" name="disks_usage_aggregate">
         <mapperTableEntries name="history_datetime" 
expression="RoutineHistoryETL.startOfDay(row12.history_datetime)" 
type="id_Date"/>
@@ -2441,7 +2441,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" 
value="&quot;SELECT&#xD;&#xA;  history_id,&#xD;&#xA;  history_datetime,&#xA;  
user_id,&#xA;  user_name,&#xA;  cast(user_logged_in_to_guest as int),&#xD;&#xA; 
 vm_id,&#xD;&#xA;  session_time_in_minutes,&#xD;&#xA;  
cpu_usage_percent,&#xD;&#xA;  memory_usage_percent,&#xD;&#xA;  
user_cpu_usage_percent,&#xD;&#xA;  system_cpu_usage_percent,&#xD;&#xA;  
vm_ip,&#xA;  vm_client_ip,&#xD;&#xA;  currently_running_on_host,&#xD;&#xA;  
vm_configuration_version,&#xD;&#xA;  
current_host_configuration_version&#xD;&#xA;FROM 
statistics_vms_users_usage_hourly&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastDayAggr+&quot;'&#xA;&#x9;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;)+&quot;'&#xD;&#xA;ORDER BY&#xA;    history_datetime,&#xD;&#xA; 
   user_name,&#xD;&#xA;    vm_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" 
value="&quot;SELECT&#xD;&#xA;  history_id,&#xD;&#xA;  history_datetime,&#xA;  
user_id,&#xA;  user_name,&#xA;  cast(user_logged_in_to_guest as int),&#xD;&#xA; 
 vm_id,&#xD;&#xA;  session_time_in_minutes,&#xD;&#xA;  
cpu_usage_percent,&#xD;&#xA;  memory_usage_percent,&#xD;&#xA;  
user_cpu_usage_percent,&#xD;&#xA;  system_cpu_usage_percent,&#xD;&#xA;  
vm_ip,&#xA;  vm_client_ip,&#xD;&#xA;  currently_running_on_host,&#xD;&#xA;  
vm_configuration_version,&#xD;&#xA;  
current_host_configuration_version&#xD;&#xA;FROM 
statistics_vms_users_usage_hourly&#xD;&#xA;WHERE history_datetime >= 
'&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastDayAggr)+&quot;'&#xA;&#x9;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastDayAggr, 
1,&quot;dd&quot;))+&quot;'&#xD;&#xA;ORDER BY&#xA;    
history_datetime,&#xD;&#xA;    user_name,&#xD;!
 &#xA;    vm_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -4102,6 +4102,17 @@
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="row12"/>
   </connection>
   <connection connectorName="FLOW" label="disks_usage_aggregate" lineStyle="0" 
metaname="disks_usage_aggregate" offsetLabelX="0" offsetLabelY="0" 
source="tMap_9" target="tAggregateRow_9">
+    <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER">
+      <elementValue elementRef="TRACE_COLUMN" value="history_datetime"/>
+      <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
+      <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
+      <elementValue elementRef="TRACE_COLUMN" value="vm_id"/>
+      <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
+      <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
+      <elementValue elementRef="TRACE_COLUMN" value="disks_usage"/>
+      <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
+      <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
+    </elementParameter>
     <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" 
value="disks_usage_aggregate"/>
   </connection>
diff --git a/tos_project/process/AggregationToDaily_3.6.properties 
b/tos_project/process/AggregationToDaily_3.6.properties
index e60e4ac..4938e7d 100644
--- a/tos_project/process/AggregationToDaily_3.6.properties
+++ b/tos_project/process/AggregationToDaily_3.6.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="2015-04-01T16:52:01.256+0300" version="3.6" statusCode="" 
item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToDaily">
+  <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" 
id="_s0iQoFShEeCW44CWrpjEnA" label="AggregationToDaily" 
creationDate="2011-07-06T14:17:29.833+0300" 
modificationDate="2015-04-26T14:21:10.810+0300" version="3.6" statusCode="" 
item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToDaily">
     <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/>
   </TalendProperties:Property>
   <TalendProperties:ItemState xmi:id="_s1bogFShEeCW44CWrpjEnA" path=""/>
diff --git a/tos_project/process/AggregationToHourly_3.6.item 
b/tos_project/process/AggregationToHourly_3.6.item
index 421c76e..d5fce9a 100644
--- a/tos_project/process/AggregationToHourly_3.6.item
+++ b/tos_project/process/AggregationToHourly_3.6.item
@@ -135,7 +135,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
history_id,&#xD;&#xA;&#x9;&#x9;history_datetime,&#xD;&#xA;      
&#x9;datacenter_id,&#xD;&#xA;      &#x9;datacenter_status,&#xD;&#xA;      
&#x9;minutes_in_status,&#xD;&#xA;&#x9;&#x9;datacenter_configuration_version&#xD;&#xA;FROM
 datacenter_samples_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastHourAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;)+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; datacenter_id,&#xD;&#xA;      &#x9; datacenter_status&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
history_id,&#xD;&#xA;&#x9;&#x9;history_datetime,&#xD;&#xA;      
&#x9;datacenter_id,&#xD;&#xA;      &#x9;datacenter_status,&#xD;&#xA;      
&#x9;minutes_in_status,&#xD;&#xA;&#x9;&#x9;datacenter_configuration_version&#xD;&#xA;FROM
 datacenter_samples_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastHourAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;))+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; datacenter_id,&#xD;&#xA;      &#x9; datacenter_status&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -328,7 +328,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  host_id, 
&#xD;&#xA;  host_status, &#xD;&#xA;  minutes_in_status, &#xD;&#xA;  
memory_usage_percent, &#xA;  ksm_shared_memory_mb,&#xD;&#xA;  
cpu_usage_percent, &#xD;&#xA;  ksm_cpu_percent, &#xD;&#xA;  active_vms, 
&#xD;&#xA;  total_vms, &#xD;&#xA;  total_vms_vcpus, &#xD;&#xA;  cpu_load, 
&#xD;&#xA;  system_cpu_usage_percent, &#xD;&#xA;  user_cpu_usage_percent, 
&#xD;&#xA;  swap_used_mb, &#xD;&#xA;  host_configuration_version&#xD;&#xA;FROM 
host_samples_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastHourAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;)+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; host_id,&#xD;&#xA;      &#x9; 
host_status&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  host_id, 
&#xD;&#xA;  host_status, &#xD;&#xA;  minutes_in_status, &#xD;&#xA;  
memory_usage_percent, &#xA;  ksm_shared_memory_mb,&#xD;&#xA;  
cpu_usage_percent, &#xD;&#xA;  ksm_cpu_percent, &#xD;&#xA;  active_vms, 
&#xD;&#xA;  total_vms, &#xD;&#xA;  total_vms_vcpus, &#xD;&#xA;  cpu_load, 
&#xD;&#xA;  system_cpu_usage_percent, &#xD;&#xA;  user_cpu_usage_percent, 
&#xD;&#xA;  swap_used_mb, &#xD;&#xA;  host_configuration_version&#xD;&#xA;FROM 
host_samples_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastHourAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;))+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; host_id,&#xD;&#xA;!
       &#x9; host_status&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -851,7 +851,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
host_interface_id, &#xD;&#xA;  receive_rate_percent, &#xD;&#xA;  
transmit_rate_percent, &#xD;&#xA;  
host_interface_configuration_version&#xD;&#xA;FROM 
host_interface_samples_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastHourAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;)+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; host_interface_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
host_interface_id, &#xD;&#xA;  receive_rate_percent, &#xD;&#xA;  
transmit_rate_percent, &#xD;&#xA;  
host_interface_configuration_version&#xD;&#xA;FROM 
host_interface_samples_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastHourAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;))+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; host_interface_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -1070,7 +1070,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  vm_id, 
&#xD;&#xA;  vm_status, &#xD;&#xA;  minutes_in_status, &#xD;&#xA;  
cpu_usage_percent, &#xD;&#xA;  memory_usage_percent, &#xD;&#xA;  
user_cpu_usage_percent, &#xD;&#xA;  system_cpu_usage_percent,&#xD;&#xA;  vm_ip, 
&#xA;  current_user_id,&#xA;  user_logged_in_to_guest,&#xD;&#xA;  
currently_running_on_host, &#xD;&#xA;  vm_configuration_version, &#xD;&#xA;  
current_host_configuration_version&#xD;&#xA;FROM 
vm_samples_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastHourAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;)+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; vm_id,&#xD;&#xA;&#x9;&#x9; vm_status&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  vm_id, 
&#xD;&#xA;  vm_status, &#xD;&#xA;  minutes_in_status, &#xD;&#xA;  
cpu_usage_percent, &#xD;&#xA;  memory_usage_percent, &#xD;&#xA;  
user_cpu_usage_percent, &#xD;&#xA;  system_cpu_usage_percent,&#xD;&#xA;  vm_ip, 
&#xA;  current_user_id,&#xA;  user_logged_in_to_guest,&#xD;&#xA;  
currently_running_on_host, &#xD;&#xA;  vm_configuration_version, &#xD;&#xA;  
current_host_configuration_version&#xD;&#xA;FROM 
vm_samples_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastHourAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;))+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; vm_id,&#xD;&#xA;&#x9;&#x9; vm_status&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -1459,7 +1459,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
vm_interface_id, &#xD;&#xA;  receive_rate_percent, &#xD;&#xA;  
transmit_rate_percent, &#xD;&#xA;  
vm_interface_configuration_version&#xD;&#xA;FROM 
vm_interface_samples_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastHourAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;)+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; vm_interface_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id, &#xD;&#xA;  history_datetime, &#xD;&#xA;  
vm_interface_id, &#xD;&#xA;  receive_rate_percent, &#xD;&#xA;  
transmit_rate_percent, &#xD;&#xA;  
vm_interface_configuration_version&#xD;&#xA;FROM 
vm_interface_samples_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastHourAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;))+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; vm_interface_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -1678,7 +1678,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id,&#xA;  history_datetime, &#xA;  storage_domain_id, &#xA; 
 storage_domain_status,&#xA;  minutes_in_status,&#xA;  available_disk_size_gb, 
&#xA;  used_disk_size_gb, &#xA;  storage_configuration_version&#xA;FROM 
storage_domain_samples_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastHourAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;)+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; storage_domain_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id,&#xA;  history_datetime, &#xA;  storage_domain_id, &#xA; 
 storage_domain_status,&#xA;  minutes_in_status,&#xA;  available_disk_size_gb, 
&#xA;  used_disk_size_gb, &#xA;  storage_configuration_version&#xA;FROM 
storage_domain_samples_history&#xD;&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastHourAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;))+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xD;&#xA;      
&#x9; storage_domain_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -1907,7 +1907,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
history_datetime,&#xA;&#x9;&#x9;vm_disk_id,&#xA;        
image_id,&#xA;&#x9;&#x9;vm_disk_status, 
&#xA;&#x9;&#x9;minutes_in_status,&#xA;&#x9;&#x9;vm_disk_actual_size_mb,&#xA;&#x9;&#x9;read_rate_bytes_per_second,&#xA;&#x9;&#x9;read_latency_seconds,&#xA;&#x9;&#x9;write_rate_bytes_per_second,&#xA;&#x9;&#x9;write_latency_seconds,&#xA;&#x9;&#x9;flush_latency_seconds,&#xA;&#x9;&#x9;vm_disk_configuration_version
 &#xA;FROM vm_disk_samples_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+context.lastHourAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;)+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; vm_disk_id, &#xD;&#xA;  &#x9;&#x9; 
vm_disk_status&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
history_datetime,&#xA;&#x9;&#x9;vm_disk_id,&#xA;        
image_id,&#xA;&#x9;&#x9;vm_disk_status, 
&#xA;&#x9;&#x9;minutes_in_status,&#xA;&#x9;&#x9;vm_disk_actual_size_mb,&#xA;&#x9;&#x9;read_rate_bytes_per_second,&#xA;&#x9;&#x9;read_latency_seconds,&#xA;&#x9;&#x9;write_rate_bytes_per_second,&#xA;&#x9;&#x9;write_latency_seconds,&#xA;&#x9;&#x9;flush_latency_seconds,&#xA;&#x9;&#x9;vm_disk_configuration_version
 &#xA;FROM vm_disk_samples_history&#xD;&#xA;WHERE history_datetime >= 
'&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastHourAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;))+&quot;'&#xD;&#xA;ORDER BY 
history_datetime,&#xD;&#xA;&#x9;&#x9; vm_disk_id, &#xD;&#xA;  &#x9;&#x9; 
vm_disk_status&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -2292,7 +2292,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT&#xA;  
history_datetime,&#xA;  vm_id,&#xA;  disks_usage&#xA;FROM 
vm_disks_usage_samples_history&#xA;WHERE history_datetime >= 
'&quot;+context.lastHourAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;)+&quot;'&#xA;ORDER BY history_id DESC,&#xA;         
vm_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT&#xA;  
history_datetime,&#xA;  vm_id,&#xA;  disks_usage&#xA;FROM 
vm_disks_usage_samples_history&#xA;WHERE history_datetime >= '&quot;+new 
SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastHourAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;))+&quot;'&#xA;ORDER BY history_id DESC,&#xA;         
vm_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -2336,7 +2336,7 @@
       <column comment="" key="false" length="2147483647" name="disks_usage" 
nullable="true" pattern="" precision="0" sourceType="TEXT" type="id_String" 
usefulColumn="true"/>
     </metadata>
     <nodeData xsi:type="MapperData">
-      <uiProperties shellMaximized="true"/>
+      <uiProperties/>
       <varTables sizeState="INTERMEDIATE" name="Var" minimized="true"/>
       <outputTables sizeState="INTERMEDIATE" name="disk_usage_aggregate">
         <mapperTableEntries name="history_datetime" 
expression="RoutineHistoryETL.startOfHour(row12.history_datetime) " 
type="id_Date"/>
@@ -2447,7 +2447,7 @@
     <elementParameter field="TECHNICAL" 
name="QUERYSTORE:REPOSITORY_QUERYSTORE_TYPE" value=""/>
     <elementParameter field="TECHNICAL" name="QUERYSTORE:QUERYSTORE_TYPE" 
value="BUILT_IN"/>
     <elementParameter field="GUESS_SCHEMA" name="GUESS_SCHEMA" 
value="&quot;&quot;"/>
-    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id,&#xD;&#xA;  history_datetime,&#xA;  
current_user_id,&#xA;  current_user_name,&#xA;  cast(user_logged_in_to_guest as 
int),&#xD;&#xA;  vm_id,&#xD;&#xA;  minutes_in_status,&#xD;&#xA;  
cpu_usage_percent,&#xD;&#xA;  memory_usage_percent,&#xD;&#xA;  
user_cpu_usage_percent,&#xD;&#xA;  system_cpu_usage_percent,&#xD;&#xA;  
vm_ip,&#xA;  vm_client_ip,&#xD;&#xA;  currently_running_on_host,&#xD;&#xA;  
vm_configuration_version,&#xD;&#xA;  
current_host_configuration_version&#xD;&#xA;FROM 
vm_samples_history&#xD;&#xA;WHERE vm_status = 1&#xA;AND history_datetime >= 
'&quot;+context.lastHourAggr+&quot;'&#xA;AND history_datetime &lt; 
'&quot;+TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;)+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xA;         
current_user_name,&#xD;&#xA;      &#x9; vm_id&quot;"/>
+    <elementParameter field="MEMO_SQL" name="QUERY" value="&quot;SELECT 
&#xD;&#xA;  history_id,&#xD;&#xA;  history_datetime,&#xA;  
current_user_id,&#xA;  current_user_name,&#xA;  cast(user_logged_in_to_guest as 
int),&#xD;&#xA;  vm_id,&#xD;&#xA;  minutes_in_status,&#xD;&#xA;  
cpu_usage_percent,&#xD;&#xA;  memory_usage_percent,&#xD;&#xA;  
user_cpu_usage_percent,&#xD;&#xA;  system_cpu_usage_percent,&#xD;&#xA;  
vm_ip,&#xA;  vm_client_ip,&#xD;&#xA;  currently_running_on_host,&#xD;&#xA;  
vm_configuration_version,&#xD;&#xA;  
current_host_configuration_version&#xD;&#xA;FROM 
vm_samples_history&#xD;&#xA;WHERE vm_status = 1&#xA;AND history_datetime >= 
'&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(context.lastHourAggr)+&quot;'&#xA;AND 
history_datetime &lt; '&quot;+new SimpleDateFormat(&quot;yyyy-MM-dd 
HH:mm:ss.SSSSSSZ&quot;).format(TalendDate.addDate(context.lastHourAggr, 
1,&quot;HH&quot;))+&quot;'&#xD;&#xA;ORDER BY history_datetime,&#xA;         
current_!
 user_name,&#xD;&#xA;      &#x9; vm_id&quot;"/>
     <elementParameter field="LABEL" name="NOTE" value="This option only 
applies when deploying and running in the Talend Runtime"/>
     <elementParameter field="CHECK" name="SPECIFY_DATASOURCE_ALIAS" 
value="false"/>
     <elementParameter field="TEXT" name="DATASOURCE_ALIAS" 
value="&quot;&quot;"/>
@@ -3032,7 +3032,7 @@
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
     <metadata connector="FLOW" label="vm_disk_hourly_history" 
name="tJDBCInput_6">
       <column comment="" key="false" name="key" nullable="true" pattern="" 
sourceType="" type="id_String" usefulColumn="true"/>
-      <column comment="" key="false" length="4" name="value" nullable="false" 
pattern="" precision="0" sourceType="INT4" type="id_String" 
usefulColumn="true"/>
+      <column comment="" key="false" length="255" name="value" 
nullable="false" pattern="" precision="0" sourceType="INT4" type="id_String" 
usefulColumn="true"/>
     </metadata>
   </node>
   <node componentName="tContextLoad" componentVersion="0.101" offsetLabelX="0" 
offsetLabelY="0" posX="448" posY="96">
diff --git a/tos_project/process/AggregationToHourly_3.6.properties 
b/tos_project/process/AggregationToHourly_3.6.properties
index 78397f4..cea101f 100644
--- a/tos_project/process/AggregationToHourly_3.6.properties
+++ b/tos_project/process/AggregationToHourly_3.6.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="2015-04-01T17:17:01.636+0300" version="3.6" statusCode="" 
item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToHourly">
+  <TalendProperties:Property xmi:id="_6qukwEi2EeCv8PaoeAjHHg" 
id="_6qsvkEi2EeCv8PaoeAjHHg" label="AggregationToHourly" 
creationDate="2011-07-06T14:17:18.376+0300" 
modificationDate="2015-04-26T14:25:48.111+0300" version="3.6" statusCode="" 
item="_6qukwki2EeCv8PaoeAjHHg" displayName="AggregationToHourly">
     <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/>
   </TalendProperties:Property>
   <TalendProperties:ItemState xmi:id="_6qukwUi2EeCv8PaoeAjHHg" path=""/>
diff --git a/tos_project/process/DailyTimeKeepingJob_3.6.item 
b/tos_project/process/DailyTimeKeepingJob_3.6.item
index ad1b1d7..1f3c115 100644
--- a/tos_project/process/DailyTimeKeepingJob_3.6.item
+++ b/tos_project/process/DailyTimeKeepingJob_3.6.item
@@ -18,31 +18,83 @@
     <contextParameter comment="" name="lastDayAggr" prompt="lastDayAggr?" 
promptNeeded="true" type="id_Date" value="yyyy-MM-dd HH:mm:ss;2000-01-01 
00:00:00"/>
   </context>
   <parameters>
-    <elementParameter field="TEXT" name="JOB_RUN_VM_ARGUMENTS" value=" 
-Xms256M -Xmx1024M"/>
-    <elementParameter field="CHECK" name="JOB_RUN_VM_ARGUMENTS_OPTION" 
value="false"/>
     <elementParameter field="TEXT" name="SCREEN_OFFSET_X" value="128"/>
     <elementParameter field="TEXT" name="SCREEN_OFFSET_Y" value="64"/>
-    <elementParameter field="TEXT" name="SCHEMA_OPTIONS" value="none"/>
-    <elementParameter field="TEXT" name="OEM_CUSTOM_ATTRIBUTE" value=""/>
-    <elementParameter field="TEXT" name="HADOOP_APP_PATH" value=""/>
-    <elementParameter field="TEXT" name="JOBID_FOR_OOZIE" value=""/>
     <elementParameter field="TEXT" name="REPOSITORY_CONNECTION_ID" value=""/>
-    <elementParameter field="TABLE" name="HADOOP_ADVANCED_PROPERTIES"/>
     <elementParameter field="CHECK" 
name="IMPLICITCONTEXT_USE_PROJECT_SETTINGS" value="true"/>
     <elementParameter field="CHECK" name="STATANDLOG_USE_PROJECT_SETTINGS" 
value="true"/>
     <elementParameter field="CHECK" name="MULTI_THREAD_EXECATION" 
value="true"/>
+    <elementParameter field="CHECK" name="IMPLICIT_TCONTEXTLOAD" 
value="false"/>
+    <elementParameter field="RADIO" name="FROM_FILE_FLAG_IMPLICIT_CONTEXT" 
value="false"/>
+    <elementParameter field="RADIO" name="FROM_DATABASE_FLAG_IMPLICIT_CONTEXT" 
value="false"/>
     <elementParameter field="FILE" name="IMPLICIT_TCONTEXTLOAD_FILE" 
value="&quot;&quot;"/>
     <elementParameter field="TEXT" name="FIELDSEPARATOR" value="&quot;&quot;"/>
+    <elementParameter field="CLOSED_LIST" name="DB_TYPE_IMPLICIT_CONTEXT" 
value=""/>
     <elementParameter field="CLOSED_LIST" name="DB_VERSION_IMPLICIT_CONTEXT" 
value=""/>
+    <elementParameter field="TEXT" name="URL_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="TABLE" name="DRIVER_JAR_IMPLICIT_CONTEXT"/>
+    <elementParameter field="TEXT" name="DRIVER_CLASS_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="HOST_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="PORT_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="DBNAME_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="LOCAL_SERVICE_NAME_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="PROPERTIES_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="SCHEMA_DB_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="USER_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="PASSWORD" name="PASS_IMPLICIT_CONTEXT" 
value="0RMsyjmybrE="/>
+    <elementParameter field="FILE" name="DBFILE_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="DBTABLE" name="DBTABLE_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="QUERY_CONDITION_IMPLICIT_CONTEXT" 
value="&quot;&quot;"/>
     <elementParameter field="CLOSED_LIST" name="LOAD_NEW_VARIABLE" value=""/>
     <elementParameter field="CLOSED_LIST" name="NOT_LOAD_OLD_VARIABLE" 
value=""/>
+    <elementParameter field="CHECK" name="PRINT_OPERATIONS" value="false"/>
+    <elementParameter field="CHECK" name="DISABLE_ERROR" value="false"/>
     <elementParameter field="CHECK" name="DISABLE_WARNINGS" value="false"/>
     <elementParameter field="CHECK" name="DISABLE_INFO" value="false"/>
+    <elementParameter field="CHECK" name="ON_STATCATCHER_FLAG" value="false"/>
     <elementParameter field="CHECK" name="ON_LOGCATCHER_FLAG" value="true"/>
+    <elementParameter field="CHECK" name="ON_METERCATCHER_FLAG" value="false"/>
     <elementParameter field="CHECK" name="ON_CONSOLE_FLAG" value="true"/>
+    <elementParameter field="CHECK" name="ON_FILES_FLAG" value="false"/>
     <elementParameter field="DIRECTORY" name="FILE_PATH" 
value="&quot;/home/ydary/Desktop&quot;"/>
+    <elementParameter field="TEXT" name="FILENAME_STATS" 
value="&quot;stats_file.txt&quot;"/>
+    <elementParameter field="TEXT" name="FILENAME_LOGS" 
value="&quot;logs_file.txt&quot;"/>
+    <elementParameter field="TEXT" name="FILENAME_METTER" 
value="&quot;meter_file.txt&quot;"/>
+    <elementParameter field="ENCODING_TYPE" name="ENCODING" 
value="ISO-8859-15"/>
     <elementParameter field="TECHNICAL" name="ENCODING:ENCODING_TYPE" 
value="ISO-8859-15"/>
-    <elementParameter field="CLOSED_LIST" name="DB_VERSION" value="ORACLE_10"/>
+    <elementParameter field="CHECK" name="ON_DATABASE_FLAG" value="false"/>
+    <elementParameter field="CLOSED_LIST" name="DB_TYPE" value="tJDBCOutput"/>
+    <elementParameter field="CLOSED_LIST" name="DB_VERSION" 
value="ojdbc14-10g.jar"/>
+    <elementParameter field="TEXT" name="URL" value="&quot;&quot;"/>
+    <elementParameter field="TABLE" name="DRIVER_JAR"/>
+    <elementParameter field="TEXT" name="DRIVER_CLASS" value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="HOST" value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="PORT" value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="DATASOURCE" value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="DBNAME" value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="LOCAL_SERVICE_NAME" 
value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="PROPERTIES" value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="SCHEMA_DB" value="&quot;&quot;"/>
+    <elementParameter field="TEXT" name="USER" value="&quot;&quot;"/>
+    <elementParameter field="PASSWORD" name="PASS" value="0RMsyjmybrE="/>
+    <elementParameter field="FILE" name="DBFILE" value="&quot;&quot;"/>
+    <elementParameter field="DBTABLE" name="TABLE_STATS" value="&quot;&quot;"/>
+    <elementParameter field="DBTABLE" name="TABLE_LOGS" value="&quot;&quot;"/>
+    <elementParameter field="DBTABLE" name="TABLE_METER" value="&quot;&quot;"/>
+    <elementParameter field="CHECK" name="CATCH_RUNTIME_ERRORS" value="true"/>
+    <elementParameter field="CHECK" name="CATCH_USER_ERRORS" value="true"/>
+    <elementParameter field="CHECK" name="CATCH_USER_WARNING" value="true"/>
+    <elementParameter field="CHECK" name="CATCH_REALTIME_STATS" value="false"/>
+    <elementParameter field="TEXT" name="HEADERFOOTER_HEADERID" value=""/>
+    <elementParameter field="CHECK" name="HEADER_ENABLED" value="false"/>
+    <elementParameter field="TEXT" name="HEADER_LIBRARY" value=""/>
+    <elementParameter field="TEXT" name="HEADER_CODE" value=""/>
+    <elementParameter field="TEXT" name="HEADER_IMPORT" value=""/>
+    <elementParameter field="TEXT" name="HEADERFOOTER_FOOTERID" value=""/>
+    <elementParameter field="CHECK" name="FOOTER_ENABLED" value="false"/>
+    <elementParameter field="TEXT" name="FOOTER_LIBRARY" value=""/>
+    <elementParameter field="TEXT" name="FOOTER_CODE" value=""/>
+    <elementParameter field="TEXT" name="FOOTER_IMPORT" value=""/>
     <routinesParameter id="_S6Oh4EJlEeCWRqOtaF5m-w" name="DataOperation"/>
     <routinesParameter id="_S6YS4EJlEeCWRqOtaF5m-w" name="Mathematical"/>
     <routinesParameter id="_S6avIEJlEeCWRqOtaF5m-w" name="Numeric"/>
@@ -55,6 +107,7 @@
   </parameters>
   <node componentName="tJDBCConnection" componentVersion="0.102" 
offsetLabelX="0" offsetLabelY="0" posX="96" posY="0">
     <elementParameter field="TEXT" name="UNIQUE_NAME" 
value="tJDBCConnection_1"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="TEXT" name="URL" 
value="context.ovirtEngineHistoryDbJdbcConnection"/>
     <elementParameter field="TABLE" name="DRIVER_JAR">
       <elementValue elementRef="JAR_NAME" 
value="postgresql-8.4-703.jdbc4.jar"/>
@@ -73,33 +126,26 @@
     <elementParameter field="CHECK" name="AUTO_COMMIT" value="false"/>
     <elementParameter field="TEXT" name="LABEL" 
value="daily_ovirt_engine_history"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
   </node>
   <node componentName="tJDBCCommit" componentVersion="0.102" offsetLabelX="0" 
offsetLabelY="0" posX="1184" posY="0">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCCommit_1"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="COMPONENT_LIST" name="CONNECTION" 
value="tJDBCConnection_1"/>
     <elementParameter field="CHECK" name="CLOSE" value="false"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tJDBCCommit_1"/>
   </node>
   <node componentName="tJDBCRollback" componentVersion="0.102" 
offsetLabelX="0" offsetLabelY="0" posX="992" posY="96">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCRollback_1"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="COMPONENT_LIST" name="CONNECTION" 
value="tJDBCConnection_1"/>
     <elementParameter field="CHECK" name="CLOSE" value="false"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tJDBCRollback_1"/>
   </node>
   <node componentName="tJDBCInput" componentVersion="0.102" offsetLabelX="0" 
offsetLabelY="0" posX="320" posY="0">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCInput_1"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="false"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CHECK" name="USE_EXISTING_CONNECTION" 
value="true"/>
     <elementParameter field="COMPONENT_LIST" name="CONNECTION" 
value="tJDBCConnection_2"/>
     <elementParameter field="TEXT" name="URL" value="&quot;jdbc:&quot;"/>
@@ -127,11 +173,10 @@
       <elementValue elementRef="SCHEMA_COLUMN" value="value"/>
       <elementValue elementRef="TRIM" value="false"/>
     </elementParameter>
+    <elementParameter field="CHECK" name="ENABLE_MAPPING" value="false"/>
+    <elementParameter field="CLOSED_LIST" name="MAPPING" value="mysql_id"/>
     <elementParameter field="TEXT" name="LABEL" value="Load Current 
Timestamp"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tJDBCInput_1">
       <column key="false" length="255" name="key" nullable="true" 
precision="0" sourceType="" type="id_String" usefulColumn="true"/>
       <column comment="" key="false" length="35" name="value" nullable="true" 
pattern="&quot;yyyy-MM-dd HH:mm:ss.SSSSSS&quot;" precision="6" 
sourceType="DATETIME" type="id_Date" usefulColumn="true"/>
@@ -139,7 +184,7 @@
   </node>
   <node componentName="tContextLoad" componentVersion="0.101" offsetLabelX="0" 
offsetLabelY="0" posX="320" posY="96">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tContextLoad_1"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="true"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CLOSED_LIST" name="LOAD_NEW_VARIABLE" 
value="Warning"/>
     <elementParameter field="CLOSED_LIST" name="NOT_LOAD_OLD_VARIABLE" 
value="Warning"/>
     <elementParameter field="CHECK" name="PRINT_OPERATIONS" value="false"/>
@@ -148,9 +193,6 @@
     <elementParameter field="CHECK" name="DISABLE_INFO" value="true"/>
     <elementParameter field="CHECK" name="DIEONERROR" value="true"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tContextLoad_1">
       <column defaultValue="" key="false" length="255" name="key" 
nullable="true" precision="0" sourceType="" type="id_String" 
usefulColumn="true"/>
       <column defaultValue="" key="false" length="35" name="value" 
nullable="true" pattern="&quot;yyyy-MM-dd HH:mm:ss.SSSSSS&quot;" precision="6" 
sourceType="DATETIME" type="id_Date" usefulColumn="true"/>
@@ -158,6 +200,7 @@
   </node>
   <node componentName="tRunJob" componentVersion="0.101" offsetLabelX="0" 
offsetLabelY="0" posX="992" posY="0">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tRunJob_1"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CHECK" name="USE_DYNAMIC_JOB" value="false"/>
     <elementParameter field="TEXT" name="CONTEXT_JOB" value=""/>
     <elementParameter field="PROCESS_TYPE" name="PROCESS" 
value="AggregationToDaily"/>
@@ -169,36 +212,29 @@
     <elementParameter field="CHECK" name="DIE_ON_CHILD_ERROR" value="true"/>
     <elementParameter field="CHECK" name="TRANSMIT_WHOLE_CONTEXT" 
value="true"/>
     <elementParameter field="TABLE" name="CONTEXTPARAMS"/>
+    <elementParameter field="CHECK" name="PROPAGATE_CHILD_RESULT" 
value="false"/>
     <elementParameter field="CHECK" name="PRINT_PARAMETER" value="false"/>
     <elementParameter field="CHECK" name="TRANSMIT_ORIGINAL_CONTEXT" 
value="true"/>
     <elementParameter field="TEXT" name="LABEL" value="__PROCESS__"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tRunJob_1"/>
   </node>
   <node componentName="tPostjob" componentVersion="0.102" offsetLabelX="0" 
offsetLabelY="0" posX="96" posY="320">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tPostjob_1"/>
-    <elementParameter field="CHECK" name="START" value="true"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
   </node>
   <node componentName="tJava" componentVersion="0.101" offsetLabelX="0" 
offsetLabelY="0" posX="448" posY="320">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJava_1"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="MEMO_JAVA" name="CODE" value="if 
(context.continueAgg == 0) {&#xA;    
&#x9;Thread.sleep((Long)TalendDate.diffDate(RoutineHistoryETL.manipulateDate(RoutineHistoryETL.startOfDay(context.runTime),1,&quot;dd&quot;),context.runTime,&quot;SSS&quot;));&#xA;}
 else {&#xA;    Thread.sleep(1800000);&#xA;}"/>
     <elementParameter field="MEMO_IMPORT" name="IMPORT" value="//import 
java.util.List;"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tJava_1"/>
   </node>
   <node componentName="tJDBCConnection" componentVersion="0.102" 
offsetLabelX="0" offsetLabelY="0" posX="-96" posY="0">
     <elementParameter field="TEXT" name="UNIQUE_NAME" 
value="tJDBCConnection_2"/>
-    <elementParameter field="CHECK" name="START" value="true"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="TEXT" name="URL" 
value="context.ovirtEngineDbJdbcConnection"/>
     <elementParameter field="TABLE" name="DRIVER_JAR">
       <elementValue elementRef="JAR_NAME" 
value="postgresql-8.4-703.jdbc4.jar"/>
@@ -217,21 +253,14 @@
     <elementParameter field="CHECK" name="AUTO_COMMIT" value="true"/>
     <elementParameter field="TEXT" name="LABEL" value="engine-events"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
   </node>
   <node componentName="tLogCatcher" componentVersion="0.101" offsetLabelX="0" 
offsetLabelY="0" posX="736" posY="224">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tLogCatcher_1"/>
-    <elementParameter field="CHECK" name="START" value="true"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="false"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CHECK" name="CATCH_JAVA_EXCEPTION" value="true"/>
     <elementParameter field="CHECK" name="CATCH_TDIE" value="true"/>
     <elementParameter field="CHECK" name="CATCH_TWARN" value="true"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tLogCatcher_1">
       <column key="false" length="0" name="moment" nullable="true" 
pattern="&quot;yyyy-MM-dd HH:mm:ss&quot;" precision="0" sourceType="" 
type="id_Date" usefulColumn="true"/>
       <column key="false" length="20" name="pid" nullable="true" precision="0" 
sourceType="" type="id_String" usefulColumn="true"/>
@@ -249,6 +278,7 @@
   </node>
   <node componentName="tMap" componentVersion="2.1" offsetLabelX="0" 
offsetLabelY="0" posX="736" posY="320">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tMap_1"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="EXTERNAL" name="MAP" value=""/>
     <elementParameter field="CLOSED_LIST" name="LINK_STYLE" value="AUTO"/>
     <elementParameter field="DIRECTORY" name="TEMPORARY_DATA_DIRECTORY" 
value=""/>
@@ -258,9 +288,6 @@
     <elementParameter field="TEXT" name="ROWS_BUFFER_SIZE" value="2000000"/>
     <elementParameter field="CHECK" 
name="CHANGE_HASH_AND_EQUALS_FOR_BIGDECIMAL" value="false"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" label="audit_log" name="event_output">
       <column comment="" key="false" length="35" name="log_time" 
nullable="false" pattern="&quot;yyyy-MM-dd HH:mm:ss.SSSSSS&quot;" precision="0" 
sourceType="TIMESTAMP" type="id_Date" usefulColumn="true"/>
       <column comment="" defaultValue="::character varying" key="false" 
length="100" name="log_type_name" nullable="true" pattern="" precision="0" 
sourceType="VARCHAR" type="id_String" usefulColumn="true"/>
@@ -296,7 +323,7 @@
   </node>
   <node componentName="tJDBCOutput" componentVersion="0.102" offsetLabelX="0" 
offsetLabelY="0" posX="736" posY="416">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCOutput_1"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="true"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CHECK" name="USE_EXISTING_CONNECTION" 
value="true"/>
     <elementParameter field="COMPONENT_LIST" name="CONNECTION" 
value="tJDBCConnection_2"/>
     <elementParameter field="TEXT" name="URL" value="&quot;jdbc:&quot;"/>
@@ -348,9 +375,6 @@
     <elementParameter field="TEXT" name="BATCH_SIZE" value="10000"/>
     <elementParameter field="TEXT" name="LABEL" value="__TABLE__"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" label="audit_log" name="tJDBCOutput_1">
       <column comment="" key="false" length="35" name="log_time" 
nullable="false" pattern="&quot;yyyy-MM-dd HH:mm:ss.SSSSSS&quot;" precision="0" 
sourceType="TIMESTAMP" type="id_Date" usefulColumn="true"/>
       <column comment="" defaultValue="::character varying" key="false" 
length="100" name="log_type_name" nullable="true" pattern="" precision="0" 
sourceType="VARCHAR" type="id_String" usefulColumn="true"/>
@@ -370,7 +394,7 @@
   </node>
   <node componentName="tJDBCInput" componentVersion="0.102" offsetLabelX="0" 
offsetLabelY="0" posX="1408" posY="0">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCInput_2"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="false"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CHECK" name="USE_EXISTING_CONNECTION" 
value="true"/>
     <elementParameter field="COMPONENT_LIST" name="CONNECTION" 
value="tJDBCConnection_1"/>
     <elementParameter field="TEXT" name="URL" value="&quot;jdbc:&quot;"/>
@@ -398,10 +422,9 @@
       <elementValue elementRef="SCHEMA_COLUMN" value="value"/>
       <elementValue elementRef="TRIM" value="false"/>
     </elementParameter>
+    <elementParameter field="CHECK" name="ENABLE_MAPPING" value="false"/>
+    <elementParameter field="CLOSED_LIST" name="MAPPING" value="mysql_id"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" label="vm_disk_hourly_history" 
name="tJDBCInput_2">
       <column comment="" key="false" name="key" nullable="true" pattern="" 
sourceType="" type="id_String" usefulColumn="true"/>
       <column comment="" key="false" length="4" name="value" nullable="false" 
pattern="" precision="0" sourceType="INT4" type="id_String" 
usefulColumn="true"/>
@@ -409,7 +432,7 @@
   </node>
   <node componentName="tContextLoad" componentVersion="0.101" offsetLabelX="0" 
offsetLabelY="0" posX="1408" posY="96">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tContextLoad_2"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="true"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CLOSED_LIST" name="LOAD_NEW_VARIABLE" 
value="Warning"/>
     <elementParameter field="CLOSED_LIST" name="NOT_LOAD_OLD_VARIABLE" 
value="Warning"/>
     <elementParameter field="CHECK" name="PRINT_OPERATIONS" value="false"/>
@@ -418,9 +441,6 @@
     <elementParameter field="CHECK" name="DISABLE_INFO" value="true"/>
     <elementParameter field="CHECK" name="DIEONERROR" value="true"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tContextLoad_2">
       <column defaultValue="" key="false" length="255" name="key" 
nullable="true" precision="0" sourceType="" type="id_String" 
usefulColumn="true"/>
       <column defaultValue="" key="false" length="255" name="value" 
nullable="true" precision="0" sourceType="" type="id_String" 
usefulColumn="true"/>
@@ -428,7 +448,7 @@
   </node>
   <node componentName="tJDBCInput" componentVersion="0.102" offsetLabelX="0" 
offsetLabelY="0" posX="512" posY="0">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCInput_5"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="false"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CHECK" name="USE_EXISTING_CONNECTION" 
value="true"/>
     <elementParameter field="COMPONENT_LIST" name="CONNECTION" 
value="tJDBCConnection_1"/>
     <elementParameter field="TEXT" name="URL" value="&quot;jdbc:&quot;"/>
@@ -456,18 +476,17 @@
       <elementValue elementRef="SCHEMA_COLUMN" value="value"/>
       <elementValue elementRef="TRIM" value="false"/>
     </elementParameter>
+    <elementParameter field="CHECK" name="ENABLE_MAPPING" value="false"/>
+    <elementParameter field="CLOSED_LIST" name="MAPPING" value="mysql_id"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" label="vm_disk_hourly_history" 
name="tJDBCInput_5">
       <column comment="" key="false" name="key" nullable="true" pattern="" 
sourceType="" type="id_String" usefulColumn="true"/>
-      <column comment="" key="false" length="4" name="value" nullable="false" 
pattern="" precision="0" sourceType="INT4" type="id_String" 
usefulColumn="true"/>
+      <column comment="" key="false" length="255" name="value" 
nullable="false" pattern="" precision="0" sourceType="INT4" type="id_String" 
usefulColumn="true"/>
     </metadata>
   </node>
   <node componentName="tContextLoad" componentVersion="0.101" offsetLabelX="0" 
offsetLabelY="0" posX="512" posY="96">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tContextLoad_5"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="true"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CLOSED_LIST" name="LOAD_NEW_VARIABLE" 
value="Warning"/>
     <elementParameter field="CLOSED_LIST" name="NOT_LOAD_OLD_VARIABLE" 
value="Warning"/>
     <elementParameter field="CHECK" name="PRINT_OPERATIONS" value="false"/>
@@ -476,9 +495,6 @@
     <elementParameter field="CHECK" name="DISABLE_INFO" value="true"/>
     <elementParameter field="CHECK" name="DIEONERROR" value="true"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tContextLoad_5">
       <column defaultValue="" key="false" length="255" name="key" 
nullable="true" precision="0" sourceType="" type="id_String" 
usefulColumn="true"/>
       <column defaultValue="" key="false" length="255" name="value" 
nullable="true" precision="0" sourceType="" type="id_String" 
usefulColumn="true"/>
@@ -486,7 +502,7 @@
   </node>
   <node componentName="tJDBCInput" componentVersion="0.102" offsetLabelX="0" 
offsetLabelY="0" posX="736" posY="0">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCInput_4"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="false"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CHECK" name="USE_EXISTING_CONNECTION" 
value="true"/>
     <elementParameter field="COMPONENT_LIST" name="CONNECTION" 
value="tJDBCConnection_1"/>
     <elementParameter field="TEXT" name="URL" value="&quot;jdbc:&quot;"/>
@@ -514,10 +530,9 @@
       <elementValue elementRef="SCHEMA_COLUMN" value="value"/>
       <elementValue elementRef="TRIM" value="false"/>
     </elementParameter>
+    <elementParameter field="CHECK" name="ENABLE_MAPPING" value="false"/>
+    <elementParameter field="CLOSED_LIST" name="MAPPING" value="mysql_id"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" label="vm_disk_hourly_history" 
name="tJDBCInput_4">
       <column comment="" key="false" name="key" nullable="true" pattern="" 
sourceType="" type="id_String" usefulColumn="true"/>
       <column comment="" key="false" length="4" name="value" nullable="false" 
pattern="" precision="0" sourceType="INT4" type="id_String" 
usefulColumn="true"/>
@@ -525,7 +540,7 @@
   </node>
   <node componentName="tContextLoad" componentVersion="0.101" offsetLabelX="0" 
offsetLabelY="0" posX="736" posY="96">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tContextLoad_4"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="true"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CLOSED_LIST" name="LOAD_NEW_VARIABLE" 
value="Warning"/>
     <elementParameter field="CLOSED_LIST" name="NOT_LOAD_OLD_VARIABLE" 
value="Warning"/>
     <elementParameter field="CHECK" name="PRINT_OPERATIONS" value="false"/>
@@ -534,9 +549,6 @@
     <elementParameter field="CHECK" name="DISABLE_INFO" value="true"/>
     <elementParameter field="CHECK" name="DIEONERROR" value="true"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tContextLoad_4">
       <column defaultValue="" key="false" length="255" name="key" 
nullable="true" precision="0" sourceType="" type="id_String" 
usefulColumn="true"/>
       <column defaultValue="" key="false" length="255" name="value" 
nullable="true" precision="0" sourceType="" type="id_String" 
usefulColumn="true"/>
@@ -544,7 +556,7 @@
   </node>
   <node componentName="tJDBCInput" componentVersion="0.102" offsetLabelX="0" 
offsetLabelY="0" posX="288" posY="320">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tJDBCInput_3"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="false"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CHECK" name="USE_EXISTING_CONNECTION" 
value="true"/>
     <elementParameter field="COMPONENT_LIST" name="CONNECTION" 
value="tJDBCConnection_2"/>
     <elementParameter field="TEXT" name="URL" value="&quot;jdbc:&quot;"/>
@@ -572,11 +584,10 @@
       <elementValue elementRef="SCHEMA_COLUMN" value="value"/>
       <elementValue elementRef="TRIM" value="false"/>
     </elementParameter>
+    <elementParameter field="CHECK" name="ENABLE_MAPPING" value="false"/>
+    <elementParameter field="CLOSED_LIST" name="MAPPING" value="mysql_id"/>
     <elementParameter field="TEXT" name="LABEL" value="Load Current 
Timestamp"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tJDBCInput_3">
       <column key="false" length="255" name="key" nullable="true" 
precision="0" sourceType="" type="id_String" usefulColumn="true"/>
       <column comment="" key="false" length="35" name="value" nullable="true" 
pattern="&quot;yyyy-MM-dd HH:mm:ss.SSSSSS&quot;" precision="6" 
sourceType="DATETIME" type="id_Date" usefulColumn="true"/>
@@ -584,7 +595,7 @@
   </node>
   <node componentName="tContextLoad" componentVersion="0.101" offsetLabelX="0" 
offsetLabelY="0" posX="288" posY="416">
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="tContextLoad_3"/>
-    <elementParameter field="CHECK" name="END_OF_FLOW" value="true"/>
+    <elementParameter field="DIRECTORY" name="JAVA_LIBRARY_PATH" 
value="/usr/local/bin/TOS_DI-20141207_1530-V5.6.1/configuration/lib/java"/>
     <elementParameter field="CLOSED_LIST" name="LOAD_NEW_VARIABLE" 
value="Warning"/>
     <elementParameter field="CLOSED_LIST" name="NOT_LOAD_OLD_VARIABLE" 
value="Warning"/>
     <elementParameter field="CHECK" name="PRINT_OPERATIONS" value="false"/>
@@ -593,24 +604,18 @@
     <elementParameter field="CHECK" name="DISABLE_INFO" value="true"/>
     <elementParameter field="CHECK" name="DIEONERROR" value="true"/>
     <elementParameter field="TEXT" name="CONNECTION_FORMAT" value="row"/>
-    <elementParameter field="CHECK" name="INFORMATION" value="false"/>
-    <elementParameter field="MEMO" name="COMMENT" value=""/>
-    <elementParameter field="CHECK" name="VALIDATION_RULES" value="false"/>
     <metadata connector="FLOW" name="tContextLoad_3">
       <column defaultValue="" key="false" length="255" name="key" 
nullable="true" precision="0" sourceType="" type="id_String" 
usefulColumn="true"/>
       <column defaultValue="" key="false" length="35" name="value" 
nullable="true" pattern="&quot;yyyy-MM-dd HH:mm:ss.SSSSSS&quot;" precision="6" 
sourceType="DATETIME" type="id_Date" usefulColumn="true"/>
     </metadata>
   </node>
   <connection connectorName="COMPONENT_OK" label="OnComponentOk" lineStyle="3" 
metaname="tJDBCConnection_1" offsetLabelX="0" offsetLabelY="0" 
source="tJDBCConnection_1" target="tJDBCInput_1">
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnComponentOk1"/>
   </connection>
   <connection connectorName="SUBJOB_OK" label="OnSubjobOk" lineStyle="1" 
metaname="tJDBCCommit_1" offsetLabelX="0" offsetLabelY="0" 
source="tJDBCCommit_1" target="tJDBCInput_2">
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnSubjobOk5"/>
   </connection>
   <connection connectorName="FLOW" label="row1" lineStyle="0" 
metaname="tJDBCInput_1" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_1" 
target="tContextLoad_1">
-    <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" 
value="true"/>
     <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER">
       <elementValue elementRef="TRACE_COLUMN" value="key"/>
       <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
@@ -620,36 +625,24 @@
       <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
     </elementParameter>
     <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/>
-    <elementParameter field="CHECK" name="USEROWLABEL" value="true"/>
-    <elementParameter field="TEXT" name="METTERLABEL" 
value="&quot;MyLabel&quot;"/>
-    <elementParameter field="CLOSED_LIST" name="ABSOLUTE" value="Absolute"/>
-    <elementParameter field="CONNECTION_LIST" name="CONNECTIONS" value=""/>
-    <elementParameter field="TABLE" name="THRESHLODS"/>
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="row1"/>
   </connection>
   <connection connectorName="SUBJOB_OK" label="OnSubjobOk" lineStyle="1" 
metaname="tJDBCInput_1" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_1" 
target="tJDBCInput_5">
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnSubjobOk2"/>
   </connection>
   <connection connectorName="SUBJOB_ERROR" label="OnSubjobError" lineStyle="4" 
metaname="tRunJob_1" offsetLabelX="0" offsetLabelY="0" source="tRunJob_1" 
target="tJDBCRollback_1">
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnSubjobError1"/>
   </connection>
   <connection connectorName="SUBJOB_OK" label="OnSubjobOk" lineStyle="1" 
metaname="tRunJob_1" offsetLabelX="0" offsetLabelY="0" source="tRunJob_1" 
target="tJDBCCommit_1">
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnSubjobOk4"/>
   </connection>
   <connection connectorName="COMPONENT_OK" label="OnComponentOk" lineStyle="3" 
metaname="tPostjob_1" offsetLabelX="0" offsetLabelY="0" source="tPostjob_1" 
target="tJDBCInput_3">
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnComponentOk2"/>
   </connection>
   <connection connectorName="COMPONENT_OK" label="OnComponentOk" lineStyle="3" 
metaname="tJDBCConnection_2" offsetLabelX="0" offsetLabelY="0" 
source="tJDBCConnection_2" target="tJDBCConnection_1">
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnComponentOk4"/>
   </connection>
   <connection connectorName="FLOW" label="row10" lineStyle="0" 
metaname="tLogCatcher_1" offsetLabelX="0" offsetLabelY="0" 
source="tLogCatcher_1" target="tMap_1">
-    <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" 
value="true"/>
     <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER">
       <elementValue elementRef="TRACE_COLUMN" value="moment"/>
       <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
@@ -689,16 +682,9 @@
       <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
     </elementParameter>
     <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/>
-    <elementParameter field="CHECK" name="USEROWLABEL" value="true"/>
-    <elementParameter field="TEXT" name="METTERLABEL" 
value="&quot;MyLabel&quot;"/>
-    <elementParameter field="CLOSED_LIST" name="ABSOLUTE" value="Absolute"/>
-    <elementParameter field="CONNECTION_LIST" name="CONNECTIONS" value=""/>
-    <elementParameter field="TABLE" name="THRESHLODS"/>
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="row10"/>
   </connection>
   <connection connectorName="FLOW" label="event_output" lineStyle="0" 
metaname="event_output" offsetLabelX="0" offsetLabelY="0" source="tMap_1" 
target="tJDBCOutput_1">
-    <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" 
value="true"/>
     <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER">
       <elementValue elementRef="TRACE_COLUMN" value="audit_log_id"/>
       <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
@@ -771,16 +757,9 @@
       <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
     </elementParameter>
     <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/>
-    <elementParameter field="CHECK" name="USEROWLABEL" value="true"/>
-    <elementParameter field="TEXT" name="METTERLABEL" 
value="&quot;MyLabel&quot;"/>
-    <elementParameter field="CLOSED_LIST" name="ABSOLUTE" value="Absolute"/>
-    <elementParameter field="CONNECTION_LIST" name="CONNECTIONS" value=""/>
-    <elementParameter field="TABLE" name="THRESHLODS"/>
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="event_output"/>
   </connection>
   <connection connectorName="FLOW" label="row2" lineStyle="0" 
metaname="tJDBCInput_2" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_2" 
target="tContextLoad_2">
-    <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" 
value="true"/>
     <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER">
       <elementValue elementRef="TRACE_COLUMN" value="key"/>
       <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
@@ -790,16 +769,9 @@
       <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
     </elementParameter>
     <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/>
-    <elementParameter field="CHECK" name="USEROWLABEL" value="true"/>
-    <elementParameter field="TEXT" name="METTERLABEL" 
value="&quot;MyLabel&quot;"/>
-    <elementParameter field="CLOSED_LIST" name="ABSOLUTE" value="Absolute"/>
-    <elementParameter field="CONNECTION_LIST" name="CONNECTIONS" value=""/>
-    <elementParameter field="TABLE" name="THRESHLODS"/>
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="row2"/>
   </connection>
   <connection connectorName="FLOW" label="row5" lineStyle="0" 
metaname="tJDBCInput_5" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_5" 
target="tContextLoad_5">
-    <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" 
value="true"/>
     <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER">
       <elementValue elementRef="TRACE_COLUMN" value="key"/>
       <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
@@ -809,20 +781,12 @@
       <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
     </elementParameter>
     <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/>
-    <elementParameter field="CHECK" name="USEROWLABEL" value="true"/>
-    <elementParameter field="TEXT" name="METTERLABEL" 
value="&quot;MyLabel&quot;"/>
-    <elementParameter field="CLOSED_LIST" name="ABSOLUTE" value="Absolute"/>
-    <elementParameter field="CONNECTION_LIST" name="CONNECTIONS" value=""/>
-    <elementParameter field="TABLE" name="THRESHLODS"/>
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="row5"/>
   </connection>
   <connection connectorName="SUBJOB_OK" label="OnSubjobOk" lineStyle="1" 
metaname="tJDBCInput_5" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_5" 
target="tJDBCInput_4">
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnSubjobOk3"/>
   </connection>
   <connection connectorName="FLOW" label="row4" lineStyle="0" 
metaname="tJDBCInput_4" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_4" 
target="tContextLoad_4">
-    <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" 
value="true"/>
     <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER">
       <elementValue elementRef="TRACE_COLUMN" value="key"/>
       <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
@@ -832,21 +796,13 @@
       <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
     </elementParameter>
     <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/>
-    <elementParameter field="CHECK" name="USEROWLABEL" value="true"/>
-    <elementParameter field="TEXT" name="METTERLABEL" 
value="&quot;MyLabel&quot;"/>
-    <elementParameter field="CLOSED_LIST" name="ABSOLUTE" value="Absolute"/>
-    <elementParameter field="CONNECTION_LIST" name="CONNECTIONS" value=""/>
-    <elementParameter field="TABLE" name="THRESHLODS"/>
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="row4"/>
   </connection>
   <connection connectorName="RUN_IF" label="FullDayCheck" lineStyle="6" 
metaname="tJDBCInput_4" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_4" 
target="tRunJob_1">
     <elementParameter field="MEMO_JAVA" name="CONDITION" 
value="TalendDate.compareDate(RoutineHistoryETL.startOfDay(context.lastHourAggr),context.lastDayAggr)
 == 1"/>
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="FullDayCheck"/>
   </connection>
   <connection connectorName="FLOW" label="row3" lineStyle="0" 
metaname="tJDBCInput_3" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_3" 
target="tContextLoad_3">
-    <elementParameter field="CHECK" name="TRACES_CONNECTION_ENABLE" 
value="true"/>
     <elementParameter field="TABLE" name="TRACES_CONNECTION_FILTER">
       <elementValue elementRef="TRACE_COLUMN" value="key"/>
       <elementValue elementRef="TRACE_COLUMN_CHECKED" value="true"/>
@@ -856,16 +812,9 @@
       <elementValue elementRef="TRACE_COLUMN_CONDITION" value=""/>
     </elementParameter>
     <elementParameter field="CHECK" name="MONITOR_CONNECTION" value="false"/>
-    <elementParameter field="CHECK" name="USEROWLABEL" value="true"/>
-    <elementParameter field="TEXT" name="METTERLABEL" 
value="&quot;MyLabel&quot;"/>
-    <elementParameter field="CLOSED_LIST" name="ABSOLUTE" value="Absolute"/>
-    <elementParameter field="CONNECTION_LIST" name="CONNECTIONS" value=""/>
-    <elementParameter field="TABLE" name="THRESHLODS"/>
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="row3"/>
   </connection>
   <connection connectorName="SUBJOB_OK" label="OnSubjobOk" lineStyle="1" 
metaname="tJDBCInput_3" offsetLabelX="0" offsetLabelY="0" source="tJDBCInput_3" 
target="tJava_1">
-    <elementParameter field="CHECK" name="ACTIVATE" value="true"/>
     <elementParameter field="TEXT" name="UNIQUE_NAME" value="OnSubjobOk7"/>
   </connection>
   <subjob>
diff --git a/tos_project/process/DailyTimeKeepingJob_3.6.properties 
b/tos_project/process/DailyTimeKeepingJob_3.6.properties
index 929f370..5bb5ad2 100644
--- a/tos_project/process/DailyTimeKeepingJob_3.6.properties
+++ b/tos_project/process/DailyTimeKeepingJob_3.6.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="_FvH2QLzqEeCaj-T1n0SCFw" 
id="_O-QEENI6EeCOk4qSIFFDtw" label="DailyTimeKeepingJob" 
creationDate="2011-08-02T12:30:39.367+0300" 
modificationDate="2015-01-13T11:55:13.577+0200" version="3.6" statusCode="" 
item="_FvH2QrzqEeCaj-T1n0SCFw" displayName="DailyTimeKeepingJob">
+  <TalendProperties:Property xmi:id="_FvH2QLzqEeCaj-T1n0SCFw" 
id="_O-QEENI6EeCOk4qSIFFDtw" label="DailyTimeKeepingJob" 
creationDate="2011-08-02T12:30:39.367+0300" 
modificationDate="2015-04-26T14:25:16.730+0300" version="3.6" statusCode="" 
item="_FvH2QrzqEeCaj-T1n0SCFw" displayName="DailyTimeKeepingJob">
     <author href="../talend.project#_SapC4EJlEeCWRqOtaF5m-w"/>
   </TalendProperties:Property>
   <TalendProperties:ItemState xmi:id="_O-iX8NI6EeCOk4qSIFFDtw" path=""/>


-- 
To view, visit https://gerrit.ovirt.org/40234
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic6cb94a248013b1bce8ee9ebd0bc0a2c91b7cbdd
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: master
Gerrit-Owner: Shirly Radco <sra...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to