diff --git a/bin/monagent b/bin/monagent
deleted file mode 100755
index f231af5d23a1696a74a272cc39ab6204d48b94dd..0000000000000000000000000000000000000000
Binary files a/bin/monagent and /dev/null differ
diff --git a/etc/module_config/monitor_ob.yaml b/etc/module_config/monitor_ob.yaml
index 4713ad45a39881997fd9a281e5f79d43027b5111..76e677521cc062195f4b0ec7563d10213dc4fe53 100644
--- a/etc/module_config/monitor_ob.yaml
+++ b/etc/module_config/monitor_ob.yaml
@@ -11,9 +11,9 @@ obInputBasic: &obInputBasic
       defaultConditionValues:
         ob_svr_ip: ${monagent.host.ip}
         ob_svr_port: ${monagent.ob.rpc.port}
-        ob_is_rootservice: true
-        ob_is_v4: true
-        ob_is_v3: true
+        ob_is_rootservice: false
+        ob_is_v4: false
+        ob_is_v3: false
       collectConfig:
 
         - sql: select ob_version() REGEXP '^4' as ob_is_v4
@@ -30,13 +30,19 @@ obInputBasic: &obInputBasic
             is_rootserver: with_rootserver
           conditionValues:
             ob_is_rootservice: with_rootserver
-          subConfig:
-            - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ with_rootserver from __all_server where svr_ip = ? and svr_port = ?
-              params: [ ob_svr_ip, ob_svr_port ]
-              condition: ob_is_v3
-            - sql: select (case when with_rootserver='YES' then 1 else 0 end) as with_rootserver from DBA_OB_SERVERS where svr_ip = ? and svr_port = ?
-              params: [ ob_svr_ip, ob_svr_port ]
-              condition: ob_is_v4
+          condition: ob_is_v3
+          params: [ ob_svr_ip, ob_svr_port ]
+          sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ with_rootserver from __all_server where svr_ip = ? and svr_port = ?
+
+        - name: ob_role
+          sqlSlowThreshold: 100ms
+          metrics:
+            is_rootserver: with_rootserver
+          conditionValues:
+            ob_is_rootservice: with_rootserver
+          condition: ob_is_v4
+          params: [ ob_svr_ip, ob_svr_port ]
+          sql: select (case when with_rootserver='YES' then 1 else 0 end) as with_rootserver from DBA_OB_SERVERS where svr_ip = ? and svr_port = ?
         - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ tenant_name, cache_name, cache_size from __all_virtual_kvcache_info, __all_tenant where __all_tenant.tenant_id = __all_virtual_kvcache_info.tenant_id and svr_ip = ? and svr_port = ?
           params: [ob_svr_ip, ob_svr_port]
           name: ob_cache
@@ -109,7 +115,7 @@ obInputBasic: &obInputBasic
           metrics:
             stat: value
             current_timestamp: current
-        - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ tenant_name, mem_used, access_count, hit_count from v$plan_cache_stat join __all_tenant on v$plan_cache_stat.tenant_id = __all_tenant.tenant_id
+        - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ tenant_name, mem_used, access_count, hit_count from v$plan_cache_stat join __all_tenant on v$plan_cache_stat.tenant_id = __all_tenant.tenant_id group by tenant_name
           name: ob_plan_cache
           condition: ob_is_v3
           tags:
@@ -118,8 +124,8 @@ obInputBasic: &obInputBasic
             memory_bytes: mem_used
             access_total: access_count
             hit_total: hit_count
-        - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ tenant_name, mem_used, access_count, hit_count from V$OB_PLAN_CACHE_STAT join __all_tenant on V$OB_PLAN_CACHE_STAT.tenant_id = __all_tenant.tenant_id
-          name: ob_plan_cache 
+        - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ tenant_name, mem_used, access_count, hit_count from V$OB_PLAN_CACHE_STAT join __all_tenant on V$OB_PLAN_CACHE_STAT.tenant_id = __all_tenant.tenant_id group by tenant_name
+          name: ob_plan_cache
           condition: ob_is_v4
           tags:
             tenant_name: tenant_name
@@ -158,9 +164,9 @@ obInputExtra: &obInputExtra
       defaultConditionValues:
         ob_svr_ip: ${monagent.host.ip}
         ob_svr_port: ${monagent.ob.rpc.port}
-        ob_is_rootservice: true
-        ob_is_v4: true
-        ob_is_v3: true
+        ob_is_rootservice: false
+        ob_is_v4: false
+        ob_is_v3: false
       collectConfig:
         - sql: select ob_version() REGEXP '^4' as ob_is_v4
           name: ob_is_v4
@@ -176,13 +182,20 @@ obInputExtra: &obInputExtra
             is_rootserver: with_rootserver
           conditionValues:
             ob_is_rootservice: with_rootserver
-          subConfig:
-            - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ with_rootserver from __all_server where svr_ip = ? and svr_port = ?
-              params: [ ob_svr_ip, ob_svr_port ]
-              condition: ob_is_v3
-            - sql: select (case when with_rootserver='YES' then 1 else 0 end) as with_rootserver from DBA_OB_SERVERS where svr_ip = ? and svr_port = ?
-              params: [ ob_svr_ip, ob_svr_port ]
-              condition: ob_is_v4
+          condition: ob_is_v3
+          params: [ ob_svr_ip, ob_svr_port ]
+          sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ with_rootserver from __all_server where svr_ip = ? and svr_port = ?
+
+        - name: ob_role
+          sqlSlowThreshold: 100ms
+          metrics:
+            is_rootserver: with_rootserver
+          conditionValues:
+            ob_is_rootservice: with_rootserver
+          condition: ob_is_v4
+          params: [ ob_svr_ip, ob_svr_port ]
+          sql: select (case when with_rootserver='YES' then 1 else 0 end) as with_rootserver from DBA_OB_SERVERS where svr_ip = ? and svr_port = ?
+
         - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ count(*) as cnt from v$unit
           name: ob_unit
           metrics:
@@ -261,12 +274,13 @@ obInputExtra: &obInputExtra
             min_iops: min_iops
             max_disk_size_bytes: max_disk_size
             max_session_num: max_session_num
-        - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ tenant_name, tenant_id, name, gets, misses, sleeps, immediate_gets, immediate_misses, spin_gets, wait_time / 1000000 as wait_time from v$latch, __all_tenant where __all_tenant.tenant_id = v$latch.con_id
+        - sql: select /*+ MONITOR_AGENT READ_CONSISTENCY(WEAK) */ tenant_name, tenant_id, `latch#` as latch_no, name, gets, misses, sleeps, immediate_gets, immediate_misses, spin_gets, wait_time / 1000000 as wait_time from v$latch, __all_tenant where __all_tenant.tenant_id = v$latch.con_id
           name: ob_latch
           tags:
             tenant_name: tenant_name
             tenant_id: tenant_id
             name: name
+            latch_no: latch_no
           metrics:
             get_total: gets
             miss_total: misses