From ebb9738b598708ee3f59e499fcc47cdfe4e13f45 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 30 May 2014 12:01:04 -0700
Subject: [PATCH 1/3] Upgrading mongodb mms agent.

---
 fabfile.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/fabfile.py b/fabfile.py
index 1c988bfca..a1284e90c 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -252,6 +252,7 @@ def setup_db(engine=None, skip_common=False):
         setup_postgres(standby=True)
     elif engine.startswith("mongo"):
         setup_mongo()
+        setup_mongo_mms()
     elif engine == "redis":
         setup_redis()
     elif engine == "redis_slave":
@@ -883,13 +884,19 @@ def setup_mongo_mongos():
 
 def setup_mongo_mms():
     pull()
-    put(os.path.join(env.SECRETS_PATH, 'settings/mongo_mms_settings.py'),
-        '%s/vendor/mms-agent/settings.py' % env.NEWSBLUR_PATH)
-    with cd(env.NEWSBLUR_PATH):
-        put('config/supervisor_mongomms.conf', '/etc/supervisor/conf.d/mongomms.conf', use_sudo=True)
+    sudo('rm -f /etc/supervisor/conf.d/mongomms.conf')
     sudo('supervisorctl reread')
     sudo('supervisorctl update')
-
+    with cd(env.VENDOR_PATH):
+        sudo('apt-get remove -y mongodb-mms-monitoring-agent')
+        run('curl -OL https://mms.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent_2.2.0.70-1_amd64.deb')
+        sudo('dpkg -i mongodb-mms-monitoring-agent_2.2.0.70-1_amd64.deb')
+        run('rm mongodb-mms-monitoring-agent_2.2.0.70-1_amd64.deb')
+        put(os.path.join(env.SECRETS_PATH, 'settings/mongo_mms_config.txt'),
+            'mongo_mms_config.txt')
+        sudo("echo \"\n\" >> /etc/mongodb-mms/monitoring-agent.config")
+        sudo('cat mongo_mms_config.txt >> /etc/mongodb-mms/monitoring-agent.config')
+        sudo('start mongodb-mms-monitoring-agent')
 
 def setup_redis(slave=False):
     redis_version = '2.6.16'

From b269eb248990357117ca6d8a7253af7b40a30efb Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 30 May 2014 13:41:57 -0700
Subject: [PATCH 2/3] Max of 3 updates per fetch.

---
 apps/rss_feeds/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
index 354e4c50e..775f11241 100644
--- a/apps/rss_feeds/models.py
+++ b/apps/rss_feeds/models.py
@@ -997,7 +997,7 @@ class Feed(models.Model):
                         logging.info('   ---> [%-30s] ~SN~FRIntegrityError on new story: %s - %s' % (self.feed_title[:30], story.get('guid'), e))
                 if self.search_indexed:
                     s.index_story_for_search()
-            elif existing_story and story_has_changed and not updates_off:
+            elif existing_story and story_has_changed and not updates_off and ret_values['updated'] < 3:
                 # update story
                 original_content = None
                 try:

From 494d4bec803a79d308890c1d8967992d67263d24 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 30 May 2014 22:38:23 -0700
Subject: [PATCH 3/3] Transitioning from tag to tag/feed_id.

---
 media/js/newsblur/models/starred_counts.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/media/js/newsblur/models/starred_counts.js b/media/js/newsblur/models/starred_counts.js
index fdce57cc0..08efa4b66 100644
--- a/media/js/newsblur/models/starred_counts.js
+++ b/media/js/newsblur/models/starred_counts.js
@@ -41,6 +41,11 @@ NEWSBLUR.Collections.StarredFeeds = Backbone.Collection.extend({
             // feed.selected = false;
             feed.ps = feed.count;
         });
+        
+        // Remove below, only used for transition to tag/feed_id.
+        models = _.filter(models, function(feed) {
+            return feed['tag'];
+        });
         return models;
     },