generate diagram

diagram.py

@@ -8,26 +8,26 @@ from diagrams.programming.framework import Rails
 from diagrams.elastic.elasticsearch import Beats, Elasticsearch, Kibana, Logstash
 
 wordpress = "./resources/wordpress.png"
-wings = "./resources/wings.jpg"
+wings = "./resources/wings.png"
 trello = "./resources/trello.jpg"
-gitlab = "./resources/gitlab.png"
-github = "./resources/github.png"
+gitlab_logo = "./resources/gitlab.png"
+github_logo = "./resources/github.png"
 mailchimp = "./resources/mailchimp.png"
 nginx = "./resources/nginx.webp"
 www = "./resources/www.png"
-insta = "./resources/instagram.jpg"
+instagram = "./resources/instagram.jpg"
 
 with Diagram("BIJ1 IT landscape"):
 
     with Cluster("Socials"):
-        fb = Facebook()
-        tw = Twitter()
-        insta = Custom("Instagram", insta)
+        fb = Facebook("facebook.com/www.bij1.org")
+        tw = Twitter("twitter.com/PolitiekBIJ1")
+        insta = Custom("instagram.com/politiek_bij1", instagram)
 
         with Cluster("Local socials"):
-            local_fb = Facebook()
-            local_tw = Twitter()
-            local_insta = Custom("Instagram", insta)
+            local_fb = Facebook("Local FBs")
+            local_tw = Twitter("Local Twitters")
+            local_insta = Custom("Local Instagrams", instagram)
 
     with Cluster("Hosting"):
         transip = Custom("TransIP", "./resources/transip.png")
@@ -38,22 +38,22 @@ with Diagram("BIJ1 IT landscape"):
         email >> transip
 
     with Cluster("Code repositories"):
-        gitlab = Custom("gitlab.com/bij1", gitlab)
-        github = Custom("github.com/bij1", github)
-        github_data = Custom("github.com/bij1data", github)
+        gitlab = Custom("gitlab.com/bij1", gitlab_logo)
+        github = Custom("github.com/bij1", github_logo)
+        github_data = Custom("github.com/bij1data", github_logo)
         github >> gitlab
 
     with Cluster("Roadmap"):
         trello_campaign = Custom("Trello Campagne Tweede Kamer verkiezingen", trello)
         trello_it = Custom("Trello BIJ1 ICT", trello)
-        gitlab_issues = Custom("Gitlab issues", gitlab)
+        gitlab_issues = Custom("Gitlab issues", gitlab_logo)
 
     with Cluster("Aanmeldingen Kanban"):
         trello_vrijwilligers = Custom("Trello board NieuweBIJ1ers", trello)
         localize_trello = Python("localize-trello")
-        with Cluster("Lokale aanmeldingen") as local_aanmeldingen:
+        with Cluster("Lokale aanmeldingen"):
             local_trello = Custom("trello by region", trello)
-            trello_vrijwilligers >> localize_trello >> local_aanmeldingen
+            trello_vrijwilligers >> localize_trello >> local_trello
         trello_campaign >> trello_vrijwilligers
 
     with Cluster("Nieuwsbrieven"):
@@ -61,18 +61,21 @@ with Diagram("BIJ1 IT landscape"):
         with Cluster("Lokale nieuwsbrieven"):
             mailchimp_central = Custom("Lokale MailChimps", mailchimp)
 
-    with Cluster("ELK") as elk:
+    with Cluster("ELK"):
 
-        logstash = Logstash()
-        beats = Beats()
-        elasticsearch = Elasticsearch()
-        kibana = Kibana()
+        logstash = Logstash("Logstash")
+        beats = Beats("Beats")
+        elasticsearch = Elasticsearch("Elasticsearch")
+        kibana = Kibana("Kibana")
 
         logstash >> beats
         logstash >> elasticsearch
         logstash >> kibana
 
-        elk >> greenhost
+        greenhost >> logstash
+        greenhost >> beats
+        greenhost >> elasticsearch
+        greenhost >> kibana
 
     with Cluster("Meetings"):
         zoom = Custom("Zoom", "./resources/zoom.jpg")
@@ -106,7 +109,7 @@ with Diagram("BIJ1 IT landscape"):
         staging_wp >> greenhost
         shop >> bij1_wp
 
-        with Cluster("Static") as statics:
+        with Cluster("Static"):
             static = Custom("static.bij1.net", nginx)
             links = Custom("links.bij1.org", www)
             # actie = Custom("actie.bij1.org", www)
@@ -117,7 +120,7 @@ with Diagram("BIJ1 IT landscape"):
             # static >> iktelookmee
             # static >> wijzijn
 
-            statics >> greenhost
+            static >> greenhost
 
         with Cluster("Afdelingssites"):
             wingspress = Nodejs("WingsPress")
@@ -144,12 +147,12 @@ with Diagram("BIJ1 IT landscape"):
         # kom >> keycloak
         # keycloak >> cloud
 
-    with Cluster("CRM") as crm:
+    with Cluster("CRM"):
         civi = Custom("CiviCRM", "./resources/civicrm.jpg")
-        bij1_wp >> crm
         bij1algemeen = Php("bij1algemeen")
         bij1rules = Php("bij1rules")
         bij1migratie = Php("bij1migratie")
+        bij1_wp >> civi
         airtable >> bij1migratie >> civi
 
     mollie = Custom("Mollie", "./resources/mollie.jpg")