from collector import Collector
from active_tasks import ActiveTasks
from atop import Atop
from iostat import IO
from latency import Latency
from observe import ObserveLatency
from net import Net
from ns_server import NSServer
from secondary_stats import SecondaryStats
from n1ql_stats import N1QLStats
from ps import PS
from typeperf import TypePerf
from spring_latency import SpringLatency,SpringSubdocLatency, SpringQueryLatency, \
    SpringN1QLQueryLatency
from sync_gateway import SyncGateway
from xdcr_lag import XdcrLag


@@ -259,24 +259,129 @@
 ondaryStats%0A
+from secondary_debugstats import SecondaryDebugStats%0Afrom secondary_latency import SecondaryLatencyStats%0A
 from n1ql_st
@@ -476,16 +476,17 @@
  import 
+(
 SpringLa
@@ -491,16 +491,65 @@
 Latency,
+ SpringQueryLatency,%0A                            
 SpringSu
@@ -559,32 +559,39 @@
 cLatency, Spring
+Spatial
 QueryLatency, %5C%0A
@@ -591,11 +591,33 @@
 ncy,
- %5C%0A
+%0A                        
     
@@ -634,24 +634,25 @@
 QueryLatency
+)
 %0Afrom sync_g
@@ -706,9 +706,8 @@
 XdcrLag%0A
-%0A

Revert "CBD: 1686 cbagent changes for cbagent"