From 03ff9cf77a2b3132da43e28a34b22813763f3e61 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Fri, 11 Nov 2016 12:58:02 -0800 Subject: [PATCH] Ignoring replica set for munin mongo to get per-server stats, not master stats. --- fabfile.py | 4 +--- vendor/munin/mongodb.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fabfile.py b/fabfile.py index db93231de..c3af0e3d5 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1003,12 +1003,10 @@ def setup_mongo(): sudo('mkdir -p /var/log/mongod') sudo('chown mongodb /var/log/mongod') put('config/logrotate.mongo.conf', '/etc/logrotate.d/mongod', use_sudo=True) - - sudo('pip install pymongo==3.0.3') # For munin # Reclaim 5% disk space used for root logs. Set to 1%. with settings(warn_only=True): - sudo('tune2fs -m 1 /dev/vda') + sudo('tune2fs -m 1 /dev/vda1') def setup_mongo_configsvr(): sudo('mkdir -p /var/lib/mongodb_configsvr') diff --git a/vendor/munin/mongodb.py b/vendor/munin/mongodb.py index c89895b6d..caaa2440b 100755 --- a/vendor/munin/mongodb.py +++ b/vendor/munin/mongodb.py @@ -29,7 +29,7 @@ class MuninMongoDBPlugin(MuninPlugin): def connection(self): if not hasattr(self, '_connection'): import pymongo - self._connection = pymongo.MongoReplicaSetClient(self.server[0], self.server[1], replicaSet='nbset') + self._connection = pymongo.MongoClient(self.server[0], self.server[1]) return self._connection @property