Merge branch 'master' into ios7

* master:
  Fixing mongo btree munin graph.
This commit is contained in:
Samuel Clay 2013-10-23 14:51:15 -07:00
commit 56baf288ef

View file

@ -20,7 +20,6 @@ def getServerStatus():
user = os.environ.get("user")
password = os.environ.get("password")
if user and password:
print user,password
passwdmngr = urllib2.HTTPPasswordMgrWithDefaultRealm()
passwdmngr.add_password(None, 'http://%s:%d' % (host, port), user, password)
authhandler = urllib2.HTTPDigestAuthHandler(passwdmngr)
@ -30,7 +29,7 @@ def getServerStatus():
return json.loads( raw )["serverStatus"]
def get():
return getServerStatus()["indexCounters"]["btree"]
return getServerStatus()["indexCounters"]
def doData():
for k,v in get().iteritems():