vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix the ephemeral build metrics

Browse source
This commit is contained in:
Evan Cordell 2016-12-13 18:02:03 -05:00
parent 808266574e
commit dd5f7cbe6c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
buildman/manager/ephemeral.py
View file

@ -475,7 +475,7 @@ class EphemeralBuilderManager(BaseManager):
try: try:
metric_queue.put_deprecated('EphemeralBuilderStarted', 1, unit='Count') metric_queue.put_deprecated('EphemeralBuilderStarted', 1, unit='Count')
metric_queue.ephemeral_build_workers.Inc(labelvalues=[execution_id, build_uuid]) metric_queue.ephemeral_build_workers.Inc()
except: except:
logger.exception('Exception when writing start metrics for execution %s for job %s', logger.exception('Exception when writing start metrics for execution %s for job %s',
execution_id, build_uuid) execution_id, build_uuid)

2
buildman/manager/executor.py
View file

@ -197,7 +197,7 @@ class EC2Executor(BuilderExecutor):
except boto.exception.EC2ResponseError as ec2e: except boto.exception.EC2ResponseError as ec2e:
logger.exception('Unable to spawn builder instance') logger.exception('Unable to spawn builder instance')
metric_queue.put_deprecated('EC2BuildStartFailure', 1, unit='Count') metric_queue.put_deprecated('EC2BuildStartFailure', 1, unit='Count')
metric_queue.ephemeral_build_worker_failure.Inc(labelvalues=[build_uuid]) metric_queue.ephemeral_build_worker_failure.Inc()
raise ec2e raise ec2e
if not reservation.instances: if not reservation.instances:

4
util/metrics/metricqueue.py
View file

@ -50,9 +50,9 @@ class MetricQueue(object):
self.percent_building = prom.create_gauge('build_percent_building', 'Percent building.') self.percent_building = prom.create_gauge('build_percent_building', 'Percent building.')
self.build_counter = prom.create_counter('builds', 'Number of builds', labelnames=['name']) self.build_counter = prom.create_counter('builds', 'Number of builds', labelnames=['name'])
self.ephemeral_build_workers = prom.create_counter('ephemeral_build_workers', self.ephemeral_build_workers = prom.create_counter('ephemeral_build_workers',
'Number of started ephemeral build workers', labelnames=['name', 'build_uuid']) 'Number of started ephemeral build workers')
self.ephemeral_build_worker_failure = prom.create_counter('ephemeral_build_worker_failure', self.ephemeral_build_worker_failure = prom.create_counter('ephemeral_build_worker_failure',
'Number of failed-to-start ephemeral build workers', labelnames=['build_uuid']) 'Number of failed-to-start ephemeral build workers')
self.work_queue_running = prom.create_gauge('work_queue_running', 'Running items in a queue', self.work_queue_running = prom.create_gauge('work_queue_running', 'Running items in a queue',
labelnames=['queue_name']) labelnames=['queue_name'])