Clone
 

jason rogena <jasonrogena@gmail.com> in openlmis-ref-distro

Merge pull request #48 from OpenLMIS/nifi_auth

test auth

Make NGINX Basic Auth Configurable

Make the user, password and whether the feature should be enabled

configurable for basic auth in the NGINX container in the reporting

docker-compose.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -1
    • +0
    /reporting/config/services/nginx/htpasswd
Add the Host & X-Forwarded-Port to Reporting NGINX (#46)

Add the X-Forwarded-Host and X-Forwarded-Port headers in the NGINX

template for the reporting stack.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Add the Host & X-Forwarded-Port to Reporting NGINX

Add the X-Forwarded-Host and X-Forwarded-Port headers in the NGINX

template for the reporting stack.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Add the X-Forwarded-Host/Port to Reporting NGINX

Add the X-Forwarded-Host and X-Forwarded-Port headers in the NGINX

template for the reporting stack.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Add the X-Forwarded-Host/Port to Reporting NGINX

Add the X-Forwarded-Host and X-Forwarded-Port headers in the NGINX

template for the reporting stack.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Add the X-Forwarded-Host/Port to Reporting NGINX

Add the X-Forwarded-Host and X-Forwarded-Port headers in the NGINX

template for the reporting stack.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Use Different NGINX Server Blocks for HTTP and HTTPS (#41)

In the reporting stack, use different NGINX server blocks for HTTP and

HTTPS traffic. Do this to prevent from getting 400 errors from NGINX.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Use Different NGINX Server Blocks for HTTP and HTTPS

In the reporting stack, use different NGINX server blocks for HTTP and

HTTPS traffic. Do this to prevent from getting 400 errors from NGINX.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Use Different NGINX Server Blocks for HTTP and HTTPS

In the reporting stack, use different NGINX server blocks for HTTP and

HTTPS traffic. Do this to prevent from getting 400 errors from NGINX.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Use Different NGINX Server Blocks for HTTP and HTTPS

In the reporting stack, use different NGINX server blocks for HTTP and

HTTPS traffic. Do this to prevent from getting 400 errors from NGINX.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Use Different NGINX Server Blocks for HTTP and HTTPS

In the reporting stack, use different NGINX server blocks for HTTP and

HTTPS traffic. Do this to prevent from getting 400 errors from NGINX.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

NiFi And Superset Over HTTPS (#37)

* OLMIS-5331: Register NiFi & Superset on Consul

Register NiFi and Superset as services in Consul in preperation for the

NGINX container to use the registered Consul services to create site

files.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* OLMIS-5331: Add Reporting NGINX Container

Add reporting NGINX container that would be used to proxy-pass requests

to the Superset and NiFi containers.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* OLMIS-5332: Add Support For NGINX SSL

Add support for running the NGINX container with SSL termination for the

services configured to run behind it.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* OLMIS-5331: Fix NGINX Dependencies

Make the NiFi and Superset services in the reporting docker-compose

dependant on the NGINX service, and not the other way around.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +1
    /reporting/config/services/nginx/tls/.gitignore
OLMIS-5331: Fix NGINX Dependencies

Make the NiFi and Superset services in the reporting docker-compose

dependant on the NGINX service, and not the other way around.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

OLMIS-5332: Add Support For NGINX SSL

Add support for running the NGINX container with SSL termination for the

services configured to run behind it.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +1
    /reporting/config/services/nginx/tls/.gitignore
OLMIS-5332: Add Support For NGINX SSL

Add support for running the NGINX container with SSL termination for the

services configured to run behind it.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +1
    /reporting/config/services/nginx/tls/.gitignore
OLMIS-5331: Add Reporting NGINX Container

Add reporting NGINX container that would be used to proxy-pass requests

to the Superset and NiFi containers.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

OLMIS-5331: Add Reporting NGINX Container

Add reporting NGINX container that would be used to proxy-pass requests

to the Superset and NiFi containers.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

OLMIS-5331: Register NiFi & Superset on Consul

Register NiFi and Superset as services in Consul in preperation for the

NGINX container to use the registered Consul services to create site

files.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Reporting Jenkins Deployment (#32)

* OLMIS-5280: Change Template Configs for NiFi Reg

Add property files for the templates to fetch from

nifi-registry.openlmis.org.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* OLMIS-5276: Use OpenLMIS's Scalyr Image

Use the OpenLMIS Scalyr image in the reporting stack docker-compose.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* OLMIS-5280: Get NiFi Configs From Config Vol

In order for the nifi service to support being deployed in a Docker

daemon running in a remote host, switch to it fetching its configs and

startup scripts from the configuration volume.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* OLMIS-5282: Get Superset Configs From Conf Vol

In order for the superset service to support being deployed in a Docker

daemon running in a remote host, switch to it fetching its configs from

the configuration volume.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* Remove NiFi Template XML Files

Remove the NiFi template XML files OrdersCsvInsertV2.xml and

QueryStockManagementToCSV.xml since all NiFi templates used her should

be in NiFi Registry.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* OLMIS-5281: Get Reporting db Configs from Conf Vol

In order for the reporting PG db service to support being deployed in a

daemon running in a remote host, switch to it fetching the

/docker-entrypoint-initdb.d directory from a configuration volume.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* Remove Unused Reporting rsyslog Volume

Remove the unused rsyslog volume pointing to /etc/rsyslog.d.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

* Add Instructions for Bringing Up Reporting Stack

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +5
    /reporting/config/Dockerfile
    • binary
    /reporting/config/services/nifi/libs/postgresql-42.2.3.jar
    • -0
    • +56
    /reporting/config/services/nifi/scripts/download-toolkit.sh
    • -0
    • +127
    /reporting/config/services/nifi/scripts/preload.sh
    • -0
    • +7
    /reporting/config/services/nifi/scripts/start.sh
    • -0
    • +34
    /reporting/config/services/scalyr/agent.json
    • -0
    • +120
    /reporting/config/services/superset/datasources/database.yaml
    • -0
    • +4
    /reporting/config/services/superset/superset_config.py
    • -0
    • +5
    /reporting/db/Dockerfile
  1. … 21 more files in changeset.
Add Instructions for Bringing Up Reporting Stack

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Remove Unused Reporting rsyslog Volume

Remove the unused rsyslog volume pointing to /etc/rsyslog.d.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

OLMIS-5281: Get Reporting db Configs from Conf Vol

In order for the reporting PG db service to support being deployed in a

daemon running in a remote host, switch to it fetching the

/docker-entrypoint-initdb.d directory from a configuration volume.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +5
    /reporting/db/Dockerfile
Remove NiFi Template XML Files

Remove the NiFi template XML files OrdersCsvInsertV2.xml and

QueryStockManagementToCSV.xml since all NiFi templates used her should

be in NiFi Registry.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

OLMIS-5282: Get Superset Configs From Conf Vol

In order for the superset service to support being deployed in a Docker

daemon running in a remote host, switch to it fetching its configs from

the configuration volume.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +120
    /reporting/config/services/superset/datasources/database.yaml
    • -0
    • +4
    /reporting/config/services/superset/superset_config.py
    • -4
    • +0
    /reporting/superset/superset_config.py
OLMIS-5280: Get NiFi Configs From Config Vol

In order for the nifi service to support being deployed in a Docker

daemon running in a remote host, switch to it fetching its configs and

startup scripts from the configuration volume.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +1101
    /reporting/config/services/nifi/OrdersCsvInsertV2.xml
    • binary
    /reporting/config/services/nifi/libs/postgresql-42.2.3.jar
    • -0
    • +56
    /reporting/config/services/nifi/scripts/download-toolkit.sh
    • -0
    • +127
    /reporting/config/services/nifi/scripts/preload.sh
    • -0
    • +7
    /reporting/config/services/nifi/scripts/start.sh
    • -0
    • +1
    /reporting/nifi-cache/.gitignore
    • -1101
    • +0
    /reporting/nifi/OrdersCsvInsertV2.xml
    • -1049
    • +0
    /reporting/nifi/QueryStockManagementToCSV.xml
    • binary
    /reporting/nifi/libs/postgresql-42.2.3.jar
  1. … 6 more files in changeset.
OLMIS-5276: Use OpenLMIS's Scalyr Image

Use the OpenLMIS Scalyr image in the reporting stack docker-compose.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +5
    /reporting/config/Dockerfile
    • -0
    • +34
    /reporting/config/services/scalyr/agent.json
    • -4
    • +0
    /reporting/scalyr/agent.d/api_key.json
OLMIS-5280: Change Template Configs for NiFi Reg

Add property files for the templates to fetch from

nifi-registry.openlmis.org.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

Harden The NiFi Toolkit Download Process (#31)

NiFi Toolkit might fail to fully download especially when the internet

connection is intermittent. Add functionaility for retrying the download

process if this happens.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +9
    /reporting/nifi/scripts/start.sh
Harden The NiFi Toolkit Download Process

NiFi Toolkit might fail to fully download especially when the internet

connection is intermittent. Add functionaility for retrying the download

process if this happens.

Signed-off-by: Jason Rogena <jasonrogena@gmail.com>

    • -0
    • +9
    /reporting/nifi/scripts/start.sh