Merge branch 'add_raspbian_gen_os' into terraform-provider

* add_raspbian_gen_os: update raspbian.png for size Added raspbian.png for Raspberry Pis. Add Raspberry Pi logo for describing RPis. fix: removed over-nesting in resources file and added test (mingrammer#498) feat(node): add Onprem puppet (mingrammer#492) feat(node): add SVN (mingrammer#426) feat(node): add Dynatrace in monitoring category (mingrammer#471) docs(contributing): add black tool requirement for autogen.sh (mingrammer#434) feat(node): add Tyk node (mingrammer#449) feat(node): add starlette framework (mingrammer#443) chore(deps-dev): bump docusaurus from 1.14.6 to 1.14.7 in /website (mingrammer#485) chore(deps): bump jinja2 from 2.11.3 to 3.0.1 (mingrammer#534) fix(website): add IBM in the side menu (mingrammer#574) chore(deps): bump graphviz from 0.16 to 0.17 (mingrammer#561) docs: replace master/slave terminology in Cluster example (mingrammer#521) fix(autogen): run autogen after IBM provider added. (mingrammer#569) docs(all): update from main to primary (mingrammer#573) feat(node): latex logo (mingrammer#565) feat(node): add k3s icon (mingrammer#575)
haad · May 12, 2022 · 1d3ea4e · 1d3ea4e
2 parents 982383b + ad8f037
commit 1d3ea4e
Show file tree

Hide file tree

Showing 50 changed files with 3,527 additions and 2,667 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -30,16 +30,17 @@ ffmpeg -i my_big_image.jpg -vf scale=w=256:h=256:force_original_aspect_ratio=dec
 
 Then just run the `./autogen.sh` to generate the added or updated node classes. (cf. [DEVELOPMENT][DEVELOPMENT.md])
 
-> IMPORTANT NOTE: To run `autogen.sh`, you need [round][round] and
+> IMPORTANT NOTE: To run `autogen.sh`, you need [round][round], [black][black] and
 > [inkscape][inkscape] command lines that are used for cleaning the image
-> resource filenames.
+> resource filenames and formatting the generated python code.
 >
 > macOS users can download the inkscape via Homebrew.
 >
 > Or you should use the docker image.
 
 [DEVELOPMENT.md]: ./DEVELOPMENT.md
 [round]: https://github.com/mingrammer/round
+[black]: https://pypi.org/project/black
 [inkscape]: https://inkscape.org/ko/release
 
 ### Update Aliases

diff --git a/diagrams/generic/os.py b/diagrams/generic/os.py
@@ -28,6 +28,10 @@ class LinuxGeneral(_Os):
     _icon = "linux-general.png"
 
 
+class Raspbian(_Os):
+    _icon = "raspbian.png"
+
+
 class Suse(_Os):
     _icon = "suse.png"
 

diff --git a/diagrams/onprem/container.py b/diagrams/onprem/container.py
@@ -28,6 +28,10 @@ class Gvisor(_Container):
     _icon = "gvisor.png"
 
 
+class K3S(_Container):
+    _icon = "k3s.png"
+
+
 class Lxc(_Container):
     _icon = "lxc.png"
 

diff --git a/diagrams/onprem/iac.py b/diagrams/onprem/iac.py
@@ -20,6 +20,10 @@ class Awx(_Iac):
     _icon = "awx.png"
 
 
+class Puppet(_Iac):
+    _icon = "puppet.png"
+
+
 class Terraform(_Iac):
     _icon = "terraform.png"
 

diff --git a/diagrams/onprem/monitoring.py b/diagrams/onprem/monitoring.py
@@ -16,6 +16,10 @@ class Datadog(_Monitoring):
     _icon = "datadog.png"
 
 
+class Dynatrace(_Monitoring):
+    _icon = "dynatrace.png"
+
+
 class Grafana(_Monitoring):
     _icon = "grafana.png"
 

diff --git a/diagrams/onprem/network.py b/diagrams/onprem/network.py
@@ -108,6 +108,10 @@ class Traefik(_Network):
     _icon = "traefik.png"
 
 
+class Tyk(_Network):
+    _icon = "tyk.png"
+
+
 class Vyos(_Network):
     _icon = "vyos.png"
 

diff --git a/diagrams/onprem/vcs.py b/diagrams/onprem/vcs.py
@@ -24,4 +24,8 @@ class Gitlab(_Vcs):
     _icon = "gitlab.png"
 
 
+class Svn(_Vcs):
+    _icon = "svn.png"
+
+
 # Aliases
diff --git a/diagrams/programming/framework.py b/diagrams/programming/framework.py
@@ -56,6 +56,10 @@ class Spring(_Framework):
     _icon = "spring.png"
 
 
+class Starlette(_Framework):
+    _icon = "starlette.png"
+
+
 class Vue(_Framework):
     _icon = "vue.png"
 

diff --git a/diagrams/programming/language.py b/diagrams/programming/language.py
@@ -52,6 +52,10 @@ class Kotlin(_Language):
     _icon = "kotlin.png"
 
 
+class Latex(_Language):
+    _icon = "latex.png"
+
+
 class Matlab(_Language):
     _icon = "matlab.png"
 

diff --git a/docs/getting-started/examples.md b/docs/getting-started/examples.md
@@ -42,13 +42,13 @@ with Diagram("Clustered Web Services", show=False):
                      ECS("web3")]
 
     with Cluster("DB Cluster"):
