use global_timeout value if timeout undefined

alerta/checker/client.py

@@ -11,13 +11,14 @@
 from alerta.common import severity_code
 from alerta.common.api import ApiClient
 
-Version = '2.0.1'
+Version = '2.0.2'
 
 LOG = logging.getLogger(__name__)
 CONF = config.CONF
 
 
 class CheckerClient(object):
+
     def main(self):
 
         if CONF.heartbeat:

alerta/common/alert.py

@@ -91,7 +91,7 @@ def __init__(self, resource, event, correlate=None, group='Misc', value=None, st
         self.threshold_info = threshold_info
         self.summary = summary or '%s - %s %s is %s on %s %s' % (
             ','.join(self.environment), self.severity.capitalize(), self.event, self.value, ','.join(self.service), self.resource)
-        self.timeout = timeout or CONF.timeout
+        self.timeout = timeout or CONF.global_timeout
         self.alertid = alertid or str(uuid4())
         if last_receive_id:
             self.last_receive_id = last_receive_id

alerta/common/config.py

@@ -43,7 +43,7 @@ def parse_args(argv, prog=None, version='unknown', cli_parser=None, daemon=True)
         'user_id': 'alerta',
         'server_threads': 4,
         'disable_flag': '/var/run/alerta/%s.disable' % prog,
-        'timeout': 86400,  # seconds
+        'global_timeout': 86400,  # seconds
         'parser_dir': '/etc/alerta/parsers',
         'loop_every': 30,   # seconds
 

alerta/sender/client.py

@@ -5,7 +5,7 @@
 from alerta.common.heartbeat import Heartbeat
 from alerta.common.api import ApiClient
 
-Version = '2.0.3'
+Version = '2.0.4'
 
 LOG = logging.getLogger(__name__)
 CONF = config.CONF
@@ -25,15 +25,14 @@ def main(self):
 
             heartbeat = Heartbeat(
                 origin=CONF.origin,
-                version=vtag or Version
+                version=vtag or Version,
+                timeout=CONF.timeout
             )
-            if CONF.dry_run:
-                print heartbeat
-            else:
-                LOG.debug(repr(heartbeat))
 
-                api = ApiClient()
-                api.send(heartbeat)
+            LOG.debug(repr(heartbeat))
+
+            api = ApiClient()
+            api.send(heartbeat, dry_run=CONF.dry_run)
 
             return heartbeat.get_id()
 

bin/alert-checker

@@ -127,13 +127,8 @@ def main(argv):
             if not CONF.event:
                 parser.error("Must supply event name using -e or --event")
 
-            if not CONF.environment:
-                parser.error("Must supply one or more environments using -E or --environment")
-            else:
-                CONF.environment = [x.upper() for x in CONF.environment]
-
-            if not CONF.service:
-                parser.error("Must supply one or more service using -S or --service")
+            if not CONF.timeout:
+                CONF.timeout = CONF.global_timeout
 
         checker = CheckerClient()
         msg_id = checker.main()

bin/alert-sender

@@ -25,6 +25,7 @@ CONF = config.CONF
 
 
 def main(argv):
+
     try:
         parser = argparse.ArgumentParser(
             add_help=False,
@@ -166,6 +167,9 @@ def main(argv):
             if CONF.correlate and CONF.event not in CONF.correlate:
                 CONF.correlate.append(CONF.event)
 
+            if not CONF.timeout:
+                CONF.timeout = CONF.global_timeout
+
         sender = SenderClient()
         msg_id = sender.main()