Merge pull request #1 from ymind/master

update versions

.gitignore

@@ -56,6 +56,7 @@ docs/_build/
 # PyBuilder
 target/
 
+.vs
 *.iml
 .idea
 mongo-connector.json

Dockerfile

@@ -1,7 +1,7 @@
-FROM python:3.5.1-alpine
+FROM python:3.5.3-alpine
 
-ENV ETCDCTL_VERSION v2.2.5
-ENV DUMB_INIT_VERSION 1.0.1
+ENV ETCDCTL_VERSION v3.1.3
+ENV DUMB_INIT_VERSION 1.2.0
 ENV CONFD_VERSION 0.12.0-alpha3
 
 # Native dependencies

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Totem
+Copyright (c) 2015 YiTeam
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,11 +1,8 @@
 # docker-mongo-es
 Docker based wrapper for [mongo connector](https://github.com/10gen-labs/mongo-connector) to send data to elasticsearch.
 
-## Status
-In Development
-
 ## Issues
-[https://github.com/totem/docker-mongo-es/issues](https://github.com/totem/docker-mongo-es/issues)
+[https://github.com/yisoft/docker-mongo-es/issues](https://github.com/yisoft/docker-mongo-es/issues)
 
 ## Requirements
 - Docker 1.6.2+
@@ -15,9 +12,11 @@ In Development
 
 ## Running
 ```
-docker run --rm -it -e MONGO_URL=172.17.42.1:27017 -e ES_URL=172.17.42.1:9200 totem/docker-mongo-es
+docker run --rm -it -e MONGO_URL=172.17.42.1:27017 \
+                    -e ES_URL=172.17.42.1:9200 \ 
+                    totem/docker-mongo-es
 ```
-
+ 
 ## Environment Variables
 
 ### MONGO_URL
@@ -33,8 +32,10 @@ Admin username for mongodb. If blank, no credentials are used. (Defaults to blan
 Admin password for mongodb.(Default to blank)
 
 ### MONGO_INCLUDES
-List of database.collection separated by comma that needs to be included for indexing. e.g.: ```totem.events,totem.deployments``` to 
-include database collections events and deployments from totem database.
+List of database.collection separated by comma that needs to be included for indexing. e.g.: ```totem.events,yisoft.*``` to 
+include database collection events from totem database, and all database collections from yisoft database.
+
+more about wildcard ```*``` see [mongo-connector wiki](https://github.com/10gen-labs/mongo-connector/wiki/Configuration-Options)
 
 ### CONFIG_LOCATION
 Optional config file location. (Defaults to blank). e.g.:  file:///tmp/config.yml  or https://my-config-server/config.yml.

conf/appconfig.py

@@ -25,7 +25,6 @@
     'es': {
         'url': ES_URL,
         'indexes': ES_INDEXES
-
     },
     'mongo-connector': {
         'mainAddress': MONGO_URL,
@@ -54,7 +53,6 @@
         'verbosity': LOG_VERBOSITY,
         'continueOnError': True
     },
-
 }
 
 CONFIG_LOCATION = os.getenv('CONFIG_LOCATION')

requirements.txt

@@ -1,6 +1,6 @@
-mongo-connector==2.3.0
+mongo-connector==2.5.1
 elastic-doc-manager
-elasticsearch>=1.0.0,<2.0.0
-pymongo==3.2.2
-requests
-PyYAML==3.11
+elasticsearch>=5.0.0,<6.0.0
+pymongo==3.4.0
+requests==2.13.0
+PyYAML==3.12