-        db_main = RDS("userdb")
-        db_main - [RDS("userdb ro")]
+        db_primary = RDS("userdb")
+        db_primary - [RDS("userdb ro")]
 
     memcached = ElastiCache("memcached")
 
     dns >> lb >> svc_group
-    svc_group >> db_main
+    svc_group >> db_primary
     svc_group >> memcached
 ```
 
@@ -196,14 +196,14 @@ with Diagram("Advanced Web Service with On-Premise", show=False):
             Server("grpc3")]
 
     with Cluster("Sessions HA"):
-        main = Redis("session")
-        main - Redis("replica") << metrics
-        grpcsvc >> main
+        primary = Redis("session")
+        primary - Redis("replica") << metrics
+        grpcsvc >> primary
 
     with Cluster("Database HA"):
-        main = PostgreSQL("users")
-        main - PostgreSQL("replica") << metrics
-        grpcsvc >> main
+        primary = PostgreSQL("users")
+        primary - PostgreSQL("replica") << metrics
+        grpcsvc >> primary
 
     aggregator = Fluentd("logging")
     aggregator >> Kafka("stream") >> Spark("analytics")
@@ -239,14 +239,14 @@ with Diagram(name="Advanced Web Service with On-Premise (colored)", show=False):
             Server("grpc3")]
 
     with Cluster("Sessions HA"):
-        main = Redis("session")
-        main - Edge(color="brown", style="dashed") - Redis("replica") << Edge(label="collect") << metrics
-        grpcsvc >> Edge(color="brown") >> main
+        primary = Redis("session")
+        primary - Edge(color="brown", style="dashed") - Redis("replica") << Edge(label="collect") << metrics
+        grpcsvc >> Edge(color="brown") >> primary
 
     with Cluster("Database HA"):
-        main = PostgreSQL("users")
-        main - Edge(color="brown", style="dotted") - PostgreSQL("replica") << Edge(label="collect") << metrics
-        grpcsvc >> Edge(color="black") >> main
+        primary = PostgreSQL("users")
+        primary - Edge(color="brown", style="dotted") - PostgreSQL("replica") << Edge(label="collect") << metrics
+        grpcsvc >> Edge(color="black") >> primary
 
     aggregator = Fluentd("logging")
     aggregator >> Edge(label="parse") >> Kafka("stream") >> Edge(color="black", style="bold") >> Spark("analytics")

diff --git a/docs/guides/cluster.md b/docs/guides/cluster.md
@@ -22,11 +22,11 @@ with Diagram("Simple Web Service with DB Cluster", show=False):
     web = ECS("service")
 
     with Cluster("DB Cluster"):
-        db_main = RDS("main")
-        db_main - [RDS("replica1"),
+        db_primary = RDS("primary")
+        db_primary - [RDS("replica1"),
                      RDS("replica2")]
 
-    dns >> web >> db_main
+    dns >> web >> db_primary
 ```
 
 ![simple web service with db cluster diagram](/img/simple_web_service_with_db_cluster_diagram.png)

diff --git a/docs/guides/edge.md b/docs/guides/edge.md
@@ -35,22 +35,22 @@ with Diagram(name="Advanced Web Service with On-Premise (colored)", show=False):
             Server("grpc3")]
 
     with Cluster("Sessions HA"):
-        main = Redis("session")
-        main \
+        primary = Redis("session")
+        primary \
             - Edge(color="brown", style="dashed") \
             - Redis("replica") \
             << Edge(label="collect") \
             << metrics
-        grpcsvc >> Edge(color="brown") >> main
+        grpcsvc >> Edge(color="brown") >> primary
 
     with Cluster("Database HA"):
