NOISSUE - Add docker-compose for MQTT cluster #841

drasko · 2019-09-06T11:38:08Z

Pull request title should be MF-XXX - description or NOISSUE - description where XXX is ID of issue that this PR relate to.
Please review the CONTRIBUTING.md file for detailed contributing guidelines.

What does this do?

Introduces docker-compose files for MQTT cluster. Also, modifies nginx.conf to improve performance.

Which issue(s) does this PR fix/relate to?

Put here Resolves #XXX to auto-close the issue that your PR fixes (if such)

List any changes that modify/break current functionality

nginx.conf files have been changed, and this demands testing

Have you included tests for your changes?

Did you document any new/modified functionality?

Notes

codecov-io · 2019-09-06T11:43:48Z

Codecov Report

Merging #841 into master will increase coverage by 0.04%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master     #841      +/-   ##
==========================================
+ Coverage   85.53%   85.57%   +0.04%     
==========================================
  Files          72       72              
  Lines        4708     4708              
==========================================
+ Hits         4027     4029       +2     
+ Misses        445      443       -2     
  Partials      236      236

Impacted Files	Coverage Δ
things/service.go	`88.02% <0%> (+1.4%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4870119...df72559. Read the comment docs.

drasko · 2019-09-08T14:09:59Z

WIP label removed

⚠️ Please pull the branch and test on your machines.

This PR tries to move as much as possible of mutual nginx.conf code into the snippets, also introduce cluster support.

Additionally, in entrypoint.sh environment (read from .env) is substituted in nginx.conf, so proxy URLs are not hadrcoded any more.

docker-compose.yaml is broken in several files, as Aedes is pulled out in aedes.yaml so it can be replaced with verne.yaml. Additionally, verne-cluster.yaml can be used instead (which will pull and setup correct nginx.conf).

docker/nginx/nginx-key.conf

mqtt/verne/Dockerfile

.gitignore

mteodor

LGTM

nmarcetic · 2019-09-09T10:00:03Z

.gitignore

-site/
+.vscode
+
+# MQTT


I would prefer to keep this in its own folder. Monorepo consists of multiple projects, where each has its own .gitignore.
Its much cleaner IMHO.

I prefer this centralized overview and one-place tuning. For now our structure is small enough, and sections are well commented.

If really needed let's do this in a separate issue, not to delay this PR.

docker/nginx/nginx-key.conf

Makefile

docker/nginx/nginx-x509.conf

docker/verne-cluster.yml

anovakovic01

Just fix gitignore

.gitignore

Signed-off-by: Drasko DRASKOVIC <[email protected]>

Signed-off-by: drasko <[email protected]>

anovakovic01

LGTM!

* Add MQTT cluster configs Signed-off-by: Drasko DRASKOVIC <[email protected]> * Bump worker_connections value in nginx.conf Signed-off-by: drasko <[email protected]> * Revert config.toml Signed-off-by: drasko <[email protected]> * Fix cluster Signed-off-by: drasko <[email protected]> * Move non-ssl server into the same directive Signed-off-by: drasko <[email protected]> * Fix cluster Signed-off-by: drasko <[email protected]> * Remove unnecessary comments Signed-off-by: drasko <[email protected]> * Organize docker-compose and nginx conf files Signed-off-by: drasko <[email protected]> * Correct nginx.conf for mTLS and aux changes Signed-off-by: drasko <[email protected]> * Fix NginX conf trailing slash in proxy_pass Signed-off-by: drasko <[email protected]> * Fix path for MQTT Signed-off-by: drasko <[email protected]> * Fix minorstuff in gitignore and comments Signed-off-by: drasko <[email protected]>

drasko requested review from nmarcetic, mteodor, a user, anovakovic01 and dborovcanin September 6, 2019 11:38

drasko added the work-in-progress label Sep 6, 2019

drasko force-pushed the cluster branch from 810cf07 to 251075e Compare September 6, 2019 19:08

drasko removed the work-in-progress label Sep 8, 2019

mteodor reviewed Sep 10, 2019

View reviewed changes

docker/nginx/nginx-key.conf Outdated Show resolved Hide resolved

docker/nginx/nginx-key.conf Outdated Show resolved Hide resolved

dborovcanin reviewed Sep 11, 2019

View reviewed changes

mqtt/verne/Dockerfile Outdated Show resolved Hide resolved

.gitignore Outdated Show resolved Hide resolved

mteodor previously approved these changes Sep 11, 2019

View reviewed changes

drasko dismissed mteodor’s stale review via a6b19c0 September 11, 2019 11:06

mteodor previously approved these changes Sep 11, 2019

View reviewed changes

nmarcetic reviewed Sep 11, 2019

View reviewed changes

anovakovic01 suggested changes Sep 11, 2019

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

drasko added 12 commits September 12, 2019 00:06

Add MQTT cluster configs

c0385a6

Signed-off-by: Drasko DRASKOVIC <[email protected]>

Bump worker_connections value in nginx.conf

bcbd844

Signed-off-by: drasko <[email protected]>

Revert config.toml

80d064f

Signed-off-by: drasko <[email protected]>

Fix cluster

679cb0f

Signed-off-by: drasko <[email protected]>

Move non-ssl server into the same directive

0c797b9

Signed-off-by: drasko <[email protected]>

Fix cluster

40db666

Signed-off-by: drasko <[email protected]>

Remove unnecessary comments

d77522e

Signed-off-by: drasko <[email protected]>

Organize docker-compose and nginx conf files

c18b182

Signed-off-by: drasko <[email protected]>

Correct nginx.conf for mTLS and aux changes

6207a8b

Signed-off-by: drasko <[email protected]>

Fix NginX conf trailing slash in proxy_pass

dc42893

Signed-off-by: drasko <[email protected]>

Fix path for MQTT

892ba21

Signed-off-by: drasko <[email protected]>

Fix minorstuff in gitignore and comments

df72559

Signed-off-by: drasko <[email protected]>

drasko dismissed mteodor’s stale review via df72559 September 11, 2019 22:06

drasko force-pushed the cluster branch from a6b19c0 to df72559 Compare September 11, 2019 22:06

anovakovic01 approved these changes Sep 12, 2019

View reviewed changes

dborovcanin approved these changes Sep 12, 2019

View reviewed changes

nmarcetic merged commit 3b19292 into absmach:master Sep 12, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

NOISSUE - Add docker-compose for MQTT cluster #841

NOISSUE - Add docker-compose for MQTT cluster #841

drasko commented Sep 6, 2019

codecov-io commented Sep 6, 2019 •

edited

Loading

drasko commented Sep 8, 2019

mteodor left a comment

nmarcetic Sep 9, 2019

drasko Sep 11, 2019

anovakovic01 left a comment

anovakovic01 left a comment

-              site/
+              .vscode
+              # MQTT

NOISSUE - Add docker-compose for MQTT cluster #841

NOISSUE - Add docker-compose for MQTT cluster #841

Conversation

drasko commented Sep 6, 2019

What does this do?

Which issue(s) does this PR fix/relate to?

List any changes that modify/break current functionality

Have you included tests for your changes?

Did you document any new/modified functionality?

Notes

codecov-io commented Sep 6, 2019 • edited Loading

Codecov Report

drasko commented Sep 8, 2019

mteodor left a comment

Choose a reason for hiding this comment

nmarcetic Sep 9, 2019

Choose a reason for hiding this comment

drasko Sep 11, 2019

Choose a reason for hiding this comment

anovakovic01 left a comment

Choose a reason for hiding this comment

anovakovic01 left a comment

Choose a reason for hiding this comment

codecov-io commented Sep 6, 2019 •

edited

Loading