Merge branch 'release/v3.5.1'

Author: royrusso

.gitignore

@@ -54,6 +54,7 @@ pip-delete-this-directory.txt
 
 # Unit test / coverage reports
 htmlcov/
+htmlout/
 .tox/
 .coverage
 .coverage.*
@@ -62,6 +63,8 @@ nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
+:memory
+
 
 # Translations
 *.mo
@@ -98,7 +101,7 @@ celerybeat-schedule
 *.sage.py
 
 # Environments
-.env
+#.env
 .venv
 env/
 venv/

Dockerfile

@@ -7,7 +7,7 @@ RUN apk update && \
     apk add supervisor && \
     apk add --update py2-pip && \
     apk add --no-cache bash && \
-    apk add --no-cache --virtual .build-deps bzip2-dev gcc libc-dev
+    apk add --no-cache --virtual .build-deps bzip2-dev gcc libc-dev libffi-dev openssl-dev python3-dev make
 
 # Copy project sources
 COPY . /src

ISSUE_TEMPLATE.md

@@ -3,7 +3,7 @@
 - **OS Platform and Distribution (e.g., Linux Ubuntu 16.04)**:
 - **ElasticHQ Version**:
 - **Elasticsearch Version**:
-- **Python version**: 
+- **Python version (ignore is using docker image)**: 
 - **Browser Vendor and Version (if applicable)**:
 
 ### Issue Description
@@ -14,4 +14,8 @@ Describe the problem clearly here. Be sure to convey here why it's a bug in Elas
 
 Include any logs or source code that would be helpful to diagnose the problem. If including stacktrace, please include the full stacktrace. 
 
-Large logs and files should be attached. Try to provide a reproducible test case or steps that are the bare minimum necessary to generate the problem.
+Large logs and files should be attached. Try to provide a reproducible test case or steps that are the bare minimum necessary to generate the problem.
+
+### Be Patient
+
+I have a day job. ;-)

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2013-2018, Roy Russo
+Copyright 2013-2019, Roy Russo
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,19 @@
+# Instructions
+
+Please try and perform pull requests against the ``develop`` branch. 
+
+Merging against the master branch causes a new release to be deployed, and I'd like to avoid that on every PR.  
+
+# PR Details
+
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+
+<!--- Describe your changes in detail -->
+
+## Related Issue
+
+<!--- If suggesting a new feature or change, please discuss it in an issue first -->
+<!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
+<!--- Please link to the issue here: -->

README.md

@@ -15,7 +15,7 @@ Simplified Monitoring and Management for ElasticSearch clusters.
 
 ## Key Features
 
-* Works with 2.x, 5.x, 6.x and current versions of Elasticsearch. 
+* Works with 2.x, 5.x, 6.x, 7.x and current versions of Elasticsearch. 
 * Monitor **many** clusters at once.
 * Monitor Nodes, Indices, Shards, and general cluster metrics.
 * Create and maintain Elasticsearch Indices.
@@ -31,7 +31,7 @@ Simplified Monitoring and Management for ElasticSearch clusters.
 
 ### Requirements
 
-* Python 3.4+
+* Python 3.6
 
 ### Instructions
 
@@ -53,6 +53,10 @@ We are hosted on Dockerhub: [ElasticHQ on Dockerhub](https://hub.docker.com/r/el
 
 For further instructions, please see relevant documentation: [Docker Images](http://docs.elastichq.org/installation.html#docker-images).
 
+## OpenShift Installation
+
+Please see relevant documentation: [ElasticHQ on OpenShift](openshift/README.md).
+
 ## Useful Links
 
 * [Documentation](http://docs.elastichq.org)

application.py

@@ -1,8 +1,8 @@
 # import argparse
+import logging.config
 import optparse
 import os
-import logging
-import logging.config
+
 from elastichq import create_app
 from elastichq.globals import socketio
 from elastichq.utils import find_config
@@ -17,6 +17,16 @@
 
 application = create_app()
 
+# set default url, override with env for docker
+application.config['DEFAULT_URL'] = os.environ.get('HQ_DEFAULT_URL', default_url)
+application.config['ENABLE_SSL'] = os.environ.get('HQ_ENABLE_SSL', default_enable_ssl)
+application.config['CA_CERTS'] = os.environ.get('HQ_CA_CERTS', default_ca_certs)
+application.config['DEBUG'] = os.environ.get('HQ_DEBUG', default_debug)
+
+if os.environ.get('HQ_DEBUG') == 'True':
+    config = find_config('logger_debug.json')
+    logging.config.dictConfig(config)
+
 if __name__ == '__main__':
     # Set up the command-line options
     parser = optparse.OptionParser()
@@ -38,7 +48,6 @@
                       help='Required when --use-ssl is set. ' + \
                            'Path to CA file or directory [default %s]' % default_ca_certs)
 
-
     options, _ = parser.parse_args()
 
     # set default url, override with env for docker

docker-entrypoint.sh

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 975bbf0704e836cd18ad12bc8c255959
+config: 7941a7fdcaed6c9c9192da5b0438d143
 tags: 645f666f9bcd5a90fca523b33c5a78b7