Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: appengine/sheriff_o_matic/alerts.py

Issue 1260293009: make version of ts_mon compatible with appengine (Closed) Base URL: https://chromium.googlesource.com/infra/infra.git@master
Patch Set: clean up code Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/sheriff_o_matic/alerts.py
diff --git a/appengine/sheriff_o_matic/alerts.py b/appengine/sheriff_o_matic/alerts.py
index 354dd157c9457be7a273afcf69194cdd688c44d2..27a30c1de977e3aa3e887b4e44c56f0ca0515790 100644
--- a/appengine/sheriff_o_matic/alerts.py
+++ b/appengine/sheriff_o_matic/alerts.py
@@ -15,6 +15,8 @@ import cloudstorage as gcs
from google.appengine.api import app_identity
from google.appengine.api import memcache
+from google.appengine.api import modules
+from google.appengine.api import urlfetch
from google.appengine.api import users
from google.appengine.datastore import datastore_query
from google.appengine.ext import ndb
@@ -37,6 +39,13 @@ class LastUpdated(ndb.Model):
haddiff = ndb.BooleanProperty()
+def increment_monarch(endpoint):
agable 2015/08/10 23:04:37 Might be nice to implement this somewhere more gen
+ base_url = app_identity.get_default_version_hostname()
+ url = 'http://%s-dot-%s/monitoring/%s' % ('monitoring', base_url, endpoint)
+ logging.info(url)
agable 2015/08/10 23:04:37 Log a more useful message here :) or nothing at al
+ return urlfetch.fetch(url=url, method=urlfetch.GET)
agable 2015/08/10 23:04:37 Using GET here makes me a very sad panda. You neve
jshu 2015/08/11 21:57:18 lol yea put didn't work either. ok.
+
+
class AlertsHandler(webapp2.RequestHandler):
ALERT_TYPE = 'alerts'
# Max number of bytes that AppEngine allows writing to Memcache
@@ -124,6 +133,7 @@ class AlertsHandler(webapp2.RequestHandler):
return False
def get(self):
+ increment_monarch('alerts')
data = self.get_from_memcache() or self.get_from_datastore()
if data:
self.send_json_data(data)
@@ -195,6 +205,7 @@ class AlertsHandler(webapp2.RequestHandler):
class NewAlertsHandler(AlertsHandler):
# pylint: disable=arguments-differ
def get(self, tree):
+ increment_monarch('api/v1/alerts')
self.ALERT_TYPE = 'new-alerts/%s' % tree
super(NewAlertsHandler, self).get()

Powered by Google App Engine
This is Rietveld 408576698