Merge 83495c28f6 into 56922bf39b

autogen.sh

@@ -45,11 +45,11 @@ fi
 # preprocess the resources
 for pvd in "${providers[@]}"; do
   # convert the svg to png for azure provider
-  if [ "$pvd" = "onprem" ] || [ "$pvd" = "azure" ]; then
+  if [ "$pvd" = "onprem" ] || [ "$pvd" = "azure" ] || [ "$pvd" = "ibm" ]; then
     echo "converting the svg to png using inkscape for provider '$pvd'"
     python -m scripts.resource svg2png "$pvd"
   fi
-  if [ "$pvd" == "oci" ] || [ "$pvd" = "ibm" ]; then
+  if [ "$pvd" == "oci" ]; then
     echo "converting the svg to png using image magick for provider '$pvd'"
     python -m scripts.resource svg2png2 "$pvd"
   fi

config.py

@@ -88,7 +88,7 @@ UPPER_WORDS = {
     "outscale": ("osc",),
     "openstack": ("rpm", "loci", "nfv", "ec2api"),
     "pve": ("pve"),
-    "ibm": ("ibm"),
+    "ibm": ("ibm", "sql", "api", "cdn", "dns", "vpn", "vpc"),
 }
 
 TITLE_WORDS = {
@@ -459,7 +459,34 @@ ALIASES = {
     "outscale": {
         "Osc": "OSC",
     },
-    "ibm": {},
+    "ibm": {
+        "compute": {
+            "HpVirtualServers": "HPVirtualServers",
+            "Vmware": "VMware",
+        },
+        "data": {
+            "TmsDataInterface": "TMSDataInterface"
+        },
+        "database": {
+            "ComposeMysql": "ComposeMySQL",
+            "ComposeRethinkdb": "ComposeRethinkDB",
+            "ComposeScylladb": "ComposeScyllaDB",
+            "Db2Warehouse": "DB2Warehouse",
+            "Db2": "DB2",
+            "Edb": "EDB",
+            "Elasticsearch": "ElasticSearch",
+            "HyperProtectDbaas": "HyperProtectDBaaS",
+            "Mongodb": "MongoDB",
+            "Postgresql": "PostgreSQL",
+            "Rabbitmq": "RabbitMQ",
+        },
+        "devops": {
+            "Devops": "DevOps"
+        },
+        "security": {
+            "OpenBsd": "OpenBSD"
+        }
+    },
     "generic": {},
     "openstack": {
         "user": {

diagrams/ibm/analytics.py

@@ -8,24 +8,28 @@ class _Analytics(_IBM):
     _icon_dir = "resources/ibm/analytics"
 
 
-class Analytics(_Analytics):
+class AccountScore(_Analytics):
-    _icon = "analytics.png"
+    _icon = "account-score.png"
 
 
-class DataIntegration(_Analytics):
+class AnalyticsEngine(_Analytics):
-    _icon = "data-integration.png"
+    _icon = "analytics-engine.png"
 
 
-class DataRepositories(_Analytics):
+class Cognos(_Analytics):
-    _icon = "data-repositories.png"
+    _icon = "cognos.png"
 
 
-class DeviceAnalytics(_Analytics):
+class Match360(_Analytics):
-    _icon = "device-analytics.png"
+    _icon = "match-360.png"
 
 
-class StreamingComputing(_Analytics):
+class Powerlytics(_Analytics):
-    _icon = "streaming-computing.png"
+    _icon = "powerlytics.png"
+
+
+class Streaming(_Analytics):
+    _icon = "streaming.png"
 
 
 # Aliases

diagrams/ibm/blockchain.py

@@ -8,84 +8,8 @@ class _Blockchain(_IBM):
     _icon_dir = "resources/ibm/blockchain"
 
 
-class BlockchainDeveloper(_Blockchain):
-    _icon = "blockchain-developer.png"
-
-
 class Blockchain(_Blockchain):
     _icon = "blockchain.png"
 
 
-class CertificateAuthority(_Blockchain):
-    _icon = "certificate-authority.png"
-
-
-class ClientApplication(_Blockchain):
-    _icon = "client-application.png"
-
-
-class Communication(_Blockchain):
-    _icon = "communication.png"
-
-
-class Consensus(_Blockchain):
-    _icon = "consensus.png"
-
-
-class EventListener(_Blockchain):
-    _icon = "event-listener.png"
-
-
-class Event(_Blockchain):
-    _icon = "event.png"
-
-
-class ExistingEnterpriseSystems(_Blockchain):
-    _icon = "existing-enterprise-systems.png"
-
-
-class HyperledgerFabric(_Blockchain):
-    _icon = "hyperledger-fabric.png"
-
-
-class KeyManagement(_Blockchain):
-    _icon = "key-management.png"
-
-
-class Ledger(_Blockchain):
-    _icon = "ledger.png"
-
-
-class MembershipServicesProviderApi(_Blockchain):
-    _icon = "membership-services-provider-api.png"
-
-
-class Membership(_Blockchain):
-    _icon = "membership.png"
-
-
-class MessageBus(_Blockchain):
-    _icon = "message-bus.png"
-
-
-class Node(_Blockchain):
-    _icon = "node.png"
-
-
-class Services(_Blockchain):
-    _icon = "services.png"
-
-
-class SmartContract(_Blockchain):
-    _icon = "smart-contract.png"
-
-
-class TransactionManager(_Blockchain):
-    _icon = "transaction-manager.png"
-
-
-class Wallet(_Blockchain):
-    _icon = "wallet.png"
-
-
 # Aliases

diagrams/ibm/compute.py

@@ -8,24 +8,71 @@ class _Compute(_IBM):
     _icon_dir = "resources/ibm/compute"
 
 
-class BareMetalServer(_Compute):
+class Autoscale(_Compute):
-    _icon = "bare-metal-server.png"
+    _icon = "autoscale.png"
 
 
-class ImageService(_Compute):
+class BareMetal(_Compute):
-    _icon = "image-service.png"
+    _icon = "bare-metal.png"
 
 
-class Instance(_Compute):
+class Citrix(_Compute):
-    _icon = "instance.png"
+    _icon = "citrix.png"
 
 
-class Key(_Compute):
+class CloudFoundry(_Compute):
-    _icon = "key.png"
+    _icon = "cloud-foundry.png"
 
 
-class PowerInstance(_Compute):
+class CodeEngine(_Compute):
-    _icon = "power-instance.png"
+    _icon = "code-engine.png"
+
+
+class DedicatedHost(_Compute):
+    _icon = "dedicated-host.png"
+
+
+class Dizzion(_Compute):
+    _icon = "dizzion.png"
+
+
+class Functions(_Compute):
+    _icon = "functions.png"
+
+
+class HpVirtualServers(_Compute):
+    _icon = "hp-virtual-servers.png"
+
+
+class Hsm(_Compute):
+    _icon = "hsm.png"
+
+
+class PowerSystems(_Compute):
+    _icon = "power-systems.png"
+
+
+class Satellite(_Compute):
+    _icon = "satellite.png"
+
+
+class Skytap(_Compute):
+    _icon = "skytap.png"
+
+
+class VirtualServer(_Compute):
+    _icon = "virtual-server.png"
+
+
+class Vmware(_Compute):
+    _icon = "vmware.png"
+
+
+class VPCVirtualServer(_Compute):
+    _icon = "vpc-virtual-server.png"
 
 
 # Aliases
+
+HPVirtualServers = HpVirtualServers
+VMware = Vmware

diagrams/ibm/container.py

@@ -0,0 +1,27 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _IBM
+
+
+class _Container(_IBM):
+    _type = "container"
+    _icon_dir = "resources/ibm/container"
+
+
+class CodeEngine(_Container):
+    _icon = "code-engine.png"
+
+
+class Kubernets(_Container):
+    _icon = "kubernets.png"
+
+
+class Openshift(_Container):
+    _icon = "openshift.png"
+
+
+class Registry(_Container):
+    _icon = "registry.png"
+
+
+# Aliases

diagrams/ibm/database.py

@@ -0,0 +1,111 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _IBM
+
+
+class _Database(_IBM):
+    _type = "database"
+    _icon_dir = "resources/ibm/database"
+
+
+class Cloudant(_Database):
+    _icon = "cloudant.png"
+
+
+class ComposeEnterprise(_Database):
+    _icon = "compose-enterprise.png"
+
+
+class ComposeJanusgraph(_Database):
+    _icon = "compose-janusgraph.png"
+
+
+class ComposeMysql(_Database):
+    _icon = "compose-mysql.png"
+
+
+class ComposeRethinkdb(_Database):
+    _icon = "compose-rethinkdb.png"
+
+
+class ComposeScylladb(_Database):
+    _icon = "compose-scylladb.png"
+
+
+class Datastax(_Database):
+    _icon = "datastax.png"
+
+
+class Db2Warehouse(_Database):
+    _icon = "db2-warehouse.png"
+
+
+class Db2(_Database):
+    _icon = "db2.png"
+
+
+class Edb(_Database):
+    _icon = "edb.png"
+
+
+class Elasticsearch(_Database):
+    _icon = "elasticsearch.png"
+
+
+class Etcd(_Database):
+    _icon = "etcd.png"
+
+
+class HyperProtectDbaas(_Database):
+    _icon = "hyper-protect-dbaas.png"
+
+
+class Influx(_Database):
+    _icon = "influx.png"
+
+
+class Informix(_Database):
+    _icon = "informix.png"
+
+
+class Match(_Database):
+    _icon = "match.png"
+
+
+class Mongodb(_Database):
+    _icon = "mongodb.png"
+
+
+class Portworx(_Database):
+    _icon = "portworx.png"
+
+
+class Postgresql(_Database):
+    _icon = "postgresql.png"
+
+
+class Rabbitmq(_Database):
+    _icon = "rabbitmq.png"
+
+
+class Redis(_Database):
+    _icon = "redis.png"
+
+
+class SQLQuery(_Database):
+    _icon = "sql-query.png"
+
+
+# Aliases
+
+ComposeMySQL = ComposeMysql
+ComposeRethinkDB = ComposeRethinkdb
+ComposeScyllaDB = ComposeScylladb
+DB2Warehouse = Db2Warehouse
+DB2 = Db2
+EDB = Edb
+ElasticSearch = Elasticsearch
+HyperProtectDBaaS = HyperProtectDbaas
+MongoDB = Mongodb
+PostgreSQL = Postgresql
+RabbitMQ = Rabbitmq

diagrams/ibm/devtools.py

@@ -0,0 +1,159 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _IBM
+
+
+class _Devtools(_IBM):
+    _type = "devtools"
+    _icon_dir = "resources/ibm/devtools"
+
+
+class Accern(_Devtools):
+    _icon = "accern.png"
+
+
+class Alloy(_Devtools):
+    _icon = "alloy.png"
+
+
+class APIGateway(_Devtools):
+    _icon = "api-gateway.png"
+
+
+class AppConfiguration(_Devtools):
+    _icon = "app-configuration.png"
+
+
+class Bondevalue(_Devtools):
+    _icon = "bondevalue.png"
+
+
+class ContinuousDelivery(_Devtools):
+    _icon = "continuous-delivery.png"
+
+
+class Difitek(_Devtools):
+    _icon = "difitek.png"
+
+
+class DomainNameRegistration(_Devtools):
+    _icon = "domain-name-registration.png"
+
+
+class Dwolla(_Devtools):
+    _icon = "dwolla.png"
+
+
+class Esri(_Devtools):
+    _icon = "esri.png"
+
+
+class GeoWs(_Devtools):
+    _icon = "geo-ws.png"
+
+
+class Hazardhub(_Devtools):
+    _icon = "hazardhub.png"
+
+
+class HealthScore(_Devtools):
+    _icon = "health-score.png"
+
+
+class Hydrogen(_Devtools):
+    _icon = "hydrogen.png"
+
+
+class Morningstar(_Devtools):
+    _icon = "morningstar.png"
+
+
+class NaturalLanguageGeneration(_Devtools):
+    _icon = "natural-language-generation.png"
+
+
+class Nexmo(_Devtools):
+    _icon = "nexmo.png"
+
+
+class Powerlytics(_Devtools):
+    _icon = "powerlytics.png"
+
+
+class Quovo(_Devtools):
+    _icon = "quovo.png"
+
+
+class Rainbow(_Devtools):
+    _icon = "rainbow.png"
+
+
+class Relsci(_Devtools):
+    _icon = "relsci.png"
+
+
+class RiskEngine(_Devtools):
+    _icon = "risk-engine.png"
+
+
+class Schematics(_Devtools):
+    _icon = "schematics.png"
+
+
+class Sendgrid(_Devtools):
+    _icon = "sendgrid.png"
+
+
+class Sizeup(_Devtools):
+    _icon = "sizeup.png"
+
+
+class Splice(_Devtools):
+    _icon = "splice.png"
+
+
+class Strands(_Devtools):
+    _icon = "strands.png"
+
+
+class Toolchains(_Devtools):
+    _icon = "toolchains.png"
+
+
+class TotumRisk(_Devtools):
+    _icon = "totum-risk.png"
+
+
+class Tradeit(_Devtools):
+    _icon = "tradeit.png"
+
+
+class Twilio(_Devtools):
+    _icon = "twilio.png"
+
+
+class Ucloud(_Devtools):
+    _icon = "ucloud.png"
+
+
+class Wealthengine(_Devtools):
+    _icon = "wealthengine.png"
+
+
+class WireAccountVerificationService(_Devtools):
+    _icon = "wire-account-verification-service.png"
+
+
+class Xignite(_Devtools):
+    _icon = "xignite.png"
+
+
+class Ylabs(_Devtools):
+    _icon = "ylabs.png"
+
+
+class Yodlee(_Devtools):
+    _icon = "yodlee.png"
+
+
+# Aliases

diagrams/ibm/integration.py

@@ -0,0 +1,43 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _IBM
+
+
+class _Integration(_IBM):
+    _type = "integration"
+    _icon_dir = "resources/ibm/integration"
+
+
+class APIConnect(_Integration):
+    _icon = "api-connect.png"
+
+
+class AppConnect(_Integration):
+    _icon = "app-connect.png"
+
+
+class EventStreams(_Integration):
+    _icon = "event-streams.png"
+
+
+class Lift(_Integration):
+    _icon = "lift.png"
+
+
+class Mq(_Integration):
+    _icon = "mq.png"
+
+
+class RocketMainframe(_Integration):
+    _icon = "rocket-mainframe.png"
+
+
+class SecureGateway(_Integration):
+    _icon = "secure-gateway.png"
+
+
+class SimpleCloudIo(_Integration):
+    _icon = "simple-cloud-io.png"
+
+
+# Aliases

diagrams/ibm/iot.py

@@ -0,0 +1,43 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _IBM
+
+
+class _Iot(_IBM):
+    _type = "iot"
+    _icon_dir = "resources/ibm/iot"
+
+
+class BoschRollouts(_Iot):
+    _icon = "bosch-rollouts.png"
+
+
+class CarDiagnostic(_Iot):
+    _icon = "car-diagnostic.png"
+
+
+class DataPlans(_Iot):
+    _icon = "data-plans.png"
+
+
+class Flow(_Iot):
+    _icon = "flow.png"
+
+
+class IotPlatform(_Iot):
+    _icon = "iot-platform.png"
+
+
+class Portworx(_Iot):
+    _icon = "portworx.png"
+
+
+class Skyhook(_Iot):
+    _icon = "skyhook.png"
+
+
+class UnificationEngine(_Iot):
+    _icon = "unification-engine.png"
+
+
+# Aliases

diagrams/ibm/logging.py

@@ -0,0 +1,23 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _IBM
+
+
+class _Logging(_IBM):
+    _type = "logging"
+    _icon_dir = "resources/ibm/logging"
+
+
+class ActivityTracker(_Logging):
+    _icon = "activity-tracker.png"
+
+
+class LogAnalysis(_Logging):
+    _icon = "log-analysis.png"
+
+
+class Monitoring(_Logging):
+    _icon = "monitoring.png"
+
+
+# Aliases

diagrams/ibm/migration.py

@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _IBM
+
+
+class _Migration(_IBM):
+    _type = "migration"
+    _icon_dir = "resources/ibm/migration"
+
+
+class CloudMigration(_Migration):
+    _icon = "cloud-migration.png"
+
+
+# Aliases

diagrams/ibm/ml.py

@@ -0,0 +1,75 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _IBM
+
+
+class _Ml(_IBM):
+    _type = "ml"
+    _icon_dir = "resources/ibm/ml"
+
+
+class Annotator(_Ml):
+    _icon = "annotator.png"
+
+
+class KnowledgeStudio(_Ml):
+    _icon = "knowledge-studio.png"
+
+
+class LanguageTranslator(_Ml):
+    _icon = "language-translator.png"
+
+
+class MachineLearning(_Ml):
+    _icon = "machine-learning.png"
+
+
+class Match360(_Ml):
+    _icon = "match-360.png"
+
+
+class NaturalLanguageClassifier(_Ml):
+    _icon = "natural-language-classifier.png"
+
+
+class NaturalLanguageUnderstanding(_Ml):
+    _icon = "natural-language-understanding.png"
+
+
+class PersonalityInsights(_Ml):
+    _icon = "personality-insights.png"
+
+
+class SpeechToText(_Ml):
+    _icon = "speech-to-text.png"
+
+
+class TextToSpeech(_Ml):
+    _icon = "text-to-speech.png"
+
+
+class ToneAnalyzer(_Ml):
+    _icon = "tone-analyzer.png"
+
+
+class WatsonAssistant(_Ml):
+    _icon = "watson-assistant.png"
+
+
+class WatsonDiscovery(_Ml):
+    _icon = "watson-discovery.png"
+
+
+class WatsonKnowledgeCatalog(_Ml):
+    _icon = "watson-knowledge-catalog.png"
+
+
+class WatsonOpenscale(_Ml):
+    _icon = "watson-openscale.png"
+
+
+class WatsonStudio(_Ml):
+    _icon = "watson-studio.png"
+
+
+# Aliases

diagrams/ibm/mobile.py

@@ -0,0 +1,39 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _IBM
+
+
+class _Mobile(_IBM):
+    _type = "mobile"
+    _icon_dir = "resources/ibm/mobile"
+
+
+class B2T(_Mobile):
+    _icon = "b2t.png"
+
+
+class Bitbar(_Mobile):
+    _icon = "bitbar.png"
+
+
+class Match360(_Mobile):
+    _icon = "match-360.png"
+
+
+class Phunware(_Mobile):
+    _icon = "phunware.png"
+
+
+class PushNotifications(_Mobile):
+    _icon = "push-notifications.png"
+
+
+class Telstra(_Mobile):
+    _icon = "telstra.png"
+
+
+class Twilio(_Mobile):
+    _icon = "twilio.png"
+
+
+# Aliases

diagrams/ibm/network.py

@@ -8,88 +8,72 @@ class _Network(_IBM):
     _icon_dir = "resources/ibm/network"
 
 
-class Bridge(_Network):
+class CDN(_Network):
-    _icon = "bridge.png"
+    _icon = "cdn.png"
 
 
-class DirectLink(_Network):
+class Cis(_Network):
-    _icon = "direct-link.png"
+    _icon = "cis.png"
-
-
-class Enterprise(_Network):
-    _icon = "enterprise.png"
-
-
-class Firewall(_Network):
-    _icon = "firewall.png"
 
 
-class FloatingIp(_Network):
+class DirectLinkConnect(_Network):
-    _icon = "floating-ip.png"
+    _icon = "direct-link-connect.png"
 
 
-class Gateway(_Network):
+class DirectLink(_Network):
-    _icon = "gateway.png"
+    _icon = "direct-link.png"
 
 
-class InternetServices(_Network):
+class DNS(_Network):
-    _icon = "internet-services.png"
+    _icon = "dns.png"
 
 
-class LoadBalancerListener(_Network):
+class Firewall(_Network):
-    _icon = "load-balancer-listener.png"
+    _icon = "firewall.png"
 
 
-class LoadBalancerPool(_Network):
+class IpsecVPN(_Network):
-    _icon = "load-balancer-pool.png"
+    _icon = "ipsec-vpn.png"
 
 
-class LoadBalancer(_Network):
+class Lbaas(_Network):
-    _icon = "load-balancer.png"
+    _icon = "lbaas.png"
 
 
-class LoadBalancingRouting(_Network):
+class LocalLoadBalancing(_Network):
-    _icon = "load-balancing-routing.png"
+    _icon = "local-load-balancing.png"
 
 
-class PublicGateway(_Network):
+class Subnets(_Network):
-    _icon = "public-gateway.png"
+    _icon = "subnets.png"
 
 
-class Region(_Network):
+class Transit(_Network):
-    _icon = "region.png"
+    _icon = "transit.png"
 
 
-class Router(_Network):
+class VirtualRouterAppliance(_Network):
-    _icon = "router.png"
+    _icon = "virtual-router-appliance.png"
 
 
-class Rules(_Network):
+class Vlan(_Network):
-    _icon = "rules.png"
+    _icon = "vlan.png"
 
 
-class Subnet(_Network):
+class VPCEndpoints(_Network):
-    _icon = "subnet.png"
+    _icon = "vpc-endpoints.png"
 
 
-class TransitGateway(_Network):
+class VPCFlowlogs(_Network):
-    _icon = "transit-gateway.png"
+    _icon = "vpc-flowlogs.png"
 
 
-class Vpc(_Network):
+class VPC(_Network):
     _icon = "vpc.png"
 
 
-class VpnConnection(_Network):
+class VPN(_Network):
-    _icon = "vpn-connection.png"
+    _icon = "vpn.png"
-
-
-class VpnGateway(_Network):
-    _icon = "vpn-gateway.png"
-
-
-class VpnPolicy(_Network):
-    _icon = "vpn-policy.png"
 
 
 # Aliases

diagrams/ibm/security.py

@@ -8,60 +8,62 @@ class _Security(_IBM):
     _icon_dir = "resources/ibm/security"
 
 
-class ApiSecurity(_Security):
+class AppId(_Security):
-    _icon = "api-security.png"
+    _icon = "app-id.png"
 
 
-class BlockchainSecurityService(_Security):
+class CertificateManager(_Security):
-    _icon = "blockchain-security-service.png"
+    _icon = "certificate-manager.png"
 
 
-class DataSecurity(_Security):
+class Contrast(_Security):
-    _icon = "data-security.png"
+    _icon = "contrast.png"
 
 
-class Firewall(_Security):
+class Crypto(_Security):
-    _icon = "firewall.png"
+    _icon = "crypto.png"
 
 
-class Gateway(_Security):
+class DataShield(_Security):
-    _icon = "gateway.png"
+    _icon = "data-shield.png"
 
 
-class GovernanceRiskCompliance(_Security):
+class Fusionauth(_Security):
-    _icon = "governance-risk-compliance.png"
+    _icon = "fusionauth.png"
 
 
-class IdentityAccessManagement(_Security):
+class Hsm(_Security):
-    _icon = "identity-access-management.png"
+    _icon = "hsm.png"
 
 
-class IdentityProvider(_Security):
+class KeyProtect(_Security):
-    _icon = "identity-provider.png"
+    _icon = "key-protect.png"
 
 
-class InfrastructureSecurity(_Security):
+class Neuvector(_Security):
-    _icon = "infrastructure-security.png"
+    _icon = "neuvector.png"
 
 
-class PhysicalSecurity(_Security):
+class OpenBsd(_Security):
-    _icon = "physical-security.png"
+    _icon = "open-bsd.png"
 
 
-class SecurityMonitoringIntelligence(_Security):
+class Raxak(_Security):
-    _icon = "security-monitoring-intelligence.png"
+    _icon = "raxak.png"
 
 
-class SecurityServices(_Security):
+class SecretsManager(_Security):
-    _icon = "security-services.png"
+    _icon = "secrets-manager.png"
 
 
-class TrustendComputing(_Security):
+class SslCertificates(_Security):
-    _icon = "trustend-computing.png"
+    _icon = "ssl-certificates.png"
 
 
-class Vpn(_Security):
+class Twilio(_Security):
-    _icon = "vpn.png"
+    _icon = "twilio.png"
 
 
 # Aliases
+
+OpenBSD = OpenBsd

diagrams/ibm/storage.py

@@ -8,12 +8,36 @@ class _Storage(_IBM):
     _icon_dir = "resources/ibm/storage"
 
 
+class BlockStorageVolumes(_Storage):
+    _icon = "block-storage-volumes.png"
+
+
 class BlockStorage(_Storage):
     _icon = "block-storage.png"
 
 
+class Box(_Storage):
+    _icon = "box.png"
+
+
+class Evault(_Storage):
+    _icon = "evault.png"
+
+
+class FileStorage(_Storage):
+    _icon = "file-storage.png"
+
+
+class MassDataMigration(_Storage):
+    _icon = "mass-data-migration.png"
+
+
 class ObjectStorage(_Storage):
     _icon = "object-storage.png"
 
 
+class Portworx(_Storage):
+    _icon = "portworx.png"
+
+
 # Aliases

docs/nodes/ibm.md

@@ -8,581 +8,548 @@ Node classes list of the ibm provider.
 ## ibm.analytics
 
 
-<img width="30" src="/img/resources/ibm/analytics/analytics.png" alt="Analytics" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/analytics/account-score.png" alt="AccountScore" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.analytics.Analytics**
+**diagrams.ibm.analytics.AccountScore**
 
-<img width="30" src="/img/resources/ibm/analytics/data-integration.png" alt="DataIntegration" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/analytics/analytics-engine.png" alt="AnalyticsEngine" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.analytics.DataIntegration**
+**diagrams.ibm.analytics.AnalyticsEngine**
 
-<img width="30" src="/img/resources/ibm/analytics/data-repositories.png" alt="DataRepositories" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/analytics/cognos.png" alt="Cognos" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.analytics.DataRepositories**
+**diagrams.ibm.analytics.Cognos**
 
-<img width="30" src="/img/resources/ibm/analytics/device-analytics.png" alt="DeviceAnalytics" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/analytics/match-360.png" alt="Match360" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.analytics.DeviceAnalytics**
+**diagrams.ibm.analytics.Match360**
 
-<img width="30" src="/img/resources/ibm/analytics/streaming-computing.png" alt="StreamingComputing" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/analytics/powerlytics.png" alt="Powerlytics" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.analytics.StreamingComputing**
+**diagrams.ibm.analytics.Powerlytics**
 
-## ibm.applications
+<img width="30" src="/img/resources/ibm/analytics/streaming.png" alt="Streaming" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.analytics.Streaming**
 
+## ibm.blockchain
 
-<img width="30" src="/img/resources/ibm/applications/actionable-insight.png" alt="ActionableInsight" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.ActionableInsight**
 
-<img width="30" src="/img/resources/ibm/applications/annotate.png" alt="Annotate" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/blockchain/blockchain.png" alt="Blockchain" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.Annotate**
+**diagrams.ibm.blockchain.Blockchain**
 
-<img width="30" src="/img/resources/ibm/applications/api-developer-portal.png" alt="ApiDeveloperPortal" style="float: left; padding-right: 5px;" >
+## ibm.compute
-**diagrams.ibm.applications.ApiDeveloperPortal**
 
-<img width="30" src="/img/resources/ibm/applications/api-polyglot-runtimes.png" alt="ApiPolyglotRuntimes" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.ApiPolyglotRuntimes**
 
-<img width="30" src="/img/resources/ibm/applications/app-server.png" alt="AppServer" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/autoscale.png" alt="Autoscale" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.AppServer**
+**diagrams.ibm.compute.Autoscale**
 
-<img width="30" src="/img/resources/ibm/applications/application-logic.png" alt="ApplicationLogic" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/bare-metal.png" alt="BareMetal" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.ApplicationLogic**
+**diagrams.ibm.compute.BareMetal**
 
-<img width="30" src="/img/resources/ibm/applications/enterprise-applications.png" alt="EnterpriseApplications" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/citrix.png" alt="Citrix" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.EnterpriseApplications**
+**diagrams.ibm.compute.Citrix**
 
-<img width="30" src="/img/resources/ibm/applications/index.png" alt="Index" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/cloud-foundry.png" alt="CloudFoundry" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.Index**
+**diagrams.ibm.compute.CloudFoundry**
 
-<img width="30" src="/img/resources/ibm/applications/iot-application.png" alt="IotApplication" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/code-engine.png" alt="CodeEngine" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.IotApplication**
+**diagrams.ibm.compute.CodeEngine**
 
-<img width="30" src="/img/resources/ibm/applications/microservice.png" alt="Microservice" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/dedicated-host.png" alt="DedicatedHost" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.Microservice**
+**diagrams.ibm.compute.DedicatedHost**
 
-<img width="30" src="/img/resources/ibm/applications/mobile-app.png" alt="MobileApp" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/dizzion.png" alt="Dizzion" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.MobileApp**
+**diagrams.ibm.compute.Dizzion**
 
-<img width="30" src="/img/resources/ibm/applications/ontology.png" alt="Ontology" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/functions.png" alt="Functions" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.Ontology**
+**diagrams.ibm.compute.Functions**
 
-<img width="30" src="/img/resources/ibm/applications/open-source-tools.png" alt="OpenSourceTools" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/hp-virtual-servers.png" alt="HpVirtualServers" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.OpenSourceTools**
+**diagrams.ibm.compute.HpVirtualServers**, **HPVirtualServers** (alias)
 
-<img width="30" src="/img/resources/ibm/applications/runtime-services.png" alt="RuntimeServices" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/hsm.png" alt="Hsm" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.RuntimeServices**
+**diagrams.ibm.compute.Hsm**
 
-<img width="30" src="/img/resources/ibm/applications/saas-applications.png" alt="SaasApplications" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/power-systems.png" alt="PowerSystems" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.SaasApplications**
+**diagrams.ibm.compute.PowerSystems**
 
-<img width="30" src="/img/resources/ibm/applications/service-broker.png" alt="ServiceBroker" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/satellite.png" alt="Satellite" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.ServiceBroker**
+**diagrams.ibm.compute.Satellite**
 
-<img width="30" src="/img/resources/ibm/applications/speech-to-text.png" alt="SpeechToText" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/skytap.png" alt="Skytap" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.SpeechToText**
+**diagrams.ibm.compute.Skytap**
 
-<img width="30" src="/img/resources/ibm/applications/visual-recognition.png" alt="VisualRecognition" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/virtual-server.png" alt="VirtualServer" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.VisualRecognition**
+**diagrams.ibm.compute.VirtualServer**
 
-<img width="30" src="/img/resources/ibm/applications/visualization.png" alt="Visualization" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/compute/vmware.png" alt="Vmware" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.applications.Visualization**
+**diagrams.ibm.compute.Vmware**, **VMware** (alias)
 
-## ibm.blockchain
+<img width="30" src="/img/resources/ibm/compute/vpc-virtual-server.png" alt="VPCVirtualServer" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.compute.VPCVirtualServer**
 
+## ibm.container
 
-<img width="30" src="/img/resources/ibm/blockchain/blockchain-developer.png" alt="BlockchainDeveloper" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.BlockchainDeveloper**
 
-<img width="30" src="/img/resources/ibm/blockchain/blockchain.png" alt="Blockchain" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/container/code-engine.png" alt="CodeEngine" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.Blockchain**
+**diagrams.ibm.container.CodeEngine**
 
-<img width="30" src="/img/resources/ibm/blockchain/certificate-authority.png" alt="CertificateAuthority" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/container/kubernets.png" alt="Kubernets" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.CertificateAuthority**
+**diagrams.ibm.container.Kubernets**
 
-<img width="30" src="/img/resources/ibm/blockchain/client-application.png" alt="ClientApplication" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/container/openshift.png" alt="Openshift" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.ClientApplication**
+**diagrams.ibm.container.Openshift**
 
-<img width="30" src="/img/resources/ibm/blockchain/communication.png" alt="Communication" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/container/registry.png" alt="Registry" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.Communication**
+**diagrams.ibm.container.Registry**
 
-<img width="30" src="/img/resources/ibm/blockchain/consensus.png" alt="Consensus" style="float: left; padding-right: 5px;" >
+## ibm.database
-**diagrams.ibm.blockchain.Consensus**
 
-<img width="30" src="/img/resources/ibm/blockchain/event-listener.png" alt="EventListener" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.EventListener**
 
-<img width="30" src="/img/resources/ibm/blockchain/event.png" alt="Event" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/cloudant.png" alt="Cloudant" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.Event**
+**diagrams.ibm.database.Cloudant**
 
-<img width="30" src="/img/resources/ibm/blockchain/existing-enterprise-systems.png" alt="ExistingEnterpriseSystems" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/compose-enterprise.png" alt="ComposeEnterprise" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.ExistingEnterpriseSystems**
+**diagrams.ibm.database.ComposeEnterprise**
 
-<img width="30" src="/img/resources/ibm/blockchain/hyperledger-fabric.png" alt="HyperledgerFabric" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/compose-janusgraph.png" alt="ComposeJanusgraph" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.HyperledgerFabric**
+**diagrams.ibm.database.ComposeJanusgraph**
 
-<img width="30" src="/img/resources/ibm/blockchain/key-management.png" alt="KeyManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/compose-mysql.png" alt="ComposeMysql" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.KeyManagement**
+**diagrams.ibm.database.ComposeMysql**, **ComposeMySQL** (alias)
 
-<img width="30" src="/img/resources/ibm/blockchain/ledger.png" alt="Ledger" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/compose-rethinkdb.png" alt="ComposeRethinkdb" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.Ledger**
+**diagrams.ibm.database.ComposeRethinkdb**, **ComposeRethinkDB** (alias)
 
-<img width="30" src="/img/resources/ibm/blockchain/membership-services-provider-api.png" alt="MembershipServicesProviderApi" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/compose-scylladb.png" alt="ComposeScylladb" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.MembershipServicesProviderApi**
+**diagrams.ibm.database.ComposeScylladb**, **ComposeScyllaDB** (alias)
 
-<img width="30" src="/img/resources/ibm/blockchain/membership.png" alt="Membership" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/datastax.png" alt="Datastax" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.Membership**
+**diagrams.ibm.database.Datastax**
 
-<img width="30" src="/img/resources/ibm/blockchain/message-bus.png" alt="MessageBus" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/db2-warehouse.png" alt="Db2Warehouse" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.MessageBus**
+**diagrams.ibm.database.Db2Warehouse**, **DB2Warehouse** (alias)
 
-<img width="30" src="/img/resources/ibm/blockchain/node.png" alt="Node" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/db2.png" alt="Db2" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.Node**
+**diagrams.ibm.database.Db2**, **DB2** (alias)
 
-<img width="30" src="/img/resources/ibm/blockchain/services.png" alt="Services" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/edb.png" alt="Edb" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.Services**
+**diagrams.ibm.database.Edb**, **EDB** (alias)
 
-<img width="30" src="/img/resources/ibm/blockchain/smart-contract.png" alt="SmartContract" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/elasticsearch.png" alt="Elasticsearch" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.SmartContract**
+**diagrams.ibm.database.Elasticsearch**, **ElasticSearch** (alias)
 
-<img width="30" src="/img/resources/ibm/blockchain/transaction-manager.png" alt="TransactionManager" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/etcd.png" alt="Etcd" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.TransactionManager**
+**diagrams.ibm.database.Etcd**
 
-<img width="30" src="/img/resources/ibm/blockchain/wallet.png" alt="Wallet" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/hyper-protect-dbaas.png" alt="HyperProtectDbaas" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.blockchain.Wallet**
+**diagrams.ibm.database.HyperProtectDbaas**, **HyperProtectDBaaS** (alias)
 
-## ibm.compute
+<img width="30" src="/img/resources/ibm/database/influx.png" alt="Influx" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.database.Influx**
 
+<img width="30" src="/img/resources/ibm/database/informix.png" alt="Informix" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.database.Informix**
 
-<img width="30" src="/img/resources/ibm/compute/bare-metal-server.png" alt="BareMetalServer" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/match.png" alt="Match" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.compute.BareMetalServer**
+**diagrams.ibm.database.Match**
 
-<img width="30" src="/img/resources/ibm/compute/image-service.png" alt="ImageService" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/mongodb.png" alt="Mongodb" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.compute.ImageService**
+**diagrams.ibm.database.Mongodb**, **MongoDB** (alias)
 
-<img width="30" src="/img/resources/ibm/compute/instance.png" alt="Instance" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/portworx.png" alt="Portworx" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.compute.Instance**
+**diagrams.ibm.database.Portworx**
 
-<img width="30" src="/img/resources/ibm/compute/key.png" alt="Key" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/postgresql.png" alt="Postgresql" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.compute.Key**
+**diagrams.ibm.database.Postgresql**, **PostgreSQL** (alias)
 
-<img width="30" src="/img/resources/ibm/compute/power-instance.png" alt="PowerInstance" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/database/rabbitmq.png" alt="Rabbitmq" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.compute.PowerInstance**
+**diagrams.ibm.database.Rabbitmq**, **RabbitMQ** (alias)
 
-## ibm.data
+<img width="30" src="/img/resources/ibm/database/redis.png" alt="Redis" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.database.Redis**
 
+<img width="30" src="/img/resources/ibm/database/sql-query.png" alt="SQLQuery" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.database.SQLQuery**
 
-<img width="30" src="/img/resources/ibm/data/caches.png" alt="Caches" style="float: left; padding-right: 5px;" >
+## ibm.devtools
-**diagrams.ibm.data.Caches**
 
-<img width="30" src="/img/resources/ibm/data/cloud.png" alt="Cloud" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.Cloud**
 
-<img width="30" src="/img/resources/ibm/data/conversation-trained-deployed.png" alt="ConversationTrainedDeployed" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/accern.png" alt="Accern" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.ConversationTrainedDeployed**
+**diagrams.ibm.devtools.Accern**
 
-<img width="30" src="/img/resources/ibm/data/data-services.png" alt="DataServices" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/alloy.png" alt="Alloy" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.DataServices**
+**diagrams.ibm.devtools.Alloy**
 
-<img width="30" src="/img/resources/ibm/data/data-sources.png" alt="DataSources" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/api-gateway.png" alt="APIGateway" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.DataSources**
+**diagrams.ibm.devtools.APIGateway**
 
-<img width="30" src="/img/resources/ibm/data/device-identity-service.png" alt="DeviceIdentityService" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/app-configuration.png" alt="AppConfiguration" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.DeviceIdentityService**
+**diagrams.ibm.devtools.AppConfiguration**
 
-<img width="30" src="/img/resources/ibm/data/device-registry.png" alt="DeviceRegistry" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/bondevalue.png" alt="Bondevalue" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.DeviceRegistry**
+**diagrams.ibm.devtools.Bondevalue**
 
-<img width="30" src="/img/resources/ibm/data/enterprise-data.png" alt="EnterpriseData" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/continuous-delivery.png" alt="ContinuousDelivery" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.EnterpriseData**
+**diagrams.ibm.devtools.ContinuousDelivery**
 
-<img width="30" src="/img/resources/ibm/data/enterprise-user-directory.png" alt="EnterpriseUserDirectory" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/difitek.png" alt="Difitek" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.EnterpriseUserDirectory**
+**diagrams.ibm.devtools.Difitek**
 
-<img width="30" src="/img/resources/ibm/data/file-repository.png" alt="FileRepository" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/domain-name-registration.png" alt="DomainNameRegistration" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.FileRepository**
+**diagrams.ibm.devtools.DomainNameRegistration**
 
-<img width="30" src="/img/resources/ibm/data/ground-truth.png" alt="GroundTruth" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/dwolla.png" alt="Dwolla" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.GroundTruth**
+**diagrams.ibm.devtools.Dwolla**
 
-<img width="30" src="/img/resources/ibm/data/model.png" alt="Model" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/esri.png" alt="Esri" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.Model**
+**diagrams.ibm.devtools.Esri**
 
-<img width="30" src="/img/resources/ibm/data/tms-data-interface.png" alt="TmsDataInterface" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/geo-ws.png" alt="GeoWs" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.data.TmsDataInterface**
+**diagrams.ibm.devtools.GeoWs**
 
-## ibm.devops
+<img width="30" src="/img/resources/ibm/devtools/hazardhub.png" alt="Hazardhub" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.devtools.Hazardhub**
 
+<img width="30" src="/img/resources/ibm/devtools/health-score.png" alt="HealthScore" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.devtools.HealthScore**
 
-<img width="30" src="/img/resources/ibm/devops/artifact-management.png" alt="ArtifactManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/hydrogen.png" alt="Hydrogen" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.ArtifactManagement**
+**diagrams.ibm.devtools.Hydrogen**
 
-<img width="30" src="/img/resources/ibm/devops/build-test.png" alt="BuildTest" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/morningstar.png" alt="Morningstar" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.BuildTest**
+**diagrams.ibm.devtools.Morningstar**
 
-<img width="30" src="/img/resources/ibm/devops/code-editor.png" alt="CodeEditor" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/natural-language-generation.png" alt="NaturalLanguageGeneration" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.CodeEditor**
+**diagrams.ibm.devtools.NaturalLanguageGeneration**
 
-<img width="30" src="/img/resources/ibm/devops/collaborative-development.png" alt="CollaborativeDevelopment" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/nexmo.png" alt="Nexmo" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.CollaborativeDevelopment**
+**diagrams.ibm.devtools.Nexmo**
 
-<img width="30" src="/img/resources/ibm/devops/configuration-management.png" alt="ConfigurationManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/powerlytics.png" alt="Powerlytics" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.ConfigurationManagement**
+**diagrams.ibm.devtools.Powerlytics**
 
-<img width="30" src="/img/resources/ibm/devops/continuous-deploy.png" alt="ContinuousDeploy" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/quovo.png" alt="Quovo" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.ContinuousDeploy**
+**diagrams.ibm.devtools.Quovo**
 
-<img width="30" src="/img/resources/ibm/devops/continuous-testing.png" alt="ContinuousTesting" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/rainbow.png" alt="Rainbow" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.ContinuousTesting**
+**diagrams.ibm.devtools.Rainbow**
 
-<img width="30" src="/img/resources/ibm/devops/devops.png" alt="Devops" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/relsci.png" alt="Relsci" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.Devops**
+**diagrams.ibm.devtools.Relsci**
 
-<img width="30" src="/img/resources/ibm/devops/provision.png" alt="Provision" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/risk-engine.png" alt="RiskEngine" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.Provision**
+**diagrams.ibm.devtools.RiskEngine**
 
-<img width="30" src="/img/resources/ibm/devops/release-management.png" alt="ReleaseManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/schematics.png" alt="Schematics" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.devops.ReleaseManagement**
+**diagrams.ibm.devtools.Schematics**
 
-## ibm.general
+<img width="30" src="/img/resources/ibm/devtools/sendgrid.png" alt="Sendgrid" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.devtools.Sendgrid**
 
+<img width="30" src="/img/resources/ibm/devtools/sizeup.png" alt="Sizeup" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.devtools.Sizeup**
 
-<img width="30" src="/img/resources/ibm/general/cloud-messaging.png" alt="CloudMessaging" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/splice.png" alt="Splice" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.CloudMessaging**
+**diagrams.ibm.devtools.Splice**
 
-<img width="30" src="/img/resources/ibm/general/cloud-services.png" alt="CloudServices" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/strands.png" alt="Strands" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.CloudServices**
+**diagrams.ibm.devtools.Strands**
 
-<img width="30" src="/img/resources/ibm/general/cloudant.png" alt="Cloudant" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/toolchains.png" alt="Toolchains" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.Cloudant**
+**diagrams.ibm.devtools.Toolchains**
 
-<img width="30" src="/img/resources/ibm/general/cognitive-services.png" alt="CognitiveServices" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/totum-risk.png" alt="TotumRisk" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.CognitiveServices**
+**diagrams.ibm.devtools.TotumRisk**
 
-<img width="30" src="/img/resources/ibm/general/data-security.png" alt="DataSecurity" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/tradeit.png" alt="Tradeit" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.DataSecurity**
+**diagrams.ibm.devtools.Tradeit**
 
-<img width="30" src="/img/resources/ibm/general/enterprise.png" alt="Enterprise" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/twilio.png" alt="Twilio" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.Enterprise**
+**diagrams.ibm.devtools.Twilio**
 
-<img width="30" src="/img/resources/ibm/general/governance-risk-compliance.png" alt="GovernanceRiskCompliance" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/ucloud.png" alt="Ucloud" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.GovernanceRiskCompliance**
+**diagrams.ibm.devtools.Ucloud**
 
-<img width="30" src="/img/resources/ibm/general/ibm-containers.png" alt="IBMContainers" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/wealthengine.png" alt="Wealthengine" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.IBMContainers**
+**diagrams.ibm.devtools.Wealthengine**
 
-<img width="30" src="/img/resources/ibm/general/ibm-public-cloud.png" alt="IBMPublicCloud" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/wire-account-verification-service.png" alt="WireAccountVerificationService" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.IBMPublicCloud**
+**diagrams.ibm.devtools.WireAccountVerificationService**
 
-<img width="30" src="/img/resources/ibm/general/identity-access-management.png" alt="IdentityAccessManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/xignite.png" alt="Xignite" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.IdentityAccessManagement**
+**diagrams.ibm.devtools.Xignite**
 
-<img width="30" src="/img/resources/ibm/general/identity-provider.png" alt="IdentityProvider" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/ylabs.png" alt="Ylabs" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.IdentityProvider**
+**diagrams.ibm.devtools.Ylabs**
 
-<img width="30" src="/img/resources/ibm/general/infrastructure-security.png" alt="InfrastructureSecurity" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/devtools/yodlee.png" alt="Yodlee" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.InfrastructureSecurity**
+**diagrams.ibm.devtools.Yodlee**
 
-<img width="30" src="/img/resources/ibm/general/internet.png" alt="Internet" style="float: left; padding-right: 5px;" >
+## ibm.integration
-**diagrams.ibm.general.Internet**
 
-<img width="30" src="/img/resources/ibm/general/iot-cloud.png" alt="IotCloud" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.IotCloud**
 
-<img width="30" src="/img/resources/ibm/general/microservices-application.png" alt="MicroservicesApplication" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/integration/api-connect.png" alt="APIConnect" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.MicroservicesApplication**
+**diagrams.ibm.integration.APIConnect**
 
-<img width="30" src="/img/resources/ibm/general/microservices-mesh.png" alt="MicroservicesMesh" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/integration/app-connect.png" alt="AppConnect" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.MicroservicesMesh**
+**diagrams.ibm.integration.AppConnect**
 
-<img width="30" src="/img/resources/ibm/general/monitoring-logging.png" alt="MonitoringLogging" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/integration/event-streams.png" alt="EventStreams" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.MonitoringLogging**
+**diagrams.ibm.integration.EventStreams**
 
-<img width="30" src="/img/resources/ibm/general/monitoring.png" alt="Monitoring" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/integration/lift.png" alt="Lift" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.Monitoring**
+**diagrams.ibm.integration.Lift**
 
-<img width="30" src="/img/resources/ibm/general/object-storage.png" alt="ObjectStorage" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/integration/mq.png" alt="Mq" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.ObjectStorage**
+**diagrams.ibm.integration.Mq**
 
-<img width="30" src="/img/resources/ibm/general/offline-capabilities.png" alt="OfflineCapabilities" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/integration/rocket-mainframe.png" alt="RocketMainframe" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.OfflineCapabilities**
+**diagrams.ibm.integration.RocketMainframe**
 
-<img width="30" src="/img/resources/ibm/general/openwhisk.png" alt="Openwhisk" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/integration/secure-gateway.png" alt="SecureGateway" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.Openwhisk**
+**diagrams.ibm.integration.SecureGateway**
 
-<img width="30" src="/img/resources/ibm/general/peer-cloud.png" alt="PeerCloud" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/integration/simple-cloud-io.png" alt="SimpleCloudIo" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.PeerCloud**
+**diagrams.ibm.integration.SimpleCloudIo**
 
-<img width="30" src="/img/resources/ibm/general/retrieve-rank.png" alt="RetrieveRank" style="float: left; padding-right: 5px;" >
+## ibm.iot
-**diagrams.ibm.general.RetrieveRank**
 
-<img width="30" src="/img/resources/ibm/general/scalable.png" alt="Scalable" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.Scalable**
 
-<img width="30" src="/img/resources/ibm/general/service-discovery-configuration.png" alt="ServiceDiscoveryConfiguration" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/iot/bosch-rollouts.png" alt="BoschRollouts" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.ServiceDiscoveryConfiguration**
+**diagrams.ibm.iot.BoschRollouts**
 
-<img width="30" src="/img/resources/ibm/general/text-to-speech.png" alt="TextToSpeech" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/iot/car-diagnostic.png" alt="CarDiagnostic" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.TextToSpeech**
+**diagrams.ibm.iot.CarDiagnostic**
 
-<img width="30" src="/img/resources/ibm/general/transformation-connectivity.png" alt="TransformationConnectivity" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/iot/data-plans.png" alt="DataPlans" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.general.TransformationConnectivity**
+**diagrams.ibm.iot.DataPlans**
 
-## ibm.infrastructure
+<img width="30" src="/img/resources/ibm/iot/flow.png" alt="Flow" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.iot.Flow**
 
+<img width="30" src="/img/resources/ibm/iot/iot-platform.png" alt="IotPlatform" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.iot.IotPlatform**
 
-<img width="30" src="/img/resources/ibm/infrastructure/channels.png" alt="Channels" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/iot/portworx.png" alt="Portworx" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.Channels**
+**diagrams.ibm.iot.Portworx**
 
-<img width="30" src="/img/resources/ibm/infrastructure/cloud-messaging.png" alt="CloudMessaging" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/iot/skyhook.png" alt="Skyhook" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.CloudMessaging**
+**diagrams.ibm.iot.Skyhook**
 
-<img width="30" src="/img/resources/ibm/infrastructure/dashboard.png" alt="Dashboard" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/iot/unification-engine.png" alt="UnificationEngine" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.Dashboard**
+**diagrams.ibm.iot.UnificationEngine**
 
-<img width="30" src="/img/resources/ibm/infrastructure/diagnostics.png" alt="Diagnostics" style="float: left; padding-right: 5px;" >
+## ibm.logging
-**diagrams.ibm.infrastructure.Diagnostics**
 
-<img width="30" src="/img/resources/ibm/infrastructure/edge-services.png" alt="EdgeServices" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.EdgeServices**
 
-<img width="30" src="/img/resources/ibm/infrastructure/enterprise-messaging.png" alt="EnterpriseMessaging" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/logging/activity-tracker.png" alt="ActivityTracker" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.EnterpriseMessaging**
+**diagrams.ibm.logging.ActivityTracker**
 
-<img width="30" src="/img/resources/ibm/infrastructure/event-feed.png" alt="EventFeed" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/logging/log-analysis.png" alt="LogAnalysis" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.EventFeed**
+**diagrams.ibm.logging.LogAnalysis**
 
-<img width="30" src="/img/resources/ibm/infrastructure/infrastructure-services.png" alt="InfrastructureServices" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/logging/monitoring.png" alt="Monitoring" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.InfrastructureServices**
+**diagrams.ibm.logging.Monitoring**
 
-<img width="30" src="/img/resources/ibm/infrastructure/interservice-communication.png" alt="InterserviceCommunication" style="float: left; padding-right: 5px;" >
+## ibm.migration
-**diagrams.ibm.infrastructure.InterserviceCommunication**
 
-<img width="30" src="/img/resources/ibm/infrastructure/load-balancing-routing.png" alt="LoadBalancingRouting" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.LoadBalancingRouting**
 
-<img width="30" src="/img/resources/ibm/infrastructure/microservices-mesh.png" alt="MicroservicesMesh" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/migration/cloud-migration.png" alt="CloudMigration" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.MicroservicesMesh**
+**diagrams.ibm.migration.CloudMigration**
 
-<img width="30" src="/img/resources/ibm/infrastructure/mobile-backend.png" alt="MobileBackend" style="float: left; padding-right: 5px;" >
+## ibm.ml
-**diagrams.ibm.infrastructure.MobileBackend**
 
-<img width="30" src="/img/resources/ibm/infrastructure/mobile-provider-network.png" alt="MobileProviderNetwork" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.MobileProviderNetwork**
 
-<img width="30" src="/img/resources/ibm/infrastructure/monitoring-logging.png" alt="MonitoringLogging" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/annotator.png" alt="Annotator" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.MonitoringLogging**
+**diagrams.ibm.ml.Annotator**
 
-<img width="30" src="/img/resources/ibm/infrastructure/monitoring.png" alt="Monitoring" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/knowledge-studio.png" alt="KnowledgeStudio" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.Monitoring**
+**diagrams.ibm.ml.KnowledgeStudio**
 
-<img width="30" src="/img/resources/ibm/infrastructure/peer-services.png" alt="PeerServices" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/language-translator.png" alt="LanguageTranslator" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.PeerServices**
+**diagrams.ibm.ml.LanguageTranslator**
 
-<img width="30" src="/img/resources/ibm/infrastructure/service-discovery-configuration.png" alt="ServiceDiscoveryConfiguration" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/machine-learning.png" alt="MachineLearning" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.ServiceDiscoveryConfiguration**
+**diagrams.ibm.ml.MachineLearning**
 
-<img width="30" src="/img/resources/ibm/infrastructure/transformation-connectivity.png" alt="TransformationConnectivity" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/match-360.png" alt="Match360" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.infrastructure.TransformationConnectivity**
+**diagrams.ibm.ml.Match360**
 
-## ibm.management
+<img width="30" src="/img/resources/ibm/ml/natural-language-classifier.png" alt="NaturalLanguageClassifier" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.ml.NaturalLanguageClassifier**
 
+<img width="30" src="/img/resources/ibm/ml/natural-language-understanding.png" alt="NaturalLanguageUnderstanding" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.ml.NaturalLanguageUnderstanding**
 
-<img width="30" src="/img/resources/ibm/management/alert-notification.png" alt="AlertNotification" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/personality-insights.png" alt="PersonalityInsights" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.AlertNotification**
+**diagrams.ibm.ml.PersonalityInsights**
 
-<img width="30" src="/img/resources/ibm/management/api-management.png" alt="ApiManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/speech-to-text.png" alt="SpeechToText" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.ApiManagement**
+**diagrams.ibm.ml.SpeechToText**
 
-<img width="30" src="/img/resources/ibm/management/cloud-management.png" alt="CloudManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/text-to-speech.png" alt="TextToSpeech" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.CloudManagement**
+**diagrams.ibm.ml.TextToSpeech**
 
-<img width="30" src="/img/resources/ibm/management/cluster-management.png" alt="ClusterManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/tone-analyzer.png" alt="ToneAnalyzer" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.ClusterManagement**
+**diagrams.ibm.ml.ToneAnalyzer**
 
-<img width="30" src="/img/resources/ibm/management/content-management.png" alt="ContentManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/watson-assistant.png" alt="WatsonAssistant" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.ContentManagement**
+**diagrams.ibm.ml.WatsonAssistant**
 
-<img width="30" src="/img/resources/ibm/management/data-services.png" alt="DataServices" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/watson-discovery.png" alt="WatsonDiscovery" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.DataServices**
+**diagrams.ibm.ml.WatsonDiscovery**
 
-<img width="30" src="/img/resources/ibm/management/device-management.png" alt="DeviceManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/watson-knowledge-catalog.png" alt="WatsonKnowledgeCatalog" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.DeviceManagement**
+**diagrams.ibm.ml.WatsonKnowledgeCatalog**
 
-<img width="30" src="/img/resources/ibm/management/information-governance.png" alt="InformationGovernance" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/watson-openscale.png" alt="WatsonOpenscale" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.InformationGovernance**
+**diagrams.ibm.ml.WatsonOpenscale**
 
-<img width="30" src="/img/resources/ibm/management/it-service-management.png" alt="ItServiceManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/ml/watson-studio.png" alt="WatsonStudio" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.ItServiceManagement**
+**diagrams.ibm.ml.WatsonStudio**
 
-<img width="30" src="/img/resources/ibm/management/management.png" alt="Management" style="float: left; padding-right: 5px;" >
+## ibm.mobile
-**diagrams.ibm.management.Management**
 
-<img width="30" src="/img/resources/ibm/management/monitoring-metrics.png" alt="MonitoringMetrics" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.MonitoringMetrics**
 
-<img width="30" src="/img/resources/ibm/management/process-management.png" alt="ProcessManagement" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/mobile/b2t.png" alt="B2T" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.ProcessManagement**
+**diagrams.ibm.mobile.B2T**
 
-<img width="30" src="/img/resources/ibm/management/provider-cloud-portal-service.png" alt="ProviderCloudPortalService" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/mobile/bitbar.png" alt="Bitbar" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.ProviderCloudPortalService**
+**diagrams.ibm.mobile.Bitbar**
 
-<img width="30" src="/img/resources/ibm/management/push-notifications.png" alt="PushNotifications" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/mobile/match-360.png" alt="Match360" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.PushNotifications**
+**diagrams.ibm.mobile.Match360**
 
-<img width="30" src="/img/resources/ibm/management/service-management-tools.png" alt="ServiceManagementTools" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/mobile/phunware.png" alt="Phunware" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.management.ServiceManagementTools**
+**diagrams.ibm.mobile.Phunware**
 
-## ibm.network
+<img width="30" src="/img/resources/ibm/mobile/push-notifications.png" alt="PushNotifications" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.mobile.PushNotifications**
 
+<img width="30" src="/img/resources/ibm/mobile/telstra.png" alt="Telstra" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.mobile.Telstra**
 
-<img width="30" src="/img/resources/ibm/network/bridge.png" alt="Bridge" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/mobile/twilio.png" alt="Twilio" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.Bridge**
+**diagrams.ibm.mobile.Twilio**
 
-<img width="30" src="/img/resources/ibm/network/direct-link.png" alt="DirectLink" style="float: left; padding-right: 5px;" >
+## ibm.network
-**diagrams.ibm.network.DirectLink**
-
-<img width="30" src="/img/resources/ibm/network/enterprise.png" alt="Enterprise" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.Enterprise**
 
-<img width="30" src="/img/resources/ibm/network/firewall.png" alt="Firewall" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.Firewall**
 
-<img width="30" src="/img/resources/ibm/network/floating-ip.png" alt="FloatingIp" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/cdn.png" alt="CDN" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.FloatingIp**
+**diagrams.ibm.network.CDN**
 
-<img width="30" src="/img/resources/ibm/network/gateway.png" alt="Gateway" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/cis.png" alt="Cis" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.Gateway**
+**diagrams.ibm.network.Cis**
 
-<img width="30" src="/img/resources/ibm/network/internet-services.png" alt="InternetServices" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/direct-link-connect.png" alt="DirectLinkConnect" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.InternetServices**
+**diagrams.ibm.network.DirectLinkConnect**
 
-<img width="30" src="/img/resources/ibm/network/load-balancer-listener.png" alt="LoadBalancerListener" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/direct-link.png" alt="DirectLink" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.LoadBalancerListener**
+**diagrams.ibm.network.DirectLink**
 
-<img width="30" src="/img/resources/ibm/network/load-balancer-pool.png" alt="LoadBalancerPool" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/dns.png" alt="DNS" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.LoadBalancerPool**
+**diagrams.ibm.network.DNS**
 
-<img width="30" src="/img/resources/ibm/network/load-balancer.png" alt="LoadBalancer" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/firewall.png" alt="Firewall" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.LoadBalancer**
+**diagrams.ibm.network.Firewall**
 
-<img width="30" src="/img/resources/ibm/network/load-balancing-routing.png" alt="LoadBalancingRouting" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/ipsec-vpn.png" alt="IpsecVPN" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.LoadBalancingRouting**
+**diagrams.ibm.network.IpsecVPN**
 
-<img width="30" src="/img/resources/ibm/network/public-gateway.png" alt="PublicGateway" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/lbaas.png" alt="Lbaas" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.PublicGateway**
+**diagrams.ibm.network.Lbaas**
 
-<img width="30" src="/img/resources/ibm/network/region.png" alt="Region" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/local-load-balancing.png" alt="LocalLoadBalancing" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.Region**
+**diagrams.ibm.network.LocalLoadBalancing**
 
-<img width="30" src="/img/resources/ibm/network/router.png" alt="Router" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/subnets.png" alt="Subnets" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.Router**
+**diagrams.ibm.network.Subnets**
 
-<img width="30" src="/img/resources/ibm/network/rules.png" alt="Rules" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/transit.png" alt="Transit" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.Rules**
+**diagrams.ibm.network.Transit**
 
-<img width="30" src="/img/resources/ibm/network/subnet.png" alt="Subnet" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/virtual-router-appliance.png" alt="VirtualRouterAppliance" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.Subnet**
+**diagrams.ibm.network.VirtualRouterAppliance**
 
-<img width="30" src="/img/resources/ibm/network/transit-gateway.png" alt="TransitGateway" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/vlan.png" alt="Vlan" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.TransitGateway**
+**diagrams.ibm.network.Vlan**
 
-<img width="30" src="/img/resources/ibm/network/vpc.png" alt="Vpc" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/vpc-endpoints.png" alt="VPCEndpoints" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.Vpc**
+**diagrams.ibm.network.VPCEndpoints**
 
-<img width="30" src="/img/resources/ibm/network/vpn-connection.png" alt="VpnConnection" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/vpc-flowlogs.png" alt="VPCFlowlogs" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.VpnConnection**
+**diagrams.ibm.network.VPCFlowlogs**
 
-<img width="30" src="/img/resources/ibm/network/vpn-gateway.png" alt="VpnGateway" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/vpc.png" alt="VPC" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.VpnGateway**
+**diagrams.ibm.network.VPC**
 
-<img width="30" src="/img/resources/ibm/network/vpn-policy.png" alt="VpnPolicy" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/network/vpn.png" alt="VPN" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.network.VpnPolicy**
+**diagrams.ibm.network.VPN**
 
 ## ibm.security
 
 
-<img width="30" src="/img/resources/ibm/security/api-security.png" alt="ApiSecurity" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/app-id.png" alt="AppId" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.ApiSecurity**
+**diagrams.ibm.security.AppId**
-
-<img width="30" src="/img/resources/ibm/security/blockchain-security-service.png" alt="BlockchainSecurityService" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.BlockchainSecurityService**
-
-<img width="30" src="/img/resources/ibm/security/data-security.png" alt="DataSecurity" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.DataSecurity**
-
-<img width="30" src="/img/resources/ibm/security/firewall.png" alt="Firewall" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.Firewall**
-
-<img width="30" src="/img/resources/ibm/security/gateway.png" alt="Gateway" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.Gateway**
-
-<img width="30" src="/img/resources/ibm/security/governance-risk-compliance.png" alt="GovernanceRiskCompliance" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.GovernanceRiskCompliance**
-
-<img width="30" src="/img/resources/ibm/security/identity-access-management.png" alt="IdentityAccessManagement" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.IdentityAccessManagement**
-
-<img width="30" src="/img/resources/ibm/security/identity-provider.png" alt="IdentityProvider" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.IdentityProvider**
 
-<img width="30" src="/img/resources/ibm/security/infrastructure-security.png" alt="InfrastructureSecurity" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/certificate-manager.png" alt="CertificateManager" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.InfrastructureSecurity**
+**diagrams.ibm.security.CertificateManager**
 
-<img width="30" src="/img/resources/ibm/security/physical-security.png" alt="PhysicalSecurity" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/contrast.png" alt="Contrast" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.PhysicalSecurity**
+**diagrams.ibm.security.Contrast**
 
-<img width="30" src="/img/resources/ibm/security/security-monitoring-intelligence.png" alt="SecurityMonitoringIntelligence" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/crypto.png" alt="Crypto" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.SecurityMonitoringIntelligence**
+**diagrams.ibm.security.Crypto**
 
-<img width="30" src="/img/resources/ibm/security/security-services.png" alt="SecurityServices" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/data-shield.png" alt="DataShield" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.SecurityServices**
+**diagrams.ibm.security.DataShield**
 
-<img width="30" src="/img/resources/ibm/security/trustend-computing.png" alt="TrustendComputing" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/fusionauth.png" alt="Fusionauth" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.TrustendComputing**
+**diagrams.ibm.security.Fusionauth**
 
-<img width="30" src="/img/resources/ibm/security/vpn.png" alt="Vpn" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/hsm.png" alt="Hsm" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.security.Vpn**
+**diagrams.ibm.security.Hsm**
 
-## ibm.social
+<img width="30" src="/img/resources/ibm/security/key-protect.png" alt="KeyProtect" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.security.KeyProtect**
 
+<img width="30" src="/img/resources/ibm/security/neuvector.png" alt="Neuvector" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.security.Neuvector**
 
-<img width="30" src="/img/resources/ibm/social/communities.png" alt="Communities" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/open-bsd.png" alt="OpenBsd" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.social.Communities**
+**diagrams.ibm.security.OpenBsd**, **OpenBSD** (alias)
 
-<img width="30" src="/img/resources/ibm/social/file-sync.png" alt="FileSync" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/raxak.png" alt="Raxak" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.social.FileSync**
+**diagrams.ibm.security.Raxak**
 
-<img width="30" src="/img/resources/ibm/social/live-collaboration.png" alt="LiveCollaboration" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/secrets-manager.png" alt="SecretsManager" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.social.LiveCollaboration**
+**diagrams.ibm.security.SecretsManager**
 
-<img width="30" src="/img/resources/ibm/social/messaging.png" alt="Messaging" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/ssl-certificates.png" alt="SslCertificates" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.social.Messaging**
+**diagrams.ibm.security.SslCertificates**
 
-<img width="30" src="/img/resources/ibm/social/networking.png" alt="Networking" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/security/twilio.png" alt="Twilio" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.social.Networking**
+**diagrams.ibm.security.Twilio**
 
 ## ibm.storage
 
 
+<img width="30" src="/img/resources/ibm/storage/block-storage-volumes.png" alt="BlockStorageVolumes" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.storage.BlockStorageVolumes**
+
 <img width="30" src="/img/resources/ibm/storage/block-storage.png" alt="BlockStorage" style="float: left; padding-right: 5px;" >
 **diagrams.ibm.storage.BlockStorage**
 
-<img width="30" src="/img/resources/ibm/storage/object-storage.png" alt="ObjectStorage" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/storage/box.png" alt="Box" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.storage.ObjectStorage**
+**diagrams.ibm.storage.Box**
-
-## ibm.user
 
+<img width="30" src="/img/resources/ibm/storage/evault.png" alt="Evault" style="float: left; padding-right: 5px;" >
+**diagrams.ibm.storage.Evault**
 
-<img width="30" src="/img/resources/ibm/user/browser.png" alt="Browser" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/storage/file-storage.png" alt="FileStorage" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.user.Browser**
+**diagrams.ibm.storage.FileStorage**
 
-<img width="30" src="/img/resources/ibm/user/device.png" alt="Device" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/storage/mass-data-migration.png" alt="MassDataMigration" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.user.Device**
+**diagrams.ibm.storage.MassDataMigration**
 
-<img width="30" src="/img/resources/ibm/user/integrated-digital-experiences.png" alt="IntegratedDigitalExperiences" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/storage/object-storage.png" alt="ObjectStorage" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.user.IntegratedDigitalExperiences**
+**diagrams.ibm.storage.ObjectStorage**
-
-<img width="30" src="/img/resources/ibm/user/physical-entity.png" alt="PhysicalEntity" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.user.PhysicalEntity**
-
-<img width="30" src="/img/resources/ibm/user/sensor.png" alt="Sensor" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.user.Sensor**
 
-<img width="30" src="/img/resources/ibm/user/user.png" alt="User" style="float: left; padding-right: 5px;" >
+<img width="30" src="/img/resources/ibm/storage/portworx.png" alt="Portworx" style="float: left; padding-right: 5px;" >
-**diagrams.ibm.user.User**
+**diagrams.ibm.storage.Portworx**