openstack/cloudkitty
Code Issues Proposed changes

Merge "Use cloudkitty.tzutils.diff_seconds() in prometheus collector"

Browse Source
This commit is contained in:
Zuul
2019-09-12 16:54:37 +00:00
committed by Gerrit Code Review
parent 9ae92242fa c5faed95b2
commit 8b234a096e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cloudkitty/collector/prometheus.py
View File

@@ -27,6 +27,7 @@ from cloudkitty.collector.exceptions import CollectError
from cloudkitty.common.prometheus_client import PrometheusClient from cloudkitty.common.prometheus_client import PrometheusClient
from cloudkitty.common.prometheus_client import PrometheusResponseError from cloudkitty.common.prometheus_client import PrometheusResponseError
from cloudkitty import dataframe from cloudkitty import dataframe
from cloudkitty import tzutils
from cloudkitty import utils as ck_utils from cloudkitty import utils as ck_utils
@@ -140,7 +141,7 @@ class PrometheusCollector(collector.BaseCollector):
method = self.conf[metric_name]['extra_args']['aggregation_method'] method = self.conf[metric_name]['extra_args']['aggregation_method']
groupby = self.conf[metric_name].get('groupby', []) groupby = self.conf[metric_name].get('groupby', [])
metadata = self.conf[metric_name].get('metadata', []) metadata = self.conf[metric_name].get('metadata', [])
period = int((end - start).total_seconds()) period = tzutils.diff_seconds(end, start)
time = end time = end
query = '{0}({0}_over_time({1}{{{2}="{3}"}}[{4}s])) by ({5})'.format( query = '{0}({0}_over_time({1}{{{2}="{3}"}}[{4}s])) by ({5})'.format(