diff --git a/website/content/docs/intro/usecases/what-is-service-discovery.mdx b/website/content/docs/concepts/service-discovery.mdx similarity index 100% rename from website/content/docs/intro/usecases/what-is-service-discovery.mdx rename to website/content/docs/concepts/service-discovery.mdx diff --git a/website/content/docs/intro/usecases/what-is-a-service-mesh.mdx b/website/content/docs/concepts/service-mesh.mdx similarity index 100% rename from website/content/docs/intro/usecases/what-is-a-service-mesh.mdx rename to website/content/docs/concepts/service-mesh.mdx diff --git a/website/content/docs/intro/usecases/index.mdx b/website/content/docs/intro/usecases/index.mdx deleted file mode 100644 index 2f2b4b324e..0000000000 --- a/website/content/docs/intro/usecases/index.mdx +++ /dev/null @@ -1,9 +0,0 @@ ---- -layout: docs -page_title: usecases -description: >- - Consul Service Mesh can be deployed on AWS ECS (Elastic Container Service). - This section documents the official installation of Consul on ECS. ---- - -lals diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json index 7f64ed3b45..010d369221 100644 --- a/website/data/docs-nav-data.json +++ b/website/data/docs-nav-data.json @@ -1,28 +1,18 @@ [ { "title": "What is Consul?", + "path": "intro" + }, + { + "title": "Core Concepts", "routes": [ { - "title": "Overview", - "path": "intro" + "title": "Service Discovery", + "path": "concepts/service-discovery" }, { - "title": "Use Cases", - "routes": [ - { - "title": "Overview", - "path": "intro/usecases", - "hidden": true - }, - { - "title": "Service Discovery", - "path": "intro/usecases/what-is-service-discovery" - }, - { - "title": "Service Mesh", - "path": "intro/usecases/what-is-a-service-mesh" - } - ] + "title": "Service Mesh", + "path": "concepts/service-mesh" } ] }, @@ -69,12 +59,40 @@ ] }, { - "title": "API", - "href": "/api-docs" + "title": "Architecture", + "routes": [ + { + "title": "Overview", + "path": "architecture" + }, + { + "title": "Improving Consul Resilience", + "path": "architecture/improving-consul-resilience" + }, + { + "title": "Anti-Entropy", + "path": "architecture/anti-entropy" + }, + { + "title": "Consensus Protocol", + "path": "architecture/consensus" + }, + { + "title": "Gossip Protocol", + "path": "architecture/gossip" + }, + { + "title": "Jepsen Testing", + "path": "architecture/jepsen" + }, + { + "title": "Network Coordinates", + "path": "architecture/coordinates" + } + ] }, { - "title": "Commands (CLI)", - "href": "/commands" + "divider": true }, { "title": "Service Discovery", @@ -355,59 +373,181 @@ ] }, { - "title": "Consul API Gateway", + "title": "Dynamic App Configuration", + "routes": [ + { + "title": "Consul KV", + "path": "dynamic-app-config/kv" + }, + { + "title": "Sessions", + "path": "dynamic-app-config/sessions" + }, + { + "title": "Watches", + "path": "dynamic-app-config/watches" + } + ] + }, + { + "title": "Security", "routes": [ { "title": "Overview", - "path": "api-gateway" + "path": "security" }, { - "title": "Installation", - "path": "api-gateway/install" + "title": "Access Control (ACLs)", + "routes": [ + { + "title": "ACL System Overview", + "path": "security/acl" + }, + { + "title": "Tokens", + "path": "security/acl/acl-tokens" + }, + { + "title": "Policies", + "path": "security/acl/acl-policies" + }, + { + "title": "Roles", + "path": "security/acl/acl-roles" + }, + { + "title": "Rules Reference", + "path": "security/acl/acl-rules" + }, + { + "title": "Legacy Mode", + "path": "security/acl/acl-legacy" + }, + { + "title": "Token Migration", + "path": "security/acl/acl-migrate-tokens" + }, + { + "title": "ACLs in Federated Datacenters", + "path": "security/acl/acl-federated-datacenters" + }, + { + "title": "Auth Methods", + "routes": [ + { + "title": "Overview", + "path": "security/acl/auth-methods" + }, + { + "title": "Kubernetes", + "path": "security/acl/auth-methods/kubernetes" + }, + { + "title": "JWT", + "path": "security/acl/auth-methods/jwt" + }, + { + "title": "OIDC", + "path": "security/acl/auth-methods/oidc" + }, + { + "title": "AWS IAM", + "path": "security/acl/auth-methods/aws-iam" + } + ] + } + ] }, { - "title": "Technical Specifications", - "path": "api-gateway/tech-specs" + "title": "Encryption", + "path": "security/encryption" }, { - "title": "Upgrades", - "path": "api-gateway/upgrades" - }, + "title": "Security Models", + "routes": [ + { + "title": "Overview", + "path": "security/security-models" + }, + { + "title": "Core", + "path": "security/security-models/core" + }, + { + "title": "Network Infrastructure Automation", + "path": "security/security-models/nia" + } + ] + } + ] + }, + { + "title": "Agent", + "routes": [ { - "title": "Usage", - "path": "api-gateway/usage" + "title": "Overview", + "path": "agent" }, { "title": "Configuration", "routes": [ { - "title": "Overview", - "path": "api-gateway/configuration" + "title": "General", + "path": "agent/config" }, { - "title": "Gateway", - "path": "api-gateway/configuration/gateway" + "title": "CLI Reference", + "path": "agent/config/cli-flags" }, { - "title": "GatewayClass", - "path": "api-gateway/configuration/gatewayclass" - }, - { - "title": "GatewayClassConfig", - "path": "api-gateway/configuration/gatewayclassconfig" - }, - { - "title": "Routes", - "path": "api-gateway/configuration/routes" - }, - { - "title": "MeshService", - "path": "api-gateway/configuration/meshservice" + "title": "Configuration Reference", + "path": "agent/config/config-files" } ] + }, + { + "title": "Configuration Entries", + "path": "agent/config-entries" + }, + { + "title": "Telemetry", + "path": "agent/telemetry" + }, + { + "title": "Sentinel", + "path": "agent/sentinel" + }, + { + "title": "RPC", + "path": "agent/rpc", + "hidden": true } ] }, + { + "title": "Integrations", + "routes": [ + { + "title": "Consul Integration Program", + "path": "integrate/partnerships" + }, + { + "title": "NIA Integration Program", + "path": "integrate/nia-integration" + }, + { + "title": "Vault Integration", + "href": "/docs/connect/ca/vault" + }, + { + "title": "Proxy Integration", + "href": "/docs/connect/proxies/integrate" + } + ] + }, + { + "divider": true + }, { "title": "Kubernetes", "routes": [ @@ -777,6 +917,140 @@ } ] }, + { + "divider": true + }, + { + "title": "HCP Consul", + "href": "https://cloud.hashicorp.com/docs/consul" + }, + { + "title": "Consul Enterprise", + "routes": [ + { + "title": "Overview", + "path": "enterprise" + }, + { + "title": "Admin Partitions", + "path": "enterprise/admin-partitions" + }, + { + "title": "Audit Logging", + "path": "enterprise/audit-logging" + }, + { + "title": "Automated Backups", + "path": "enterprise/backups" + }, + { + "title": "Automated Upgrades", + "path": "enterprise/upgrades" + }, + { + "title": "Enhanced Read Scalability", + "path": "enterprise/read-scale" + }, + { + "title": "Single sign-on - OIDC", + "href": "/docs/security/acl/auth-methods/oidc" + }, + { + "title": "Redundancy Zones", + "path": "enterprise/redundancy" + }, + { + "title": "Advanced Federation", + "path": "enterprise/federation" + }, + { + "title": "Network Segments", + "path": "enterprise/network-segments" + }, + { + "title": "Namespaces", + "path": "enterprise/namespaces" + }, + { + "title": "NIA with TFE", + "href": "/docs/nia/enterprise" + }, + { + "title": "Sentinel", + "path": "enterprise/sentinel" + }, + { + "title": "License", + "routes": [ + { + "title": "Overview", + "path": "enterprise/license/overview" + }, + { + "title": "FAQ", + "path": "enterprise/license/faq" + } + ] + } + ] + }, + { + "divider": true + }, + { + "title": "Consul API Gateway", + "routes": [ + { + "title": "Overview", + "path": "api-gateway" + }, + { + "title": "Installation", + "path": "api-gateway/install" + }, + { + "title": "Technical Specifications", + "path": "api-gateway/tech-specs" + }, + { + "title": "Upgrades", + "path": "api-gateway/upgrades" + }, + { + "title": "Usage", + "path": "api-gateway/usage" + }, + { + "title": "Configuration", + "routes": [ + { + "title": "Overview", + "path": "api-gateway/configuration" + }, + { + "title": "Gateway", + "path": "api-gateway/configuration/gateway" + }, + { + "title": "GatewayClass", + "path": "api-gateway/configuration/gatewayclass" + }, + { + "title": "GatewayClassConfig", + "path": "api-gateway/configuration/gatewayclassconfig" + }, + { + "title": "Routes", + "path": "api-gateway/configuration/routes" + }, + { + "title": "MeshService", + "path": "api-gateway/configuration/meshservice" + } + ] + } + ] + }, { "title": "Network Infrastructure Automation", "routes": [ @@ -900,343 +1174,7 @@ ] }, { - "title": "Dynamic App Configuration", - "routes": [ - { - "title": "Consul KV", - "path": "dynamic-app-config/kv" - }, - { - "title": "Sessions", - "path": "dynamic-app-config/sessions" - }, - { - "title": "Watches", - "path": "dynamic-app-config/watches" - } - ] - }, - { - "title": "Agent", - "routes": [ - { - "title": "Overview", - "path": "agent" - }, - { - "title": "Configuration", - "routes": [ - { - "title": "General", - "path": "agent/config" - }, - { - "title": "CLI Reference", - "path": "agent/config/cli-flags" - }, - { - "title": "Configuration Reference", - "path": "agent/config/config-files" - } - ] - }, - { - "title": "Configuration Entries", - "path": "agent/config-entries" - }, - { - "title": "Telemetry", - "path": "agent/telemetry" - }, - { - "title": "Sentinel", - "path": "agent/sentinel" - }, - { - "title": "RPC", - "path": "agent/rpc", - "hidden": true - } - ] - }, - { - "title": "Security", - "routes": [ - { - "title": "Overview", - "path": "security" - }, - { - "title": "Access Control (ACLs)", - "routes": [ - { - "title": "ACL System Overview", - "path": "security/acl" - }, - { - "title": "Tokens", - "path": "security/acl/acl-tokens" - }, - { - "title": "Policies", - "path": "security/acl/acl-policies" - }, - { - "title": "Roles", - "path": "security/acl/acl-roles" - }, - { - "title": "Rules Reference", - "path": "security/acl/acl-rules" - }, - { - "title": "Legacy Mode", - "path": "security/acl/acl-legacy" - }, - { - "title": "Token Migration", - "path": "security/acl/acl-migrate-tokens" - }, - { - "title": "ACLs in Federated Datacenters", - "path": "security/acl/acl-federated-datacenters" - }, - { - "title": "Auth Methods", - "routes": [ - { - "title": "Overview", - "path": "security/acl/auth-methods" - }, - { - "title": "Kubernetes", - "path": "security/acl/auth-methods/kubernetes" - }, - { - "title": "JWT", - "path": "security/acl/auth-methods/jwt" - }, - { - "title": "OIDC", - "path": "security/acl/auth-methods/oidc" - }, - { - "title": "AWS IAM", - "path": "security/acl/auth-methods/aws-iam" - } - ] - } - ] - }, - { - "title": "Encryption", - "path": "security/encryption" - }, - { - "title": "Security Models", - "routes": [ - { - "title": "Overview", - "path": "security/security-models" - }, - { - "title": "Core", - "path": "security/security-models/core" - }, - { - "title": "Network Infrastructure Automation", - "path": "security/security-models/nia" - } - ] - } - ] - }, - { - "title": "Consul Enterprise", - "routes": [ - { - "title": "Overview", - "path": "enterprise" - }, - { - "title": "Admin Partitions", - "path": "enterprise/admin-partitions" - }, - { - "title": "Audit Logging", - "path": "enterprise/audit-logging" - }, - { - "title": "Automated Backups", - "path": "enterprise/backups" - }, - { - "title": "Automated Upgrades", - "path": "enterprise/upgrades" - }, - { - "title": "Enhanced Read Scalability", - "path": "enterprise/read-scale" - }, - { - "title": "Single sign-on - OIDC", - "href": "/docs/security/acl/auth-methods/oidc" - }, - { - "title": "Redundancy Zones", - "path": "enterprise/redundancy" - }, - { - "title": "Advanced Federation", - "path": "enterprise/federation" - }, - { - "title": "Network Segments", - "path": "enterprise/network-segments" - }, - { - "title": "Namespaces", - "path": "enterprise/namespaces" - }, - { - "title": "NIA with TFE", - "href": "/docs/nia/enterprise" - }, - { - "title": "Sentinel", - "path": "enterprise/sentinel" - }, - { - "title": "License", - "routes": [ - { - "title": "Overview", - "path": "enterprise/license/overview" - }, - { - "title": "FAQ", - "path": "enterprise/license/faq" - } - ] - } - ] - }, - { - "title": "Architecture", - "routes": [ - { - "title": "Overview", - "path": "architecture" - }, - { - "title": "Improving Consul Resilience", - "path": "architecture/improving-consul-resilience" - }, - { - "title": "Anti-Entropy", - "path": "architecture/anti-entropy" - }, - { - "title": "Consensus Protocol", - "path": "architecture/consensus" - }, - { - "title": "Gossip Protocol", - "path": "architecture/gossip" - }, - { - "title": "Jepsen Testing", - "path": "architecture/jepsen" - }, - { - "title": "Network Coordinates", - "path": "architecture/coordinates" - } - ] - }, - { - "title": "Integrations", - "routes": [ - { - "title": "Consul Integration Program", - "path": "integrate/partnerships" - }, - { - "title": "NIA Integration Program", - "path": "integrate/nia-integration" - }, - { - "title": "Vault Integration", - "href": "/docs/connect/ca/vault" - }, - { - "title": "Proxy Integration", - "href": "/docs/connect/proxies/integrate" - } - ] - }, - { - "title": "Consul Tools", - "path": "download-tools" - }, - { - "title": "Upgrade", - "routes": [ - { - "title": "Overview", - "path": "upgrading" - }, - { - "title": "Compatibility Promise", - "path": "upgrading/compatibility" - }, - { - "title": "Specific Version Details", - "path": "upgrading/upgrade-specific" - }, - { - "title": "Upgrade Instructions", - "routes": [ - { - "title": "Overview", - "path": "upgrading/instructions" - }, - { - "title": "General Process", - "path": "upgrading/instructions/general-process" - }, - { - "title": "Upgrading to Latest 1.2.x", - "path": "upgrading/instructions/upgrade-to-1-2-x" - }, - { - "title": "Upgrading to Latest 1.6.x", - "path": "upgrading/instructions/upgrade-to-1-6-x" - }, - { - "title": "Upgrading to Latest 1.8.x", - "path": "upgrading/instructions/upgrade-to-1-8-x" - }, - { - "title": "Upgrading to Latest 1.10.x", - "path": "upgrading/instructions/upgrade-to-1-10-x" - } - ] - } - ] - }, - { - "title": "Troubleshoot", - "routes": [ - { - "title": "Common Error Messages", - "path": "troubleshoot/common-errors" - }, - { - "title": "FAQ", - "path": "troubleshoot/faq" - } - ] + "divider": true }, { "title": "Release Notes", @@ -1319,6 +1257,69 @@ } ] }, + { + "title": "Upgrade", + "routes": [ + { + "title": "Overview", + "path": "upgrading" + }, + { + "title": "Compatibility Promise", + "path": "upgrading/compatibility" + }, + { + "title": "Specific Version Details", + "path": "upgrading/upgrade-specific" + }, + { + "title": "Upgrade Instructions", + "routes": [ + { + "title": "Overview", + "path": "upgrading/instructions" + }, + { + "title": "General Process", + "path": "upgrading/instructions/general-process" + }, + { + "title": "Upgrading to Latest 1.2.x", + "path": "upgrading/instructions/upgrade-to-1-2-x" + }, + { + "title": "Upgrading to Latest 1.6.x", + "path": "upgrading/instructions/upgrade-to-1-6-x" + }, + { + "title": "Upgrading to Latest 1.8.x", + "path": "upgrading/instructions/upgrade-to-1-8-x" + }, + { + "title": "Upgrading to Latest 1.10.x", + "path": "upgrading/instructions/upgrade-to-1-10-x" + } + ] + } + ] + }, + { + "title": "Troubleshoot", + "routes": [ + { + "title": "Common Error Messages", + "path": "troubleshoot/common-errors" + }, + { + "title": "FAQ", + "path": "troubleshoot/faq" + } + ] + }, + { + "title": "Consul Tools", + "path": "download-tools" + }, { "title": "Internals", "hidden": true,