use message.html and not message.txt

Author: Aakash Sabharwal

graphite_beacon/alerts.py

@@ -89,6 +89,8 @@ def __init__(self, reactor, **options):
 
         LOGGER.info("Alert '%s': has inited", self)
 
+        
+
     def __hash__(self):
         """Provide alert's hash."""
         return hash(self.name) ^ hash(self.source)
@@ -131,10 +133,6 @@ def configure(self, name=None, rules=None, query=None, **options):
             'request_timeout', self.reactor.options['request_timeout'])
         self.connect_timeout = options.get(
             'connect_timeout', self.reactor.options['connect_timeout'])
-        self.url_retries = options.get(
-            'url_retries', self.reactor.options['url_retries'])
-        self.url_retry_delay = parse_interval(options.get(
-            'url_retry_delay', self.reactor.options['url_retry_delay'])) / 1000
 
         self.history_size = options.get('history_size', self.reactor.options['history_size'])
         self.history_size = parse_interval(self.history_size)
@@ -171,29 +169,22 @@ def stop(self):
         self.callback.stop()
         return self
 
-    def check(self, records, final=True):
-        """Check current value. Returns true if check succeeded."""
-        rvalue = True
+    def check(self, records):
+        """Check current value."""
         for value, target in records:
             LOGGER.info("%s [%s]: %s", self.name, target, value)
             if value is None:
-                if final:
-                    self.notify(self.no_data, value, target)
-                rvalue = False
+                self.notify(self.no_data, value, target)
                 continue
             for rule in self.rules:
                 if self.evaluate_rule(rule, value, target):
-                    if final:
-                        self.notify(rule['level'], value, target, rule=rule)
-                    rvalue = False
+                    self.notify(rule['level'], value, target, rule=rule)
                     break
             else:
                 self.notify('normal', value, target, rule=rule)
 
             self.history[target].append(value)
 
-        return rvalue
-
     def evaluate_rule(self, rule, value, target):
         """Calculate the value."""
         def evaluate(expr):
@@ -330,29 +321,16 @@ def load(self):
             self.notify('warning', 'Process takes too much time', target='waiting', ntype='common')
         else:
             self.waiting = True
-            retries_remaining = self.url_retries
-            while True:
-                final = retries_remaining <= 0
-                retries_remaining -= 1
-                try:
-                    response = yield self.client.fetch(
-                        self.query, method=self.options.get('method', 'GET'),
-                        request_timeout=self.request_timeout,
-                        connect_timeout=self.connect_timeout,
-                        validate_cert=self.options.get('validate_cert', True))
-                    if self.check([(self.get_data(response), self.query)], final):
-                        self.notify('normal', 'Metrics are loaded', target='loading', ntype='common')
-                        break
-                    elif final:
-                        break
-                    elif self.url_retry_delay > 0:
-                        yield gen.sleep(self.url_retry_delay)
-
-                except Exception as e:
-                    if final:
-                        self.notify('critical', str(e), target='loading', ntype='common')
-                        break
-                    elif self.url_retry_delay > 0:
-                        yield gen.sleep(self.url_retry_delay)
+            try:
+                response = yield self.client.fetch(
+                    self.query, method=self.options.get('method', 'GET'),
+                    request_timeout=self.request_timeout,
+                    connect_timeout=self.connect_timeout,
+                    validate_cert=self.options.get('validate_cert', True))
+                self.check([(self.get_data(response), self.query)])
+                self.notify('normal', 'Metrics are loaded', target='loading', ntype='common')
+
+            except Exception as e:
+                self.notify('critical', str(e), target='loading', ntype='common')
 
             self.waiting = False

graphite_beacon/templates/graphite/message.html

@@ -50,6 +50,9 @@
             {% end %}
             {% end %}
 
+            View the graphtestvar 1: {{ alert.options.get('testvar') }}
+            View the graphtestvar 2: {{ alert.testvar }}
+
         </td>
     </tr>
     <tr>

graphite_beacon/templates/graphite/message.txt

@@ -20,8 +20,6 @@ History: {{ [ alert.convert(v) for v in alert.history[target][:100] ] }} {% end
 
 View the graph: {{ alert.get_graph_url(alert.query) }}
 
-View the graph: {{ alert.testvar }}
-
 --
 
 You can configure alerts for notifications in your configuration file.