Merge branch 'release/v3.3.0'

Author: royrusso

README.md

@@ -3,11 +3,12 @@ ElasticHQ
 
 Simplified Monitoring and Management for ElasticSearch clusters.
 
-[![GitHub Stars](https://img.shields.io/github/stars/ElasticHQ/elasticsearch-HQ.svg)](https://github.com/ElasticHQ/elasticsearch-HQ) 
-[![GitHub Issues](https://img.shields.io/github/issues/ElasticHQ/elasticsearch-HQ.svg)](https://github.com/ElasticHQ/elasticsearch-HQ) 
-[![Current Version](https://img.shields.io/badge/version-3.0.0-green.svg)](https://github.com/ElasticHQ/elasticsearch-HQ) 
-![Python](https://img.shields.io/badge/python-v3.4%20%2F%20v3.6-blue.svg)
-[![License](https://img.shields.io/badge/license-ASL-blue.svg)](https://opensource.org/licenses/ASL)
+[![gitHub stars](https://img.shields.io/github/stars/ElasticHQ/elasticsearch-HQ.svg)](https://github.com/ElasticHQ/elasticsearch-HQ) 
+[![gitHub issues](https://img.shields.io/github/issues/ElasticHQ/elasticsearch-HQ.svg)](https://github.com/ElasticHQ/elasticsearch-HQ) 
+[![latest](https://img.shields.io/github/release/ElasticHQ/elasticsearch-HQ.svg)](https://github.com/ElasticHQ/elasticsearch-HQ)
+[![docker pulls](https://img.shields.io/docker/pulls/elastichq/elasticsearch-hq.svg)](https://hub.docker.com/r/elastichq/elasticsearch-hq 'DockerHub') 
+![python](https://img.shields.io/badge/python-v3.4%20%2F%20v3.6-blue.svg)
+[![license](https://img.shields.io/badge/license-ASL-blue.svg)](https://opensource.org/licenses/ASL)
 
 
 ![alt text](https://raw.githubusercontent.com/ElasticHQ/elasticsearch-HQ/master/main_dashboard.png)

application.py

@@ -1,12 +1,14 @@
 # import argparse
 import optparse
+import os
 
 from elastichq import create_app
 from elastichq.globals import socketio
 
 default_host = '0.0.0.0'
 default_port = 5000
 default_debug = False
+default_url = 'http://localhost:9200'
 
 application = create_app()
 
@@ -24,8 +26,11 @@
     parser.add_option("-d", "--debug",
                       action="store_true", dest="debug", default=default_debug,
                       help=optparse.SUPPRESS_HELP)
+    parser.add_option("-u", "--url", default=default_url)
 
     options, _ = parser.parse_args()
 
-    socketio.run(application, host=options.host, port=options.port, debug=options.debug)
+    # set default url, override with env for docker
+    application.config['DEFAULT_URL'] = os.environ.get('HQ_DEFAULT_URL', options.url)
 
+    socketio.run(application, host=options.host, port=options.port, debug=options.debug)