Merge branch 'master' into feature/tracing

README.md

@@ -72,12 +72,16 @@ To contribute to diagram, check out [contribution guidelines](CONTRIBUTING.md).
 
 [![GitPitch](https://gitpitch.com/gpimg/logo.png)](https://gitpitch.com/)
 
-[GitPitch](https://gitpitch.com/) is a markdown presentation service for developers. Diagrams is now integrated as [Cloud Diagram Widget](https://gitpitch.com/docs/diagram-features/cloud-diagrams/) of GitPitch, so you can use the Diagrams when to create slide decks for Tech Conferences, Meetups, and Training with GitPitch.
+[GitPitch](https://gitpitch.com/) is the perfect slide deck solution for Tech Conferences, Training, Developer Advocates, and Educators. Diagrams is now available as a dedicated [Cloud Diagram Markdown Widget](https://docs.gitpitch.com/#/diagrams/cloud-architecture) so you can use Diagrams directly on any slide for conferences, meetups, and training.
 
-[Cloudiscovery](https://github.com/Cloud-Architects/cloudiscovery) helps you to analyze resources in your cloud (AWS/GCP/Azure/Alibaba/IBM) account. It allows you to create a diagram of analyzed cloud resource map based on this Diagrams library, so you can draw the your existing cloud infratructure with Cloudicovery.
+[Cloudiscovery](https://github.com/Cloud-Architects/cloudiscovery) helps you to analyze resources in your cloud (AWS/GCP/Azure/Alibaba/IBM) account. It allows you to create a diagram of analyzed cloud resource map based on this Diagrams library, so you can draw the your existing cloud infrastructure with Cloudicovery.
 
 [Airflow Diagrams](https://github.com/feluelle/airflow-diagrams) is an Airflow plugin that aims to easily visualise your Airflow DAGs on service level from providers like AWS, GCP, Azure, etc. via diagrams.
 
+## Other languages
+
+- If you are familiar to Go, you can use [go-diagrams](https://github.com/blushft/go-diagrams) as well.
+
 ## License
 
 [MIT](LICENSE)

config.py

@@ -66,9 +66,10 @@ UPPER_WORDS = {
     ),
     "oci": ("oci", "ocid", "oke", "ocir", "ddos", "waf", "bm", "vm", "cdn", "vpn", "dns", "nat", "dms", "api", "id"),
     "elastic": ("apm", "siem", "ece", "eck"),
-    "generic": ("vpn", "ios", "xen", "sql"),
+    "generic": ("vpn", "ios", "xen", "sql", "lxc"),
     "outscale": ("osc",),
     "openstack": ("rpm", "loci", "nfv", "ec2api"),
+    "pve": ("pve"),
 }
 
 TITLE_WORDS = {
@@ -99,6 +100,7 @@ ALIASES = {
             "Zuulci": "ZuulCI",
         },
         "container": {
+            "Lxc": "LXC",
             "Rkt": "RKT",
         },
         "database": {
@@ -129,11 +131,20 @@ ALIASES = {
             "Pfsense": "PFSense",
             "Vyos": "VyOS"
         },
+        "proxmox": {
+            "Pve": "ProxmoxVE",
+        },
         "queue": {
             "Activemq": "ActiveMQ",
             "Rabbitmq": "RabbitMQ",
             "Zeromq": "ZeroMQ",
         },
+        "storage": {
+            "ceph": {
+                "CEPH": "ceph",
+                "Ceph-OSD": "CEPH-OSD"
+            }
+        },
         "workflow": {
             "Kubeflow": "KubeFlow",
             "Nifi": "NiFi",

diagrams/__init__.py

@@ -60,6 +60,8 @@ class Diagram:
         "height": "1.4",
         "labelloc": "b",
         # imagepos attribute is not backward compatible
+        # TODO: check graphviz version to see if "imagepos" is available >= 2.40
+        # https://github.com/xflr6/graphviz/blob/master/graphviz/backend.py#L248
         # "imagepos": "tc",
         "imagescale": "true",
         "fontname": "Sans-Serif",

diagrams/k8s/chaos.py

@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _K8S
+
+
+class _Chaos(_K8S):
+    _type = "chaos"
+    _icon_dir = "resources/k8s/chaos"
+
+
+class ChaosMesh(_Chaos):
+    _icon = "chaos-mesh.png"
+
+
+class LitmusChaos(_Chaos):
+    _icon = "litmus-chaos.png"
+
+
+# Aliases

diagrams/k8s/ecosystem.py

@@ -8,6 +8,10 @@ class _Ecosystem(_K8S):
     _icon_dir = "resources/k8s/ecosystem"
 
 
+class ExternalDns(_Ecosystem):
+    _icon = "external-dns.png"
+
+
 class Helm(_Ecosystem):
     _icon = "helm.png"
 

diagrams/onprem/aggregator.py

@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OnPrem
+
+
+class _Aggregator(_OnPrem):
+    _type = "aggregator"
+    _icon_dir = "resources/onprem/aggregator"
+
+
+class Fluentd(_Aggregator):
+    _icon = "fluentd.png"
+
+
+class Vector(_Aggregator):
+    _icon = "vector.png"
+
+
+# Aliases

diagrams/onprem/auth.py

@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OnPrem
+
+
+class _Auth(_OnPrem):
+    _type = "auth"
+    _icon_dir = "resources/onprem/auth"
+
+
+class BuzzfeedSso(_Auth):
+    _icon = "buzzfeed-sso.png"
+
+
+class Oauth2Proxy(_Auth):
+    _icon = "oauth2-proxy.png"
+
+
+# Aliases

diagrams/onprem/container.py

@@ -12,10 +12,15 @@ class Docker(_Container):
     _icon = "docker.png"
 
 
+class Lxc(_Container):
+    _icon = "lxc.png"
+
+
 class Rkt(_Container):
     _icon = "rkt.png"
 
 
 # Aliases
 
+LXC = Lxc
 RKT = Rkt

diagrams/onprem/identity.py

@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OnPrem
+
+
+class _Identity(_OnPrem):
+    _type = "identity"
+    _icon_dir = "resources/onprem/identity"
+
+
+class Dex(_Identity):
+    _icon = "dex.png"
+
+
+# Aliases

diagrams/onprem/logging.py

@@ -12,10 +12,6 @@ class Fluentbit(_Logging):
     _icon = "fluentbit.png"
 
 
-class Fluentd(_Logging):
-    _icon = "fluentd.png"
-
-
 class Graylog(_Logging):
     _icon = "graylog.png"
 

diagrams/onprem/monitoring.py

@@ -36,4 +36,8 @@ class Thanos(_Monitoring):
     _icon = "thanos.png"
 
 
+class Zabbix(_Monitoring):
+    _icon = "zabbix.png"
+
+
 # Aliases

diagrams/onprem/network.py

@@ -12,6 +12,10 @@ class Apache(_Network):
     _icon = "apache.png"
 
 
+class Bind9(_Network):
+    _icon = "bind-9.png"
+
+
 class Caddy(_Network):
     _icon = "caddy.png"
 
@@ -28,6 +32,14 @@ class Etcd(_Network):
     _icon = "etcd.png"
 
 
+class Glassfish(_Network):
+    _icon = "glassfish.png"
+
+
+class Gunicorn(_Network):
+    _icon = "gunicorn.png"
+
+
 class Haproxy(_Network):
     _icon = "haproxy.png"
 
@@ -40,6 +52,14 @@ class Istio(_Network):
     _icon = "istio.png"
 
 
+class Jbossas(_Network):
+    _icon = "jbossas.png"
+
+
+class Jetty(_Network):
+    _icon = "jetty.png"
+
+
 class Kong(_Network):
     _icon = "kong.png"
 
@@ -72,6 +92,10 @@ class Pomerium(_Network):
     _icon = "pomerium.png"
 
 
+class Powerdns(_Network):
+    _icon = "powerdns.png"
+
+
 class Tomcat(_Network):
     _icon = "tomcat.png"
 
@@ -84,6 +108,10 @@ class Vyos(_Network):
     _icon = "vyos.png"
 
 
+class Wildfly(_Network):
+    _icon = "wildfly.png"
+
+
 class Zookeeper(_Network):
     _icon = "zookeeper.png"
 
@@ -93,5 +121,6 @@ class Zookeeper(_Network):
 ETCD = Etcd
 HAProxy = Haproxy
 OSM = OpenServiceMesh
+OPNSense = Opnsense
 PFSense = Pfsense
 VyOS = Vyos

diagrams/onprem/proxmox.py

@@ -0,0 +1,17 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OnPrem
+
+
+class _Proxmox(_OnPrem):
+    _type = "proxmox"
+    _icon_dir = "resources/onprem/proxmox"
+
+
+class Pve(_Proxmox):
+    _icon = "pve.png"
+
+
+# Aliases
+
+ProxmoxVE = Pve

diagrams/onprem/storage.py

@@ -0,0 +1,19 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _OnPrem
+
+class _Storage(_OnPrem):
+    _type = "storage"
+    _icon_dir = "resources/onprem/storage"
+
+
+class CephOsd(_Storage):
+    _icon = "ceph-osd.png"
+class Ceph(_Storage):
+    _icon = "ceph.png"
+class Glusterfs(_Storage):
+    _icon = "glusterfs.png"
+
+# Aliases
+
+{'CEPH': 'ceph', 'Ceph-OSD': 'CEPH-OSD'} = ceph

docs/nodes/k8s.md

@@ -5,6 +5,11 @@ title: K8S
 
 Node classes list of k8s provider.
 
+## k8s.chaos
+
+- **diagrams.k8s.chaos.ChaosMesh**
+- **diagrams.k8s.chaos.LitmusChaos**
+
 ## k8s.clusterconfig
 
 - **diagrams.k8s.clusterconfig.HPA**, **HorizontalPodAutoscaler** (alias)
@@ -32,6 +37,7 @@ Node classes list of k8s provider.
 
 ## k8s.ecosystem
 
+- **diagrams.k8s.ecosystem.ExternalDns**
 - **diagrams.k8s.ecosystem.Helm**
 - **diagrams.k8s.ecosystem.Krew**
 - **diagrams.k8s.ecosystem.Kustomize**

docs/nodes/onprem.md

@@ -5,6 +5,11 @@ title: OnPrem
 
 Node classes list of onprem provider.
 
+## onprem.aggregator
+
+- **diagrams.onprem.aggregator.Fluentd**
+- **diagrams.onprem.aggregator.Vector**
+
 ## onprem.analytics
 
 - **diagrams.onprem.analytics.Beam**
@@ -20,6 +25,11 @@ Node classes list of onprem provider.
 - **diagrams.onprem.analytics.Storm**
 - **diagrams.onprem.analytics.Tableau**
 
+## onprem.auth
+
+- **diagrams.onprem.auth.BuzzfeedSso**
+- **diagrams.onprem.auth.Oauth2Proxy**
+
 ## onprem.cd
 
 - **diagrams.onprem.cd.Spinnaker**
@@ -56,6 +66,7 @@ Node classes list of onprem provider.
 ## onprem.container
 
 - **diagrams.onprem.container.Docker**
+- **diagrams.onprem.container.Lxc**, **LXC** (alias)
 - **diagrams.onprem.container.Rkt**, **RKT** (alias)
 
 ## onprem.database
@@ -96,6 +107,10 @@ Node classes list of onprem provider.
 - **diagrams.onprem.iac.Awx**
 - **diagrams.onprem.iac.Terraform**
 
+## onprem.identity
+
+- **diagrams.onprem.identity.Dex**
+
 ## onprem.inmemory
 
 - **diagrams.onprem.inmemory.Aerospike**
@@ -106,7 +121,6 @@ Node classes list of onprem provider.
 ## onprem.logging
 
 - **diagrams.onprem.logging.Fluentbit**, **FluentBit** (alias)
-- **diagrams.onprem.logging.Fluentd**
 - **diagrams.onprem.logging.Graylog**
 - **diagrams.onprem.logging.Loki**
 - **diagrams.onprem.logging.Rsyslog**, **RSyslog** (alias)
@@ -125,17 +139,23 @@ Node classes list of onprem provider.
 - **diagrams.onprem.monitoring.Sentry**
 - **diagrams.onprem.monitoring.Splunk**
 - **diagrams.onprem.monitoring.Thanos**
+- **diagrams.onprem.monitoring.Zabbix**
 
 ## onprem.network
 
 - **diagrams.onprem.network.Apache**
+- **diagrams.onprem.network.Bind9**
 - **diagrams.onprem.network.Caddy**
 - **diagrams.onprem.network.Consul**
 - **diagrams.onprem.network.Envoy**
 - **diagrams.onprem.network.Etcd**, **ETCD** (alias)
+- **diagrams.onprem.network.Glassfish**
+- **diagrams.onprem.network.Gunicorn**
 - **diagrams.onprem.network.Haproxy**, **HAProxy** (alias)
 - **diagrams.onprem.network.Internet**
 - **diagrams.onprem.network.Istio**
+- **diagrams.onprem.network.Jbossas**
+- **diagrams.onprem.network.Jetty**
 - **diagrams.onprem.network.Kong**
 - **diagrams.onprem.network.Linkerd**
 - **diagrams.onprem.network.Nginx**
@@ -144,11 +164,17 @@ Node classes list of onprem provider.
 - **diagrams.onprem.network.Opnsense**, **OPNsense** (alias)
 - **diagrams.onprem.network.Pfsense**, **PFSense** (alias)
 - **diagrams.onprem.network.Pomerium**
+- **diagrams.onprem.network.Powerdns**
 - **diagrams.onprem.network.Tomcat**
 - **diagrams.onprem.network.Traefik**
 - **diagrams.onprem.network.Vyos**, **VyOS** (alias)
+- **diagrams.onprem.network.Wildfly**
 - **diagrams.onprem.network.Zookeeper**
 
+## onprem.proxmox
+
+- **diagrams.onprem.proxmox.Pve**, **ProxmoxVE** (alias)
+
 ## onprem.queue
 
 - **diagrams.onprem.queue.Activemq**, **ActiveMQ** (alias)
@@ -166,6 +192,12 @@ Node classes list of onprem provider.
 - **diagrams.onprem.security.Trivy**
 - **diagrams.onprem.security.Vault**
 
+## onprem.storage
+
+- **diagrams.onprem.storage.CephOsd**
+- **diagrams.onprem.storage.Ceph**
+- **diagrams.onprem.storage.Glusterfs**
+
 ## onprem.tracing
 
 - **diagrams.onprem.tracing.Jaeger**

scripts/resource.py

@@ -13,7 +13,7 @@ import sys
 import config as cfg
 from . import resource_dir
 
-_usage = "Usage: resources.py <cmd> <pvd>"
+_usage = "Usage: resource.py <cmd> <pvd>"
 
 
 def cleaner_onprem(f):