Merge pull request #404 from Runbook/develop

Develop to Master

src/monitors/checks/cloudflare-http-codes/__init__.py

@@ -17,20 +17,10 @@ def check(**kwargs):
     if not metrics:
         return None
     time_pattern = "%Y-%m-%dT%H:%M:%SZ"
-    last_time = int(time.mktime(time.strptime(metrics['query']['until'], time_pattern)))
     time_delta = metrics['query']['time_delta'] * 60
-    previous_end_time = last_time - time_delta
 
-    previous_interval = {}
-    current_interval = {}
-
-    # Grab previous interval from metrics
-    for stats in metrics['result']['timeseries']:
-        stats_end_time = int(time.mktime(time.strptime(stats['until'], time_pattern)))
-        if stats_end_time == previous_end_time:
-            previous_interval = stats
-        elif stats_end_time == last_time:
-            current_interval = stats
+    previous_interval = metrics['result']['timeseries'][-2]
+    current_interval = metrics['result']['timeseries'][-1]
 
     # Verify necessary keys exist
     if "http_status" in current_interval['requests']:

src/monitors/checks/cloudflare-traffic-decrease/__init__.py

@@ -17,20 +17,10 @@ def check(**kwargs):
     if not metrics:
         return None
     time_pattern = "%Y-%m-%dT%H:%M:%SZ"
-    last_time = int(time.mktime(time.strptime(metrics['query']['until'], time_pattern)))
     time_delta = metrics['query']['time_delta'] * 60
-    previous_end_time = last_time - time_delta
 
-    previous_interval = {}
-    current_interval = {}
-
-    # Grab previous interval from metrics
-    for stats in metrics['result']['timeseries']:
-        stats_end_time = int(time.mktime(time.strptime(stats['until'], time_pattern)))
-        if stats_end_time == previous_end_time:
-            previous_interval = stats
-        elif stats_end_time == last_time:
-            current_interval = stats
+    previous_interval = metrics['result']['timeseries'][-2]
+    current_interval = metrics['result']['timeseries'][-1]
 
     # Calculate whether traffic increased or not
     percent = ((float(current_interval['requests']['all']) + 1) /

src/monitors/checks/cloudflare-traffic-increase/__init__.py

@@ -17,20 +17,10 @@ def check(**kwargs):
     if not metrics:
         return None
     time_pattern = "%Y-%m-%dT%H:%M:%SZ"
-    last_time = int(time.mktime(time.strptime(metrics['query']['until'], time_pattern)))
     time_delta = metrics['query']['time_delta'] * 60
-    previous_end_time = last_time - time_delta
 
-    previous_interval = {}
-    current_interval = {}
-
-    # Grab previous interval from metrics
-    for stats in metrics['result']['timeseries']:
-        stats_end_time = int(time.mktime(time.strptime(stats['until'], time_pattern)))
-        if stats_end_time == previous_end_time:
-            previous_interval = stats
-        elif stats_end_time == last_time:
-            current_interval = stats
+    previous_interval = metrics['result']['timeseries'][-2]
+    current_interval = metrics['result']['timeseries'][-1]
 
     # Calculate whether traffic increased or not
     percent = ((float(current_interval['requests']['all']) + 1) /

src/web/payments/Stripe/__init__.py

@@ -50,7 +50,7 @@ def create(self, request):
                 self.user.stripeid = result
                 self.user.stripe = form_data['stripe_token']
                 self.user.subscription = form_data['plan']
-                if "pro_plus" in form_data['plan']:
+                if "pro_plus" in form_data['plan'] or "proplus" in form_data['plan']:
                     self.user.acttype = "proplus"
                 else:
                     self.user.acttype = "pro"