diff --git a/config.py b/config.py index b694f4e..7b50ad6 100644 --- a/config.py +++ b/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", diff --git a/diagrams/onprem/container.py b/diagrams/onprem/container.py index 4f3161f..de04942 100644 --- a/diagrams/onprem/container.py +++ b/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 diff --git a/diagrams/onprem/monitoring.py b/diagrams/onprem/monitoring.py index bd690f5..4d90d85 100644 --- a/diagrams/onprem/monitoring.py +++ b/diagrams/onprem/monitoring.py @@ -36,4 +36,8 @@ class Thanos(_Monitoring): _icon = "thanos.png" +class Zabbix(_Monitoring): + _icon = "zabbix.png" + + # Aliases diff --git a/diagrams/onprem/network.py b/diagrams/onprem/network.py index ec7bb81..4687980 100644 --- a/diagrams/onprem/network.py +++ b/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" diff --git a/diagrams/onprem/proxmox.py b/diagrams/onprem/proxmox.py new file mode 100644 index 0000000..64fc4f4 --- /dev/null +++ b/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 diff --git a/diagrams/onprem/storage.py b/diagrams/onprem/storage.py new file mode 100644 index 0000000..49d9556 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md index bc23de7..a519be5 100644 --- a/docs/nodes/onprem.md +++ b/docs/nodes/onprem.md @@ -56,6 +56,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 @@ -125,17 +126,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 +151,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 +179,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.vcs - **diagrams.onprem.vcs.Git** diff --git a/resources/onprem/container/lxc.png b/resources/onprem/container/lxc.png new file mode 100644 index 0000000..66182e6 Binary files /dev/null and b/resources/onprem/container/lxc.png differ diff --git a/resources/onprem/monitoring/zabbix.png b/resources/onprem/monitoring/zabbix.png new file mode 100644 index 0000000..cab7014 Binary files /dev/null and b/resources/onprem/monitoring/zabbix.png differ diff --git a/resources/onprem/network/bind-9.png b/resources/onprem/network/bind-9.png new file mode 100644 index 0000000..ea842c9 Binary files /dev/null and b/resources/onprem/network/bind-9.png differ diff --git a/resources/onprem/network/glassfish.png b/resources/onprem/network/glassfish.png new file mode 100644 index 0000000..a94d2dd Binary files /dev/null and b/resources/onprem/network/glassfish.png differ diff --git a/resources/onprem/network/gunicorn.png b/resources/onprem/network/gunicorn.png new file mode 100644 index 0000000..6d277e0 Binary files /dev/null and b/resources/onprem/network/gunicorn.png differ diff --git a/resources/onprem/network/jbossas.png b/resources/onprem/network/jbossas.png new file mode 100644 index 0000000..c161835 Binary files /dev/null and b/resources/onprem/network/jbossas.png differ diff --git a/resources/onprem/network/jetty.png b/resources/onprem/network/jetty.png new file mode 100644 index 0000000..c00c269 Binary files /dev/null and b/resources/onprem/network/jetty.png differ diff --git a/resources/onprem/network/powerdns.png b/resources/onprem/network/powerdns.png new file mode 100644 index 0000000..491c66c Binary files /dev/null and b/resources/onprem/network/powerdns.png differ diff --git a/resources/onprem/network/wildfly.png b/resources/onprem/network/wildfly.png new file mode 100644 index 0000000..95edc66 Binary files /dev/null and b/resources/onprem/network/wildfly.png differ diff --git a/resources/onprem/proxmox/pve.png b/resources/onprem/proxmox/pve.png new file mode 100644 index 0000000..631f271 Binary files /dev/null and b/resources/onprem/proxmox/pve.png differ diff --git a/resources/onprem/storage/ceph-osd.png b/resources/onprem/storage/ceph-osd.png new file mode 100644 index 0000000..46007b3 Binary files /dev/null and b/resources/onprem/storage/ceph-osd.png differ diff --git a/resources/onprem/storage/ceph.png b/resources/onprem/storage/ceph.png new file mode 100644 index 0000000..1c29467 Binary files /dev/null and b/resources/onprem/storage/ceph.png differ diff --git a/resources/onprem/storage/glusterfs.png b/resources/onprem/storage/glusterfs.png new file mode 100644 index 0000000..2b46ca6 Binary files /dev/null and b/resources/onprem/storage/glusterfs.png differ diff --git a/scripts/resource.py b/scripts/resource.py index 2543472..e36432b 100644 --- a/scripts/resource.py +++ b/scripts/resource.py @@ -13,7 +13,7 @@ import sys import config as cfg from . import resource_dir -_usage = "Usage: resources.py " +_usage = "Usage: resource.py " def cleaner_onprem(f):