TOOLS-2669 TOOLS-2683 TOOLS-2705 TOOLS-2706 7.0 config/stats changes

lib/collectinfo_analyzer/info_controller.py

@@ -253,13 +253,15 @@ def _do_default(self, line):
     @CommandHelp("Displays usage information for each namespace")
     def do_usage(self, line):
         ns_stats = self.stat_getter.get_namespace()
+        service_stats = self.stat_getter.get_service()
 
         for timestamp in sorted(ns_stats.keys()):
             if not ns_stats[timestamp]:
                 continue
 
             self.view.info_namespace_usage(
                 ns_stats[timestamp],
+                service_stats[timestamp],
                 self.log_handler.get_cinfo_log_at(timestamp=timestamp),
                 timestamp=timestamp,
                 **self.mods,

lib/live_cluster/info_controller.py

@@ -238,6 +238,7 @@ class InfoNamespaceController(LiveClusterCommandController):
     def __init__(self, get_futures=False):
         self.modifiers = set(["with"])
         self.get_futures = get_futures
+        self.stats_getter = GetStatisticsController(self.cluster)
 
     @CommandHelp(
         "Displays usage and objects information for each namespace",
@@ -259,9 +260,16 @@ async def _do_default(self, line):
         modifiers=(with_modifier_help,),
     )
     async def do_usage(self, line):
-        stats = await self.cluster.info_all_namespace_statistics(nodes=self.nodes)
+        service_stats, ns_stats = await asyncio.gather(
+            self.stats_getter.get_service(nodes=self.nodes),
+            self.stats_getter.get_namespace(nodes=self.nodes),
+        )  # Includes stats and configs
         return util.callable(
-            self.view.info_namespace_usage, stats, self.cluster, **self.mods
+            self.view.info_namespace_usage,
+            ns_stats,
+            service_stats,
+            self.cluster,
+            **self.mods,
         )
 
     @CommandHelp(

lib/live_cluster/show_controller.py

@@ -902,7 +902,6 @@ def __init__(self):
     )
     async def _do_default(self, line):
         return await asyncio.gather(
-            self.do_bins(line[:]),
             self.do_sets(line[:]),
             self.do_service(line[:]),
             self.do_namespace(line[:]),