diff --git a/content/blog/2017/0.1-using-network-policy/index.md b/content/blog/2017/0.1-using-network-policy/index.md index f73e9d96f0..28755ce950 100644 --- a/content/blog/2017/0.1-using-network-policy/index.md +++ b/content/blog/2017/0.1-using-network-policy/index.md @@ -104,7 +104,7 @@ spec: Here is the service graph for the Bookinfo application. {{< image width="80%" ratio="59.08%" - link="/docs/guides/img/bookinfo/withistio.svg" + link="/docs/guides/bookinfo/withistio.svg" caption="Bookinfo Service Graph" >}} diff --git a/content/blog/2018/egress-https/index.md b/content/blog/2018/egress-https/index.md index 28ad015655..a6c1873a09 100644 --- a/content/blog/2018/egress-https/index.md +++ b/content/blog/2018/egress-https/index.md @@ -26,7 +26,7 @@ The Bookinfo configuration files reside in the `samples/bookinfo/kube` directory Here is a copy of the end-to-end architecture of the application from the original [Bookinfo Guide](/docs/guides/bookinfo/). {{< image width="80%" ratio="59.08%" - link="/docs/guides/img/bookinfo/withistio.svg" + link="/docs/guides/bookinfo/withistio.svg" caption="The Original Bookinfo Application" >}} diff --git a/content/blog/2018/egress-tcp/index.md b/content/blog/2018/egress-tcp/index.md index cac457242b..93511c743b 100644 --- a/content/blog/2018/egress-tcp/index.md +++ b/content/blog/2018/egress-tcp/index.md @@ -127,7 +127,7 @@ The example commands in this blog post work with Istio 0.3+, with or without [Mu As a reminder, here is the end-to-end architecture of the application from the [Bookinfo Guide](/docs/guides/bookinfo/). {{< image width="80%" ratio="59.08%" - link="/docs/guides/img/bookinfo/withistio.svg" + link="/docs/guides/bookinfo/withistio.svg" caption="The original Bookinfo application" >}} diff --git a/content/docs/guides/bookinfo.md b/content/docs/guides/bookinfo/index.md similarity index 99% rename from content/docs/guides/bookinfo.md rename to content/docs/guides/bookinfo/index.md index 34885f738b..b5ea767971 100644 --- a/content/docs/guides/bookinfo.md +++ b/content/docs/guides/bookinfo/index.md @@ -38,7 +38,7 @@ There are 3 versions of the reviews microservice: The end-to-end architecture of the application is shown below. {{< image width="80%" ratio="68.52%" - link="../img/bookinfo/noistio.svg" + link="./noistio.svg" caption="Bookinfo Application without Istio" >}} @@ -61,7 +61,7 @@ The needed commands and configuration vary depending on the runtime environment although in all cases the resulting deployment will look like this: {{< image width="80%" ratio="59.08%" - link="../img/bookinfo/withistio.svg" + link="./withistio.svg" caption="Bookinfo Application" >}} diff --git a/content/docs/guides/img/bookinfo/noistio.svg b/content/docs/guides/bookinfo/noistio.svg similarity index 100% rename from content/docs/guides/img/bookinfo/noistio.svg rename to content/docs/guides/bookinfo/noistio.svg diff --git a/content/docs/guides/img/bookinfo/withistio.svg b/content/docs/guides/bookinfo/withistio.svg similarity index 100% rename from content/docs/guides/img/bookinfo/withistio.svg rename to content/docs/guides/bookinfo/withistio.svg diff --git a/content/docs/guides/endpoints.md b/content/docs/guides/endpoints/index.md similarity index 100% rename from content/docs/guides/endpoints.md rename to content/docs/guides/endpoints/index.md diff --git a/content/docs/guides/integrating-vms.md b/content/docs/guides/integrating-vms/index.md similarity index 99% rename from content/docs/guides/integrating-vms.md rename to content/docs/guides/integrating-vms/index.md index bfbff1139d..a3167b2b0e 100644 --- a/content/docs/guides/integrating-vms.md +++ b/content/docs/guides/integrating-vms/index.md @@ -16,7 +16,7 @@ VMs cannot initiate any direct communication to Kubernetes Pods even when using ## Overview {{< image width="80%" ratio="56.78%" - link="../img/mesh-expansion.svg" + link="./mesh-expansion.svg" caption="Bookinfo Application with Istio Mesh Expansion" >}} diff --git a/content/docs/guides/img/mesh-expansion.svg b/content/docs/guides/integrating-vms/mesh-expansion.svg similarity index 100% rename from content/docs/guides/img/mesh-expansion.svg rename to content/docs/guides/integrating-vms/mesh-expansion.svg diff --git a/content/docs/guides/intelligent-routing.md b/content/docs/guides/intelligent-routing/index.md similarity index 100% rename from content/docs/guides/intelligent-routing.md rename to content/docs/guides/intelligent-routing/index.md diff --git a/content/docs/guides/telemetry.md b/content/docs/guides/telemetry/index.md similarity index 100% rename from content/docs/guides/telemetry.md rename to content/docs/guides/telemetry/index.md diff --git a/content/docs/performance-and-scalability/microbenchmarks.md b/content/docs/performance-and-scalability/microbenchmarks/index.md similarity index 100% rename from content/docs/performance-and-scalability/microbenchmarks.md rename to content/docs/performance-and-scalability/microbenchmarks/index.md diff --git a/content/docs/performance-and-scalability/overview.md b/content/docs/performance-and-scalability/overview/index.md similarity index 100% rename from content/docs/performance-and-scalability/overview.md rename to content/docs/performance-and-scalability/overview/index.md diff --git a/content/docs/performance-and-scalability/performance-testing-automation.md b/content/docs/performance-and-scalability/performance-testing-automation/index.md similarity index 100% rename from content/docs/performance-and-scalability/performance-testing-automation.md rename to content/docs/performance-and-scalability/performance-testing-automation/index.md diff --git a/content/docs/performance-and-scalability/realistic-app-benchmark.md b/content/docs/performance-and-scalability/realistic-app-benchmark/index.md similarity index 100% rename from content/docs/performance-and-scalability/realistic-app-benchmark.md rename to content/docs/performance-and-scalability/realistic-app-benchmark/index.md diff --git a/content/docs/performance-and-scalability/scalability.md b/content/docs/performance-and-scalability/scalability/index.md similarity index 100% rename from content/docs/performance-and-scalability/scalability.md rename to content/docs/performance-and-scalability/scalability/index.md diff --git a/content/docs/performance-and-scalability/scenarios.md b/content/docs/performance-and-scalability/scenarios/index.md similarity index 100% rename from content/docs/performance-and-scalability/scenarios.md rename to content/docs/performance-and-scalability/scenarios/index.md diff --git a/content/docs/performance-and-scalability/synthetic-benchmarks.md b/content/docs/performance-and-scalability/synthetic-benchmarks/index.md similarity index 100% rename from content/docs/performance-and-scalability/synthetic-benchmarks.md rename to content/docs/performance-and-scalability/synthetic-benchmarks/index.md diff --git a/content/docs/setup/consul/install.md b/content/docs/setup/consul/install/index.md similarity index 100% rename from content/docs/setup/consul/install.md rename to content/docs/setup/consul/install/index.md diff --git a/content/docs/setup/consul/quick-start.md b/content/docs/setup/consul/quick-start/index.md similarity index 100% rename from content/docs/setup/consul/quick-start.md rename to content/docs/setup/consul/quick-start/index.md diff --git a/content/docs/setup/eureka/install.md b/content/docs/setup/eureka/install/index.md similarity index 100% rename from content/docs/setup/eureka/install.md rename to content/docs/setup/eureka/install/index.md diff --git a/content/docs/setup/eureka/quick-start.md b/content/docs/setup/eureka/quick-start/index.md similarity index 100% rename from content/docs/setup/eureka/quick-start.md rename to content/docs/setup/eureka/quick-start/index.md diff --git a/content/docs/setup/kubernetes/advanced-install.md b/content/docs/setup/kubernetes/advanced-install/index.md similarity index 100% rename from content/docs/setup/kubernetes/advanced-install.md rename to content/docs/setup/kubernetes/advanced-install/index.md diff --git a/content/docs/setup/kubernetes/ansible-install.md b/content/docs/setup/kubernetes/ansible-install/index.md similarity index 100% rename from content/docs/setup/kubernetes/ansible-install.md rename to content/docs/setup/kubernetes/ansible-install/index.md diff --git a/content/docs/setup/kubernetes/helm-install.md b/content/docs/setup/kubernetes/helm-install/index.md similarity index 100% rename from content/docs/setup/kubernetes/helm-install.md rename to content/docs/setup/kubernetes/helm-install/index.md diff --git a/content/docs/setup/kubernetes/mesh-expansion.md b/content/docs/setup/kubernetes/mesh-expansion/index.md similarity index 100% rename from content/docs/setup/kubernetes/mesh-expansion.md rename to content/docs/setup/kubernetes/mesh-expansion/index.md diff --git a/content/docs/setup/kubernetes/multicluster-install.md b/content/docs/setup/kubernetes/multicluster-install/index.md similarity index 100% rename from content/docs/setup/kubernetes/multicluster-install.md rename to content/docs/setup/kubernetes/multicluster-install/index.md diff --git a/content/docs/setup/kubernetes/img/dm-tracing.png b/content/docs/setup/kubernetes/quick-start-gke-dm/dm-tracing.png similarity index 100% rename from content/docs/setup/kubernetes/img/dm-tracing.png rename to content/docs/setup/kubernetes/quick-start-gke-dm/dm-tracing.png diff --git a/content/docs/setup/kubernetes/img/dm_bookinfo.png b/content/docs/setup/kubernetes/quick-start-gke-dm/dm_bookinfo.png similarity index 100% rename from content/docs/setup/kubernetes/img/dm_bookinfo.png rename to content/docs/setup/kubernetes/quick-start-gke-dm/dm_bookinfo.png diff --git a/content/docs/setup/kubernetes/img/dm_gcp_iam.png b/content/docs/setup/kubernetes/quick-start-gke-dm/dm_gcp_iam.png similarity index 100% rename from content/docs/setup/kubernetes/img/dm_gcp_iam.png rename to content/docs/setup/kubernetes/quick-start-gke-dm/dm_gcp_iam.png diff --git a/content/docs/setup/kubernetes/img/dm_gcp_iam_role.png b/content/docs/setup/kubernetes/quick-start-gke-dm/dm_gcp_iam_role.png similarity index 100% rename from content/docs/setup/kubernetes/img/dm_gcp_iam_role.png rename to content/docs/setup/kubernetes/quick-start-gke-dm/dm_gcp_iam_role.png diff --git a/content/docs/setup/kubernetes/img/dm_grafana.png b/content/docs/setup/kubernetes/quick-start-gke-dm/dm_grafana.png similarity index 100% rename from content/docs/setup/kubernetes/img/dm_grafana.png rename to content/docs/setup/kubernetes/quick-start-gke-dm/dm_grafana.png diff --git a/content/docs/setup/kubernetes/img/dm_kubernetes_workloads.png b/content/docs/setup/kubernetes/quick-start-gke-dm/dm_kubernetes_workloads.png similarity index 100% rename from content/docs/setup/kubernetes/img/dm_kubernetes_workloads.png rename to content/docs/setup/kubernetes/quick-start-gke-dm/dm_kubernetes_workloads.png diff --git a/content/docs/setup/kubernetes/img/dm_launcher.png b/content/docs/setup/kubernetes/quick-start-gke-dm/dm_launcher.png similarity index 100% rename from content/docs/setup/kubernetes/img/dm_launcher.png rename to content/docs/setup/kubernetes/quick-start-gke-dm/dm_launcher.png diff --git a/content/docs/setup/kubernetes/img/dm_prometheus.png b/content/docs/setup/kubernetes/quick-start-gke-dm/dm_prometheus.png similarity index 100% rename from content/docs/setup/kubernetes/img/dm_prometheus.png rename to content/docs/setup/kubernetes/quick-start-gke-dm/dm_prometheus.png diff --git a/content/docs/setup/kubernetes/img/dm_servicegraph.png b/content/docs/setup/kubernetes/quick-start-gke-dm/dm_servicegraph.png similarity index 100% rename from content/docs/setup/kubernetes/img/dm_servicegraph.png rename to content/docs/setup/kubernetes/quick-start-gke-dm/dm_servicegraph.png diff --git a/content/docs/setup/kubernetes/quick-start-gke-dm.md b/content/docs/setup/kubernetes/quick-start-gke-dm/index.md similarity index 97% rename from content/docs/setup/kubernetes/quick-start-gke-dm.md rename to content/docs/setup/kubernetes/quick-start-gke-dm/index.md index 87d423013a..1495c375a0 100644 --- a/content/docs/setup/kubernetes/quick-start-gke-dm.md +++ b/content/docs/setup/kubernetes/quick-start-gke-dm/index.md @@ -26,14 +26,14 @@ application. It uses Deployment Manager to automate the steps detailed in the [ To set this up, navigate to the **IAM** section of the [Cloud Console](https://console.cloud.google.com/iam-admin/iam/project) as shown below and find your default GCE/GKE service account in the following form: `projectNumber-compute@developer.gserviceaccount.com`: by default it should just have the **Editor** role. Then in the **Roles** drop-down list for that account, find the **Kubernetes Engine** group and select the role **Kubernetes Engine Admin**. The **Roles** listing for your account will change to **Multiple**. {{< image width="100%" ratio="22.94%" -link="../img/dm_gcp_iam.png" +link="./dm_gcp_iam.png" caption="GKE-IAM Service" >}} Then add the `Kubernetes Engine Admin` role: {{< image width="70%" ratio="65.04%" -link="../img/dm_gcp_iam_role.png" +link="./dm_gcp_iam_role.png" caption="GKE-IAM Role" >}} @@ -57,7 +57,7 @@ caption="GKE-IAM Role" 1. Click **Deploy**: {{< image width="100%" ratio="67.17%" - link="../img/dm_launcher.png" + link="./dm_launcher.png" caption="GKE-Istio Launcher" >}} @@ -131,7 +131,7 @@ Note down the IP address (EXTERNAL-IP) and port assigned to the Bookinfo product You can also view the installation using the ***Kubernetes Engine -> Workloads** section on the [Cloud Console](https://console.cloud.google.com/kubernetes/workload): {{< image width="70%" ratio="80.37%" - link="../img/dm_kubernetes_workloads.png" + link="./dm_kubernetes_workloads.png" caption="GKE-Workloads" >}} @@ -148,7 +148,7 @@ You can also view the installation using the ***Kubernetes Engine -> Workloads** 1. Verify you can access the Bookinfo ```http://${GATEWAY_URL}/productpage```: {{< image width="100%" ratio="45.04%" - link="../img/dm_bookinfo.png" + link="./dm_bookinfo.png" caption="Bookinfo" >}} @@ -178,7 +178,7 @@ http://localhost:3000/dashboard/db/istio-dashboard You should see some statistics for the requests you sent earlier. {{< image width="100%" ratio="48.49%" - link="../img/dm_grafana.png" + link="./dm_grafana.png" caption="Grafana" >}} @@ -199,7 +199,7 @@ http://localhost:9090/graph ``` {{< image width="100%" ratio="43.88%" - link="../img/dm_prometheus.png" + link="./dm_prometheus.png" caption="Prometheus" >}} @@ -220,7 +220,7 @@ http://localhost:8088/dotviz ``` {{< image width="100%" ratio="53.33%" - link="../img/dm_servicegraph.png" + link="./dm_servicegraph.png" caption="ServiceGraph" >}} @@ -237,7 +237,7 @@ $ kubectl port-forward -n istio-system $(kubectl get pod -n istio-system -l app= You should see the trace statistics sent earlier on [http://localhost:16686](http://localhost:16686) {{< image width="100%" ratio="42.35%" - link="../img/dm-tracing.png" + link="./dm-tracing.png" caption="Tracing Dashboard" >}} diff --git a/content/docs/setup/kubernetes/quick-start.md b/content/docs/setup/kubernetes/quick-start/index.md similarity index 100% rename from content/docs/setup/kubernetes/quick-start.md rename to content/docs/setup/kubernetes/quick-start/index.md diff --git a/content/docs/setup/kubernetes/sidecar-injection.md b/content/docs/setup/kubernetes/sidecar-injection/index.md similarity index 100% rename from content/docs/setup/kubernetes/sidecar-injection.md rename to content/docs/setup/kubernetes/sidecar-injection/index.md diff --git a/content/docs/setup/kubernetes/upgrading-istio.md b/content/docs/setup/kubernetes/upgrading-istio/index.md similarity index 100% rename from content/docs/setup/kubernetes/upgrading-istio.md rename to content/docs/setup/kubernetes/upgrading-istio/index.md diff --git a/content/docs/tasks/policy-enforcement/rate-limiting.md b/content/docs/tasks/policy-enforcement/rate-limiting/index.md similarity index 100% rename from content/docs/tasks/policy-enforcement/rate-limiting.md rename to content/docs/tasks/policy-enforcement/rate-limiting/index.md diff --git a/content/docs/tasks/security/authn-policy.md b/content/docs/tasks/security/authn-policy/index.md similarity index 100% rename from content/docs/tasks/security/authn-policy.md rename to content/docs/tasks/security/authn-policy/index.md diff --git a/content/docs/tasks/security/basic-access-control.md b/content/docs/tasks/security/basic-access-control/index.md similarity index 100% rename from content/docs/tasks/security/basic-access-control.md rename to content/docs/tasks/security/basic-access-control/index.md diff --git a/content/docs/tasks/security/health-check.md b/content/docs/tasks/security/health-check/index.md similarity index 100% rename from content/docs/tasks/security/health-check.md rename to content/docs/tasks/security/health-check/index.md diff --git a/content/docs/tasks/security/https-overlay.md b/content/docs/tasks/security/https-overlay/index.md similarity index 100% rename from content/docs/tasks/security/https-overlay.md rename to content/docs/tasks/security/https-overlay/index.md diff --git a/content/docs/tasks/security/mutual-tls.md b/content/docs/tasks/security/mutual-tls/index.md similarity index 100% rename from content/docs/tasks/security/mutual-tls.md rename to content/docs/tasks/security/mutual-tls/index.md diff --git a/content/docs/tasks/security/plugin-ca-cert.md b/content/docs/tasks/security/plugin-ca-cert/index.md similarity index 100% rename from content/docs/tasks/security/plugin-ca-cert.md rename to content/docs/tasks/security/plugin-ca-cert/index.md diff --git a/content/docs/tasks/security/role-based-access-control.md b/content/docs/tasks/security/role-based-access-control/index.md similarity index 100% rename from content/docs/tasks/security/role-based-access-control.md rename to content/docs/tasks/security/role-based-access-control/index.md diff --git a/content/docs/tasks/security/secure-access-control.md b/content/docs/tasks/security/secure-access-control/index.md similarity index 100% rename from content/docs/tasks/security/secure-access-control.md rename to content/docs/tasks/security/secure-access-control/index.md diff --git a/content/docs/tasks/telemetry/distributed-tracing.md b/content/docs/tasks/telemetry/distributed-tracing/index.md similarity index 98% rename from content/docs/tasks/telemetry/distributed-tracing.md rename to content/docs/tasks/telemetry/distributed-tracing/index.md index 2cb1aed1ff..37c1dd9195 100644 --- a/content/docs/tasks/telemetry/distributed-tracing.md +++ b/content/docs/tasks/telemetry/distributed-tracing/index.md @@ -42,7 +42,7 @@ With the Bookinfo application up and running, generate trace information by acce If you now look at the dashboard, you should see something similar to the following: {{< image width="100%" ratio="42.35%" - link="../img/istio-tracing-list.png" + link="./istio-tracing-list.png" caption="Tracing Dashboard" >}} @@ -51,7 +51,7 @@ latest refresh of the `/productpage`. The page should look something like this: {{< image width="100%" ratio="42.35%" - link="../img/istio-tracing-details.png" + link="./istio-tracing-details.png" caption="Detailed Trace View" >}} diff --git a/content/docs/tasks/telemetry/img/istio-tracing-details.png b/content/docs/tasks/telemetry/distributed-tracing/istio-tracing-details.png similarity index 100% rename from content/docs/tasks/telemetry/img/istio-tracing-details.png rename to content/docs/tasks/telemetry/distributed-tracing/istio-tracing-details.png diff --git a/content/docs/tasks/telemetry/img/istio-tracing-list.png b/content/docs/tasks/telemetry/distributed-tracing/istio-tracing-list.png similarity index 100% rename from content/docs/tasks/telemetry/img/istio-tracing-list.png rename to content/docs/tasks/telemetry/distributed-tracing/istio-tracing-list.png diff --git a/content/docs/tasks/telemetry/fluentd.md b/content/docs/tasks/telemetry/fluentd/index.md similarity index 100% rename from content/docs/tasks/telemetry/fluentd.md rename to content/docs/tasks/telemetry/fluentd/index.md diff --git a/content/docs/tasks/telemetry/img/dashboard_response_size.png b/content/docs/tasks/telemetry/img/dashboard_response_size.png deleted file mode 100644 index d78e2ed152..0000000000 Binary files a/content/docs/tasks/telemetry/img/dashboard_response_size.png and /dev/null differ diff --git a/content/docs/tasks/telemetry/metrics-logs.md b/content/docs/tasks/telemetry/metrics-logs/index.md similarity index 100% rename from content/docs/tasks/telemetry/metrics-logs.md rename to content/docs/tasks/telemetry/metrics-logs/index.md diff --git a/content/docs/tasks/telemetry/querying-metrics.md b/content/docs/tasks/telemetry/querying-metrics/index.md similarity index 98% rename from content/docs/tasks/telemetry/querying-metrics.md rename to content/docs/tasks/telemetry/querying-metrics/index.md index 4f4a3b5ed1..fb5ba2f8b3 100644 --- a/content/docs/tasks/telemetry/querying-metrics.md +++ b/content/docs/tasks/telemetry/querying-metrics/index.md @@ -58,7 +58,7 @@ application. The results will be similar to: {{< image width="100%" ratio="39.36%" - link="../img/prometheus_query_result.png" + link="./prometheus_query_result.png" caption="Prometheus Query Result" >}} diff --git a/content/docs/tasks/telemetry/img/prometheus_query_result.png b/content/docs/tasks/telemetry/querying-metrics/prometheus_query_result.png similarity index 100% rename from content/docs/tasks/telemetry/img/prometheus_query_result.png rename to content/docs/tasks/telemetry/querying-metrics/prometheus_query_result.png diff --git a/content/docs/tasks/telemetry/servicegraph.md b/content/docs/tasks/telemetry/servicegraph/index.md similarity index 98% rename from content/docs/tasks/telemetry/servicegraph.md rename to content/docs/tasks/telemetry/servicegraph/index.md index 6da5293b18..cf68123b47 100644 --- a/content/docs/tasks/telemetry/servicegraph.md +++ b/content/docs/tasks/telemetry/servicegraph/index.md @@ -67,7 +67,7 @@ the example application throughout this task. The results will look similar to: {{< image width="75%" ratio="107.7%" - link="../img/servicegraph-example.png" + link="./servicegraph-example.png" caption="Example Servicegraph" >}} diff --git a/content/docs/tasks/telemetry/img/servicegraph-example.png b/content/docs/tasks/telemetry/servicegraph/servicegraph-example.png similarity index 100% rename from content/docs/tasks/telemetry/img/servicegraph-example.png rename to content/docs/tasks/telemetry/servicegraph/servicegraph-example.png diff --git a/content/docs/tasks/telemetry/tcp-metrics.md b/content/docs/tasks/telemetry/tcp-metrics/index.md similarity index 99% rename from content/docs/tasks/telemetry/tcp-metrics.md rename to content/docs/tasks/telemetry/tcp-metrics/index.md index e409f527e0..20676ec5a9 100644 --- a/content/docs/tasks/telemetry/tcp-metrics.md +++ b/content/docs/tasks/telemetry/tcp-metrics/index.md @@ -207,7 +207,7 @@ These attributes are generated by server-side Envoy proxies. They are forwarded protocols within policies. {{< image width="100%" ratio="192.50%" - link="../img/istio-tcp-attribute-flow.svg" + link="./istio-tcp-attribute-flow.svg" alt="Attribute Generation Flow for TCP Services in an Istio Mesh." caption="TCP Attribute Flow" >}} diff --git a/content/docs/tasks/telemetry/img/istio-tcp-attribute-flow.svg b/content/docs/tasks/telemetry/tcp-metrics/istio-tcp-attribute-flow.svg similarity index 100% rename from content/docs/tasks/telemetry/img/istio-tcp-attribute-flow.svg rename to content/docs/tasks/telemetry/tcp-metrics/istio-tcp-attribute-flow.svg diff --git a/content/docs/tasks/telemetry/img/dashboard-with-traffic.png b/content/docs/tasks/telemetry/using-istio-dashboard/dashboard-with-traffic.png similarity index 100% rename from content/docs/tasks/telemetry/img/dashboard-with-traffic.png rename to content/docs/tasks/telemetry/using-istio-dashboard/dashboard-with-traffic.png diff --git a/content/docs/tasks/telemetry/img/grafana-istio-dashboard.png b/content/docs/tasks/telemetry/using-istio-dashboard/grafana-istio-dashboard.png similarity index 100% rename from content/docs/tasks/telemetry/img/grafana-istio-dashboard.png rename to content/docs/tasks/telemetry/using-istio-dashboard/grafana-istio-dashboard.png diff --git a/content/docs/tasks/telemetry/using-istio-dashboard.md b/content/docs/tasks/telemetry/using-istio-dashboard/index.md similarity index 97% rename from content/docs/tasks/telemetry/using-istio-dashboard.md rename to content/docs/tasks/telemetry/using-istio-dashboard/index.md index c63d98cebe..855070ff34 100644 --- a/content/docs/tasks/telemetry/using-istio-dashboard.md +++ b/content/docs/tasks/telemetry/using-istio-dashboard/index.md @@ -51,7 +51,7 @@ the example application throughout this task. The Istio Dashboard will look similar to: {{< image width="100%" ratio="56.57%" - link="../img/grafana-istio-dashboard.png" + link="./grafana-istio-dashboard.png" caption="Istio Dashboard" >}} @@ -71,7 +71,7 @@ the example application throughout this task. generated. It will look similar to: {{< image width="100%" ratio="56.57%" - link="../img/dashboard-with-traffic.png" + link="./dashboard-with-traffic.png" caption="Istio Dashboard With Traffic" >}} diff --git a/content/docs/tasks/traffic-management/app-health-check.md b/content/docs/tasks/traffic-management/app-health-check/index.md similarity index 100% rename from content/docs/tasks/traffic-management/app-health-check.md rename to content/docs/tasks/traffic-management/app-health-check/index.md diff --git a/content/docs/tasks/traffic-management/circuit-breaking.md b/content/docs/tasks/traffic-management/circuit-breaking/index.md similarity index 100% rename from content/docs/tasks/traffic-management/circuit-breaking.md rename to content/docs/tasks/traffic-management/circuit-breaking/index.md diff --git a/content/docs/tasks/traffic-management/egress-tls-origination.md b/content/docs/tasks/traffic-management/egress-tls-origination/index.md similarity index 100% rename from content/docs/tasks/traffic-management/egress-tls-origination.md rename to content/docs/tasks/traffic-management/egress-tls-origination/index.md diff --git a/content/docs/tasks/traffic-management/egress.md b/content/docs/tasks/traffic-management/egress/index.md similarity index 100% rename from content/docs/tasks/traffic-management/egress.md rename to content/docs/tasks/traffic-management/egress/index.md diff --git a/content/docs/tasks/traffic-management/fault-injection.md b/content/docs/tasks/traffic-management/fault-injection/index.md similarity index 100% rename from content/docs/tasks/traffic-management/fault-injection.md rename to content/docs/tasks/traffic-management/fault-injection/index.md diff --git a/content/docs/tasks/traffic-management/ingress.md b/content/docs/tasks/traffic-management/ingress/index.md similarity index 100% rename from content/docs/tasks/traffic-management/ingress.md rename to content/docs/tasks/traffic-management/ingress/index.md diff --git a/content/docs/tasks/traffic-management/mirroring.md b/content/docs/tasks/traffic-management/mirroring/index.md similarity index 100% rename from content/docs/tasks/traffic-management/mirroring.md rename to content/docs/tasks/traffic-management/mirroring/index.md diff --git a/content/docs/tasks/traffic-management/request-routing.md b/content/docs/tasks/traffic-management/request-routing/index.md similarity index 100% rename from content/docs/tasks/traffic-management/request-routing.md rename to content/docs/tasks/traffic-management/request-routing/index.md diff --git a/content/docs/tasks/traffic-management/request-timeouts.md b/content/docs/tasks/traffic-management/request-timeouts/index.md similarity index 100% rename from content/docs/tasks/traffic-management/request-timeouts.md rename to content/docs/tasks/traffic-management/request-timeouts/index.md diff --git a/content/docs/tasks/traffic-management/traffic-shifting.md b/content/docs/tasks/traffic-management/traffic-shifting/index.md similarity index 100% rename from content/docs/tasks/traffic-management/traffic-shifting.md rename to content/docs/tasks/traffic-management/traffic-shifting/index.md diff --git a/content_zh/docs/concepts/traffic-management/load-balancing.md b/content_zh/docs/concepts/traffic-management/load-balancing.md index f05d2cbe12..b395f71375 100644 --- a/content_zh/docs/concepts/traffic-management/load-balancing.md +++ b/content_zh/docs/concepts/traffic-management/load-balancing.md @@ -11,12 +11,12 @@ keywords: [traffic-management,load-balancing] **服务发现**：Pilot 使用来自服务注册的信息，并提供与平台无关的服务发现接口。网格中的 Envoy 实例执行服务发现，并相应地动态更新其负载均衡池。 -{{< image width="80%" ratio="74.79%" +{{}} + */>}} -如上图所示，网格中的服务使用其 DNS 名称访问彼此。服务的所有 HTTP 流量都会通过 Envoy 自动重新路由。Envoy 在负载均衡池中的实例之间分发流量。虽然 Envoy 支持多种[复杂的负载均衡算法][https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/load_balancing]，但 Istio 目前仅允许三种负载平衡模式：轮循、随机和带权重的最少请求。 +如上图所示，网格中的服务使用其 DNS 名称访问彼此。服务的所有 HTTP 流量都会通过 Envoy 自动重新路由。Envoy 在负载均衡池中的实例之间分发流量。虽然 Envoy 支持多种[复杂的负载均衡算法](https://www.envoyproxy.io/docs/envoy/latest/intro/arch_overview/load_balancing)，但 Istio 目前仅允许三种负载平衡模式：轮循、随机和带权重的最少请求。 除了负载均衡外，Envoy 还会定期检查池中每个实例的运行状况。Envoy 遵循熔断器风格模式，根据健康检查 API 调用的失败率将实例分类为不健康或健康。换句话说，当给定实例的健康检查失败次数超过预定阈值时，它将从负载均衡池中弹出。类似地，当通过的健康检查数超过预定阈值时，该实例将被添加回负载均衡池。您可以在[处理故障](/docs/concepts/traffic-management/handling-failures/)中了解更多有关 Envoy 的故障处理功能。