Add more resource plotting to the reports

.gitignore

@@ -6,3 +6,5 @@
 *.toml
 .coverage
 .bob
+.vscode
+

benchmark/cephtestrados.py

@@ -1,7 +1,7 @@
 from .benchmark import Benchmark
 import common
 import settings
-import monitoring
+from monitoring.monitoring_factory import MonitoringFactory
 import os
 import time
 import logging
@@ -74,7 +74,7 @@ def run(self):
         self.mkpool()
         self.dropcaches()
         self.cluster.dump_config(self.run_dir)
-        monitoring.start(self.run_dir)
+        MonitoringFactory.start(self.run_dir)
         time.sleep(5)
         # Run the backfill testing thread if requested
         if 'recovery_test' in self.cluster.config:
@@ -92,7 +92,7 @@ def run(self):
         if 'recovery_test' in self.cluster.config:
             self.cluster.wait_recovery_done()
 
-        monitoring.stop(self.run_dir)
+        MonitoringFactory.stop(self.run_dir)
 
         # Finally, get the historic ops
         self.cluster.dump_historic_ops(self.run_dir)
@@ -117,10 +117,10 @@ def mkcmd(self):
         return ' '.join(cmd)
 
     def mkpool(self):
-        monitoring.start("%s/pool_monitoring" % self.run_dir)
+        MonitoringFactory.start("%s/pool_monitoring" % self.run_dir)
         self.cluster.rmpool('ceph_test_rados', self.pool_profile)
         self.cluster.mkpool('ceph_test_rados', self.pool_profile, 'ceph_test_rados')
-        monitoring.stop()
+        MonitoringFactory.stop()
 
     def recovery_callback(self):
         common.pdsh(settings.getnodes('clients'), 'sudo pkill -f ceph_test_rados').communicate()

benchmark/cosbench.py

@@ -1,6 +1,6 @@
 import common
 import settings
-import monitoring
+from monitoring.monitoring_factory import MonitoringFactory
 import os
 import sys
 import time
@@ -185,9 +185,9 @@ def initialize(self):
         self.prerun_check()
 
         logger.debug('Pausing for 60s for idle monitoring.')
-        monitoring.start("%s/idle_monitoring" % self.run_dir)
+        MonitoringFactory.start("%s/idle_monitoring" % self.run_dir)
         time.sleep(60)
-        monitoring.stop()
+        MonitoringFactory.stop()
 
         common.sync_files('%s' % self.run_dir, self.out_dir)
 
@@ -248,7 +248,7 @@ def run(self):
         super(Cosbench, self).run()
         self.dropcaches()
         self.cluster.dump_config(self.run_dir)
-        monitoring.start(self.run_dir)
+        MonitoringFactory.start(self.run_dir)
 
         # Run cosbench test
         try:
@@ -262,7 +262,7 @@ def run(self):
         self.check_workload_status()
         self.check_cosbench_res_dir()
 
-        monitoring.stop(self.run_dir)
+        MonitoringFactory.stop(self.run_dir)
         self.cluster.dump_historic_ops(self.run_dir)
         common.sync_files('%s/*' % self.run_dir, self.out_dir)
 

benchmark/fio.py

@@ -1,6 +1,6 @@
 import common
 import settings
-import monitoring
+from monitoring.monitoring_factory import MonitoringFactory
 import os
 import time
 import logging
@@ -228,7 +228,7 @@ def run(self):
             # Wait for signal to start client IO
             self.cluster.wait_start_io()
 
-        monitoring.start(self.run_dir)
+        MonitoringFactory.start(self.run_dir)
 
         logger.info('Running fio %s test.', self.mode)
         ps = []
@@ -241,7 +241,7 @@ def run(self):
         if 'recovery_test' in self.cluster.config:
             self.cluster.wait_recovery_done()
 
-        monitoring.stop(self.run_dir)
+        MonitoringFactory.stop(self.run_dir)
 
         # Finally, get the historic ops
         self.cluster.dump_historic_ops(self.run_dir)

benchmark/getput.py

@@ -1,6 +1,6 @@
 import common
 import settings
-import monitoring
+from monitoring.monitoring_factory import MonitoringFactory
 import os
 import time
 import logging
@@ -58,9 +58,9 @@ def initialize(self):
         common.make_remote_dir(self.run_dir)
 
         logger.info('Pausing for 60s for idle monitoring.')
-        monitoring.start("%s/idle_monitoring" % self.run_dir)
+        MonitoringFactory.start("%s/idle_monitoring" % self.run_dir)
         time.sleep(60)
-        monitoring.stop()
+        MonitoringFactory.stop()
 
         common.sync_files('%s/*' % self.run_dir, self.out_dir)
 
@@ -125,7 +125,7 @@ def run(self):
             self.cluster.create_recovery_test(self.run_dir, recovery_callback)
 
         # Run getput
-        monitoring.start(self.run_dir)
+        MonitoringFactory.start(self.run_dir)
         logger.info('Running getput %s test.' % self.test)
 
         ps = []
@@ -135,7 +135,7 @@ def run(self):
             ps.append(p)
         for p in ps:
             p.wait()
-        monitoring.stop(self.run_dir)
+        MonitoringFactory.stop(self.run_dir)
 
         # If we were doing recovery, wait until it's done.
         if 'recovery_test' in self.cluster.config:

benchmark/hsbench.py

@@ -1,6 +1,6 @@
 import common
 import settings
-import monitoring
+from monitoring.monitoring_factory import MonitoringFactory
 import os
 import logging
 import pathlib
@@ -141,7 +141,7 @@ def run(self):
             recovery_callback = self.recovery_callback
             self.cluster.create_recovery_test(self.run_dir, recovery_callback)
 
-        monitoring.start(self.run_dir)
+        MonitoringFactory.start(self.run_dir)
         logger.info('Running hsbench %s test.' % self.modes)
         ps = []
         for i in range(self.endpoints_per_client):
@@ -153,7 +153,7 @@ def run(self):
         if 'recovery_test' in self.cluster.config:
             self.cluster.wait_recovery_done()
 
-        monitoring.stop(self.run_dir)
+        MonitoringFactory.stop(self.run_dir)
 
         # If we were doing recovery, wait until it's done.
         if 'recovery_test' in self.cluster.config:

benchmark/kvmrbdfio.py

@@ -1,6 +1,6 @@
 import common
 import settings
-import monitoring
+from monitoring.monitoring_factory import MonitoringFactory
 import os
 import time
 import logging
@@ -94,7 +94,7 @@ def run(self):
         # We'll always drop caches for rados bench
         self.dropcaches()
 
-        monitoring.start(self.run_dir)
+        MonitoringFactory.start(self.run_dir)
 
         time.sleep(5)
         # Run the backfill testing thread if requested
@@ -139,7 +139,7 @@ def run(self):
             fio_process_list.append(common.pdsh(clnts, fio_cmd, continue_if_error=False))
         for p in fio_process_list:
             p.communicate()
-        monitoring.stop(self.run_dir)
+        MonitoringFactory.stop(self.run_dir)
         logger.info('Finished rbd fio test')
 
         common.sync_files('%s/*' % self.run_dir, self.out_dir)