[mongo] Connection DB should be separate from monitored DB(s) #1961
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
||
| self.event({ | ||
| 'timestamp': int(time.time()), | ||
| 'event_type': 'Mongo', | ||
| 'api_key': agentConfig['api_key'], | ||
| 'api_key': api_key, |
There was a problem hiding this comment.
you can replace the modifications above with
'api_key': agentConfig.get('api_key', ''),
here
|
LGTM, just need to rebase. |
Fix get database names via pymongo. Reusing the conn object was failing. No need to reauthenticate. Fixing typo. pymongo.Connection is deprecated, favoring MongoClient. socket timeout now expressed in milliseconds w/ MongoClient fixing typo. We were appending multiple times to the same list. ReplicaSet have to be defined when declaring a MongoClient. Also, the replicaset events were orginally ignored if not targeting the admin db, they should now always work. Fixing pep8 and flake8 issues. Pythonic dict lookup, instead of ugly if. Typo, how did api_key end up in a list? Improvements following Haissams cue towards a more pythonic code. Fixing a couple of long lines. No need to de-dupe tags again there.
truthbk
force-pushed
the
jaime/mongo-clustermon-fix
branch
from
801998e to
6ffbd4f
Compare
truthbk
added a commit
that referenced
this pull request
Oct 9, 2015
[mongo] Connection DB should be separate from monitored DB(s)
|
Don't forget to remove your branch from Github once you're all set :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fix attempts to address what is described here: #1855
Two main things have been done:
Also, since pymongo.Connection is deprecated, I changed this over to use MongoClient which is the preferred way to do so. Finally, the api_key was causing issues when creating an event when dealing with some of the replicaset data and creating events - older integration tests were not picking up on this because replicaset's were essentially not being handled originally.
Integration tests are good. Local tests against docker are good.
Some refactoring may be in order. Also note my python game definitely need polishing - so any comments are welcome.