From e7007a386d64686bacac22b5f7fa21087dbed283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20L=C3=A4ssig?= Date: Fri, 1 Jul 2016 19:05:36 +0200 Subject: [PATCH] remove ScalarContext. We have no scalars --- check-systemd-service | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/check-systemd-service b/check-systemd-service index dedbfeb..07db07e 100755 --- a/check-systemd-service +++ b/check-systemd-service @@ -118,27 +118,9 @@ class Systemd_Service(nagiosplugin.Resource): self.connect_systemd() self.running_service_found = self.activeStateD[self.activestate()] self.service_state = (self.activestate(), self.substate()) - #yield nagiosplugin.Metric('running_service_state', self.running_service_found, min=0, max=1) yield nagiosplugin.Metric('service_state', self.service_state) -class Service_Fmt_Metric(object): - """print a message for a bool-metric """ - def __init__(self, msg_success, msg_fail): - self.msg_success = msg_success - self.msg_fail = msg_fail - - def __call__(self, metric, context): - _log.debug('Value: %r UOM: %r', metric.value, metric.uom) - - if metric.value: - return self.msg_success.format(v=metric.value, u=metric.uom) - else: - return self.msg_fail.format(v=metric.value, u=metric.uom) - - -class Service_Result(nagiosplugin.Result): - pass @nagiosplugin.guarded def main(): @@ -154,12 +136,6 @@ def main(): _log.debug('Found arguments %r', args) check = nagiosplugin.Check( Systemd_Service(**vars(args)), - #nagiosplugin.ScalarContext('running_service_found', - # warning='0.2:1', - # critical='0.8:1', - # fmt_metric=Bool_Fmt_Metric('Running service found!', - # 'Service not running!') - #), nagiosplugin.Context('service_state', fmt_metric=Service_Fmt_Metric('Service is running. State is {v[0]}, {v[1]}', 'Service is broken! State is {v[0]}, {v[1]}')