Skip to content

Commit

Permalink
Update dependency graph and docker-compose conditions
Browse files Browse the repository at this point in the history
Replaced the obsolete services dependency graph with a new local deployment dependency graph. Modified docker-compose dependencies by removing conditions on the db and webmon services for streamlined startup.

Signed-off-by: Jose Borreguero <[email protected]>
  • Loading branch information
jmborr committed Sep 5, 2024
1 parent e98f787 commit 5b78657
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 31 deletions.
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@ services:
depends_on:
db:
condition: service_healthy
webmon:
condition: service_healthy
activemq:
condition: service_healthy

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions docs/developer/images/local_deployment_dependence_graph.puml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
@startuml
'https://plantuml.com/component-diagram

left to right direction


legend right
|= Color |= Tier |
| red | first |
| blue | second |
| green | third |
endlegend

component db #lightcoral
component activemq #lightcoral
component autoheal #lightcoral

component webmon #lightblue
component autoreducer #lightblue
component autoreducer_himem #lightblue
component webmonchow #lightblue

component nginx #lightgreen
component dasmon #lightgreen
component workflow #lightgreen
component livedata #lightgreen

nginx --> webmon
webmon --> db
webmon --> activemq
dasmon --> activemq
dasmon --> webmon
workflow --> activemq
workflow --> webmon
autoreducer --> activemq
autoreducer_himem --> activemq
webmonchow --> db
webmonchow --> activemq
livedata --> db
livedata --> webmon

@enduml
Binary file removed docs/developer/images/services_dependence_graph.png
Binary file not shown.
27 changes: 0 additions & 27 deletions docs/developer/images/services_dependence_graph.puml

This file was deleted.

5 changes: 3 additions & 2 deletions docs/developer/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ Services
--------

The components making up the infrastructure of Web Monitor have dependencies.
In the diagram below `service1` --> `service2` is to be read as `service1` depends on `service2`.
In the diagram below shows the dependencies of the local deployment.
`service1` --> `service2` is to be read as `service1` depends on `service2`.
For instance, `webmonchow` depends on `db`.

.. image:: images/services_dependence_graph.png
.. image:: images/local_deployment_dependence_graph.png
:width: 600px
:align: center
:alt: services dependence graph
Expand Down

0 comments on commit 5b78657

Please sign in to comment.