v0.14.20 - Fetching Application Metrics Componentwise (#218)

* Bump version from v0.14.19 to 0.14.20

* Metrics: fetch application metrics only for matching components

Author: perdelt

dbmsbenchmarker/__version__.py

@@ -1 +1 @@
-__version__ = "0.14.19"
+__version__ = "0.14.20"

dbmsbenchmarker/monitor.py

@@ -238,7 +238,7 @@ def generateLatexForQuery(self, parameter):
         else:
             return ""
     @staticmethod
-    def fetchMetric(query, metric_code, connection, connectiondata, time_start, time_end, path, container=None, metrics_query_path='metrics'):
+    def fetchMetric(query, metric_code, connection, connectiondata, time_start, time_end, path, container=None, metrics_query_path='metrics', component=''):
         # metrics_query_path = where to find the promql paths in connectiondata (metrics for components managed by bexhoma, metrics_special otherwise)
         #for m, metric in metrics.metrics.items():
         logging.debug("Metric "+metric_code)
@@ -262,6 +262,9 @@ def fetchMetric(query, metric_code, connection, connectiondata, time_start, time
                 if not active:
                     df = pd.DataFrame()
                     return df
+                if len(component) > 0 and 'component' in metric and metric['component'] != component:
+                    df = pd.DataFrame()
+                    return df
                 #print(metric)
                 if container is not None:
                     metric['query'] = metric['query'].replace('container_label_io_kubernetes_container_name="dbms"', 'container_label_io_kubernetes_container_name="{}"'.format(container))

metrics.py

@@ -36,7 +36,7 @@
     parser.add_argument('-f', '--config-folder', help='folder containing query and connection config files. If set, the names connections.config and queries.config are assumed automatically.', default=None)
     parser.add_argument('-c', '--connection', help='Name of the connection (dbms) to use', default=None)
     parser.add_argument('-mt', '--metrics-type', help='Type of metrics definitions (metrics, metrics_special, metrics_custom)', default='')
-    #parser.add_argument('-co', '--component', help='Component name', default='sut')
+    parser.add_argument('-com', '--component', help='Component name', default='')
     parser.add_argument('-ct', '--component-type', help='Type of the component (loading or stream)', default='loading')
     parser.add_argument('-cn', '--container-name', help='Name of the container (if not dbms for sut/workers: datagenerator, sensor, dbmsbenchmarker)', default=None)
     parser.add_argument('-cf', '--connection-file', help='name of connection config file', default='connections.config')
@@ -54,7 +54,7 @@
     connection = args.connection
     query = args.component_type
     metrics_type = args.metrics_type
-    #component = args.component
+    component = args.component
     container_name = args.container_name
     time_start = int(args.time_start)#1616083225
     time_end = int(args.time_end)#1616083310
@@ -92,7 +92,7 @@
             for m, metric in connection_data.connectiondata['monitoring'][metrics_type].items():
                 print("Metric", m)
                 path = '{result_path}/{code}/'.format(result_path=result_path, code=code)
-                monitor.metrics.fetchMetric(query, m, connection_name, connection_data.connectiondata, time_start, time_end, path, container=container_name, metrics_query_path=metrics_type)
+                monitor.metrics.fetchMetric(query, m, connection_name, connection_data.connectiondata, time_start, time_end, path, container=container_name, metrics_query_path=metrics_type, component=component)
         # do not use replacement anymore (SUT deployment replaced by SUT worker)
         #elif 'metrics_special' in connection_data.connectiondata['monitoring'] and (query == 'loading' or query == 'stream'):
         #    print("Use special metrics for SUT not managed by bexhoma: component type = {}".format(query))
@@ -105,7 +105,7 @@
             for m, metric in connection_data.connectiondata['monitoring']['metrics'].items():
                 print("Metric", m)
                 path = '{result_path}/{code}/'.format(result_path=result_path, code=code)
-                monitor.metrics.fetchMetric(query, m, connection_name, connection_data.connectiondata, time_start, time_end, path, container=container_name, metrics_query_path='metrics')
+                monitor.metrics.fetchMetric(query, m, connection_name, connection_data.connectiondata, time_start, time_end, path, container=container_name, metrics_query_path='metrics', component=component)
                 #metrics = monitor.metrics(experiments)
                 #df = metrics.dfHardwareMetricsLoading(m)
                 #print(df)