diff --git a/vendor/mms-agent/WINDOWS.txt b/vendor/mms-agent/WINDOWS.txt new file mode 100755 index 000000000..d80662b33 --- /dev/null +++ b/vendor/mms-agent/WINDOWS.txt @@ -0,0 +1,57 @@ +Contents +------------ +* README.txt +* mongommsinstall.bat +* mongommstinstall.ps1 +* srvany.exe + +Prerequisites +------------ +* Expects a MMS/PyMongo compatible python version to be installed +* Expects pymongo to be installed +* Powershell version 2.0 (for windows service installation) +* Powershell script execution to be turned on + +Installation +------------ +* The following instructions are to run MMS as a windows service +* More information can be found at https://mms.10gen.com/help/install.html#installing-mms-on-windows + +Install Prerequisites +--------------------- +* Install python 2.7.x using the Windows Installer. 64 bit installer is preferred. +e.g. http://www.python.org/ftp/python/2.7.2/python-2.7.2.amd64.msi +* Install latest version of pymongo using the Windows Installer from pypi. Ensure +you pick the installer that corresponds to your python version and the type (32 bit or 64 bit). +http://pypi.python.org/pypi/pymongo/ + +Install Powershell 2.0 +---------------------- +* If you do not have powershell 2.0 installed you would need to install it from http://support.microsoft.com/kb/968929. + +Enable Powershell Script Execution +---------------------------------- +* Open the Windows Powershell by right-clicking its icon in the Start bar and selecting Run as Administrator +* Type `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned` and agree when prompted about changing the policy + +Specifying a Proxy Server +------------------------- +If the MMS agent needs a proxy server to connect outside, specify it in the HTTPS_PROXY environment variable + as http://proxyservername:port + +Sevice Installation +------------------- +* The script reads python path from windows registry if not specified on command line +* If multiple python installations are present edit the bat file to specify the path of the python install to work +* Run mongommsinstall.bat from an administrator command window +* This will install the windows service and start it +* If you stop the windows service, the agent will stop + +Uninstall +--------- +- Stop the "MongoDB MMS" windows service +- Run "sc delete mongomms" + +More Information +---------------- +- MMS Help https://mms.10gen.com/help/ diff --git a/vendor/mms-agent/agentProcess.py b/vendor/mms-agent/agentProcess.py index 1953f90cb..91788f3e8 100755 --- a/vendor/mms-agent/agentProcess.py +++ b/vendor/mms-agent/agentProcess.py @@ -21,7 +21,7 @@ import os, sys, platform, time, threading, socket, traceback, random, hashlib, t socket.setdefaulttimeout( _settings.socket_timeout ) -_agentVersion = "1.5.6" +_agentVersion = "1.5.7" _pymongoVersion = pymongo.version diff --git a/vendor/mms-agent/blockingStats.py b/vendor/mms-agent/blockingStats.py index 314e80c98..7a67edf57 100755 --- a/vendor/mms-agent/blockingStats.py +++ b/vendor/mms-agent/blockingStats.py @@ -8,7 +8,7 @@ import threading, time, datetime, pymongo, traceback, socket, warnings warnings.simplefilter( 'ignore', DeprecationWarning ) -blockingStatsAgentVersion = "1.5.6" +blockingStatsAgentVersion = "1.5.7" class BlockingMongoStatsThread( threading.Thread ): """ Pull the blocking data from the various hosts. """ diff --git a/vendor/mms-agent/confPull.py b/vendor/mms-agent/confPull.py index 4155db9e1..6f96df3fe 100755 --- a/vendor/mms-agent/confPull.py +++ b/vendor/mms-agent/confPull.py @@ -8,7 +8,7 @@ import threading, time, urllib2, traceback import bson -confPullAgentVersion = "1.5.6" +confPullAgentVersion = "1.5.7" class ConfPullThread( threading.Thread ): """ The remote configuration pull thread object """ diff --git a/vendor/mms-agent/getLogs.py b/vendor/mms-agent/getLogs.py index 96ea2d7c9..e9fbd4e97 100755 --- a/vendor/mms-agent/getLogs.py +++ b/vendor/mms-agent/getLogs.py @@ -8,7 +8,7 @@ import threading, time, traceback, warnings, sets warnings.simplefilter( 'ignore', DeprecationWarning ) -getLogsAgentVersion = "1.5.6" +getLogsAgentVersion = "1.5.7" class GetLogsThread( threading.Thread ): """ When enabled pull log data from hosts. """ diff --git a/vendor/mms-agent/mmsAgent.py b/vendor/mms-agent/mmsAgent.py index e7eabb55a..df080c63c 100755 --- a/vendor/mms-agent/mmsAgent.py +++ b/vendor/mms-agent/mmsAgent.py @@ -13,7 +13,7 @@ import bson # Python import threading, urllib, urllib2, socket, zlib, time, sets, re, gc -mmsAgentVersion = "1.5.6" +mmsAgentVersion = "1.5.7" class MmsAgent( object ): """ The mms agent object """ diff --git a/vendor/mms-agent/mongommsinstall.bat b/vendor/mms-agent/mongommsinstall.bat new file mode 100755 index 000000000..749ed366d --- /dev/null +++ b/vendor/mms-agent/mongommsinstall.bat @@ -0,0 +1 @@ +powershell .\mongommsinstall.ps1 \ No newline at end of file diff --git a/vendor/mms-agent/munin.py b/vendor/mms-agent/munin.py index 601ff300f..6631b4ecb 100755 --- a/vendor/mms-agent/munin.py +++ b/vendor/mms-agent/munin.py @@ -7,7 +7,7 @@ This is a label on a mattress. Do not modify this file! # Python import socket, threading, time -muninAgentVersion = "1.5.6" +muninAgentVersion = "1.5.7" def containsStr( val, query ): """ Returns true if the value is contained in the string """ diff --git a/vendor/mms-agent/nonBlockingStats.py b/vendor/mms-agent/nonBlockingStats.py index 5f8166c1a..2bb89b0f1 100755 --- a/vendor/mms-agent/nonBlockingStats.py +++ b/vendor/mms-agent/nonBlockingStats.py @@ -8,7 +8,7 @@ import threading, time, pymongo, traceback, warnings, datetime warnings.simplefilter( 'ignore', DeprecationWarning ) -nonBlockingStatsAgentVersion = "1.5.6" +nonBlockingStatsAgentVersion = "1.5.7" class NonBlockingMongoStatsThread( threading.Thread ): """ Pull the non-blocking data from the various hosts. """ @@ -167,13 +167,6 @@ class NonBlockingMongoStatsThread( threading.Thread ): except Exception, e: self.mmsAgent.handleOperationFailure( self.hostKey, 'getShardVersion.mdbfoo.foo', e ) - # Run the writeBacksQueued command - if 'msg' not in isMaster: - try: - root['writeBacksQueued'] = monitorConn.admin.command( 'writeBacksQueued' ) - except Exception, e: - self.mmsAgent.handleOperationFailure( self.hostKey, 'writeBacksQueued', e ) - # Check to see if this is a mongod host try: if isMaster['ismaster'] and isMaster.get('msg', '') == 'isdbgrid': diff --git a/vendor/mms-agent/srvany.exe b/vendor/mms-agent/srvany.exe new file mode 100755 index 000000000..c6c106b3a Binary files /dev/null and b/vendor/mms-agent/srvany.exe differ