-        main = PostgreSQL("users")
-        main \
+        primary = PostgreSQL("users")
+        primary \
             - Edge(color="brown", style="dotted") \
             - PostgreSQL("replica") \
             << Edge(label="collect") \
             << metrics
-        grpcsvc >> Edge(color="black") >> main
+        grpcsvc >> Edge(color="black") >> primary
 
     aggregator = Fluentd("logging")
     aggregator \

diff --git a/docs/nodes/generic.md b/docs/nodes/generic.md
@@ -37,6 +37,7 @@ Node classes list of generic provider.
 - **diagrams.generic.os.Debian**
 - **diagrams.generic.os.IOS**
 - **diagrams.generic.os.LinuxGeneral**
+- **diagrams.generic.os.Raspbian**
 - **diagrams.generic.os.Suse**
 - **diagrams.generic.os.Ubuntu**
 - **diagrams.generic.os.Windows**

diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
@@ -75,6 +75,7 @@ Node classes list of onprem provider.
 - **diagrams.onprem.container.Docker**
 - **diagrams.onprem.container.Firecracker**
 - **diagrams.onprem.container.Gvisor**
+- **diagrams.onprem.container.K3S**
 - **diagrams.onprem.container.Lxc**, **LXC** (alias)
 - **diagrams.onprem.container.Rkt**, **RKT** (alias)
 
@@ -123,6 +124,7 @@ Node classes list of onprem provider.
 - **diagrams.onprem.iac.Ansible**
 - **diagrams.onprem.iac.Atlantis**
 - **diagrams.onprem.iac.Awx**
+- **diagrams.onprem.iac.Puppet**
 - **diagrams.onprem.iac.Terraform**
 
 ## onprem.identity
@@ -152,6 +154,7 @@ Node classes list of onprem provider.
 
 - **diagrams.onprem.monitoring.Cortex**
 - **diagrams.onprem.monitoring.Datadog**
+- **diagrams.onprem.monitoring.Dynatrace**
 - **diagrams.onprem.monitoring.Grafana**
 - **diagrams.onprem.monitoring.Humio**
 - **diagrams.onprem.monitoring.Newrelic**
@@ -189,6 +192,7 @@ Node classes list of onprem provider.
 - **diagrams.onprem.network.Powerdns**
 - **diagrams.onprem.network.Tomcat**
 - **diagrams.onprem.network.Traefik**
+- **diagrams.onprem.network.Tyk**
 - **diagrams.onprem.network.Vyos**, **VyOS** (alias)
 - **diagrams.onprem.network.Wildfly**
 - **diagrams.onprem.network.Zookeeper**
@@ -232,6 +236,7 @@ Node classes list of onprem provider.
 - **diagrams.onprem.vcs.Gitea**
 - **diagrams.onprem.vcs.Github**
 - **diagrams.onprem.vcs.Gitlab**
+- **diagrams.onprem.vcs.Svn**
 
 ## onprem.workflow
 

diff --git a/docs/nodes/openstack.md b/docs/nodes/openstack.md
@@ -5,9 +5,6 @@ title: OpenStack
 
 Node classes list of openstack provider.
 
-## openstack.adjacentenablers
-
-
 ## openstack.apiproxies
 
 - **diagrams.openstack.apiproxies.EC2API**
@@ -51,9 +48,6 @@ Node classes list of openstack provider.
 
 - **diagrams.openstack.frontend.Horizon**
 
-## openstack.lifecyclemanagement
-
-
 ## openstack.monitoring
 
 - **diagrams.openstack.monitoring.Monasca**
@@ -73,9 +67,6 @@ Node classes list of openstack provider.
 
 - **diagrams.openstack.nfv.Tacker**
 
-## openstack.operations
-
-
 ## openstack.optimization
 
 - **diagrams.openstack.optimization.Congress**

diff --git a/docs/nodes/programming.md b/docs/nodes/programming.md
@@ -46,6 +46,7 @@ Node classes list of programming provider.
 - **diagrams.programming.framework.Rails**
 - **diagrams.programming.framework.React**
 - **diagrams.programming.framework.Spring**
+- **diagrams.programming.framework.Starlette**
 - **diagrams.programming.framework.Vue**
 
 ## programming.language
@@ -61,6 +62,7 @@ Node classes list of programming provider.
 - **diagrams.programming.language.Java**
 - **diagrams.programming.language.Javascript**, **JavaScript** (alias)
 - **diagrams.programming.language.Kotlin**
+- **diagrams.programming.language.Latex**
 - **diagrams.programming.language.Matlab**
 - **diagrams.programming.language.Nodejs**, **NodeJS** (alias)
 - **diagrams.programming.language.Php**, **PHP** (alias)