X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Fcollector%2Fbackends%2Fprometheus.py;h=fbe6d36b7ebbe29355217f35753958e02d58fe06;hb=a2eeb474200b8f9ebcaee6fa68fe52b6e1a5e337;hp=70632a1a141cd2cc88cc275c40dbc19c569622eb;hpb=0e34244e420bd68e6acb0cf6bb4383fedb662070;p=osm%2FMON.git diff --git a/osm_mon/collector/backends/prometheus.py b/osm_mon/collector/backends/prometheus.py index 70632a1..fbe6d36 100644 --- a/osm_mon/collector/backends/prometheus.py +++ b/osm_mon/collector/backends/prometheus.py @@ -41,19 +41,22 @@ class PrometheusBackend(BaseBackend): self._start_exporter(8000) def handle(self, metrics: List[Metric]): - prometheus_metrics = [] + log.debug('handle') + log.debug('metrics: %s', metrics) + prometheus_metrics = {} for metric in metrics: - prometheus_metric = GaugeMetricFamily( - OSM_METRIC_PREFIX + metric.name, - 'OSM metric', - labels=['ns_id', 'vnf_member_index', 'vdu_name'] - ) - prometheus_metric.add_metric([metric.nsr_id, metric.vnf_member_index, metric.vdur_name], metric.value) - prometheus_metrics.append(prometheus_metric) - self.custom_collector.metrics = prometheus_metrics + if metric.name not in prometheus_metrics: + prometheus_metrics[metric.name] = GaugeMetricFamily( + OSM_METRIC_PREFIX + metric.name, + 'OSM metric', + labels=list(metric.tags.keys()) + ) + prometheus_metrics[metric.name].add_metric(list(metric.tags.values()), metric.value) + self.custom_collector.metrics = prometheus_metrics.values() def _start_exporter(self, port): log.debug('_start_exporter') + log.debug('port: %s', port) REGISTRY.register(self.custom_collector) log.info("Starting MON Prometheus exporter at port %s", port) start_http_server(port)