From a943f66afd4575846dc9c865c9eea0e29ace558c Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 15:49:46 -0500 Subject: [PATCH 001/125] renamed introducing moved features to overview --- site/{introducing-weave.md => overview.md} | 0 site/{ => overview}/features.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename site/{introducing-weave.md => overview.md} (100%) rename site/{ => overview}/features.md (100%) diff --git a/site/introducing-weave.md b/site/overview.md similarity index 100% rename from site/introducing-weave.md rename to site/overview.md diff --git a/site/features.md b/site/overview/features.md similarity index 100% rename from site/features.md rename to site/overview/features.md From e351d0c3c0b3ec87d07771d359b12ea085873e07 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:23:35 -0500 Subject: [PATCH 002/125] how it works renamed to concepts --- .../encryption-implementation.md | 0 site/{how-it-works => concepts}/encryption.md | 0 .../fastdp-how-it-works.md | 0 site/{ => concepts}/how-it-works.md | 6 ++---- site/{how-it-works => concepts}/ip-addresses.md | 0 site/{how-it-works => concepts}/network-topology.md | 0 .../router-encapsulation.md | 0 .../weave-frame-encapsulation-178x300.png | Bin .../weave-net-encap1-1024x459.png | Bin .../weave-net-fdp1-1024x454.png | Bin 10 files changed, 2 insertions(+), 4 deletions(-) rename site/{how-it-works => concepts}/encryption-implementation.md (100%) rename site/{how-it-works => concepts}/encryption.md (100%) rename site/{how-it-works => concepts}/fastdp-how-it-works.md (100%) rename site/{ => concepts}/how-it-works.md (97%) rename site/{how-it-works => concepts}/ip-addresses.md (100%) rename site/{how-it-works => concepts}/network-topology.md (100%) rename site/{how-it-works => concepts}/router-encapsulation.md (100%) rename site/{how-it-works => concepts}/weave-frame-encapsulation-178x300.png (100%) rename site/{how-it-works => concepts}/weave-net-encap1-1024x459.png (100%) rename site/{how-it-works => concepts}/weave-net-fdp1-1024x454.png (100%) diff --git a/site/how-it-works/encryption-implementation.md b/site/concepts/encryption-implementation.md similarity index 100% rename from site/how-it-works/encryption-implementation.md rename to site/concepts/encryption-implementation.md diff --git a/site/how-it-works/encryption.md b/site/concepts/encryption.md similarity index 100% rename from site/how-it-works/encryption.md rename to site/concepts/encryption.md diff --git a/site/how-it-works/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md similarity index 100% rename from site/how-it-works/fastdp-how-it-works.md rename to site/concepts/fastdp-how-it-works.md diff --git a/site/how-it-works.md b/site/concepts/how-it-works.md similarity index 97% rename from site/how-it-works.md rename to site/concepts/how-it-works.md index 14fda30b..4082b09f 100644 --- a/site/how-it-works.md +++ b/site/concepts/how-it-works.md @@ -1,11 +1,9 @@ --- -title: Understanding how Weave Net Works -menu_order: 90 +title: Understanding Weave Net +menu_order: 10 search_type: Documentation --- - - A Weave network consists of a number of 'peers' - Weave Net routers residing on different hosts. Each peer has a name, which tends to remain the same over restarts, a human friendly nickname for use in diff --git a/site/how-it-works/ip-addresses.md b/site/concepts/ip-addresses.md similarity index 100% rename from site/how-it-works/ip-addresses.md rename to site/concepts/ip-addresses.md diff --git a/site/how-it-works/network-topology.md b/site/concepts/network-topology.md similarity index 100% rename from site/how-it-works/network-topology.md rename to site/concepts/network-topology.md diff --git a/site/how-it-works/router-encapsulation.md b/site/concepts/router-encapsulation.md similarity index 100% rename from site/how-it-works/router-encapsulation.md rename to site/concepts/router-encapsulation.md diff --git a/site/how-it-works/weave-frame-encapsulation-178x300.png b/site/concepts/weave-frame-encapsulation-178x300.png similarity index 100% rename from site/how-it-works/weave-frame-encapsulation-178x300.png rename to site/concepts/weave-frame-encapsulation-178x300.png diff --git a/site/how-it-works/weave-net-encap1-1024x459.png b/site/concepts/weave-net-encap1-1024x459.png similarity index 100% rename from site/how-it-works/weave-net-encap1-1024x459.png rename to site/concepts/weave-net-encap1-1024x459.png diff --git a/site/how-it-works/weave-net-fdp1-1024x454.png b/site/concepts/weave-net-fdp1-1024x454.png similarity index 100% rename from site/how-it-works/weave-net-fdp1-1024x454.png rename to site/concepts/weave-net-fdp1-1024x454.png From 8b615e58e86abdaee5a368e842d000f831187188 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:24:16 -0500 Subject: [PATCH 003/125] menu order --- site/concepts/router-encapsulation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/router-encapsulation.md b/site/concepts/router-encapsulation.md index f6b729d3..b15a3b2e 100644 --- a/site/concepts/router-encapsulation.md +++ b/site/concepts/router-encapsulation.md @@ -1,6 +1,6 @@ --- title: Weave Net Router Sleeve Encapsulation -menu_order: 10 +menu_order: 15 search_type: Documentation --- From 9d2237cfd4eeffde6e6e1accba68352a3f404a23 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:24:49 -0500 Subject: [PATCH 004/125] menu reorder --- site/concepts/fastdp-how-it-works.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md index a1e52301..e5640c50 100644 --- a/site/concepts/fastdp-how-it-works.md +++ b/site/concepts/fastdp-how-it-works.md @@ -1,5 +1,5 @@ --- -title: How Fast Datapath Works +title: Fast Datapath & Weave Net menu_order: 30 search_type: Documentation --- From 092ec8d83d6bc625a735ca3acf8ddcf5743ef850 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:25:14 -0500 Subject: [PATCH 005/125] menu order --- site/concepts/ip-addresses.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/ip-addresses.md b/site/concepts/ip-addresses.md index 58f9ff12..66210e38 100644 --- a/site/concepts/ip-addresses.md +++ b/site/concepts/ip-addresses.md @@ -1,6 +1,6 @@ --- title: IP Addresses, Routes and Networks -menu_order: 50 +menu_order: 40 search_type: Documentation --- From 015809c83ab0af09be12243e05be32d1364fc2f0 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:25:42 -0500 Subject: [PATCH 006/125] menu order --- site/concepts/encryption.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/encryption.md b/site/concepts/encryption.md index f804a3a1..08231d5c 100644 --- a/site/concepts/encryption.md +++ b/site/concepts/encryption.md @@ -1,6 +1,6 @@ --- title: Encryption and Weave Net -menu_order: 60 +menu_order: 50 search_type: Documentation --- From 677c872d5aaf8e20ae793ae54de6379fcfb54ffa Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:25:59 -0500 Subject: [PATCH 007/125] menu order --- site/concepts/encryption-implementation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/encryption-implementation.md b/site/concepts/encryption-implementation.md index 2d44bc4d..ff8511d6 100644 --- a/site/concepts/encryption-implementation.md +++ b/site/concepts/encryption-implementation.md @@ -1,6 +1,6 @@ --- title: How Weave Net Implements Encryption -menu_order: 70 +menu_order: 60 search_type: Documentation --- From 2914b9d22007e5a002c236153c429346817f870f Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:26:41 -0500 Subject: [PATCH 008/125] initial index file --- site/concepts.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 site/concepts.md diff --git a/site/concepts.md b/site/concepts.md new file mode 100644 index 00000000..be2e7e5d --- /dev/null +++ b/site/concepts.md @@ -0,0 +1,6 @@ +--- +title: Weave Net Concepts Index +menu_order: 20 +search_type: Documentation +--- + From 20711cb8bca16359295537fab79aef1d0a84caf2 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:06:47 -0500 Subject: [PATCH 009/125] renamed installing-weave to install moved cloud and launch to install --- site/{ => install}/installing-weave.md | 0 site/{installing-weave => install}/systemd.md | 0 site/{ => install}/using-weave.md | 0 site/{using-weave => install}/weave-cloud-token.png | Bin site/{using-weave => install}/weave-cloud.md | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => install}/installing-weave.md (100%) rename site/{installing-weave => install}/systemd.md (100%) rename site/{ => install}/using-weave.md (100%) rename site/{using-weave => install}/weave-cloud-token.png (100%) rename site/{using-weave => install}/weave-cloud.md (100%) diff --git a/site/installing-weave.md b/site/install/installing-weave.md similarity index 100% rename from site/installing-weave.md rename to site/install/installing-weave.md diff --git a/site/installing-weave/systemd.md b/site/install/systemd.md similarity index 100% rename from site/installing-weave/systemd.md rename to site/install/systemd.md diff --git a/site/using-weave.md b/site/install/using-weave.md similarity index 100% rename from site/using-weave.md rename to site/install/using-weave.md diff --git a/site/using-weave/weave-cloud-token.png b/site/install/weave-cloud-token.png similarity index 100% rename from site/using-weave/weave-cloud-token.png rename to site/install/weave-cloud-token.png diff --git a/site/using-weave/weave-cloud.md b/site/install/weave-cloud.md similarity index 100% rename from site/using-weave/weave-cloud.md rename to site/install/weave-cloud.md From 64518c3bd4ebe2505e461d97252e7d51ce207412 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:07:17 -0500 Subject: [PATCH 010/125] ordered menu --- site/install/systemd.md | 2 +- site/install/using-weave.md | 5 ++--- site/install/weave-cloud.md | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/site/install/systemd.md b/site/install/systemd.md index 50bebabc..4d725986 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -1,6 +1,6 @@ --- title: Using Weave with Systemd -menu_order: 130 +menu_order: 40 search_type: Documentation --- diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 89a4d4c9..d9c756ec 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -1,6 +1,6 @@ --- -title: Using Weave Net -menu_order: 40 +title: Launching Weave Net +menu_order: 20 search_type: Documentation --- @@ -13,7 +13,6 @@ This section contains the following topics: * [Testing Container Communications](#testing) * [Starting the Netcat Service](#start-netcat) - ### Launching Weave Net Before launching Weave Net and deploying your apps, ensure that Docker is [installed](https://docs.docker.com/engine/installation/) on both hosts. diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 785a95aa..96ed6679 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -1,6 +1,6 @@ --- title: Using Weave Cloud to get started with Weave Net -menu_order: 10 +menu_order: 30 search_type: Documentation --- From 53cf6c2f8c3301a07e7cf449a56a6f479f0274fd Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:28:43 -0500 Subject: [PATCH 011/125] docker plugin subdirectory of install --- site/{ => install}/plugin/plugin-how-it-works.md | 0 site/{ => install/plugin}/plugin-v2.md | 0 site/{ => install/plugin}/plugin.md | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => install}/plugin/plugin-how-it-works.md (100%) rename site/{ => install/plugin}/plugin-v2.md (100%) rename site/{ => install/plugin}/plugin.md (100%) diff --git a/site/plugin/plugin-how-it-works.md b/site/install/plugin/plugin-how-it-works.md similarity index 100% rename from site/plugin/plugin-how-it-works.md rename to site/install/plugin/plugin-how-it-works.md diff --git a/site/plugin-v2.md b/site/install/plugin/plugin-v2.md similarity index 100% rename from site/plugin-v2.md rename to site/install/plugin/plugin-v2.md diff --git a/site/plugin.md b/site/install/plugin/plugin.md similarity index 100% rename from site/plugin.md rename to site/install/plugin/plugin.md From 15a4b189f42fe52a8cf0f3f99697a1cf6c79b175 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:29:24 -0500 Subject: [PATCH 012/125] menu items ordered --- site/install/plugin.md | 6 ++++++ site/install/plugin/plugin-how-it-works.md | 2 +- site/install/plugin/plugin-v2.md | 2 +- site/install/plugin/plugin.md | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 site/install/plugin.md diff --git a/site/install/plugin.md b/site/install/plugin.md new file mode 100644 index 00000000..927cabfc --- /dev/null +++ b/site/install/plugin.md @@ -0,0 +1,6 @@ +--- +title: Weave Net Docker Plugin +menu_order: 50 +search_type: Documentation +--- + diff --git a/site/install/plugin/plugin-how-it-works.md b/site/install/plugin/plugin-how-it-works.md index 573277e8..48f55c1f 100644 --- a/site/install/plugin/plugin-how-it-works.md +++ b/site/install/plugin/plugin-how-it-works.md @@ -1,6 +1,6 @@ --- title: How the Weave Net Docker Network Plugins Work -menu_order: 20 +menu_order: 10 search_type: Documentation --- diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md index 00bfdc91..76988c18 100644 --- a/site/install/plugin/plugin-v2.md +++ b/site/install/plugin/plugin-v2.md @@ -1,6 +1,6 @@ --- title: Integrating Docker via the Network Plugin (V2) -menu_order: 65 +menu_order: 20 search_type: Documentation --- diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index fc359807..403211fa 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -1,6 +1,6 @@ --- title: Integrating Docker via the Network Plugin (Legacy) -menu_order: 60 +menu_order: 30 search_type: Documentation --- From 1354ad1884d82190d1bd8211664b6803f07adcf0 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:30:26 -0500 Subject: [PATCH 013/125] index files and subdirectory order --- site/install.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 site/install.md diff --git a/site/install.md b/site/install.md new file mode 100644 index 00000000..c33c0149 --- /dev/null +++ b/site/install.md @@ -0,0 +1,5 @@ +--- +title: Installing Weave Net +menu_order: 30 +search_type: Documentation +--- From 92a6694ac8e7c311784b9ef3a9295a3496e19fef Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:48:36 -0500 Subject: [PATCH 014/125] cni-plugin moved to kubernetes file kube-add moved --- site/cni-plugin.md | 115 ---------------------------- site/{ => kubernetes}/kube-addon.md | 0 2 files changed, 115 deletions(-) delete mode 100644 site/cni-plugin.md rename site/{ => kubernetes}/kube-addon.md (100%) diff --git a/site/cni-plugin.md b/site/cni-plugin.md deleted file mode 100644 index 2e5b3efd..00000000 --- a/site/cni-plugin.md +++ /dev/null @@ -1,115 +0,0 @@ ---- -title: Integrating Kubernetes and Mesos via the CNI Plugin -menu_order: 65 -search_type: Documentation ---- - -> The recommended way of using Weave with Kubernetes is via the new -> [Kubernetes Addon](/site/kube-addon.md). The instructions below -> remain valid however, and are still the recommended method for -> integrating with Mesos. - -CNI, the [_Container Network Interface_](https://github.com/containernetworking/cni), -is a proposed standard for configuring network interfaces for Linux -application containers. CNI is supported by -[Kubernetes](http://kubernetes.io/), [Apache Mesos](http://mesos.apache.org) -and -[others](https://github.com/containernetworking/cni#who-is-using-cni). - -### Installing the Weave Net CNI plugin - -If your machine has the directories normally used to host CNI plugins, -then the Weave Net CNI plugin is installed when you run `weave setup`. - -To create those directories, run (as root): - - mkdir -p /opt/cni/bin - mkdir -p /etc/cni/net.d - -Then run: - - weave setup - -#### Launching Weave Net - -To create a network that spans multiple hosts, the Weave peers must be connected to each other. -This is accomplished by specifying the other hosts during `weave launch` or via -[`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md). - -See [Creating Peer Connections Between Hosts](/site/using-weave.md#peer-connections) -for a discussion on peer connections. - - weave launch - -#### Using the CNI network configuration file - -All CNI plugins are configured by a JSON file in the directory -`/etc/cni/net.d/`. `weave setup` installs a minimal configuration -file named `10-weave.conf`, which you can alter to suit your needs. - -See the [CNI Spec](https://github.com/appc/cni/blob/master/SPEC.md#network-configuration) -for details on the format and contents of this file. - -By default, the Weave CNI plugin adds a default route out via an IP -address on the Weave bridge, so your containers can access resources -on the internet. If you do not want this, add a section to the config -file that specifies no routes: - - "ipam": { - "routes": [ ] - } - -The following other fields in the spec are supported: - -- `ipam / type` - default is to use Weave's own IPAM -- `ipam / subnet` - default is to use Weave's IPAM default subnet -- `ipam / gateway` - default is to use the Weave bridge IP address (allocated by `weave expose`) - -### Using the Weave Net CNI plugin - -#### Configuring Kubernetes to use the CNI Plugin - -After you've launched Weave and peered your hosts, you can configure -Kubernetes to use Weave, by adding the following options to the -`kubelet` command: - - --network-plugin=cni --network-plugin-dir=/etc/cni/net.d - -See the [`kubelet` documentation](http://kubernetes.io/v1.1/docs/admin/kubelet.html) -for more details. - -Now, whenever Kubernetes starts a pod, it will be attached to the Weave network. - -#### Configuring Mesos to use the CNI plugin - -To use the CNI plugin, the Mesos Agent must be started with reference -to the CNI configuration and binary directories: - - sudo mesos-slave - --network_cni_config_dir=/etc/cni/net.d - --network_cni_plugins_dir=/opt/cni/bin - ... - -To start a container that is connected to the Weave network via CNI, -use the name specified in the configuration file. This example starts -a alpine container running a `nc` server listening on port 1080 with -the `mesos-execute` command. From the Master, run: - - nohup sudo mesos-execute --command="ifconfig; nc -k -l 0.0.0.0 1080" --docker_image=alpine --master=localhost:5050 --name=example --networks=weave --resources=cpus:0.1 --shell test.log 2>&1 & - -After this task has started, it is possible to obtain the ip address of -the container and ping it from any of other agents (which are also -connected to the weave network)" - - nc -z -v 1080 - -For more information, see the -[Mesos documentation](http://mesos.apache.org/documentation/cni/). - -### Caveats - -- The program `nsenter` must be present on the host; it is required by - the CNI plugin. In some distros (e.g. Alpine, Ubuntu) it is in the - util-linux package -- The Weave Net router container must be running for CNI to allocate addresses -- The CNI plugin does not add entries to weaveDNS. diff --git a/site/kube-addon.md b/site/kubernetes/kube-addon.md similarity index 100% rename from site/kube-addon.md rename to site/kubernetes/kube-addon.md From 742ef03495eab4eb8f8236e190f732d502b6b729 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:48:58 -0500 Subject: [PATCH 015/125] ordered menu --- site/kubernetes/kube-addon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index 0b1d2975..61488c00 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -1,6 +1,6 @@ --- title: Integrating Kubernetes via the Addon -menu_order: 63 +menu_order: 20 search_type: Documentation --- From efd290a3bef594f9be90ebfc3432f2cbcbd02349 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:49:31 -0500 Subject: [PATCH 016/125] content from cni-plugin added --- site/kubernetes.md | 115 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 site/kubernetes.md diff --git a/site/kubernetes.md b/site/kubernetes.md new file mode 100644 index 00000000..2bacfa6a --- /dev/null +++ b/site/kubernetes.md @@ -0,0 +1,115 @@ +--- +title: Integrating Kubernetes and Mesos via the CNI Plugin +menu_order: 40 +search_type: Documentation +--- + +> The recommended way of using Weave with Kubernetes is via the new +> [Kubernetes Addon](/site/kube-addon.md). The instructions below +> remain valid however, and are still the recommended method for +> integrating with Mesos. + +CNI, the [_Container Network Interface_](https://github.com/containernetworking/cni), +is a proposed standard for configuring network interfaces for Linux +application containers. CNI is supported by +[Kubernetes](http://kubernetes.io/), [Apache Mesos](http://mesos.apache.org) +and +[others](https://github.com/containernetworking/cni#who-is-using-cni). + +### Installing the Weave Net CNI plugin + +If your machine has the directories normally used to host CNI plugins, +then the Weave Net CNI plugin is installed when you run `weave setup`. + +To create those directories, run (as root): + + mkdir -p /opt/cni/bin + mkdir -p /etc/cni/net.d + +Then run: + + weave setup + +#### Launching Weave Net + +To create a network that spans multiple hosts, the Weave peers must be connected to each other. +This is accomplished by specifying the other hosts during `weave launch` or via +[`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md). + +See [Creating Peer Connections Between Hosts](/site/using-weave.md#peer-connections) +for a discussion on peer connections. + + weave launch + +#### Using the CNI network configuration file + +All CNI plugins are configured by a JSON file in the directory +`/etc/cni/net.d/`. `weave setup` installs a minimal configuration +file named `10-weave.conf`, which you can alter to suit your needs. + +See the [CNI Spec](https://github.com/appc/cni/blob/master/SPEC.md#network-configuration) +for details on the format and contents of this file. + +By default, the Weave CNI plugin adds a default route out via an IP +address on the Weave bridge, so your containers can access resources +on the internet. If you do not want this, add a section to the config +file that specifies no routes: + + "ipam": { + "routes": [ ] + } + +The following other fields in the spec are supported: + +- `ipam / type` - default is to use Weave's own IPAM +- `ipam / subnet` - default is to use Weave's IPAM default subnet +- `ipam / gateway` - default is to use the Weave bridge IP address (allocated by `weave expose`) + +### Using the Weave Net CNI plugin + +#### Configuring Kubernetes to use the CNI Plugin + +After you've launched Weave and peered your hosts, you can configure +Kubernetes to use Weave, by adding the following options to the +`kubelet` command: + + --network-plugin=cni --network-plugin-dir=/etc/cni/net.d + +See the [`kubelet` documentation](http://kubernetes.io/v1.1/docs/admin/kubelet.html) +for more details. + +Now, whenever Kubernetes starts a pod, it will be attached to the Weave network. + +#### Configuring Mesos to use the CNI plugin + +To use the CNI plugin, the Mesos Agent must be started with reference +to the CNI configuration and binary directories: + + sudo mesos-slave + --network_cni_config_dir=/etc/cni/net.d + --network_cni_plugins_dir=/opt/cni/bin + ... + +To start a container that is connected to the Weave network via CNI, +use the name specified in the configuration file. This example starts +a alpine container running a `nc` server listening on port 1080 with +the `mesos-execute` command. From the Master, run: + + nohup sudo mesos-execute --command="ifconfig; nc -k -l 0.0.0.0 1080" --docker_image=alpine --master=localhost:5050 --name=example --networks=weave --resources=cpus:0.1 --shell test.log 2>&1 & + +After this task has started, it is possible to obtain the ip address of +the container and ping it from any of other agents (which are also +connected to the weave network)" + + nc -z -v 1080 + +For more information, see the +[Mesos documentation](http://mesos.apache.org/documentation/cni/). + +### Caveats + +- The program `nsenter` must be present on the host; it is required by + the CNI plugin. In some distros (e.g. Alpine, Ubuntu) it is in the + util-linux package +- The Weave Net router container must be running for CNI to allocate addresses +- The CNI plugin does not add entries to weaveDNS. From 166d5bfc5b26b3314c9be8ed9ae5d3870215b3d6 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:26:15 -0500 Subject: [PATCH 017/125] added manage sd and mv using-weave to it --- site/{using-weave => tasks}/configuring-weave.md | 0 .../manage}/application-isolation.md | 0 site/{using-weave => tasks/manage}/awsvpc.md | 0 .../manage}/dynamically-attach-containers.md | 0 site/{using-weave => tasks/manage}/fastdp.md | 0 .../manage}/finding-adding-hosts-dynamically.md | 0 .../manage}/host-network-integration.md | 0 site/{ => tasks/manage}/metrics.md | 0 .../manage}/multi-cloud-multi-hop.md | 0 .../manage}/security-untrusted-networks.md | 0 .../manage}/service-management.md | 0 site/{using-weave => tasks}/manual-ip-address.md | 0 .../weave-net-awsvpc-1007x438.png | Bin 13 files changed, 0 insertions(+), 0 deletions(-) rename site/{using-weave => tasks}/configuring-weave.md (100%) rename site/{using-weave => tasks/manage}/application-isolation.md (100%) rename site/{using-weave => tasks/manage}/awsvpc.md (100%) rename site/{using-weave => tasks/manage}/dynamically-attach-containers.md (100%) rename site/{using-weave => tasks/manage}/fastdp.md (100%) rename site/{using-weave => tasks/manage}/finding-adding-hosts-dynamically.md (100%) rename site/{using-weave => tasks/manage}/host-network-integration.md (100%) rename site/{ => tasks/manage}/metrics.md (100%) rename site/{using-weave => tasks/manage}/multi-cloud-multi-hop.md (100%) rename site/{using-weave => tasks/manage}/security-untrusted-networks.md (100%) rename site/{using-weave => tasks/manage}/service-management.md (100%) rename site/{using-weave => tasks}/manual-ip-address.md (100%) rename site/{using-weave => tasks}/weave-net-awsvpc-1007x438.png (100%) diff --git a/site/using-weave/configuring-weave.md b/site/tasks/configuring-weave.md similarity index 100% rename from site/using-weave/configuring-weave.md rename to site/tasks/configuring-weave.md diff --git a/site/using-weave/application-isolation.md b/site/tasks/manage/application-isolation.md similarity index 100% rename from site/using-weave/application-isolation.md rename to site/tasks/manage/application-isolation.md diff --git a/site/using-weave/awsvpc.md b/site/tasks/manage/awsvpc.md similarity index 100% rename from site/using-weave/awsvpc.md rename to site/tasks/manage/awsvpc.md diff --git a/site/using-weave/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md similarity index 100% rename from site/using-weave/dynamically-attach-containers.md rename to site/tasks/manage/dynamically-attach-containers.md diff --git a/site/using-weave/fastdp.md b/site/tasks/manage/fastdp.md similarity index 100% rename from site/using-weave/fastdp.md rename to site/tasks/manage/fastdp.md diff --git a/site/using-weave/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md similarity index 100% rename from site/using-weave/finding-adding-hosts-dynamically.md rename to site/tasks/manage/finding-adding-hosts-dynamically.md diff --git a/site/using-weave/host-network-integration.md b/site/tasks/manage/host-network-integration.md similarity index 100% rename from site/using-weave/host-network-integration.md rename to site/tasks/manage/host-network-integration.md diff --git a/site/metrics.md b/site/tasks/manage/metrics.md similarity index 100% rename from site/metrics.md rename to site/tasks/manage/metrics.md diff --git a/site/using-weave/multi-cloud-multi-hop.md b/site/tasks/manage/multi-cloud-multi-hop.md similarity index 100% rename from site/using-weave/multi-cloud-multi-hop.md rename to site/tasks/manage/multi-cloud-multi-hop.md diff --git a/site/using-weave/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md similarity index 100% rename from site/using-weave/security-untrusted-networks.md rename to site/tasks/manage/security-untrusted-networks.md diff --git a/site/using-weave/service-management.md b/site/tasks/manage/service-management.md similarity index 100% rename from site/using-weave/service-management.md rename to site/tasks/manage/service-management.md diff --git a/site/using-weave/manual-ip-address.md b/site/tasks/manual-ip-address.md similarity index 100% rename from site/using-weave/manual-ip-address.md rename to site/tasks/manual-ip-address.md diff --git a/site/using-weave/weave-net-awsvpc-1007x438.png b/site/tasks/weave-net-awsvpc-1007x438.png similarity index 100% rename from site/using-weave/weave-net-awsvpc-1007x438.png rename to site/tasks/weave-net-awsvpc-1007x438.png From 124ef94500483d43dcb26af0ac0aa4bf1d8c5af3 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:27:22 -0500 Subject: [PATCH 018/125] index files for tasks and manage directories --- site/tasks/manage.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 site/tasks/manage.md diff --git a/site/tasks/manage.md b/site/tasks/manage.md new file mode 100644 index 00000000..b45300bf --- /dev/null +++ b/site/tasks/manage.md @@ -0,0 +1,5 @@ +--- +title: Managing Containerized Applications +menu_order: 10 +search_type: Documentation +--- From 52d06513bbd554fa0322237f9ac9514e5f74a37a Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:27:44 -0500 Subject: [PATCH 019/125] menu topic order --- site/tasks/manage/application-isolation.md | 2 +- site/tasks/manage/awsvpc.md | 4 ++-- site/tasks/manage/dynamically-attach-containers.md | 2 +- site/tasks/manage/fastdp.md | 2 +- site/tasks/manage/finding-adding-hosts-dynamically.md | 2 +- site/tasks/manage/host-network-integration.md | 2 +- site/tasks/manage/metrics.md | 2 +- site/tasks/manage/multi-cloud-multi-hop.md | 2 +- site/tasks/manage/security-untrusted-networks.md | 2 +- site/tasks/manage/service-management.md | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md index 8e89d28e..db1dd76b 100644 --- a/site/tasks/manage/application-isolation.md +++ b/site/tasks/manage/application-isolation.md @@ -1,6 +1,6 @@ --- title: Isolating Applications on a Weave Network -menu_order: 30 +menu_order: 5 search_type: Documentation --- diff --git a/site/tasks/manage/awsvpc.md b/site/tasks/manage/awsvpc.md index 02ce182b..a755034d 100644 --- a/site/tasks/manage/awsvpc.md +++ b/site/tasks/manage/awsvpc.md @@ -1,6 +1,6 @@ --- -title: Using IP Routing on an Amazon Web Services Virtual Private Cloud -menu_order: 110 +title: Configuring IP Routing on an Amazon Web Services Virtual Private Cloud +menu_order: 80 search_type: Documentation --- diff --git a/site/tasks/manage/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md index 0907e341..11384e92 100644 --- a/site/tasks/manage/dynamically-attach-containers.md +++ b/site/tasks/manage/dynamically-attach-containers.md @@ -1,6 +1,6 @@ --- title: Dynamically Attaching and Detaching Applications -menu_order: 40 +menu_order: 10 search_type: Documentation --- diff --git a/site/tasks/manage/fastdp.md b/site/tasks/manage/fastdp.md index 2711cfc8..7eb7a27b 100644 --- a/site/tasks/manage/fastdp.md +++ b/site/tasks/manage/fastdp.md @@ -1,6 +1,6 @@ --- title: Using Fast Datapath -menu_order: 96 +menu_order: 60 search_type: Documentation --- diff --git a/site/tasks/manage/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md index c0c623b7..3892d031 100644 --- a/site/tasks/manage/finding-adding-hosts-dynamically.md +++ b/site/tasks/manage/finding-adding-hosts-dynamically.md @@ -1,6 +1,6 @@ --- title: Adding and Removing Hosts Dynamically -menu_order: 90 +menu_order: 50 search_type: Documentation --- diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index 3ea2d494..b957bdef 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -1,6 +1,6 @@ --- title: Integrating with the Host Network -menu_order: 60 +menu_order: 20 search_type: Documentation --- diff --git a/site/tasks/manage/metrics.md b/site/tasks/manage/metrics.md index b116bde5..6f7d5f8d 100644 --- a/site/tasks/manage/metrics.md +++ b/site/tasks/manage/metrics.md @@ -1,6 +1,6 @@ --- title: Monitoring with Prometheus -menu_order: 105 +menu_order: 90 search_type: Documentation --- diff --git a/site/tasks/manage/multi-cloud-multi-hop.md b/site/tasks/manage/multi-cloud-multi-hop.md index e75144ae..405bfbd5 100644 --- a/site/tasks/manage/multi-cloud-multi-hop.md +++ b/site/tasks/manage/multi-cloud-multi-hop.md @@ -1,6 +1,6 @@ --- title: Enabling Multi-Cloud, Multi-Hop Networking and Routing -menu_order: 100 +menu_order: 70 search_type: Documentation --- diff --git a/site/tasks/manage/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md index 951ff12a..848a6ccb 100644 --- a/site/tasks/manage/security-untrusted-networks.md +++ b/site/tasks/manage/security-untrusted-networks.md @@ -1,6 +1,6 @@ --- title: Securing Connections Across Untrusted Networks -menu_order: 80 +menu_order: 40 search_type: Documentation --- diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index fac03585..68504e5b 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -1,6 +1,6 @@ --- title: Managing Services - Exporting, Importing, Binding and Routing -menu_order: 70 +menu_order: 30 search_type: Documentation --- From 35e21792717b2f1b5a874620acb3b709cf7f8680 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:28:09 -0500 Subject: [PATCH 020/125] index file for tasks section --- site/tasks.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 site/tasks.md diff --git a/site/tasks.md b/site/tasks.md new file mode 100644 index 00000000..e4969dde --- /dev/null +++ b/site/tasks.md @@ -0,0 +1,5 @@ +--- +title: Weave Net Tasks +menu_order: 50 +search_type: Documentation +--- From 050f671c6595cece909736d78a2e7f4ab7ab9f76 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:50:52 -0500 Subject: [PATCH 021/125] mv ipam tasks mv weavedns tasks mv image tasks/manage --- site/{ => tasks}/ipam/allocation-multi-ipam.md | 0 site/tasks/{ => ipam}/configuring-weave.md | 0 site/{ => tasks/ipam}/ipam.md | 0 site/tasks/{ => ipam}/manual-ip-address.md | 0 site/{ => tasks}/ipam/stop-remove-peers-ipam.md | 0 site/{ => tasks}/ipam/troubleshooting-ipam.md | 0 .../{ => manage}/weave-net-awsvpc-1007x438.png | Bin site/{ => tasks}/weavedns/how-works-weavedns.md | 0 .../weavedns/load-balance-fault-weavedns.md | 0 .../weavedns/managing-domains-weavedns.md | 0 .../weavedns/managing-entries-weavedns.md | 0 .../weavedns/troubleshooting-weavedns.md | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => tasks}/ipam/allocation-multi-ipam.md (100%) rename site/tasks/{ => ipam}/configuring-weave.md (100%) rename site/{ => tasks/ipam}/ipam.md (100%) rename site/tasks/{ => ipam}/manual-ip-address.md (100%) rename site/{ => tasks}/ipam/stop-remove-peers-ipam.md (100%) rename site/{ => tasks}/ipam/troubleshooting-ipam.md (100%) rename site/tasks/{ => manage}/weave-net-awsvpc-1007x438.png (100%) rename site/{ => tasks}/weavedns/how-works-weavedns.md (100%) rename site/{ => tasks}/weavedns/load-balance-fault-weavedns.md (100%) rename site/{ => tasks}/weavedns/managing-domains-weavedns.md (100%) rename site/{ => tasks}/weavedns/managing-entries-weavedns.md (100%) rename site/{ => tasks}/weavedns/troubleshooting-weavedns.md (100%) diff --git a/site/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md similarity index 100% rename from site/ipam/allocation-multi-ipam.md rename to site/tasks/ipam/allocation-multi-ipam.md diff --git a/site/tasks/configuring-weave.md b/site/tasks/ipam/configuring-weave.md similarity index 100% rename from site/tasks/configuring-weave.md rename to site/tasks/ipam/configuring-weave.md diff --git a/site/ipam.md b/site/tasks/ipam/ipam.md similarity index 100% rename from site/ipam.md rename to site/tasks/ipam/ipam.md diff --git a/site/tasks/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md similarity index 100% rename from site/tasks/manual-ip-address.md rename to site/tasks/ipam/manual-ip-address.md diff --git a/site/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md similarity index 100% rename from site/ipam/stop-remove-peers-ipam.md rename to site/tasks/ipam/stop-remove-peers-ipam.md diff --git a/site/ipam/troubleshooting-ipam.md b/site/tasks/ipam/troubleshooting-ipam.md similarity index 100% rename from site/ipam/troubleshooting-ipam.md rename to site/tasks/ipam/troubleshooting-ipam.md diff --git a/site/tasks/weave-net-awsvpc-1007x438.png b/site/tasks/manage/weave-net-awsvpc-1007x438.png similarity index 100% rename from site/tasks/weave-net-awsvpc-1007x438.png rename to site/tasks/manage/weave-net-awsvpc-1007x438.png diff --git a/site/weavedns/how-works-weavedns.md b/site/tasks/weavedns/how-works-weavedns.md similarity index 100% rename from site/weavedns/how-works-weavedns.md rename to site/tasks/weavedns/how-works-weavedns.md diff --git a/site/weavedns/load-balance-fault-weavedns.md b/site/tasks/weavedns/load-balance-fault-weavedns.md similarity index 100% rename from site/weavedns/load-balance-fault-weavedns.md rename to site/tasks/weavedns/load-balance-fault-weavedns.md diff --git a/site/weavedns/managing-domains-weavedns.md b/site/tasks/weavedns/managing-domains-weavedns.md similarity index 100% rename from site/weavedns/managing-domains-weavedns.md rename to site/tasks/weavedns/managing-domains-weavedns.md diff --git a/site/weavedns/managing-entries-weavedns.md b/site/tasks/weavedns/managing-entries-weavedns.md similarity index 100% rename from site/weavedns/managing-entries-weavedns.md rename to site/tasks/weavedns/managing-entries-weavedns.md diff --git a/site/weavedns/troubleshooting-weavedns.md b/site/tasks/weavedns/troubleshooting-weavedns.md similarity index 100% rename from site/weavedns/troubleshooting-weavedns.md rename to site/tasks/weavedns/troubleshooting-weavedns.md From 540d1cbf069179d993616fca288967f9e9286d0a Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:51:37 -0500 Subject: [PATCH 022/125] ipam topic order --- site/tasks/ipam.md | 5 +++++ site/tasks/ipam/allocation-multi-ipam.md | 2 +- site/tasks/ipam/configuring-weave.md | 2 +- site/tasks/ipam/ipam.md | 2 +- site/tasks/ipam/stop-remove-peers-ipam.md | 2 +- site/tasks/ipam/troubleshooting-ipam.md | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 site/tasks/ipam.md diff --git a/site/tasks/ipam.md b/site/tasks/ipam.md new file mode 100644 index 00000000..eed33454 --- /dev/null +++ b/site/tasks/ipam.md @@ -0,0 +1,5 @@ +--- +title: Administering IP Addresses +menu_order: 20 +search_type: Documentation +--- \ No newline at end of file diff --git a/site/tasks/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md index 794e2c93..ba534aa1 100644 --- a/site/tasks/ipam/allocation-multi-ipam.md +++ b/site/tasks/ipam/allocation-multi-ipam.md @@ -1,6 +1,6 @@ --- title: Automatic Allocation Across Multiple Subnets -menu_order: 10 +menu_order: 30 search_type: Documentation --- diff --git a/site/tasks/ipam/configuring-weave.md b/site/tasks/ipam/configuring-weave.md index db7405cb..03e2755a 100644 --- a/site/tasks/ipam/configuring-weave.md +++ b/site/tasks/ipam/configuring-weave.md @@ -1,6 +1,6 @@ --- title: Allocating IPs in a Specific Range -menu_order: 15 +menu_order: 10 search_type: Documentation --- diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md index ca014269..82abb79a 100644 --- a/site/tasks/ipam/ipam.md +++ b/site/tasks/ipam/ipam.md @@ -1,6 +1,6 @@ --- title: Allocating IP Addresses -menu_order: 70 +menu_order: 5 search_type: Documentation --- diff --git a/site/tasks/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md index f76d1331..67f1113c 100644 --- a/site/tasks/ipam/stop-remove-peers-ipam.md +++ b/site/tasks/ipam/stop-remove-peers-ipam.md @@ -1,6 +1,6 @@ --- title: Starting, Stopping and Removing Peers -menu_order: 20 +menu_order: 40 search_type: Documentation --- diff --git a/site/tasks/ipam/troubleshooting-ipam.md b/site/tasks/ipam/troubleshooting-ipam.md index 3a5f80b9..e0ac44ee 100644 --- a/site/tasks/ipam/troubleshooting-ipam.md +++ b/site/tasks/ipam/troubleshooting-ipam.md @@ -1,6 +1,6 @@ --- title: Troubleshooting the IP Allocator -menu_order: 30 +menu_order: 50 search_type: Documentation --- From 31267f36ede6de154028e957f3840c1e43079f5a Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:07:23 -0500 Subject: [PATCH 023/125] added diagram to concepts mv weavedns --- site/{ => concepts}/top-diag1.png | Bin site/{ => tasks/weavedns}/weavedns.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => concepts}/top-diag1.png (100%) rename site/{ => tasks/weavedns}/weavedns.md (100%) diff --git a/site/top-diag1.png b/site/concepts/top-diag1.png similarity index 100% rename from site/top-diag1.png rename to site/concepts/top-diag1.png diff --git a/site/weavedns.md b/site/tasks/weavedns/weavedns.md similarity index 100% rename from site/weavedns.md rename to site/tasks/weavedns/weavedns.md From 51601a325851c2a752089e6e50d8d0a8d93ad340 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:07:51 -0500 Subject: [PATCH 024/125] menu topic order --- site/tasks/weavedns/weavedns.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/tasks/weavedns/weavedns.md b/site/tasks/weavedns/weavedns.md index a83e6fec..c0f3b4cc 100644 --- a/site/tasks/weavedns/weavedns.md +++ b/site/tasks/weavedns/weavedns.md @@ -1,6 +1,6 @@ --- title: Discovering Containers with WeaveDNS -menu_order: 80 +menu_order: 5 search_type: Documentation --- From 2b8fb49be2d2a179d8b8365eecc786d4c11f2c7f Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:08:10 -0500 Subject: [PATCH 025/125] index file --- site/tasks/weavedns.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 site/tasks/weavedns.md diff --git a/site/tasks/weavedns.md b/site/tasks/weavedns.md new file mode 100644 index 00000000..a1f13376 --- /dev/null +++ b/site/tasks/weavedns.md @@ -0,0 +1,5 @@ +--- +title: Managing WeaveDNS +menu_order: 30 +search_type: Documentation +--- \ No newline at end of file From e132f6c3853be200016a67172ce8080de9395ab5 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:10:01 -0500 Subject: [PATCH 026/125] moved .dot file need this? --- site/{ => concepts}/top-diag1.dot | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site/{ => concepts}/top-diag1.dot (100%) diff --git a/site/top-diag1.dot b/site/concepts/top-diag1.dot similarity index 100% rename from site/top-diag1.dot rename to site/concepts/top-diag1.dot From 02328ae43f470a9f5444f6162a7595590dbb8e73 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:14:00 -0500 Subject: [PATCH 027/125] moved screencast image to installing --- site/{ => install}/hello-screencast.png | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename site/{ => install}/hello-screencast.png (100%) diff --git a/site/hello-screencast.png b/site/install/hello-screencast.png similarity index 100% rename from site/hello-screencast.png rename to site/install/hello-screencast.png From 562f49b3addfcd5081d245e7b44c868ea46e9262 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:34:58 -0500 Subject: [PATCH 028/125] docker-api mv to tasks --- site/{ => tasks}/weave-docker-api/automatic-discovery-proxy.md | 0 site/{ => tasks}/weave-docker-api/ipam-proxy.md | 0 site/{ => tasks}/weave-docker-api/launching-without-proxy.md | 0 site/{ => tasks}/weave-docker-api/name-resolution-proxy.md | 0 site/{ => tasks}/weave-docker-api/securing-proxy.md | 0 site/{ => tasks}/weave-docker-api/using-proxy.md | 0 site/{ => tasks/weave-docker-api}/weave-docker-api.md | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => tasks}/weave-docker-api/automatic-discovery-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/ipam-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/launching-without-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/name-resolution-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/securing-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/using-proxy.md (100%) rename site/{ => tasks/weave-docker-api}/weave-docker-api.md (100%) diff --git a/site/weave-docker-api/automatic-discovery-proxy.md b/site/tasks/weave-docker-api/automatic-discovery-proxy.md similarity index 100% rename from site/weave-docker-api/automatic-discovery-proxy.md rename to site/tasks/weave-docker-api/automatic-discovery-proxy.md diff --git a/site/weave-docker-api/ipam-proxy.md b/site/tasks/weave-docker-api/ipam-proxy.md similarity index 100% rename from site/weave-docker-api/ipam-proxy.md rename to site/tasks/weave-docker-api/ipam-proxy.md diff --git a/site/weave-docker-api/launching-without-proxy.md b/site/tasks/weave-docker-api/launching-without-proxy.md similarity index 100% rename from site/weave-docker-api/launching-without-proxy.md rename to site/tasks/weave-docker-api/launching-without-proxy.md diff --git a/site/weave-docker-api/name-resolution-proxy.md b/site/tasks/weave-docker-api/name-resolution-proxy.md similarity index 100% rename from site/weave-docker-api/name-resolution-proxy.md rename to site/tasks/weave-docker-api/name-resolution-proxy.md diff --git a/site/weave-docker-api/securing-proxy.md b/site/tasks/weave-docker-api/securing-proxy.md similarity index 100% rename from site/weave-docker-api/securing-proxy.md rename to site/tasks/weave-docker-api/securing-proxy.md diff --git a/site/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md similarity index 100% rename from site/weave-docker-api/using-proxy.md rename to site/tasks/weave-docker-api/using-proxy.md diff --git a/site/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md similarity index 100% rename from site/weave-docker-api.md rename to site/tasks/weave-docker-api/weave-docker-api.md From 313860266100b057512afe93a802296919682301 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:35:28 -0500 Subject: [PATCH 029/125] topic ordering --- site/tasks/weave-docker-api/automatic-discovery-proxy.md | 2 +- site/tasks/weave-docker-api/ipam-proxy.md | 2 +- site/tasks/weave-docker-api/launching-without-proxy.md | 2 +- site/tasks/weave-docker-api/name-resolution-proxy.md | 2 +- site/tasks/weave-docker-api/weave-docker-api.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/tasks/weave-docker-api/automatic-discovery-proxy.md b/site/tasks/weave-docker-api/automatic-discovery-proxy.md index d0ad1921..7b333ef7 100644 --- a/site/tasks/weave-docker-api/automatic-discovery-proxy.md +++ b/site/tasks/weave-docker-api/automatic-discovery-proxy.md @@ -1,6 +1,6 @@ --- title: Using Automatic Discovery With the Weave Net Proxy -menu_order: 30 +menu_order: 40 search_type: Documentation --- diff --git a/site/tasks/weave-docker-api/ipam-proxy.md b/site/tasks/weave-docker-api/ipam-proxy.md index f468ff10..231ca9e8 100644 --- a/site/tasks/weave-docker-api/ipam-proxy.md +++ b/site/tasks/weave-docker-api/ipam-proxy.md @@ -1,6 +1,6 @@ --- title: Automatic IP Allocation and the Weave Proxy -menu_order: 25 +menu_order: 30 search_type: Documentation --- diff --git a/site/tasks/weave-docker-api/launching-without-proxy.md b/site/tasks/weave-docker-api/launching-without-proxy.md index a261452f..d6cdd9e4 100644 --- a/site/tasks/weave-docker-api/launching-without-proxy.md +++ b/site/tasks/weave-docker-api/launching-without-proxy.md @@ -1,6 +1,6 @@ --- title: Launching Containers With Weave Run (without the Proxy) -menu_order: 50 +menu_order: 60 search_type: Documentation --- diff --git a/site/tasks/weave-docker-api/name-resolution-proxy.md b/site/tasks/weave-docker-api/name-resolution-proxy.md index 60635ae1..c0d42267 100644 --- a/site/tasks/weave-docker-api/name-resolution-proxy.md +++ b/site/tasks/weave-docker-api/name-resolution-proxy.md @@ -1,6 +1,6 @@ --- title: Name resolution via `/etc/hosts` -menu_order: 40 +menu_order: 50 search_type: Documentation --- diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md index 14e7b6ad..97ddcf0b 100644 --- a/site/tasks/weave-docker-api/weave-docker-api.md +++ b/site/tasks/weave-docker-api/weave-docker-api.md @@ -1,6 +1,6 @@ --- title: Integrating Docker via the API Proxy -menu_order: 50 +menu_order: 5 search_type: Documentation --- From fcbbf89083802a717344030a65d7dfbe92c75d35 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:35:57 -0500 Subject: [PATCH 030/125] index file for directory --- site/tasks/weave-docker-api.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 site/tasks/weave-docker-api.md diff --git a/site/tasks/weave-docker-api.md b/site/tasks/weave-docker-api.md new file mode 100644 index 00000000..75382591 --- /dev/null +++ b/site/tasks/weave-docker-api.md @@ -0,0 +1,6 @@ +--- +title: Attaching Docker Containers via the Weave API Proxy +menu_order: 40 +search_type: Documentation +--- + From f17053fcee7cfa958e3c36a772efe8ef18f962af Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 20:17:00 -0500 Subject: [PATCH 031/125] order topic --- site/building.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/building.md b/site/building.md index 50aac708..26d5109b 100644 --- a/site/building.md +++ b/site/building.md @@ -1,6 +1,6 @@ --- title: Building Weave Net -menu_order: 120 +menu_order: 220 search_type: Documentation --- You only need to build Weave Net if you want to work on the Weave Net codebase From 39591490770c8395b35cb0d4c8ea7fc01cc464a9 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 23:40:16 -0500 Subject: [PATCH 032/125] remove index from concepts title --- site/concepts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts.md b/site/concepts.md index be2e7e5d..6b64f325 100644 --- a/site/concepts.md +++ b/site/concepts.md @@ -1,5 +1,5 @@ --- -title: Weave Net Concepts Index +title: Concepts in Weave Net menu_order: 20 search_type: Documentation --- From 4edff2f17fca320653f4b9d3527a5b65811da003 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 12:37:33 -0500 Subject: [PATCH 033/125] put installing first --- site/install/installing-weave.md | 2 +- site/install/using-weave.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 9f3e8042..7bfa1c3d 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -1,6 +1,6 @@ --- title: Installing Weave Net -menu_order: 30 +menu_order: 20 search_type: Documentation --- diff --git a/site/install/using-weave.md b/site/install/using-weave.md index d9c756ec..7b413e8a 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -1,6 +1,6 @@ --- title: Launching Weave Net -menu_order: 20 +menu_order: 30 search_type: Documentation --- From be52e08f2d77a591983d6b757372ac31ae4565cf Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 12:41:38 -0500 Subject: [PATCH 034/125] make launch 10 --- site/install/using-weave.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 7b413e8a..d397bba2 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -1,6 +1,6 @@ --- title: Launching Weave Net -menu_order: 30 +menu_order: 10 search_type: Documentation --- From 9ec8cb9bf48ce3e1df44ed633f83e2080ea84a93 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 12:45:13 -0500 Subject: [PATCH 035/125] better title for weave cloud and net --- site/install/weave-cloud.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 96ed6679..bd8f658f 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -1,5 +1,5 @@ --- -title: Using Weave Cloud to get started with Weave Net +title: Visualizing Weave Net in Weave Cloud menu_order: 30 search_type: Documentation --- From cba793524eefb0cdc148a51529f6e296aa57a89e Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:06:34 -0500 Subject: [PATCH 036/125] replaced url for features --- site/install/installing-weave.md | 2 +- site/install/systemd.md | 2 +- site/overview.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 7bfa1c3d..8f22445f 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -66,7 +66,7 @@ To make encryption in fast datapath work on Google Cloud Platform, see * [Using Weave Net](/site/using-weave.md) * [Getting Started Guides](http://www.weave.works/guides/) - * [Features](/site/features.md) + * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) * [Building](/site/building.md) * [Using Weave with Systemd](/site/installing-weave/systemd.md) diff --git a/site/install/systemd.md b/site/install/systemd.md index 4d725986..9f5b8ed3 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -66,5 +66,5 @@ context with the commands shown below. You will need to have the * [Using Weave Net](/site/using-weave.md) * [Getting Started Guides](http://www.weave.works/guides/) - * [Features](/site/features.md) + * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) diff --git a/site/overview.md b/site/overview.md index 93fb9e9f..bedf4596 100644 --- a/site/overview.md +++ b/site/overview.md @@ -60,7 +60,7 @@ With Weave Net, deploy your applications - whether peer-to-peer file sharing, vo Weave Net is a good choice if you want one tool for everything. For example: In addition to Docker plugins, you can also use Weave as a Kubernetes plugin. You can also use Weave with Amazon ECS or with Mesos and Marathon. Refer to our Getting Started and Integration Guides for more information. -For a complete list and description of Weave Net’s current feature set see, [Weave Net Features](/site/features.md). +For a complete list and description of Weave Net’s current feature set see, [Weave Net Features](/site/overview/features.md). From d84154326f53caaf5e79ae96ebef05beff6be24f Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:12:02 -0500 Subject: [PATCH 037/125] update how it works url --- site/concepts/encryption.md | 2 +- site/troubleshooting.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/concepts/encryption.md b/site/concepts/encryption.md index 08231d5c..084e6a12 100644 --- a/site/concepts/encryption.md +++ b/site/concepts/encryption.md @@ -6,7 +6,7 @@ search_type: Documentation Weave Net peers -[communicate with each other over both TCP and UDP](/site/how-it-works.md). This +[communicate with each other over both TCP and UDP](/site/concepts/how-it-works.md). This communication [can be encrypted](/site/using-weave/security-untrusted-networks.md). diff --git a/site/troubleshooting.md b/site/troubleshooting.md index d849c272..1bbdb2fc 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -79,7 +79,7 @@ $ weave status ``` The terms used here are explained further at -[How Weave Net Works](/site/how-it-works.md). +[How Weave Net Works](/site/concepts/how-it-works.md). * **Version** - shows the Weave Net version. If checkpoint is enabled (i.e. `CHECKPOINT_DISABLE` is not set), information about existence of a new version From 61e798d4001b6cac199807a3588dea8a13951956 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:31:48 -0500 Subject: [PATCH 038/125] replaced urls /site/how-it-works/ with /site/concepts/ --- site/concepts/encryption-implementation.md | 4 ++-- site/concepts/encryption.md | 2 +- site/concepts/how-it-works.md | 4 ++-- site/concepts/network-topology.md | 2 +- site/concepts/router-encapsulation.md | 2 +- site/faq.md | 2 +- site/overview/features.md | 6 +++--- site/tasks/ipam/configuring-weave.md | 2 +- site/tasks/ipam/ipam.md | 2 +- site/tasks/ipam/manual-ip-address.md | 2 +- site/tasks/manage/fastdp.md | 6 +++--- site/tasks/manage/host-network-integration.md | 2 +- site/tasks/manage/security-untrusted-networks.md | 2 +- site/troubleshooting.md | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/site/concepts/encryption-implementation.md b/site/concepts/encryption-implementation.md index ff8511d6..21b534ef 100644 --- a/site/concepts/encryption-implementation.md +++ b/site/concepts/encryption-implementation.md @@ -5,7 +5,7 @@ search_type: Documentation --- This section describes some details of Weave Net's built-in -[encryption](/site/how-it-works/encryption.md): +[encryption](/site/concepts/encryption.md): * [Establishing the Ephemeral Session Key](#ephemeral-key) * [Key Generation](#csprng) @@ -148,7 +148,7 @@ follows: | Frame N: Captured payload | | +-----------------------------------+ -+ -This is very similar to the [non-crypto encapsulation](/site/how-it-works/router-encapsulation.md). +This is very similar to the [non-crypto encapsulation](/site/concepts/router-encapsulation.md). All of the frames on a connection are encrypted with the same ephemeral session key, and a nonce constructed from a message sequence diff --git a/site/concepts/encryption.md b/site/concepts/encryption.md index 084e6a12..dceafb62 100644 --- a/site/concepts/encryption.md +++ b/site/concepts/encryption.md @@ -41,5 +41,5 @@ the IP transformation framework (XFRM). **See Also** - * [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md) + * [How Weave Implements Encryption](/site/concepts/encryption-implementation.md) * [Securing Containers Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) diff --git a/site/concepts/how-it-works.md b/site/concepts/how-it-works.md index 4082b09f..4bde7068 100644 --- a/site/concepts/how-it-works.md +++ b/site/concepts/how-it-works.md @@ -45,5 +45,5 @@ first send it to peer 3: **See Also** - * [Weave Router Sleeve Encapsulation](/site/how-it-works/router-encapsulation.md) - * [How Weave Interprets Network Topology](/site/how-it-works/network-topology.md) + * [Weave Router Sleeve Encapsulation](/site/concepts/router-encapsulation.md) + * [How Weave Interprets Network Topology](/site/concepts/network-topology.md) diff --git a/site/concepts/network-topology.md b/site/concepts/network-topology.md index d168b5b0..111dd453 100644 --- a/site/concepts/network-topology.md +++ b/site/concepts/network-topology.md @@ -145,7 +145,7 @@ which time the topology should have updated. **See Also** - * [Weave Net Router Encapsulation](/site/how-it-works/router-encapsulation.md) + * [Weave Net Router Encapsulation](/site/concepts/router-encapsulation.md) diff --git a/site/concepts/router-encapsulation.md b/site/concepts/router-encapsulation.md index b15a3b2e..44806eeb 100644 --- a/site/concepts/router-encapsulation.md +++ b/site/concepts/router-encapsulation.md @@ -62,4 +62,4 @@ MAC discovery. **See Also** - * [How Weave Net Interprets Network Topology](/site/how-it-works/network-topology.md) + * [How Weave Net Interprets Network Topology](/site/concepts/network-topology.md) diff --git a/site/faq.md b/site/faq.md index 8f9c83aa..8cd4d12c 100644 --- a/site/faq.md +++ b/site/faq.md @@ -63,7 +63,7 @@ All virtualization techniques have some overhead, and Weave's overhead is typica Weave Net also automatically uses the fastest datapath between two hosts. When Weave Net can't use the fast datapath between two hosts, it falls back to the slower packet forwarding approach. Selecting the fastest forwarding approach is automatic, and is determined on a connection-by-connection basis. For example, a Weave network spanning two data centers might use fast datapath within the data centers, but not for the more constrained network link between them. -For more information about fast datapath see [How Fast Datapath Works](/site/how-it-works/fastdp-how-it-works.md). +For more information about fast datapath see [How Fast Datapath Works](/site/concepts/fastdp-how-it-works.md). diff --git a/site/overview/features.md b/site/overview/features.md index 03187e3a..8e2353c2 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -54,7 +54,7 @@ transport data between peers. The best performing of these (the 'fast datapath') offers near-native throughput and latency. See [Using Fast Datapath](/site/using-weave/fastdp.md) and -[How Fast Datapath Works](/site/how-it-works/fastdp-how-it-works.md). +[How Fast Datapath Works](/site/concepts/fastdp-how-it-works.md). ### Seamless Docker Integration (Weave Docker API Proxy) @@ -103,7 +103,7 @@ Instead of allowing Weave to automatically allocate addresses, an IP address and specified. See [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) for instructions. For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Management](/site/ipam.md). And also review the -[the basics of IP addressing](/site/how-it-works/ip-addresses.md) for an explanation of addressing and private networks. +[the basics of IP addressing](/site/concepts/ip-addresses.md) for an explanation of addressing and private networks. ### Naming and Discovery @@ -176,7 +176,7 @@ running alongside Weave. Weave Net implements encryption and security using the Go version of [Daniel J. Bernstein's NaCl library](http://nacl.cr.yp.to/index.html), and, additionally in the case of encrypted fast datapath using [the cryptography framework of the Linux kernel](https://en.wikipedia.org/wiki/Crypto_API_(Linux)). -For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/how-it-works/encryption.md) and [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md). +For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/concepts/encryption.md) and [How Weave Implements Encryption](/site/concepts/encryption-implementation.md). ### Host Network Integration diff --git a/site/tasks/ipam/configuring-weave.md b/site/tasks/ipam/configuring-weave.md index 03e2755a..22353e6e 100644 --- a/site/tasks/ipam/configuring-weave.md +++ b/site/tasks/ipam/configuring-weave.md @@ -40,4 +40,4 @@ Networks](https://en.wikipedia.org/wiki/Private_network). For example **See Also** - * [IP Addresses, Routes and Networks](/site/how-it-works/ip-addresses.md) + * [IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md index 82abb79a..4d3b0723 100644 --- a/site/tasks/ipam/ipam.md +++ b/site/tasks/ipam/ipam.md @@ -180,7 +180,7 @@ The range parameter is written in in this example "/16" means the first 16 bits of the address form the network address and the allocator is to allocate container addresses that all start 10.2. See [IP -addresses and routes](/site/how-it-works/ip-addresses.md) for more information. +addresses and routes](/site/concepts/ip-addresses.md) for more information. Weave shares the IP address range across all peers, dynamically according to their needs. If a group of peers becomes isolated from diff --git a/site/tasks/ipam/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md index c206e577..3edd1feb 100644 --- a/site/tasks/ipam/manual-ip-address.md +++ b/site/tasks/ipam/manual-ip-address.md @@ -11,7 +11,7 @@ Containers are automatically allocated an IP address that is unique across the W Weave Net detects when a container has exited and releases its allocated addresses so they can be re-used by the network. -See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/site/how-it-works/ip-addresses.md) for further details. +See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/site/concepts/ip-addresses.md) for further details. Instead of allowing Weave Net to allocate IP addresses automatically (using IPAM), there may be instances where you need to control a particular container or a cluster by setting an IP address for it. diff --git a/site/tasks/manage/fastdp.md b/site/tasks/manage/fastdp.md index 7eb7a27b..02b17fc3 100644 --- a/site/tasks/manage/fastdp.md +++ b/site/tasks/manage/fastdp.md @@ -9,7 +9,7 @@ The most important thing to know about fast datapath is that you don't need to c When Weave Net cannot use the fast data path between two hosts, it falls back to a slower packet forwarding approach called `sleeve`. Selecting the fastest forwarding approach is automatic, and is determined on a connection-by-connection basis. For example, a Weave network spanning two data centers might use fast data path within the data centers, but not for the more constrained network link between them. -See [How Fastdp Works](/site/how-it-works/fastdp-how-it-works.md) for a more in-depth discussion of this feature. +See [How Fastdp Works](/site/concepts/fastdp-how-it-works.md) for a more in-depth discussion of this feature. ### Disabling Fast Datapath @@ -26,7 +26,7 @@ Each encrypted dataplane packet is encapsulated into [ESP](https://tools.ietf.or thus in some networks a firewall rule for allowing ESP traffic needs to be installed. E.g. Google Cloud Platform denies ESP packets by default. -See [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md) +See [How Weave Implements Encryption](/site/concepts/encryption-implementation.md) for more details for the fastdp encryption. ### Viewing Connection Mode Fastdp or Sleeve @@ -72,5 +72,5 @@ frame" configuration: **See Also** * [Using Weave Net](/site/using-weave.md) - * [How Fastdp Works](/site/how-it-works/fastdp-how-it-works.md) + * [How Fastdp Works](/site/concepts/fastdp-how-it-works.md) * [Performance measurements](/blog/weave-docker-networking-performance-fast-data-path/) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index b957bdef..81788dcb 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -60,5 +60,5 @@ hosts. **See Also** * [Using Weave Net](/site/using-weave.md) - * [General information on IP Addresses, Routes and Networks](/site/how-it-works/ip-addresses.md) + * [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) diff --git a/site/tasks/manage/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md index 848a6ccb..f05ecae2 100644 --- a/site/tasks/manage/security-untrusted-networks.md +++ b/site/tasks/manage/security-untrusted-networks.md @@ -53,5 +53,5 @@ Be aware that: **See Also** - * [Weave Encryption](/site/how-it-works/encryption.md) + * [Weave Encryption](/site/concepts/encryption.md) * [Using Fast Datapath](/site/using-weave/fastdp.md) diff --git a/site/troubleshooting.md b/site/troubleshooting.md index 1bbdb2fc..9e31a2a0 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -95,7 +95,7 @@ can be overridden by using the `--nickname` argument at `weave launch`. * **Encryption** - indicates whether -[encryption](/site/how-it-works/encryption.md) is in use for communication +[encryption](/site/concepts/encryption.md) is in use for communication between peers. * **PeerDiscovery** - indicates whether From 6bd529ef665197991976c060c7611d93c2e5036a Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:35:45 -0500 Subject: [PATCH 039/125] replaced urls /site/installing-weave.md w /site/install/installing-weave.md --- site/install/systemd.md | 2 +- site/install/using-weave.md | 2 +- site/install/weave-cloud.md | 2 +- site/overview/features.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/install/systemd.md b/site/install/systemd.md index 9f5b8ed3..cb32ce9f 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -5,7 +5,7 @@ search_type: Documentation --- -Having installed Weave Net as per [Installing Weave](/site/installing-weave.md), you might find it convenient to configure the +Having installed Weave Net as per [Installing Weave](/site/install/installing-weave.md), you might find it convenient to configure the init daemon to start Weave on boot. Most recent Linux distribution releases ship with [systemd](http://www.freedesktop.org/wiki/Software/systemd/). The information below provides you with some initial guidance on getting a Weave Net service configured on a systemd-based OS. ## Weave Net Service Unit and Configuration diff --git a/site/install/using-weave.md b/site/install/using-weave.md index d397bba2..58ce1799 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -134,7 +134,7 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex **See Also** - * [Installing Weave Net](/site/installing-weave.md) + * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Cloud to get started with Weave Net](/site/using-weave/weave-cloud.md) * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index bd8f658f..c1ea7ef0 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -121,7 +121,7 @@ connect to it. **See Also** - * [Installing Weave Net](/site/installing-weave.md) + * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Net](/site/using-weave.md) * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) diff --git a/site/overview/features.md b/site/overview/features.md index 8e2353c2..2f17d65a 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -44,7 +44,7 @@ a container network. Broadcast and Multicast protocols can also be used over Weave Net. -To start using Weave Net, see [Installing Weave Net](/site/installing-weave.md) +To start using Weave Net, see [Installing Weave Net](/site/install/installing-weave.md) and [Using Weave Net](/site/using-weave.md). ### Fast Datapath From 227d45a40c214af373487e97cfeed9c60404d25f Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:46:56 -0500 Subject: [PATCH 040/125] replaced URLs for install and docker plugins --- site/install/plugin/plugin-how-it-works.md | 4 ++-- site/install/plugin/plugin-v2.md | 4 ++-- site/install/plugin/plugin.md | 4 ++-- site/install/using-weave.md | 4 ++-- site/install/weave-cloud.md | 4 ++-- site/overview.md | 2 +- site/overview/features.md | 4 ++-- site/tasks/ipam/ipam.md | 2 +- site/tasks/weave-docker-api/weave-docker-api.md | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/site/install/plugin/plugin-how-it-works.md b/site/install/plugin/plugin-how-it-works.md index 48f55c1f..28e78d39 100644 --- a/site/install/plugin/plugin-how-it-works.md +++ b/site/install/plugin/plugin-how-it-works.md @@ -51,6 +51,6 @@ The plugin accepts the following options via `docker network create ... --opt`: **See Also** - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) + * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md index 76988c18..6b82b2e1 100644 --- a/site/install/plugin/plugin-v2.md +++ b/site/install/plugin/plugin-v2.md @@ -76,5 +76,5 @@ Or to start a container: **See Also** - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [How the Weave Network Plugins Work](/site/plugin/plugin-how-it-works.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) + * [How the Weave Network Plugins Work](/site/install/plugin/plugin-how-it-works.md) diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index 403211fa..f8633941 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -63,7 +63,7 @@ this between hosts requires that you run Docker in ["swarm mode"](https://docs.d ["key-value store"](https://docs.docker.com/engine/userguide/networking/get-started-overlay/#/set-up-a-key-value-store). To operate in swarm mode, you are required to use the plugin v2 of Weave Net. -See [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md) for +See [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) for more details. If your Docker installation has a key-value store, create a network @@ -96,4 +96,4 @@ If you are using `systemd` with Docker 1.9, it is advised that you modify the Do **See Also** - * [How the Weave Network Plugins Work](/site/plugin/plugin-how-it-works.md) + * [How the Weave Network Plugins Work](/site/install/plugin/plugin-how-it-works.md) diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 58ce1799..cae0f8a5 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -137,5 +137,5 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Cloud to get started with Weave Net](/site/using-weave/weave-cloud.md) * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) + * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index c1ea7ef0..64fa8f03 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -124,5 +124,5 @@ connect to it. * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Net](/site/using-weave.md) * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) + * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/overview.md b/site/overview.md index bedf4596..7772aa0a 100644 --- a/site/overview.md +++ b/site/overview.md @@ -27,7 +27,7 @@ Weave Net implements service discovery by providing a fast "micro DNS" server at All other Docker networking plugins, including Docker's own "Overlay" driver, require that you set up Docker with a cluster store – a central database like Consul or Zookeeper – before you can even use them. Besides being difficult to set up, maintain and manage, every Docker host must also be in constant contact with the cluster store: if you lose the connection, even temporarily, then you cannot start or stop any containers. Weave Net is bundled with a Docker Network plugin that doesn't require an external cluster store. You can get started right away and you can start and stop containers even when there are network connectivity problems. -For information about the Weave Docker Plugin, see [How The Weave Network Plugin Works](/site/plugin/plugin-how-it-works.md). +For information about the Weave Docker Plugin, see [How The Weave Network Plugin Works](/site/install/plugin/plugin-how-it-works.md). ### Operates in Partially Connected Networks diff --git a/site/overview/features.md b/site/overview/features.md index 2f17d65a..bfe6a781 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -84,8 +84,8 @@ named `weave` is created by `weave launch`, which is used as follows: Using the Weave plugin enables you to take advantage of [Docker's network functionality](https://docs.docker.com/engine/extend/plugins_network/). There are two plugin implementations for Weave Net: the -["Legacy"](/site/plugin.md) plugin which doesn't require an external -cluster store, and the ["V2"](/site/plugin-v2.md) plugin which +["Legacy"](/site/install/plugin/plugin.md) plugin which doesn't require an external +cluster store, and the ["V2"](/site/install/plugin/plugin-v2.md) plugin which supports Docker swarm mode. ### Weave Network CNI Plugin diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md index 4d3b0723..d5351ae5 100644 --- a/site/tasks/ipam/ipam.md +++ b/site/tasks/ipam/ipam.md @@ -203,4 +203,4 @@ named `weavedb` is used to store this data. **See Also** * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md index 97ddcf0b..2dd2d6cd 100644 --- a/site/tasks/weave-docker-api/weave-docker-api.md +++ b/site/tasks/weave-docker-api/weave-docker-api.md @@ -28,8 +28,8 @@ Docker containers are started with the --net flag, for example: Note that if a Docker container is started with the --net flag, then the Weave Docker API Proxy is automatically disabled and is not used to attach containers. -See [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) and -[Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md). +See [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) and +[Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md). **3.** Containers can also be attached to the Weave network with `weave attach` commands. This method also does not use the Weave Docker API Proxy. From 4e41e422c5f864acc4a9edc9891fd2a1512c2376 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:53:18 -0500 Subject: [PATCH 041/125] replace URLs for kubernetes section --- site/kubernetes.md | 2 +- site/kubernetes/kube-addon.md | 2 +- site/overview/features.md | 4 ++-- site/tasks/manage/metrics.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/site/kubernetes.md b/site/kubernetes.md index 2bacfa6a..d6751b7e 100644 --- a/site/kubernetes.md +++ b/site/kubernetes.md @@ -5,7 +5,7 @@ search_type: Documentation --- > The recommended way of using Weave with Kubernetes is via the new -> [Kubernetes Addon](/site/kube-addon.md). The instructions below +> [Kubernetes Addon](/site/kubernetes/kube-addon.md). The instructions below > remain valid however, and are still the recommended method for > integrating with Mesos. diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index 61488c00..c29411ff 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -43,7 +43,7 @@ recommend your master node has at least two CPU cores. > Alternatively, you can [configure CNI yourself](http://kubernetes.io/docs/admin/network-plugins/#cni) **Note:** If using the [Weave CNI -Plugin](/site/cni-plugin.md) from a prior full install of Weave Net with your +Plugin](/site/kubernetes.md) from a prior full install of Weave Net with your cluster, you must first uninstall it before applying the Weave-kube addon. Shut down Kubernetes, and _on all nodes_ perform the following: diff --git a/site/overview/features.md b/site/overview/features.md index bfe6a781..33e458c0 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -92,7 +92,7 @@ supports Docker swarm mode. Weave can be used as a plugin to systems that support the [Container Network Interface](https://github.com/appc/cni), such as Kubernetes and Mesosphere. -See [Integrating Kubernetes and Mesos via the CNI Plugin](/site/cni-plugin.md) for more details. +See [Integrating Kubernetes and Mesos via the CNI Plugin](/site/kubernetes.md) for more details. ### IP Address Management (IPAM) @@ -138,7 +138,7 @@ technique with Weave Net. ### Network Policy -The Weave [Kubernetes Addon](/site/kube-addon.md) includes a network +The Weave [Kubernetes Addon](/site/kubernetes/kube-addon.md) includes a network policy controller that implements [Kubernetes Network Policies](http://kubernetes.io/docs/user-guide/networkpolicies/). diff --git a/site/tasks/manage/metrics.md b/site/tasks/manage/metrics.md index 6f7d5f8d..93cbbbe7 100644 --- a/site/tasks/manage/metrics.md +++ b/site/tasks/manage/metrics.md @@ -5,8 +5,8 @@ search_type: Documentation --- Two endpoints are exposed: one for the Weave Net router, and, when deployed as -a [Kubernetes Addon](/site/kube-addon.md), one for the [network policy -controller](/site/kube-addon.md#npc). +a [Kubernetes Addon](/site/kubernetes/kube-addon.md), one for the [network policy +controller](/site/kubernetes/kube-addon.md#npc). ### Router Metrics From 16272f0d75c9fafa2134ce5d98236e00e12f6c2f Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:05:23 -0500 Subject: [PATCH 042/125] replaced urls for tasks/manage section --- site/concepts/encryption-implementation.md | 2 +- site/concepts/encryption.md | 4 ++-- site/concepts/fastdp-how-it-works.md | 2 +- site/concepts/how-it-works.md | 2 +- site/concepts/router-encapsulation.md | 2 +- site/faq.md | 10 +++++----- site/install/plugin/plugin-v2.md | 4 ++-- site/install/systemd.md | 4 ++-- site/install/using-weave.md | 4 ++-- site/install/weave-cloud.md | 2 +- site/kubernetes/kube-addon.md | 2 +- site/overview.md | 2 +- site/overview/features.md | 16 ++++++++-------- site/tasks/ipam/allocation-multi-ipam.md | 4 ++-- site/tasks/ipam/manual-ip-address.md | 2 +- site/tasks/ipam/stop-remove-peers-ipam.md | 2 +- site/tasks/manage/application-isolation.md | 2 +- .../manage/finding-adding-hosts-dynamically.md | 2 +- site/tasks/manage/host-network-integration.md | 2 +- site/tasks/manage/security-untrusted-networks.md | 2 +- site/tasks/manage/service-management.md | 2 +- .../weave-docker-api/launching-without-proxy.md | 2 +- site/tasks/weave-docker-api/weave-docker-api.md | 2 +- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/site/concepts/encryption-implementation.md b/site/concepts/encryption-implementation.md index 21b534ef..ab2ab5a5 100644 --- a/site/concepts/encryption-implementation.md +++ b/site/concepts/encryption-implementation.md @@ -211,4 +211,4 @@ Integrity Check Value of AES-GCM. * [architecture documentation](https://github.com/weaveworks/weave/blob/master/docs/architecture.txt) * [fastdp encryption](https://github.com/weaveworks/weave/blob/master/docs/fastdp-crypto.md) - * [Securing Containers Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) + * [Securing Containers Across Untrusted Networks](/site/tasks/manage/security-untrusted-networks.md) diff --git a/site/concepts/encryption.md b/site/concepts/encryption.md index dceafb62..b7d1cb4d 100644 --- a/site/concepts/encryption.md +++ b/site/concepts/encryption.md @@ -8,7 +8,7 @@ search_type: Documentation Weave Net peers [communicate with each other over both TCP and UDP](/site/concepts/how-it-works.md). This communication -[can be encrypted](/site/using-weave/security-untrusted-networks.md). +[can be encrypted](/site/tasks/manage/security-untrusted-networks.md). Encryption of control plane traffic (TCP) and data plane traffic (UDP) of sleeve overlay is accomplished using the [NaCl](http://nacl.cr.yp.to/) @@ -42,4 +42,4 @@ the IP transformation framework (XFRM). **See Also** * [How Weave Implements Encryption](/site/concepts/encryption-implementation.md) - * [Securing Containers Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) + * [Securing Containers Across Untrusted Networks](/site/tasks/manage/security-untrusted-networks.md) diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md index e5640c50..13a092e9 100644 --- a/site/concepts/fastdp-how-it-works.md +++ b/site/concepts/fastdp-how-it-works.md @@ -26,6 +26,6 @@ Prior to version 1.2, Weave Net used a custom encapsulation format. Fast datapat **See Also** * [Using Weave Net](/site/using-weave.md) - * [Using Fast Datapath](/site/using-weave/fastdp.md) + * [Using Fast Datapath](/site/tasks/manage/fastdp.md) diff --git a/site/concepts/how-it-works.md b/site/concepts/how-it-works.md index 4bde7068..d5412ec9 100644 --- a/site/concepts/how-it-works.md +++ b/site/concepts/how-it-works.md @@ -25,7 +25,7 @@ is given an IP address and netmask supplied either by the user or by Weave Net's IP address allocator. Weave Net routes packets between containers on different hosts via two -methods: a [fast data path](/site/using-weave/fastdp.md) method, which operates +methods: a [fast data path](/site/tasks/manage/fastdp.md) method, which operates entirely in kernel space, and a fallback `sleeve` method, in which packets destined for non-local containers are captured by the kernel and processed by the Weave Net router in user space, forwarded over diff --git a/site/concepts/router-encapsulation.md b/site/concepts/router-encapsulation.md index 44806eeb..fc031530 100644 --- a/site/concepts/router-encapsulation.md +++ b/site/concepts/router-encapsulation.md @@ -5,7 +5,7 @@ search_type: Documentation --- When the Weave Net router forwards packets to peers in `sleeve` mode -(rather than via the [fast data path](/site/using-weave/fastdp.md)), the +(rather than via the [fast data path](/site/tasks/manage/fastdp.md)), the encapsulation looks something like this: +-----------------------------------+ diff --git a/site/faq.md b/site/faq.md index 8cd4d12c..cd267553 100644 --- a/site/faq.md +++ b/site/faq.md @@ -25,7 +25,7 @@ For more information, refer to [Manually Specifying the IP Address of a Containe **Q: How do I expose one of my containers to the outside world?** -Exposing a container to the outside world is described in [Exporting Services](/site/using-weave/service-management.md#exporting). +Exposing a container to the outside world is described in [Exporting Services](/site/tasks/manage/service-management.md#exporting). @@ -37,7 +37,7 @@ For example, you have a Weave network that runs on hosts A, B, C. and you have a A simple way to accomplish this would be to run Weave on the host and then run, `weave expose` to expose the network to any running containers. Or you set up a route from P to one of A, B or C. See [Integrating a Network Host](/site/using-weave/host-network-integration.md). -Yet another option is to expose a port from the container on host B and then connect to it. You can read about exposing ports in [Exporting Services](/site/using-weave/service-management.md#exporting). +Yet another option is to expose a port from the container on host B and then connect to it. You can read about exposing ports in [Exporting Services](/site/tasks/manage/service-management.md#exporting). @@ -71,7 +71,7 @@ For more information about fast datapath see [How Fast Datapath Works](/site/con To view whether Weave is using fastdp or not, you can run, `weave status connections` -For more information on this command, see [Using Fast Datapath](/site/using-weave/fastdp.md). +For more information on this command, see [Using Fast Datapath](/site/tasks/manage/fastdp.md). @@ -79,12 +79,12 @@ For more information on this command, see [Using Fast Datapath](/site/using-weav Yes, 1.9 version of Weave Net added the encryption feature to fastdp. -See [Using Fast Datapath](/site/using-weave/fastdp.md) for more information. +See [Using Fast Datapath](/site/tasks/manage/fastdp.md) for more information. **Q: Can I create multiple networks where containers can communicate on one network, but are isolated from containers on other networks?** -Yes, of course! Weave allows you to run isolated networks and still allow open communications between individual containers from those isolated networks. You can find information on how to do this in [Application Isolation](/site/using-weave/application-isolation.md). +Yes, of course! Weave allows you to run isolated networks and still allow open communications between individual containers from those isolated networks. You can find information on how to do this in [Application Isolation](/site/tasks/manage/application-isolation.md). **Q: Which ports does Weave Net use (e.g. if I am configuring a firewall) ?** diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md index 6b82b2e1..24592212 100644 --- a/site/install/plugin/plugin-v2.md +++ b/site/install/plugin/plugin-v2.md @@ -34,14 +34,14 @@ There are several configuration parameters which can be set with: The parameters include: * `WEAVE_PASSWORD` - if non empty, it will instruct Weave Net to encrypt - traffic - see [here](/site/using-weave/security-untrusted-networks.md) for + traffic - see [here](/site/tasks/manage/security-untrusted-networks.md) for more details. * `WEAVE_MULTICAST` - set to 1 on each host running the plugin to enable multicast traffic on any Weave Net network. * `WEAVE_MTU` - Weave Net defaults to 1376 bytes, but you can set a smaller size if your underlying network has a tighter limit, or set a larger size for better performance if your network supports jumbo - frames - see [here](/site/using-weave/fastdp.md#mtu) for more + frames - see [here](/site/tasks/manage/fastdp.md#mtu) for more details. * `IPALLOC_RANGE` - the range of IP addresses used by Weave Net and the subnet they are placed in (CIDR format; default 10.32.0.0/12). diff --git a/site/install/systemd.md b/site/install/systemd.md index cb32ce9f..16cc99ac 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -34,9 +34,9 @@ create the `/etc/sysconfig/weave` environment file using the following format: You can also use the [`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md) command to add participating hosts dynamically. -Additionally, if you want to enable [encryption](/site/using-weave/security-untrusted-networks.md) specify a +Additionally, if you want to enable [encryption](/site/tasks/manage/security-untrusted-networks.md) specify a password using `WEAVE_PASSWORD="wfvAwt7sj"` in the `/etc/sysconfig/weave` environment file, and it will get picked up by -Weave Net on launch. Recommendations for choosing a suitably strong password can be found [here](/site/using-weave/security-untrusted-networks.md). +Weave Net on launch. Recommendations for choosing a suitably strong password can be found [here](/site/tasks/manage/security-untrusted-networks.md). You can now launch Weave Net using diff --git a/site/install/using-weave.md b/site/install/using-weave.md index cae0f8a5..088bf8ae 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -93,7 +93,7 @@ Standard firewall rules can be deployed to restrict access to the Weave Net control and data ports. For communication across untrusted networks, connections can be -[encrypted](/site/using-weave/security-untrusted-networks.md). +[encrypted](/site/tasks/manage/security-untrusted-networks.md). ### Testing Container Communications @@ -136,6 +136,6 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Cloud to get started with Weave Net](/site/using-weave/weave-cloud.md) - * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) + * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 64fa8f03..ad72f5fe 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -123,6 +123,6 @@ connect to it. * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Net](/site/using-weave.md) - * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) + * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index c29411ff..7b0589ca 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -252,7 +252,7 @@ The list of variables you can set is: * `WEAVE_MTU` - Weave Net defaults to 1376 bytes, but you can set a smaller size if your underlying network has a tighter limit, or set a larger size for better performance if your network supports jumbo - frames - see [here](/site/using-weave/fastdp.md#mtu) for more + frames - see [here](/site/tasks/manage/fastdp.md#mtu) for more details. Example: diff --git a/site/overview.md b/site/overview.md index 7772aa0a..850a030e 100644 --- a/site/overview.md +++ b/site/overview.md @@ -37,7 +37,7 @@ Weave Net can forward traffic between nodes, and it works even if the mesh netwo Weave Net automatically chooses the fastest path between two hosts, offering near native throughput and latency, all without your intervention. -See [How Fast Datapath Works](/site/using-weave/fastdp.md) for more information. +See [How Fast Datapath Works](/site/tasks/manage/fastdp.md) for more information. ### Network Operations Friendly diff --git a/site/overview/features.md b/site/overview/features.md index 33e458c0..2b5540b1 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -53,7 +53,7 @@ Weave Net automatically chooses the fastest available method to transport data between peers. The best performing of these (the 'fast datapath') offers near-native throughput and latency. -See [Using Fast Datapath](/site/using-weave/fastdp.md) and +See [Using Fast Datapath](/site/tasks/manage/fastdp.md) and [How Fast Datapath Works](/site/concepts/fastdp-how-it-works.md). ### Seamless Docker Integration (Weave Docker API Proxy) @@ -132,7 +132,7 @@ _isolation-through-subnets_ technique. This common strategy techniques can be used to deploy your applications to containers. -See [Isolating Applications](/site/using-weave/application-isolation.md) +See [Isolating Applications](/site/tasks/manage/application-isolation.md) for information on how to use the isolation-through-subnets technique with Weave Net. @@ -149,7 +149,7 @@ given container in advance. In these cases, you can take advantage of Weave's ability to attach and detach running containers to and from any network. -See [Dynamically Attaching and Detaching Containers](/site/using-weave/dynamically-attach-containers.md) +See [Dynamically Attaching and Detaching Containers](/site/tasks/manage/dynamically-attach-containers.md) for details. @@ -176,7 +176,7 @@ running alongside Weave. Weave Net implements encryption and security using the Go version of [Daniel J. Bernstein's NaCl library](http://nacl.cr.yp.to/index.html), and, additionally in the case of encrypted fast datapath using [the cryptography framework of the Linux kernel](https://en.wikipedia.org/wiki/Crypto_API_(Linux)). -For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/concepts/encryption.md) and [How Weave Implements Encryption](/site/concepts/encryption-implementation.md). +For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/tasks/manage/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/concepts/encryption.md) and [How Weave Implements Encryption](/site/concepts/encryption-implementation.md). ### Host Network Integration @@ -193,7 +193,7 @@ See [Integrating with the Host Network](/site/using-weave/host-network-integrati * **Binding Services** - A container can be bound to a particular IP and port without having to change your application code, while at the same time will maintain its original endpoint. * **Routing Services** - By combining the importing and exporting features, you can connect to disjointed networks, even when separated by firewalls and where there may be overlapping IP addresses. -See [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) for instructions on how to manage services on a Weave container network. +See [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) for instructions on how to manage services on a Weave container network. ### Multi-Cloud Networking @@ -203,7 +203,7 @@ of containers that run on [Google Compute Engine](https://cloud.google.com/compu (GCE), [Amazon Elastic Compute Cloud](https://aws.amazon.com/ec2/) (EC2) and in a local data centre all at the same time. -See [Enabling Multi-Cloud networking and Muti-hop Routing](/site/using-weave/multi-cloud-multi-hop.md). +See [Enabling Multi-Cloud networking and Muti-hop Routing](/site/tasks/manage/multi-cloud-multi-hop.md). ### Multi-Hop Routing @@ -213,7 +213,7 @@ even when there is only partial connectivity between the hosts. Weave Net routes traffic between containers as long as there is at least one *path* of connected hosts between them. -See [Enabling Multi-Cloud networking and Multi-hop Routing](/site/using-weave/multi-cloud-multi-hop.md). +See [Enabling Multi-Cloud networking and Multi-hop Routing](/site/tasks/manage/multi-cloud-multi-hop.md). ### Dynamic Topologies @@ -230,7 +230,7 @@ reconfiguration or, in many cases, restarts of other containers. All that is required is for the migrated container to be started with the same IP address as it was given originally. -See [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md), in particular, Routing Services for more information on container mobility. +See [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md), in particular, Routing Services for more information on container mobility. ### Fault Tolerance diff --git a/site/tasks/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md index ba534aa1..9f624ff8 100644 --- a/site/tasks/ipam/allocation-multi-ipam.md +++ b/site/tasks/ipam/allocation-multi-ipam.md @@ -10,7 +10,7 @@ puts all containers into a subnet that spans the entire allocation range, so that every Weave-attached container can communicate with every other Weave-attached container. -If you want some [isolation](/site/using-weave/application-isolation.md), you +If you want some [isolation](/site/tasks/manage/application-isolation.md), you can choose to run containers on different subnets. To request the allocation of an address from a particular subnet, set the `WEAVE_CIDR` environment variable to `net:` when creating the @@ -64,5 +64,5 @@ for manual allocation. **See Also** * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) - * [Isolating Applications on a Weave Network](/site/using-weave/application-isolation.md) + * [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md) * [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) diff --git a/site/tasks/ipam/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md index 3edd1feb..2c9ecb71 100644 --- a/site/tasks/ipam/manual-ip-address.md +++ b/site/tasks/ipam/manual-ip-address.md @@ -52,7 +52,7 @@ Individual IP addresses given to containers must, of course, be unique. If you p **See Also** - * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) + * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) * [Allocating IPs in a Specific Range](/site/using-weave/configuring-weave.md) * [Automatic IP Address Management](/site/ipam.md) diff --git a/site/tasks/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md index 67f1113c..6932e34e 100644 --- a/site/tasks/ipam/stop-remove-peers-ipam.md +++ b/site/tasks/ipam/stop-remove-peers-ipam.md @@ -58,4 +58,4 @@ dropping attempted connections with peers in other cliques. * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) - * [Isolating Applications on a Weave Network](/site/using-weave/application-isolation.md) + * [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md) diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md index db1dd76b..eb589c3b 100644 --- a/site/tasks/manage/application-isolation.md +++ b/site/tasks/manage/application-isolation.md @@ -67,4 +67,4 @@ isolation between application containers, that feature needs to be disabled by [ **See Also** * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) - * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) + * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) diff --git a/site/tasks/manage/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md index 3892d031..10ee2092 100644 --- a/site/tasks/manage/finding-adding-hosts-dynamically.md +++ b/site/tasks/manage/finding-adding-hosts-dynamically.md @@ -68,5 +68,5 @@ with `weave launch` and `weave connect` run: **See Also** - * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/using-weave/multi-cloud-multi-hop.md) + * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md) * [Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index 81788dcb..713fa7b0 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -61,4 +61,4 @@ hosts. * [Using Weave Net](/site/using-weave.md) * [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) - * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) + * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) diff --git a/site/tasks/manage/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md index f05ecae2..de7cfb49 100644 --- a/site/tasks/manage/security-untrusted-networks.md +++ b/site/tasks/manage/security-untrusted-networks.md @@ -54,4 +54,4 @@ Be aware that: **See Also** * [Weave Encryption](/site/concepts/encryption.md) - * [Using Fast Datapath](/site/using-weave/fastdp.md) + * [Using Fast Datapath](/site/tasks/manage/fastdp.md) diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index 68504e5b..478a05d4 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -114,5 +114,5 @@ For example, you can move the netcat service to `$HOST4:2211` and it will retai **See Also** * [Adding and Removing Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) - * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/using-weave/multi-cloud-multi-hop.md) + * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md) diff --git a/site/tasks/weave-docker-api/launching-without-proxy.md b/site/tasks/weave-docker-api/launching-without-proxy.md index d6cdd9e4..6ecf26cb 100644 --- a/site/tasks/weave-docker-api/launching-without-proxy.md +++ b/site/tasks/weave-docker-api/launching-without-proxy.md @@ -14,7 +14,7 @@ limitations, we have removed `weave run`. If you have scripts using `weave run`, you can achieve exactly the same effect by combining `docker run` and `weave attach`; see [Dynamically Attaching and Detaching -Containers](/site/using-weave/dynamically-attach-containers.md) for +Containers](/site/tasks/manage/dynamically-attach-containers.md) for details. The `weave start` and `weave restart` commands have also been removed, diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md index 2dd2d6cd..1c825b45 100644 --- a/site/tasks/weave-docker-api/weave-docker-api.md +++ b/site/tasks/weave-docker-api/weave-docker-api.md @@ -33,7 +33,7 @@ See [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/pl **3.** Containers can also be attached to the Weave network with `weave attach` commands. This method also does not use the Weave Docker API Proxy. -See [Dynamically Attaching and Detaching Containers](/site/using-weave/dynamically-attach-containers.md). +See [Dynamically Attaching and Detaching Containers](/site/tasks/manage/dynamically-attach-containers.md). ### Setting Up The Weave Net Docker API Proxy From 098a3c59c73e524024c4eb5281e3a22b04d5ed8d Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:14:47 -0500 Subject: [PATCH 043/125] replaced more urls for /site/tasks/manage section --- site/faq.md | 2 +- site/install/installing-weave.md | 2 +- site/install/plugin/plugin.md | 2 +- site/install/systemd.md | 2 +- site/install/using-weave.md | 2 +- site/kubernetes.md | 2 +- site/operational-guide/concepts.md | 2 +- site/overview/features.md | 2 +- site/tasks/manage/dynamically-attach-containers.md | 2 +- site/tasks/manage/multi-cloud-multi-hop.md | 2 +- site/tasks/manage/service-management.md | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/site/faq.md b/site/faq.md index cd267553..be48e21e 100644 --- a/site/faq.md +++ b/site/faq.md @@ -92,7 +92,7 @@ Yes, of course! Weave allows you to run isolated networks and still allow open You must permit traffic to flow through TCP 6783 and UDP 6783/6784, which are Weave’s control and data ports. -The daemon also uses TCP port 6782 for [metrics](/site/metrics.md), but +The daemon also uses TCP port 6782 for [metrics](/site/tasks/manage/metrics.md), but you would only need to open up this port if you wish to collect metrics from another host. diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 8f22445f..172882ec 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -55,7 +55,7 @@ for the latest Weave AMIs and [here](https://www.weave.works/docs/tutorials/old- If you're on Amazon EC2, the standard installation instructions at the top of this page, provide the simplest setup and the most flexibility. -A [special no-overlay mode for EC2](/site/using-weave/awsvpc.md) can +A [special no-overlay mode for EC2](/site/tasks/manage/awsvpc.md) can optionally be enabled, which allows containers to communicate at the full speed of the underlying network. diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index f8633941..ab2b6510 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -14,7 +14,7 @@ Networking Plugin is fast and easy to use, and, unlike other networking plugins, does not require an external cluster store. To create a network which can span multiple Docker hosts, Weave Net peers must be connected to each other, by specifying the other hosts during `weave launch` or via -[`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md). +[`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). See [Using Weave Net](/site/using-weave.md#peer-connections) for a discussion on peer connections. diff --git a/site/install/systemd.md b/site/install/systemd.md index 16cc99ac..f6129613 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -32,7 +32,7 @@ create the `/etc/sysconfig/weave` environment file using the following format: PEERS="HOST1 HOST2 .. HOSTn" -You can also use the [`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md) command to add participating hosts dynamically. +You can also use the [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md) command to add participating hosts dynamically. Additionally, if you want to enable [encryption](/site/tasks/manage/security-untrusted-networks.md) specify a password using `WEAVE_PASSWORD="wfvAwt7sj"` in the `/etc/sysconfig/weave` environment file, and it will get picked up by diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 088bf8ae..60f798b2 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -81,7 +81,7 @@ For example: host2$ weave launch -Peers can also be dynamically added. See [Adding Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) for more information. +Peers can also be dynamically added. See [Adding Hosts Dynamically](/site/tasks/manage/finding-adding-hosts-dynamically.md) for more information. #### Restricting Access diff --git a/site/kubernetes.md b/site/kubernetes.md index d6751b7e..f06df09f 100644 --- a/site/kubernetes.md +++ b/site/kubernetes.md @@ -34,7 +34,7 @@ Then run: To create a network that spans multiple hosts, the Weave peers must be connected to each other. This is accomplished by specifying the other hosts during `weave launch` or via -[`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md). +[`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). See [Creating Peer Connections Between Hosts](/site/using-weave.md#peer-connections) for a discussion on peer connections. diff --git a/site/operational-guide/concepts.md b/site/operational-guide/concepts.md index 604db86d..8a77f1e1 100644 --- a/site/operational-guide/concepts.md +++ b/site/operational-guide/concepts.md @@ -72,7 +72,7 @@ detail below. Peer discovery is a mechanism that allows peers to learn about new Weave Net hosts from existing peers without being explicitly told. Peer discovery is -[enabled by default](/site/using-weave/finding-adding-hosts-dynamically.md). +[enabled by default](/site/tasks/manage/finding-adding-hosts-dynamically.md). ## Network Partition diff --git a/site/overview/features.md b/site/overview/features.md index 2b5540b1..51a7fcef 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -220,7 +220,7 @@ See [Enabling Multi-Cloud networking and Multi-hop Routing](/site/tasks/manage/m Hosts can be added to or removed from a Weave network without stopping or reconfiguring the remaining hosts. See [Adding and Removing Hosts -Dynamically.](/site/using-weave/finding-adding-hosts-dynamically.md) +Dynamically.](/site/tasks/manage/finding-adding-hosts-dynamically.md) ### Container Mobility diff --git a/site/tasks/manage/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md index 11384e92..5887b620 100644 --- a/site/tasks/manage/dynamically-attach-containers.md +++ b/site/tasks/manage/dynamically-attach-containers.md @@ -69,4 +69,4 @@ Finally, multiple addresses can be attached or detached using a single command: **See Also** - * [Adding and Removing Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) + * [Adding and Removing Hosts Dynamically](/site/tasks/manage/finding-adding-hosts-dynamically.md) diff --git a/site/tasks/manage/multi-cloud-multi-hop.md b/site/tasks/manage/multi-cloud-multi-hop.md index 405bfbd5..25c82844 100644 --- a/site/tasks/manage/multi-cloud-multi-hop.md +++ b/site/tasks/manage/multi-cloud-multi-hop.md @@ -39,6 +39,6 @@ traffic via the local data center. **See Also** - * [Finding and Adding Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) + * [Finding and Adding Hosts Dynamically](/site/tasks/manage/finding-adding-hosts-dynamically.md) diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index 478a05d4..b64f2dbe 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -113,6 +113,6 @@ For example, you can move the netcat service to `$HOST4:2211` and it will retai **See Also** - * [Adding and Removing Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) + * [Adding and Removing Hosts Dynamically](/site/tasks/manage/finding-adding-hosts-dynamically.md) * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md) From 16dbd5eea06f814600e74e58c2ac051c7e52932a Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:16:58 -0500 Subject: [PATCH 044/125] replaced URLs for host network int. --- site/faq.md | 2 +- site/overview/features.md | 2 +- site/tasks/manage/service-management.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/faq.md b/site/faq.md index be48e21e..f970431a 100644 --- a/site/faq.md +++ b/site/faq.md @@ -35,7 +35,7 @@ Yes you can. For example, you have a Weave network that runs on hosts A, B, C. and you have an additional host, that we'll call P, where neither Weave nor Docker are running. However, you need to connect from a process running on host P to a specific container running on host B on the Weave network. Since the Weave network is completely separate from any network that P is connected to, you cannot connect the container using the container's IP address. -A simple way to accomplish this would be to run Weave on the host and then run, `weave expose` to expose the network to any running containers. Or you set up a route from P to one of A, B or C. See [Integrating a Network Host](/site/using-weave/host-network-integration.md). +A simple way to accomplish this would be to run Weave on the host and then run, `weave expose` to expose the network to any running containers. Or you set up a route from P to one of A, B or C. See [Integrating a Network Host](/site/tasks/manage/host-network-integration.md). Yet another option is to expose a port from the container on host B and then connect to it. You can read about exposing ports in [Exporting Services](/site/tasks/manage/service-management.md#exporting). diff --git a/site/overview/features.md b/site/overview/features.md index 51a7fcef..f31f683d 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -184,7 +184,7 @@ For information on how to secure your Docker network connections, see [Securing Weave Net application networks can be integrated with a host's network, and establish connectivity between the host and application containers anywhere. -See [Integrating with the Host Network](/site/using-weave/host-network-integration.md). +See [Integrating with the Host Network](/site/tasks/manage/host-network-integration.md). ### Managing Services: Exporting, Importing, Binding and Routing diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index b64f2dbe..a3b2ecd0 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -24,7 +24,7 @@ located. Returning to the [netcat example service](/site/using-weave.md), you can expose the netcat service running on `HOST1` and make it accessible to the outside world via `$HOST2`. -First, expose the application network to `$HOST2`, as explained in [Integrating with the Host Network](/site/using-weave/host-network-integration.md): +First, expose the application network to `$HOST2`, as explained in [Integrating with the Host Network](/site/tasks/manage/host-network-integration.md): host2$ weave expose 10.2.1.132 @@ -53,7 +53,7 @@ Expanding on the [netcat service example](/site/using-weave.md), you now decide An additional caveat is that `$HOST3` can only be reached from `$HOST1`, which is not accessible via `$HOST2`. Nonetheless, you still need to make the `$HOST3` service available to an application that is running in a container on `$HOST2`. -To satisfy this scenario, first [expose the application network to the host](/site/using-weave/host-network-integration.md) by running the following on `$HOST1`: +To satisfy this scenario, first [expose the application network to the host](/site/tasks/manage/host-network-integration.md) by running the following on `$HOST1`: host1$ weave expose -h host1.weave.local 10.2.1.3 From 5492d046d17ac9065ba8ddb4e593074a64383d8b Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:18:56 -0500 Subject: [PATCH 045/125] replaced URL to weave cloud --- site/install/using-weave.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 60f798b2..40666175 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -135,7 +135,7 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex **See Also** * [Installing Weave Net](/site/install/installing-weave.md) - * [Using Weave Cloud to get started with Weave Net](/site/using-weave/weave-cloud.md) + * [Using Weave Cloud to get started with Weave Net](/site/install/weave-cloud.md) * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) From 38a84e95ad167987d7944cd074c3ea6c35b80c36 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:27:23 -0500 Subject: [PATCH 046/125] replaced URLs for ipam section --- site/concepts/ip-addresses.md | 4 ++-- site/faq.md | 8 ++++---- site/install/plugin/plugin-v2.md | 2 +- site/install/weave-cloud.md | 4 ++-- site/operational-guide/concepts.md | 2 +- site/operational-guide/tasks.md | 6 +++--- site/overview/features.md | 4 ++-- site/tasks/ipam/allocation-multi-ipam.md | 4 ++-- site/tasks/ipam/ipam.md | 2 +- site/tasks/ipam/manual-ip-address.md | 6 +++--- site/tasks/ipam/stop-remove-peers-ipam.md | 6 +++--- site/tasks/ipam/troubleshooting-ipam.md | 2 +- site/tasks/manage/application-isolation.md | 2 +- site/tasks/manage/finding-adding-hosts-dynamically.md | 2 +- site/tasks/manage/host-network-integration.md | 2 +- site/tasks/weave-docker-api/ipam-proxy.md | 6 +++--- site/tasks/weave-docker-api/using-proxy.md | 2 +- site/troubleshooting.md | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/site/concepts/ip-addresses.md b/site/concepts/ip-addresses.md index 66210e38..e510c1c6 100644 --- a/site/concepts/ip-addresses.md +++ b/site/concepts/ip-addresses.md @@ -8,7 +8,7 @@ search_type: Documentation Weave Net runs containers on a private network, which means that IP addresses are isolated from the rest of the Internet, and that you don't have to worry about addresses clashing. -You can of course also manually change the IP of any given container or subnet on a Weave network. See, [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) +You can of course also manually change the IP of any given container or subnet on a Weave network. See, [How to Manually Specify IP Addresses and Subnets](/site/tasks/ipam/manual-ip-address.md) ### Some Definitions @@ -64,4 +64,4 @@ find a match, so uses the default rule. **See Also** - * [Allocating IPs in a Specific Range](/site/using-weave/configuring-weave.md) + * [Allocating IPs in a Specific Range](/site/tasks/ipam/configuring-weave.md) diff --git a/site/faq.md b/site/faq.md index f970431a..1e0cd0fd 100644 --- a/site/faq.md +++ b/site/faq.md @@ -19,7 +19,7 @@ See [Troubleshooting Weave - List attached containers](/site/troubleshooting.md# You can manually change the IP of a container using [Classless Inter-Domain Routing or CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). -For more information, refer to [Manually Specifying the IP Address of a Container](/site/using-weave/manual-ip-address.md). +For more information, refer to [Manually Specifying the IP Address of a Container](/site/tasks/ipam/manual-ip-address.md). @@ -45,7 +45,7 @@ Yet another option is to expose a port from the container on host B and then con Under normal circumstances, this should never happen, but it can occur if `weave rmpeer` was run on more than one host. -For more information see [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md). +For more information see [Starting, Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md). @@ -53,7 +53,7 @@ For more information see [Starting, Stopping and Removing Peers](/site/ipam/stop When a node goes out of service, the best option is to call `weave rmpeer` on one host and then `weave forget` on all the other hosts. -See [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) for an in-depth discussion. +See [Starting, Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) for an in-depth discussion. @@ -116,6 +116,6 @@ Ubuntu image with those two commands added. **See Also** * [Troubleshooting Weave](/site/troubleshooting.md) - * [Troubleshooting IPAM](/site/ipam.md) + * [Troubleshooting IPAM](/site/tasks/ipam/ipam.md) * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md) diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md index 24592212..be5ecb4d 100644 --- a/site/install/plugin/plugin-v2.md +++ b/site/install/plugin/plugin-v2.md @@ -45,7 +45,7 @@ The parameters include: details. * `IPALLOC_RANGE` - the range of IP addresses used by Weave Net and the subnet they are placed in (CIDR format; default 10.32.0.0/12). - See [here](/site/using-weave/configuring-weave.md) for more details. + See [here](/site/tasks/ipam/configuring-weave.md) for more details. Before setting any parameter, the plugin has to be disabled with: diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index ad72f5fe..9d5260a2 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -110,12 +110,12 @@ error message in its log and exit. To check the logs run: host1$ docker logs weave When a Weave Net instance is formed for the first time, the peers must -initialize the [IP Allocation Manager](/site/ipam.md). This process, +initialize the [IP Allocation Manager](/site/tasks/ipam/ipam.md). This process, and the configuration options available, are unchanged when using Weave Cloud. When you shut down a peer for good, use [the `weave reset` -command](/site/ipam/stop-remove-peers-ipam.md) and it will be removed +command](/site/tasks/ipam/stop-remove-peers-ipam.md) and it will be removed from the Weave Cloud database so future peers will not attempt to connect to it. diff --git a/site/operational-guide/concepts.md b/site/operational-guide/concepts.md index 8a77f1e1..0ffda7b6 100644 --- a/site/operational-guide/concepts.md +++ b/site/operational-guide/concepts.md @@ -85,7 +85,7 @@ partition, healing automatically once the partition is over. ## IP Address Manager (IPAM) -[IPAM](/site/ipam.md) is the subsystem responsible for dividing up a +[IPAM](/site/tasks/ipam/ipam.md) is the subsystem responsible for dividing up a large contiguous block of IP addresses (known as the IP allocation range) amongst peers so that individual addresses may be uniquely assigned to containers anywhere on the overlay network. diff --git a/site/operational-guide/tasks.md b/site/operational-guide/tasks.md index 3cb14c87..703773f4 100644 --- a/site/operational-guide/tasks.md +++ b/site/operational-guide/tasks.md @@ -66,7 +66,7 @@ after which one of the remaining peers could decide unilaterally that it is safe to appropriate the space for itself, and so an administrative action is required to reclaim it. -The [`weave rmpeer`](/site/ipam/stop-remove-peers-ipam.md) +The [`weave rmpeer`](/site/tasks/ipam/stop-remove-peers-ipam.md) command is provided to perform this task, and must be executed on _one_ of the remaining peers. That peer will then take ownership of the freed address space. @@ -115,6 +115,6 @@ you can issue the following command: **See Also** - * [Allocating IP Addresses](/site/ipam.md) - * [Troubleshooting the IP Allocator](/site/ipam/troubleshooting-ipam.md) + * [Allocating IP Addresses](/site/tasks/ipam/ipam.md) + * [Troubleshooting the IP Allocator](/site/tasks/ipam/troubleshooting-ipam.md) diff --git a/site/overview/features.md b/site/overview/features.md index f31f683d..44eb9953 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -100,9 +100,9 @@ See [Integrating Kubernetes and Mesos via the CNI Plugin](/site/kubernetes.md) f Containers are automatically allocated a unique IP address. To view the addresses allocated by Weave, run `weave ps`. Instead of allowing Weave to automatically allocate addresses, an IP address and a network can be explicitly -specified. See [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) for instructions. +specified. See [How to Manually Specify IP Addresses and Subnets](/site/tasks/ipam/manual-ip-address.md) for instructions. -For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Management](/site/ipam.md). And also review the +For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Management](/site/tasks/ipam/ipam.md). And also review the [the basics of IP addressing](/site/concepts/ip-addresses.md) for an explanation of addressing and private networks. diff --git a/site/tasks/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md index 9f624ff8..908e74e4 100644 --- a/site/tasks/ipam/allocation-multi-ipam.md +++ b/site/tasks/ipam/allocation-multi-ipam.md @@ -63,6 +63,6 @@ for manual allocation. **See Also** - * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) + * [Address Allocation with IP Address Management (IPAM)](/site/tasks/ipam/ipam.md) * [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md) - * [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) + * [Starting, Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md index d5351ae5..97be9031 100644 --- a/site/tasks/ipam/ipam.md +++ b/site/tasks/ipam/ipam.md @@ -202,5 +202,5 @@ named `weavedb` is used to store this data. **See Also** - * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) + * [Automatic Allocation Across Multiple Subnets](/site/tasks/ipam/allocation-multi-ipam.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) diff --git a/site/tasks/ipam/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md index 2c9ecb71..78287e1b 100644 --- a/site/tasks/ipam/manual-ip-address.md +++ b/site/tasks/ipam/manual-ip-address.md @@ -11,7 +11,7 @@ Containers are automatically allocated an IP address that is unique across the W Weave Net detects when a container has exited and releases its allocated addresses so they can be re-used by the network. -See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/site/concepts/ip-addresses.md) for further details. +See the [Automatic IP Address Management](/site/tasks/ipam/ipam.md) and also an explanation of [the basics of IP addressing](/site/concepts/ip-addresses.md) for further details. Instead of allowing Weave Net to allocate IP addresses automatically (using IPAM), there may be instances where you need to control a particular container or a cluster by setting an IP address for it. @@ -53,6 +53,6 @@ Individual IP addresses given to containers must, of course, be unique. If you p **See Also** * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) - * [Allocating IPs in a Specific Range](/site/using-weave/configuring-weave.md) - * [Automatic IP Address Management](/site/ipam.md) + * [Allocating IPs in a Specific Range](/site/tasks/ipam/configuring-weave.md) + * [Automatic IP Address Management](/site/tasks/ipam/ipam.md) diff --git a/site/tasks/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md index 6932e34e..c70f033a 100644 --- a/site/tasks/ipam/stop-remove-peers-ipam.md +++ b/site/tasks/ipam/stop-remove-peers-ipam.md @@ -24,7 +24,7 @@ later rejoin the Weave network, the same IP address may be allocated twice. Assume you had started the three peers in the -[overview example](/site/ipam.md), and then host3 +[overview example](/site/tasks/ipam/ipam.md), and then host3 caught fire, you can go to one of the other hosts and run: host1$ weave rmpeer host3 @@ -56,6 +56,6 @@ dropping attempted connections with peers in other cliques. **See Also** - * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) - * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) + * [Address Allocation with IP Address Management (IPAM)](/site/tasks/ipam/ipam.md) + * [Automatic Allocation Across Multiple Subnets](/site/tasks/ipam/allocation-multi-ipam.md) * [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md) diff --git a/site/tasks/ipam/troubleshooting-ipam.md b/site/tasks/ipam/troubleshooting-ipam.md index e0ac44ee..34f46277 100644 --- a/site/tasks/ipam/troubleshooting-ipam.md +++ b/site/tasks/ipam/troubleshooting-ipam.md @@ -64,4 +64,4 @@ Columns are as follows: ipam` was run; whilst this could be a transient condition due to a partition, it may be because the peer has failed and needs to be removed administratively - see [Starting, Stopping and Removing - Peers](/site/ipam/stop-remove-peers-ipam.md) for more details. + Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) for more details. diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md index eb589c3b..d479c340 100644 --- a/site/tasks/manage/application-isolation.md +++ b/site/tasks/manage/application-isolation.md @@ -66,5 +66,5 @@ isolation between application containers, that feature needs to be disabled by [ **See Also** - * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) + * [Automatic Allocation Across Multiple Subnets](/site/tasks/ipam/allocation-multi-ipam.md) * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) diff --git a/site/tasks/manage/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md index 10ee2092..12dc350a 100644 --- a/site/tasks/manage/finding-adding-hosts-dynamically.md +++ b/site/tasks/manage/finding-adding-hosts-dynamically.md @@ -69,4 +69,4 @@ with `weave launch` and `weave connect` run: **See Also** * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md) - * [Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) + * [Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index 713fa7b0..ea9afbeb 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -53,7 +53,7 @@ for example, `10.2.0.0/16` or `10.32.0.0/12` and, * `` is the address of the machine on which you ran `weave expose`. >**Note:** You must ensure that the [IP subnet used by Weave -Net](/site/ipam.md#range) does not clash with anything on those other +Net](/site/tasks/ipam/ipam.md#range) does not clash with anything on those other hosts. diff --git a/site/tasks/weave-docker-api/ipam-proxy.md b/site/tasks/weave-docker-api/ipam-proxy.md index 231ca9e8..8b81bdae 100644 --- a/site/tasks/weave-docker-api/ipam-proxy.md +++ b/site/tasks/weave-docker-api/ipam-proxy.md @@ -5,7 +5,7 @@ search_type: Documentation --- -If [automatic IP address allocation](/site/ipam.md) is enabled in Weave Net (by default IPAM is enabled), +If [automatic IP address allocation](/site/tasks/ipam/ipam.md) is enabled in Weave Net (by default IPAM is enabled), then containers started via the proxy are automatically assigned an IP address, *without having to specify any special environment variables or any other options*. @@ -38,5 +38,5 @@ container with a blank `WEAVE_CIDR`, for example: **See Also** - * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) - * [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) + * [Address Allocation with IP Address Management (IPAM)](/site/tasks/ipam/ipam.md) + * [How to Manually Specify IP Addresses and Subnets](/site/tasks/ipam/manual-ip-address.md) diff --git a/site/tasks/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md index aa46b0b5..913271fc 100644 --- a/site/tasks/weave-docker-api/using-proxy.md +++ b/site/tasks/weave-docker-api/using-proxy.md @@ -10,7 +10,7 @@ modified to wait for the Weave network interface to become available. When they are started via the Weave Net proxy, containers are -[automatically assigned IP addresses](/site/ipam.md) and connected to the +[automatically assigned IP addresses](/site/tasks/ipam/ipam.md) and connected to the Weave network. ### Creating and Starting Containers with the Weave Net Proxy diff --git a/site/troubleshooting.md b/site/troubleshooting.md index 9e31a2a0..80846668 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -99,7 +99,7 @@ launch`. between peers. * **PeerDiscovery** - indicates whether -[automatic peer discovery](/site/ipam/allocation-multi-ipam.md) is +[automatic peer discovery](/site/tasks/ipam/allocation-multi-ipam.md) is enabled (which is the default). * **Targets** - are the number of hosts that the local Weave Router has been @@ -307,5 +307,5 @@ and the container image versions as git hashes. **See Also** - * [Troubleshooting IPAM](/site/ipam/troubleshooting-ipam.md) + * [Troubleshooting IPAM](/site/tasks/ipam/troubleshooting-ipam.md) * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md) From 1e709928358fef3398421d45d7854e189bd9d1b6 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:32:15 -0500 Subject: [PATCH 047/125] replaced URLs for weavedns section --- site/install/plugin/plugin.md | 2 +- site/overview/features.md | 6 +++--- site/tasks/weave-docker-api/automatic-discovery-proxy.md | 6 +++--- site/tasks/weave-docker-api/using-proxy.md | 2 +- site/tasks/weavedns/how-works-weavedns.md | 6 +++--- site/tasks/weavedns/load-balance-fault-weavedns.md | 8 ++++---- site/tasks/weavedns/managing-domains-weavedns.md | 4 ++-- site/tasks/weavedns/managing-entries-weavedns.md | 6 +++--- site/tasks/weavedns/weavedns.md | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index ab2b6510..a090352a 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -25,7 +25,7 @@ After you've launched Weave Net and peered your hosts, you can start containers on any of the hosts, and they can all communicate with each other using any protocol, even multicast. -In order to use Weave Net's [Service Discovery](/site/weavedns.md) you +In order to use Weave Net's [Service Discovery](/site/tasks/weavedns/weavedns.md) you must pass the additional arguments `--dns` and `-dns-search`, for which a helper is provided in the Weave script: diff --git a/site/overview/features.md b/site/overview/features.md index 44eb9953..02dba740 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -108,16 +108,16 @@ For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Managemen ### Naming and Discovery -Named containers are automatically registered in [weaveDNS](/site/weavedns.md), +Named containers are automatically registered in [weaveDNS](/site/tasks/weavedns/weavedns.md), and are discoverable by using standard, simple name lookups: host1$ docker run -dti --name=service weaveworks/ubuntu host1$ docker run -ti weaveworks/ubuntu root@7b21498fb103:/# ping service -WeaveDNS also supports [load balancing](/site/weavedns/load-balance-fault-weavedns.md), [fault resilience](/site/weavedns/load-balance-fault-weavedns.md) and [hot swapping](/site/weavedns/managing-entries-weavedns.md). +WeaveDNS also supports [load balancing](/site/tasks/weavedns/load-balance-fault-weavedns.md), [fault resilience](/site/tasks/weavedns/load-balance-fault-weavedns.md) and [hot swapping](/site/tasks/weavedns/managing-entries-weavedns.md). -See [Discovering Containers with WeaveDNS](/site/weavedns.md). +See [Discovering Containers with WeaveDNS](/site/tasks/weavedns/weavedns.md). ### Application Isolation diff --git a/site/tasks/weave-docker-api/automatic-discovery-proxy.md b/site/tasks/weave-docker-api/automatic-discovery-proxy.md index 7b333ef7..c0b94603 100644 --- a/site/tasks/weave-docker-api/automatic-discovery-proxy.md +++ b/site/tasks/weave-docker-api/automatic-discovery-proxy.md @@ -4,9 +4,9 @@ menu_order: 40 search_type: Documentation --- -Containers launched via the proxy use [weaveDNS](/site/weavedns.md) +Containers launched via the proxy use [weaveDNS](/site/tasks/weavedns/weavedns.md) automatically if it is running when they are started - -see the [weaveDNS usage](/site/weavedns.md#usage) section for an in depth +see the [weaveDNS usage](/site/tasks/weavedns/weavedns.md#usage) section for an in depth explanation of the behaviour and how to control it. Typically, the proxy passes on container names as-is to weaveDNS @@ -57,4 +57,4 @@ to the proxy, the specified label takes precedence over the container's name. **See Also** * [Name resolution via `/etc/hosts`](/site/weave-docker-api/name-resolution-proxy.md) - * [How Weave Finds Containers](/site/weavedns/how-works-weavedns.md) + * [How Weave Finds Containers](/site/tasks/weavedns/how-works-weavedns.md) diff --git a/site/tasks/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md index 913271fc..c6074483 100644 --- a/site/tasks/weave-docker-api/using-proxy.md +++ b/site/tasks/weave-docker-api/using-proxy.md @@ -55,7 +55,7 @@ route, add the `--no-multicast-route` flag to `weave launch`. ### Other Weave Proxy options - * `--without-dns` -- stop telling containers to use [WeaveDNS](/site/weavedns.md) + * `--without-dns` -- stop telling containers to use [WeaveDNS](/site/tasks/weavedns/weavedns.md) * `--log-level=debug|info|warning|error` -- controls how much information to emit for debugging * `--no-restart` -- remove the default policy of `--restart=always`, if diff --git a/site/tasks/weavedns/how-works-weavedns.md b/site/tasks/weavedns/how-works-weavedns.md index 0f6a5882..a7bae14f 100644 --- a/site/tasks/weavedns/how-works-weavedns.md +++ b/site/tasks/weavedns/how-works-weavedns.md @@ -43,6 +43,6 @@ $ sudo DOCKER_BRIDGE=someother weave attach ... **See Also** - * [Using WeaveDNS](/site/weavedns.md) - * [Load Balancing with weaveDNS](/site/weavedns/load-balance-fault-weavedns.md) - * [Managing Domain Entries](/site/weavedns/managing-domains-weavedns.md) + * [Using WeaveDNS](/site/tasks/weavedns/weavedns.md) + * [Load Balancing with weaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) + * [Managing Domain Entries](/site/tasks/weavedns/managing-domains-weavedns.md) diff --git a/site/tasks/weavedns/load-balance-fault-weavedns.md b/site/tasks/weavedns/load-balance-fault-weavedns.md index d55c416a..3421f8bd 100644 --- a/site/tasks/weavedns/load-balance-fault-weavedns.md +++ b/site/tasks/weavedns/load-balance-fault-weavedns.md @@ -10,7 +10,7 @@ It is permissible to register multiple containers with the same name: weaveDNS returns all addresses, in a random order, for each request. This provides a basic load balancing capability. -Expanding the [overview example](/site/weavedns.md), let us start an additional `pingme` container on a second host, and then run +Expanding the [overview example](/site/tasks/weavedns/weavedns.md), let us start an additional `pingme` container on a second host, and then run some ping tests. ``` @@ -49,11 +49,11 @@ WeaveDNS removes the addresses of any container that dies. This offers a simple way to implement redundancy. E.g. if in our example we stop one of the `pingme` containers and re-run the ping tests, eventually (within ~30s at most, since that is the weaveDNS -[cache expiry time](/site/weavedns/managing-entries-weavedns.md#ttl)) we will only be hitting the address of the +[cache expiry time](/site/tasks/weavedns/managing-entries-weavedns.md#ttl)) we will only be hitting the address of the container that is still alive. **See Also** * [How Weave Finds Containers](/site/how-works-weavedns.md) - * [Managing Domains](/site/weavedns/managing-domains-weavedns.md) - * [Managing Domain Entries](/site/weavedns/managing-entries-weavedns.md) + * [Managing Domains](/site/tasks/weavedns/managing-domains-weavedns.md) + * [Managing Domain Entries](/site/tasks/weavedns/managing-entries-weavedns.md) diff --git a/site/tasks/weavedns/managing-domains-weavedns.md b/site/tasks/weavedns/managing-domains-weavedns.md index 49a12b57..cc640db5 100644 --- a/site/tasks/weavedns/managing-domains-weavedns.md +++ b/site/tasks/weavedns/managing-domains-weavedns.md @@ -46,5 +46,5 @@ link-local as per [RFC6762](https://tools.ietf.org/html/rfc6762), * [How Weave Finds Containers](/site/how-works-weavedns.md) - * [Load Balancing and Fault Resilience with WeaveDNS](/site/weavedns/load-balance-fault-weavedns.md) - * [Managing Domain Entries](/site/weavedns/managing-entries-weavedns.md) + * [Load Balancing and Fault Resilience with WeaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) + * [Managing Domain Entries](/site/tasks/weavedns/managing-entries-weavedns.md) diff --git a/site/tasks/weavedns/managing-entries-weavedns.md b/site/tasks/weavedns/managing-entries-weavedns.md index 7600c573..75bfa6e1 100644 --- a/site/tasks/weavedns/managing-entries-weavedns.md +++ b/site/tasks/weavedns/managing-entries-weavedns.md @@ -78,6 +78,6 @@ weaveDNS instance will receive. **See Also** - * [How Weave Finds Containers](/site/weavedns/how-works-weavedns.md) - * [Load Balancing and Fault Resilience with WeaveDNS](/site/weavedns/load-balance-fault-weavedns.md) - * [Managing Domains](/site/weavedns/managing-domains-weavedns.md) + * [How Weave Finds Containers](/site/tasks/weavedns/how-works-weavedns.md) + * [Load Balancing and Fault Resilience with WeaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) + * [Managing Domains](/site/tasks/weavedns/managing-domains-weavedns.md) diff --git a/site/tasks/weavedns/weavedns.md b/site/tasks/weavedns/weavedns.md index c0f3b4cc..8231b97b 100644 --- a/site/tasks/weavedns/weavedns.md +++ b/site/tasks/weavedns/weavedns.md @@ -46,4 +46,4 @@ disable weaveDNS itself, launch weave with the `--no-dns` option. **See Also** * [Integrating Docker via the API Proxy](/site/weave-docker-api.md) - * [Load Balancing and Fault Resilience with WeaveDNS](/site/weavedns/load-balance-fault-weavedns.md) + * [Load Balancing and Fault Resilience with WeaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) From 6aba9411a68463883ff25c257c7f75851bcefe26 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:41:04 -0500 Subject: [PATCH 048/125] replaced URLs for weave proxy section --- site/faq.md | 2 +- site/install/installing-weave.md | 2 +- site/overview/features.md | 4 ++-- site/tasks/manage/dynamically-attach-containers.md | 2 +- site/tasks/weave-docker-api/automatic-discovery-proxy.md | 2 +- site/tasks/weave-docker-api/name-resolution-proxy.md | 2 +- site/tasks/weave-docker-api/securing-proxy.md | 2 +- site/tasks/weave-docker-api/using-proxy.md | 4 ++-- site/tasks/weave-docker-api/weave-docker-api.md | 6 +++--- site/tasks/weavedns/managing-domains-weavedns.md | 2 +- site/tasks/weavedns/weavedns.md | 2 +- site/troubleshooting.md | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/site/faq.md b/site/faq.md index 1e0cd0fd..7afc207c 100644 --- a/site/faq.md +++ b/site/faq.md @@ -117,5 +117,5 @@ Ubuntu image with those two commands added. * [Troubleshooting Weave](/site/troubleshooting.md) * [Troubleshooting IPAM](/site/tasks/ipam/ipam.md) - * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md) + * [Troubleshooting the Proxy](/site/tasks/weave-docker-api/using-proxy.md) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 172882ec..3e6759a7 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -17,7 +17,7 @@ If you are on OSX and you are using Docker Machine ensure that a VM is running a before downloading Weave Net. To set up a VM see [the Docker Machine documentation](https://docs.docker.com/installation/mac/#from-your-shell) or refer to ["Part 1: Launching Weave Net with Docker Machine"](/guides/part-1-launching-weave-net-with-docker-machine/). -After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/weave-docker-api/using-proxy.md). +After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md). With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Using Weave Net](/site/using-weave.md). diff --git a/site/overview/features.md b/site/overview/features.md index 02dba740..3ce1418f 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -58,7 +58,7 @@ See [Using Fast Datapath](/site/tasks/manage/fastdp.md) and ### Seamless Docker Integration (Weave Docker API Proxy) -Weave Net includes a [Docker API Proxy](/site/weave-docker-api.md), which can be +Weave Net includes a [Docker API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md), which can be used to start containers using the Docker [command-line interface](https://docs.docker.com/reference/commandline/cli/) or the [remote API](https://docs.docker.com/reference/api/docker_remote_api/), and attach them to the Weave network before they begin execution. To use the proxy, run: @@ -71,7 +71,7 @@ Containers started in this way that subsequently restart, either by an explicit `docker restart` command or by Docker restart policy, are re-attached to the Weave network by the `Weave Docker API Proxy`. -See [Integrating Docker via the API Proxy](/site/weave-docker-api.md). +See [Integrating Docker via the API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md). ### Weave Network Docker Plugin diff --git a/site/tasks/manage/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md index 5887b620..d64c18c4 100644 --- a/site/tasks/manage/dynamically-attach-containers.md +++ b/site/tasks/manage/dynamically-attach-containers.md @@ -32,7 +32,7 @@ with the `--without-dns` argument). 10.32.0.1 If you would like `/etc/hosts` to contain the Weave Net address (the -same way [the proxy does](/site/weave-docker-api/name-resolution-proxy.md)), +same way [the proxy does](/site/tasks/weave-docker-api/name-resolution-proxy.md)), specify `--rewrite-hosts` when running `weave attach`: host1$ weave attach --rewrite-hosts c1 diff --git a/site/tasks/weave-docker-api/automatic-discovery-proxy.md b/site/tasks/weave-docker-api/automatic-discovery-proxy.md index c0b94603..127cc622 100644 --- a/site/tasks/weave-docker-api/automatic-discovery-proxy.md +++ b/site/tasks/weave-docker-api/automatic-discovery-proxy.md @@ -56,5 +56,5 @@ to the proxy, the specified label takes precedence over the container's name. **See Also** - * [Name resolution via `/etc/hosts`](/site/weave-docker-api/name-resolution-proxy.md) + * [Name resolution via `/etc/hosts`](/site/tasks/weave-docker-api/name-resolution-proxy.md) * [How Weave Finds Containers](/site/tasks/weavedns/how-works-weavedns.md) diff --git a/site/tasks/weave-docker-api/name-resolution-proxy.md b/site/tasks/weave-docker-api/name-resolution-proxy.md index c0d42267..3a2e0a74 100644 --- a/site/tasks/weave-docker-api/name-resolution-proxy.md +++ b/site/tasks/weave-docker-api/name-resolution-proxy.md @@ -31,5 +31,5 @@ Docker-managed networks), the proxy must be launched using the **See Also** - * [Using Automatic Discovery With the Weave Proxy](/site/weave-docker-api/automatic-discovery-proxy.md) + * [Using Automatic Discovery With the Weave Proxy](/site/tasks/weave-docker-api/automatic-discovery-proxy.md) diff --git a/site/tasks/weave-docker-api/securing-proxy.md b/site/tasks/weave-docker-api/securing-proxy.md index feb9f26f..4431a691 100644 --- a/site/tasks/weave-docker-api/securing-proxy.md +++ b/site/tasks/weave-docker-api/securing-proxy.md @@ -56,4 +56,4 @@ proxy port. **See Also** - * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md) + * [Setting Up The Weave Docker API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) diff --git a/site/tasks/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md index c6074483..00f49596 100644 --- a/site/tasks/weave-docker-api/using-proxy.md +++ b/site/tasks/weave-docker-api/using-proxy.md @@ -70,5 +70,5 @@ If for some reason you need to disable the proxy, but still want to start other **See Also** - * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md) - * [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md) + * [Setting Up The Weave Docker API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) + * [Securing Docker Communications With TLS](/site/tasks/weave-docker-api/securing-proxy.md) diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md index 1c825b45..c44613b6 100644 --- a/site/tasks/weave-docker-api/weave-docker-api.md +++ b/site/tasks/weave-docker-api/weave-docker-api.md @@ -89,8 +89,8 @@ to the original settings prior to running `stop`. **See Also** - * [Using The Weave Docker API Proxy](/site/weave-docker-api/using-proxy.md) - * [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md) - * [Launching Containers With Weave Run (without the Proxy)](/site/weave-docker-api/launching-without-proxy.md) + * [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md) + * [Securing Docker Communications With TLS](/site/tasks/weave-docker-api/securing-proxy.md) + * [Launching Containers With Weave Run (without the Proxy)](/site/tasks/weave-docker-api/launching-without-proxy.md) diff --git a/site/tasks/weavedns/managing-domains-weavedns.md b/site/tasks/weavedns/managing-domains-weavedns.md index cc640db5..083c9cbc 100644 --- a/site/tasks/weavedns/managing-domains-weavedns.md +++ b/site/tasks/weavedns/managing-domains-weavedns.md @@ -12,7 +12,7 @@ The following topics are discussed: ## Configuring the domain search paths If you don't supply a domain search path (with `--dns-search=`), Weave -Net (via the [proxy](/site/weave-docker-api.md) or via `weave attach`) +Net (via the [proxy](/site/tasks/weave-docker-api/weave-docker-api.md) or via `weave attach`) tells a container to look for "bare" hostnames, like `pingme`, in its own domain (or in `weave.local` if it has no domain). diff --git a/site/tasks/weavedns/weavedns.md b/site/tasks/weavedns/weavedns.md index 8231b97b..c66da58f 100644 --- a/site/tasks/weavedns/weavedns.md +++ b/site/tasks/weavedns/weavedns.md @@ -45,5 +45,5 @@ disable weaveDNS itself, launch weave with the `--no-dns` option. **See Also** - * [Integrating Docker via the API Proxy](/site/weave-docker-api.md) + * [Integrating Docker via the API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) * [Load Balancing and Fault Resilience with WeaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) diff --git a/site/troubleshooting.md b/site/troubleshooting.md index 80846668..03661925 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -286,7 +286,7 @@ on reboot. This can be disabled via: Note that the Weave Net router will create the `weave` network bridge if necessary when it restarts, and the [Weave Net Docker API -Proxy](/site/weave-docker-api.md) will re-attach any application +Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) will re-attach any application containers that it originally attached to the Weave network when they restart. @@ -308,4 +308,4 @@ and the container image versions as git hashes. **See Also** * [Troubleshooting IPAM](/site/tasks/ipam/troubleshooting-ipam.md) - * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md) + * [Troubleshooting the Proxy](/site/tasks/weave-docker-api/using-proxy.md) From 43c608e25c168701680ad98fa71a60363f62bf2a Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:43:55 -0500 Subject: [PATCH 049/125] misc link replaced topology still going to router-topology --- site/concepts/how-it-works.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/how-it-works.md b/site/concepts/how-it-works.md index d5412ec9..165aa8b2 100644 --- a/site/concepts/how-it-works.md +++ b/site/concepts/how-it-works.md @@ -13,7 +13,7 @@ the router is concerned, although the name defaults to a MAC address. Weave Net routers establish TCP connections with each other, over which they perform a protocol handshake and subsequently exchange -[topology](/site/router-topology/network-topology.md) information. +[topology](/site/concepts/network-topology.md) information. These connections are encrypted if so configured. Peers also establish UDP "connections", possibly encrypted, which carry encapsulated network packets. These From 1b7efab40a60f988b9970326b1695d2663004fd5 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:55:10 -0500 Subject: [PATCH 050/125] replaced URLs systemd and installing-weave --- site/concepts/fastdp-how-it-works.md | 2 +- site/install/installing-weave.md | 6 +++--- site/install/plugin/plugin.md | 2 +- site/install/systemd.md | 2 +- site/install/weave-cloud.md | 2 +- site/kubernetes.md | 2 +- site/operational-guide/autoscaling.md | 2 +- site/operational-guide/tasks.md | 2 +- site/operational-guide/uniform-dynamic-cluster.md | 4 ++-- site/operational-guide/uniform-fixed-cluster.md | 4 ++-- site/overview/features.md | 4 ++-- site/tasks/manage/application-isolation.md | 2 +- site/tasks/manage/awsvpc.md | 2 +- site/tasks/manage/fastdp.md | 2 +- site/tasks/manage/host-network-integration.md | 4 ++-- site/tasks/manage/service-management.md | 6 +++--- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md index 13a092e9..fbc855c8 100644 --- a/site/concepts/fastdp-how-it-works.md +++ b/site/concepts/fastdp-how-it-works.md @@ -25,7 +25,7 @@ Prior to version 1.2, Weave Net used a custom encapsulation format. Fast datapat **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [Using Fast Datapath](/site/tasks/manage/fastdp.md) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 3e6759a7..9420b708 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -19,7 +19,7 @@ documentation](https://docs.docker.com/installation/mac/#from-your-shell) or ref After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md). -With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Using Weave Net](/site/using-weave.md). +With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Using Weave Net](/site/install/using-weave.md). ### Quick Start Screencast @@ -64,10 +64,10 @@ To make encryption in fast datapath work on Google Cloud Platform, see **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [Getting Started Guides](http://www.weave.works/guides/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) * [Building](/site/building.md) - * [Using Weave with Systemd](/site/installing-weave/systemd.md) + * [Using Weave with Systemd](/site/install/systemd.md) diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index a090352a..aedaa989 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -16,7 +16,7 @@ networking plugins, does not require an external cluster store. To create a network which can span multiple Docker hosts, Weave Net peers must be connected to each other, by specifying the other hosts during `weave launch` or via [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). -See [Using Weave Net](/site/using-weave.md#peer-connections) for a discussion on peer connections. +See [Using Weave Net](/site/install/using-weave.md#peer-connections) for a discussion on peer connections. After you've launched Weave Net and peered your hosts, you can start containers using the following, for example: diff --git a/site/install/systemd.md b/site/install/systemd.md index f6129613..357cdde9 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -64,7 +64,7 @@ context with the commands shown below. You will need to have the **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [Getting Started Guides](http://www.weave.works/guides/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 9d5260a2..0a1d4ecf 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -122,7 +122,7 @@ connect to it. **See Also** * [Installing Weave Net](/site/install/installing-weave.md) - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/kubernetes.md b/site/kubernetes.md index f06df09f..0c8b13f8 100644 --- a/site/kubernetes.md +++ b/site/kubernetes.md @@ -36,7 +36,7 @@ To create a network that spans multiple hosts, the Weave peers must be connected This is accomplished by specifying the other hosts during `weave launch` or via [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). -See [Creating Peer Connections Between Hosts](/site/using-weave.md#peer-connections) +See [Creating Peer Connections Between Hosts](/site/install/using-weave.md#peer-connections) for a discussion on peer connections. weave launch diff --git a/site/operational-guide/autoscaling.md b/site/operational-guide/autoscaling.md index 41ccf719..79a0db40 100644 --- a/site/operational-guide/autoscaling.md +++ b/site/operational-guide/autoscaling.md @@ -25,7 +25,7 @@ and partitions. ### Scaling Out On the additional dynamic peer, at boot, via -[systemd](/site/installing-weave/systemd.md) or equivalent: +[systemd](/site/install/systemd.md) or equivalent: weave launch --no-restart --ipalloc-init=observer $PEERS diff --git a/site/operational-guide/tasks.md b/site/operational-guide/tasks.md index 703773f4..3c703b97 100644 --- a/site/operational-guide/tasks.md +++ b/site/operational-guide/tasks.md @@ -21,7 +21,7 @@ once and your system is configured to start Docker on boot, then Weave Net will start automatically on system restarts. If you are aiming for a non-interactive installation, use -[systemd](/site/installing-weave/systemd.md) or a similar init system to +[systemd](/site/install/systemd.md) or a similar init system to launch Weave using the `--no-restart` flag after Docker has been started. ## Detecting and Reclaiming Lost IP Address Space diff --git a/site/operational-guide/uniform-dynamic-cluster.md b/site/operational-guide/uniform-dynamic-cluster.md index fe067618..c33456d7 100644 --- a/site/operational-guide/uniform-dynamic-cluster.md +++ b/site/operational-guide/uniform-dynamic-cluster.md @@ -18,7 +18,7 @@ A uniform dynamic cluster has the following characteristics: ## Bootstrapping On each initial peer N, at boot, via -[systemd](/site/installing-weave/systemd.md): +[systemd](/site/install/systemd.md): hostN$ weave launch --no-restart --name ::N --ipalloc-init seed=$SEED $PEERS @@ -45,7 +45,7 @@ Where ## Adding a Peer On each new peer, at boot, via -[systemd](/site/installing-weave/systemd.md): +[systemd](/site/install/systemd.md): hostN$ weave launch --no-restart --name ::N --ipalloc-init seed=$SEED $PEERS diff --git a/site/operational-guide/uniform-fixed-cluster.md b/site/operational-guide/uniform-fixed-cluster.md index 0913fbc7..fa9c56d4 100644 --- a/site/operational-guide/uniform-fixed-cluster.md +++ b/site/operational-guide/uniform-fixed-cluster.md @@ -24,7 +24,7 @@ A uniform fixed cluster has the following characteristics: ### Bootstrapping On each initial peer, at boot, via -[systemd](/site/installing-weave/systemd.md): +[systemd](/site/install/systemd.md): weave launch --no-restart $PEERS @@ -56,7 +56,7 @@ that](/site/troubleshooting.md) before moving on. ### Adding a Peer On the new peer, at boot, via -[systemd](/site/installing-weave/systemd.md) run: +[systemd](/site/install/systemd.md) run: weave launch --no-restart $PEERS diff --git a/site/overview/features.md b/site/overview/features.md index 3ce1418f..259cad3b 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -26,7 +26,7 @@ search_type: Documentation * [Container Mobility](#container-mobility) * [Fault Tolerance](#fault-tolerance) -For step-by-step instructions on how to use Weave Net, see [Using Weave Net](/site/using-weave.md). +For step-by-step instructions on how to use Weave Net, see [Using Weave Net](/site/install/using-weave.md). ### Virtual Ethernet Switch @@ -45,7 +45,7 @@ Broadcast and Multicast protocols can also be used over Weave Net. To start using Weave Net, see [Installing Weave Net](/site/install/installing-weave.md) -and [Using Weave Net](/site/using-weave.md). +and [Using Weave Net](/site/install/using-weave.md). ### Fast Datapath diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md index d479c340..956dc0d6 100644 --- a/site/tasks/manage/application-isolation.md +++ b/site/tasks/manage/application-isolation.md @@ -14,7 +14,7 @@ techniques can still be used to deploy applications to a container network. To begin isolating an application (or parts of an application), configure Weave Net's IP allocator to manage multiple subnets. -Using [the netcat example](/site/using-weave.md), configure multiple subsets: +Using [the netcat example](/site/install/using-weave.md), configure multiple subsets: host1$ weave launch --ipalloc-range 10.2.0.0/16 --ipalloc-default-subnet 10.2.1.0/24 host1$ eval $(weave env) diff --git a/site/tasks/manage/awsvpc.md b/site/tasks/manage/awsvpc.md index a755034d..7857631c 100644 --- a/site/tasks/manage/awsvpc.md +++ b/site/tasks/manage/awsvpc.md @@ -101,5 +101,5 @@ In AWS-VPC mode you can run the following: **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) diff --git a/site/tasks/manage/fastdp.md b/site/tasks/manage/fastdp.md index 02b17fc3..64a6f034 100644 --- a/site/tasks/manage/fastdp.md +++ b/site/tasks/manage/fastdp.md @@ -71,6 +71,6 @@ frame" configuration: **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [How Fastdp Works](/site/concepts/fastdp-how-it-works.md) * [Performance measurements](/blog/weave-docker-networking-performance-fast-data-path/) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index ea9afbeb..b4f96b57 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -6,7 +6,7 @@ search_type: Documentation Weave application networks can be integrated with an external host network, establishing connectivity between the host and with application containers running anywhere. -For example, returning to the [netcat example](/site/using-weave.md), you’ve now decided that you need to have the application containers that are running on `$HOST2` accessible by other hosts and containers. +For example, returning to the [netcat example](/site/install/using-weave.md), you’ve now decided that you need to have the application containers that are running on `$HOST2` accessible by other hosts and containers. On `$HOST2` run: @@ -59,6 +59,6 @@ hosts. **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index a3b2ecd0..4114bbbb 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -21,7 +21,7 @@ accessible to the outside world (and, more generally, to other networks) from any Weave Net host, irrespective of where the service containers are located. -Returning to the [netcat example service](/site/using-weave.md), +Returning to the [netcat example service](/site/install/using-weave.md), you can expose the netcat service running on `HOST1` and make it accessible to the outside world via `$HOST2`. First, expose the application network to `$HOST2`, as explained in [Integrating with the Host Network](/site/tasks/manage/host-network-integration.md): @@ -49,7 +49,7 @@ Similar NAT rules to the above can be used to expose services not just to the ou Applications running in containers on a Weave network can be given access to services, which are only reachable from certain Weave hosts, regardless of where the actual application containers are located. -Expanding on the [netcat service example](/site/using-weave.md), you now decide to add a third, non-containerized, netcat service. This additional netcat service runs on `$HOST3`, and listens on port 2211, but it is not on the Weave network. +Expanding on the [netcat service example](/site/install/using-weave.md), you now decide to add a third, non-containerized, netcat service. This additional netcat service runs on `$HOST3`, and listens on port 2211, but it is not on the Weave network. An additional caveat is that `$HOST3` can only be reached from `$HOST1`, which is not accessible via `$HOST2`. Nonetheless, you still need to make the `$HOST3` service available to an application that is running in a container on `$HOST2`. @@ -88,7 +88,7 @@ You can combine the service export and service import features to establish conn Each network imports its services into Weave Net, while at the same time, exports from Weave Net any services that are required by its applications. In this scenario, there are no application containers (although, there could be). Weave Net is acting as an address translation and routing facility, and uses the Weave container network as an intermediary. -Expanding on the [netcat example](/site/using-weave.md), you can also import an additional netcat service running on `$HOST3` into Weave Net via `$HOST1`. +Expanding on the [netcat example](/site/install/using-weave.md), you can also import an additional netcat service running on `$HOST3` into Weave Net via `$HOST1`. Begin importing the service onto `$HOST2` by first exposing the application network: From ad8a943eb27e79a6a3d77d05b47654a24ea1d635 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:59:40 -0500 Subject: [PATCH 051/125] replaced getting started guides with tutorials --- site/install/installing-weave.md | 2 +- site/install/systemd.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 9420b708..5818033b 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -65,7 +65,7 @@ To make encryption in fast datapath work on Google Cloud Platform, see **See Also** * [Using Weave Net](/site/install/using-weave.md) - * [Getting Started Guides](http://www.weave.works/guides/) + * [Tutorials](https://www.weave.works/docs/tutorials/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) * [Building](/site/building.md) diff --git a/site/install/systemd.md b/site/install/systemd.md index 357cdde9..ac1fce27 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -65,6 +65,6 @@ context with the commands shown below. You will need to have the **See Also** * [Using Weave Net](/site/install/using-weave.md) - * [Getting Started Guides](http://www.weave.works/guides/) + * [Tutorials](https://www.weave.works/docs/tutorials/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) From 650adb47fd94be62fe0138b9ca92fc1fe71ab42f Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 16:09:04 -0500 Subject: [PATCH 052/125] replaced Using Weave Net with Launching Weave Net --- site/concepts/fastdp-how-it-works.md | 2 +- site/install/installing-weave.md | 4 ++-- site/install/plugin/plugin.md | 2 +- site/install/systemd.md | 2 +- site/install/weave-cloud.md | 2 +- site/overview/features.md | 4 ++-- site/tasks/manage/awsvpc.md | 2 +- site/tasks/manage/fastdp.md | 2 +- site/tasks/manage/host-network-integration.md | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md index fbc855c8..4774c6a2 100644 --- a/site/concepts/fastdp-how-it-works.md +++ b/site/concepts/fastdp-how-it-works.md @@ -25,7 +25,7 @@ Prior to version 1.2, Weave Net used a custom encapsulation format. Fast datapat **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [Using Fast Datapath](/site/tasks/manage/fastdp.md) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 5818033b..36dc65ca 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -19,7 +19,7 @@ documentation](https://docs.docker.com/installation/mac/#from-your-shell) or ref After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md). -With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Using Weave Net](/site/install/using-weave.md). +With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Launching Weave Net](/site/install/using-weave.md). ### Quick Start Screencast @@ -64,7 +64,7 @@ To make encryption in fast datapath work on Google Cloud Platform, see **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [Tutorials](https://www.weave.works/docs/tutorials/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index aedaa989..3691e191 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -16,7 +16,7 @@ networking plugins, does not require an external cluster store. To create a network which can span multiple Docker hosts, Weave Net peers must be connected to each other, by specifying the other hosts during `weave launch` or via [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). -See [Using Weave Net](/site/install/using-weave.md#peer-connections) for a discussion on peer connections. +See [Launching Weave Net](/site/install/using-weave.md#peer-connections) for a discussion on peer connections. After you've launched Weave Net and peered your hosts, you can start containers using the following, for example: diff --git a/site/install/systemd.md b/site/install/systemd.md index ac1fce27..e2794cf7 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -64,7 +64,7 @@ context with the commands shown below. You will need to have the **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [Tutorials](https://www.weave.works/docs/tutorials/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 0a1d4ecf..4c3e02af 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -122,7 +122,7 @@ connect to it. **See Also** * [Installing Weave Net](/site/install/installing-weave.md) - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/overview/features.md b/site/overview/features.md index 259cad3b..925171c5 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -26,7 +26,7 @@ search_type: Documentation * [Container Mobility](#container-mobility) * [Fault Tolerance](#fault-tolerance) -For step-by-step instructions on how to use Weave Net, see [Using Weave Net](/site/install/using-weave.md). +For step-by-step instructions on how to use Weave Net, see [Launching Weave Net](/site/install/using-weave.md). ### Virtual Ethernet Switch @@ -45,7 +45,7 @@ Broadcast and Multicast protocols can also be used over Weave Net. To start using Weave Net, see [Installing Weave Net](/site/install/installing-weave.md) -and [Using Weave Net](/site/install/using-weave.md). +and [Launching Weave Net](/site/install/using-weave.md). ### Fast Datapath diff --git a/site/tasks/manage/awsvpc.md b/site/tasks/manage/awsvpc.md index 7857631c..4e648147 100644 --- a/site/tasks/manage/awsvpc.md +++ b/site/tasks/manage/awsvpc.md @@ -101,5 +101,5 @@ In AWS-VPC mode you can run the following: **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) diff --git a/site/tasks/manage/fastdp.md b/site/tasks/manage/fastdp.md index 64a6f034..b0adce64 100644 --- a/site/tasks/manage/fastdp.md +++ b/site/tasks/manage/fastdp.md @@ -71,6 +71,6 @@ frame" configuration: **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [How Fastdp Works](/site/concepts/fastdp-how-it-works.md) * [Performance measurements](/blog/weave-docker-networking-performance-fast-data-path/) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index b4f96b57..e8a3c723 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -59,6 +59,6 @@ hosts. **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) From f598338a5f6bfdddfa3cd9d611f359b246b8fdc1 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 16:29:36 -0500 Subject: [PATCH 053/125] fixed url with anchor and broken link --- site/install/weave-cloud.md | 2 +- site/tasks/manage/awsvpc.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 4c3e02af..85780780 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -86,7 +86,7 @@ first and automatically create a connection to it. >**Note:** If there is a firewall between `$HOST1` and `$HOST2`, you must permit traffic to flow through TCP 6783 and UDP 6783/6784, which are Weave’s control and data ports. -Now you can proceed to [test container communications](/site/using-weave#testing) +Now you can proceed to [test container communications](/site/install/using-weave#testing) ### How Peer Discovery Works diff --git a/site/tasks/manage/awsvpc.md b/site/tasks/manage/awsvpc.md index 4e648147..386e2f66 100644 --- a/site/tasks/manage/awsvpc.md +++ b/site/tasks/manage/awsvpc.md @@ -75,7 +75,7 @@ your cluster. is all or nothing. In this mode, all hosts in a cluster must be AWS instances. (We hope to ease this limitation in future.) - The `weave launch` command waits until the - [IP address manager](/site//operational-guide/concepts.md#ip-address-manager-ipam) + [IP address manager](/site/operational-guide/concepts.md#ip-address-manager-ipam) is ready, i.e. until after this peer has been able to make contact with other peers and confirm that it has joined the cluster the bridge. Without AWS-VPC, `weave launch` returns without waiting. From 09984001fc99f15d99fb022dfe85461bac1044bb Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 17:04:04 -0500 Subject: [PATCH 054/125] remove code format from title --- site/install/plugin/plugin-how-it-works.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/install/plugin/plugin-how-it-works.md b/site/install/plugin/plugin-how-it-works.md index 28e78d39..ef42a9a8 100644 --- a/site/install/plugin/plugin-how-it-works.md +++ b/site/install/plugin/plugin-how-it-works.md @@ -11,7 +11,7 @@ named `weave` that can only work with one (like Docker's overlay driver), while the V2 plugin provides *one* - `store/weaveworks/net-plugin:latest_release` operating only in swarm mode. -### `weavemesh` driver +### weavemesh driver * Weave Net handles all co-ordination between hosts (referred to by Docker as a "local scope" driver) * Supports a single network only. A network named `weave` is automatically created for you. @@ -19,7 +19,7 @@ operating only in swarm mode. If you do create additional networks using the `weavemesh` driver, containers attached to them will be able to communicate with containers attached to `weave`. There is no isolation between those networks. -### `weave` driver +### weave driver * This runs in what Docker calls "global scope", which requires an external cluster store * Supports multiple networks that must be created using `docker network create --driver weave ...` @@ -41,7 +41,7 @@ The plugin accepts the following options via `docker network create ... --opt`: network created when the plugin is first launched has the multicast option turned on, but for any networks you create it defaults to off. -### `store/weaveworks/net-plugin:latest_release` driver +### store/weaveworks/net-plugin:latest_release driver * The driver runs within the plugin V2. * Requires Docker to run in [swarm mode](https://docs.docker.com/engine/swarm/swarm-mode/). From 8e445f349b52c34e07ea6d1ca5c7cd5c5e1061b1 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 17:28:26 -0500 Subject: [PATCH 055/125] test anchor --- site/install/installing-weave.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 36dc65ca..a05b3a8d 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -32,7 +32,7 @@ With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weav Weave Net [periodically contacts Weaveworks servers for available versions](https://github.com/weaveworks/go-checkpoint). New versions are announced in the log and in [the status -summary](/site/troubleshooting.md#weave-status). +summary](/site/troubleshooting#weave-status). The information sent in this check is: From 4a1c2c5d096ce089fc0a23909236cba36905f95b Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 17:39:33 -0500 Subject: [PATCH 056/125] test anchor --- site/install/installing-weave.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index a05b3a8d..ba4d3a1c 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -32,7 +32,7 @@ With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weav Weave Net [periodically contacts Weaveworks servers for available versions](https://github.com/weaveworks/go-checkpoint). New versions are announced in the log and in [the status -summary](/site/troubleshooting#weave-status). +summary](/site/troubleshooting.md/#weave-status). The information sent in this check is: @@ -60,7 +60,7 @@ optionally be enabled, which allows containers to communicate at the full speed of the underlying network. To make encryption in fast datapath work on Google Cloud Platform, see -[here](/site/faq.md#ports). +[here](/site/faq.md/#ports). **See Also** From 7f93c403e9868600697ec778fa49fb581f19e51e Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 18:25:47 -0500 Subject: [PATCH 057/125] concepts toc --- site/concepts.md | 13 +++++++++++++ site/install/installing-weave.md | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/site/concepts.md b/site/concepts.md index 6b64f325..18e61741 100644 --- a/site/concepts.md +++ b/site/concepts.md @@ -4,3 +4,16 @@ menu_order: 20 search_type: Documentation --- +The section contains topics about how Weave Net works as well as providing a technical deep dive on how Weave Net implements encryption, and fast data path. + +* [Understanding Weave Net](/site/concepts/how-it-works.md) +* [Weave Net Router Sleeve Encapsulation](/site/concepts/router-encapsulation.md) +* [How Weave Net Interprets Network Topology](/site/concepts/network-topology.md) + * [Communicating Topology Among Peers](/site/concepts/network-topology#topology) + * [How Messages are Formed](/site/concepts/network-topology#messages) + * [Removing Peers](/site/concepts/network-topology#removing-peers) + * [What Happens When The Topology is Out of Date?](/site/concepts/network-topology#out-of-date-topology) +* [Fast Datapath & Weave Net](/site/concepts/fastdp-how-it-works.md) +* [IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) +* [Encryption and Weave Net](/site/concepts/encryption.md) + * [How Weave Net Implements Encryption](/site/concepts/encryption-implementation.md) \ No newline at end of file diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index ba4d3a1c..36dc65ca 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -32,7 +32,7 @@ With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weav Weave Net [periodically contacts Weaveworks servers for available versions](https://github.com/weaveworks/go-checkpoint). New versions are announced in the log and in [the status -summary](/site/troubleshooting.md/#weave-status). +summary](/site/troubleshooting.md#weave-status). The information sent in this check is: @@ -60,7 +60,7 @@ optionally be enabled, which allows containers to communicate at the full speed of the underlying network. To make encryption in fast datapath work on Google Cloud Platform, see -[here](/site/faq.md/#ports). +[here](/site/faq.md#ports). **See Also** From e26b0663e3fdf1fe7f6637f11d9843ede22b73a1 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 19:53:14 -0500 Subject: [PATCH 058/125] update links in readme anchors --- README.md | 10 +++++----- site/concepts.md | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ec2066f1..b01e3248 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ [Weaveworks](https://www.weave.works) is the company that delivers the most productive way for developers to connect, observe and control Docker containers. -This repository contains [Weave Net](https://www.weave.works/products/weave-net/), the first product developed by Weaveworks, and with over 8 million downloads to date, it enables you to get started with Docker clusters and portable apps in a fraction of the time compared with other solutions. +This repository contains [Weave Net](https://www.weave.works/products/weave-net/), the first product developed by Weaveworks, and with over 8 million downloads to date, enables you to get started with Docker clusters and portable apps in a fraction of the time compared with other solutions. ## Weave Cloud: [Weave Cloud](https://www.weave.works/product/cloud/) is software-as-a-service that simplifies deployment, monitoring and management for containers and microservices. It extends and complements popular orchestrators, and enables developers and DevOps to realize faster deployments, insightful monitoring, visualization and networking. -Weave Cloud is built using these Open Source projects: [Weave Scope](https://www.weave.works/products/weave-scope/), a powerful container monitoring tool that automatically maps Docker containers and their interactions, [Weave Cortex](https://github.com/weaveworks/cortex), a horizontally-scalable version of Prometheus, and [Weave Flux](https://www.weave.works/products/weave-flux/), a continuous deployment tool that works with Kubernetes. +Weave Cloud is built using these Open Source projects: [Weave Scope](https://www.weave.works/products/weave-scope/), a powerful container visualization tool that automatically maps Docker containers and their interactions, [Weave Cortex](https://github.com/weaveworks/cortex), a horizontally-scalable version of Prometheus, and [Weave Flux](https://www.weave.works/products/weave-flux/), a continuous deployment tool that works with Kubernetes. # Weave Net @@ -28,7 +28,7 @@ Services provided by application containers on the Weave network can be exposed If you have any questions about, feedback for or a problem with Weave Net: -- Read [the Weave Net docs](https://www.weave.works/docs/net/latest/introducing-weave/). +- Read [the Weave Net docs](https://www.weave.works/docs/net/latest/overview). - Invite yourself to the #weave-community slack channel. - Ask a question on the #weave-community slack channel. - Join the Weave User Group and get invited to online talks, hands-on training and meetups in your area. @@ -39,5 +39,5 @@ Your feedback is always welcome! ## Further Information -* [Installing Weave Net](https://www.weave.works/docs/net/latest/installing-weave/) -* [Weave Net Product Overview](https://www.weave.works/products/weave-net/) +* [Installing Weave Net](https://www.weave.works/docs/net/latest/install/installing-weave) +* [Weave Net Product Overview](https://www.weave.works/products/weave-net) diff --git a/site/concepts.md b/site/concepts.md index 18e61741..e6cffdfd 100644 --- a/site/concepts.md +++ b/site/concepts.md @@ -10,8 +10,8 @@ The section contains topics about how Weave Net works as well as providing a tec * [Weave Net Router Sleeve Encapsulation](/site/concepts/router-encapsulation.md) * [How Weave Net Interprets Network Topology](/site/concepts/network-topology.md) * [Communicating Topology Among Peers](/site/concepts/network-topology#topology) - * [How Messages are Formed](/site/concepts/network-topology#messages) - * [Removing Peers](/site/concepts/network-topology#removing-peers) + * [How Messages are Formed](/site/concepts/network-topology/#messages) + * [Removing Peers](/site/concepts/network-topology/#removing-peers) * [What Happens When The Topology is Out of Date?](/site/concepts/network-topology#out-of-date-topology) * [Fast Datapath & Weave Net](/site/concepts/fastdp-how-it-works.md) * [IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) From fb138b54fac1890993bc2f69db210e4182aa4370 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Fri, 14 Jul 2017 16:56:43 -0500 Subject: [PATCH 059/125] add full urls instead --- site/concepts.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/site/concepts.md b/site/concepts.md index e6cffdfd..eb361228 100644 --- a/site/concepts.md +++ b/site/concepts.md @@ -4,16 +4,20 @@ menu_order: 20 search_type: Documentation --- -The section contains topics about how Weave Net works as well as providing a technical deep dive on how Weave Net implements encryption, and fast data path. +The section contains topics about how Weave Net works as well as providing a technical deep dive on how Weave Net implements fast datapath, and encryption. * [Understanding Weave Net](/site/concepts/how-it-works.md) * [Weave Net Router Sleeve Encapsulation](/site/concepts/router-encapsulation.md) * [How Weave Net Interprets Network Topology](/site/concepts/network-topology.md) - * [Communicating Topology Among Peers](/site/concepts/network-topology#topology) - * [How Messages are Formed](/site/concepts/network-topology/#messages) - * [Removing Peers](/site/concepts/network-topology/#removing-peers) - * [What Happens When The Topology is Out of Date?](/site/concepts/network-topology#out-of-date-topology) + * [Communicating Topology Among Peers](https://weave.works/docs/net/latest/concepts/network-topology/#topology) + * [How Messages are Formed](https://weave.works/docs/net/latest/concepts/network-topology/#messages) + * [Removing Peers](https://weave.works/docs/net/latest/concepts/network-topology/#removing-peers) + * [What Happens When The Topology is Out of Date?](https://weave.works/docs/net/latest/concepts/network-topology/#out-of-date-topology) * [Fast Datapath & Weave Net](/site/concepts/fastdp-how-it-works.md) * [IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) * [Encryption and Weave Net](/site/concepts/encryption.md) - * [How Weave Net Implements Encryption](/site/concepts/encryption-implementation.md) \ No newline at end of file + * [How Weave Net Implements Encryption](/site/concepts/encryption-implementation.md) + * [Establishing the Emphemeral Session Key](https://weave.works/docs/net/latest/concepts/network-topology/#ephemeral-key) + * [Key Generation and the Linux CSPRIN](https://weave.works/docs/net/latest/concepts/network-topology/#cspring) + * [Encrypting and Decrypting TCP Messages](https://weave.works/docs/net/latest/concepts/network-topology/#tcp) + * [Encrypting and Decrypting UDP Messages](https://weave.works/docs/net/latest/concepts/network-topology/#udp) \ No newline at end of file From fdc01a41de5cf50414c767c2ffd4ecae42f0ff53 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Fri, 14 Jul 2017 16:57:40 -0500 Subject: [PATCH 060/125] rearrange install and launch --- site/install/installing-weave.md | 2 +- site/install/using-weave.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 36dc65ca..599d12ee 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -1,6 +1,6 @@ --- title: Installing Weave Net -menu_order: 20 +menu_order: 10 search_type: Documentation --- diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 40666175..937933d9 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -1,6 +1,6 @@ --- title: Launching Weave Net -menu_order: 10 +menu_order: 20 search_type: Documentation --- From 6ca9b2c006610cfcd7f70fb20223b6feaac20f6d Mon Sep 17 00:00:00 2001 From: abuehrle Date: Sun, 16 Jul 2017 12:40:47 -0500 Subject: [PATCH 061/125] install toc added - full urls --- site/install.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/site/install.md b/site/install.md index c33c0149..ab0a3a84 100644 --- a/site/install.md +++ b/site/install.md @@ -3,3 +3,40 @@ title: Installing Weave Net menu_order: 30 search_type: Documentation --- + +Install Weave Net from the command line on its own or if you are using Docker, Kubernetes or Mesosphere as a Docker or a CNI plugin. Weave Net can also be launched it as a cloud agent within Weave Cloud to visualize and troubleshoot peer connections. + + +## Installing Weave Net Stand-alone and in Weave Cloud + +* [Installing Weave Net](https://www.weave.works/docs/net/latest/install/installing-weave/) +* [Launching Weave Net](https://www.weave.works/docs/net/latest/install/using-weave/) +* [Visualizing Weave Net in Weave Cloud](https://www.weave.works/docs/net/latest/install/weave-cloud/) +* [Using Weave with Systemd](https://www.weave.works/docs/net/latest/install/systemd/) + + +## Weave Net Docker Plugin + +* [How the Weave Net Docker Network Plugins Work](https://www.weave.works/docs/net/latestplugin/plugin-how-it-works/) +* [Integrating Docker via the Network Plugin (V2)](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/) + * [Installation](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#installation) + * [Configuring the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#configuring) + * [Running Services or Containers Using the Plugin]((https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#usage) +* [Integrating Docker via the Network Plugin (Legacy)](https://www.weave.works/docs/net/latest/install/plugin/plugin/) + * [Launching Weave Net and Running Containers Using the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin/#launching) + * [Restarting the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin/#restarting) + +## Weave Net CNI plugin for Kubernetes and Mesosphere + +* [Integrating Kubernetes and Mesos via the CNI Plugin](https://www.weave.works/docs/net/latest/kubernetes/) +* [Integrating Kubernetes via the Addon](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/) + * [Installation](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#install) + * [Upgrading Kubernetes to version 1.6](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#kube-1.6-upgrade) + * [Upgrading the Daemon Sets](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#daemon-sets) + * [CPU and Memory Requirements](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#resources) + * [Pod Eviction](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#eviction) + * [Network Policy Controller](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#npc) + * [Troubleshooting Blocked Connections](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#blocked-connections) + * [Changing Configuration Options](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#configuration-options) + + From 7a34d997aa6fc65560789f42aa59092014a84494 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Sun, 16 Jul 2017 12:41:56 -0500 Subject: [PATCH 062/125] taks toc - full urls added --- site/tasks.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/site/tasks.md b/site/tasks.md index e4969dde..e6fd9843 100644 --- a/site/tasks.md +++ b/site/tasks.md @@ -3,3 +3,63 @@ title: Weave Net Tasks menu_order: 50 search_type: Documentation --- + +The section describes the configuration options available in Weave Net. It is divided into: Managing Containerized Applications, Administering IP Addresses, Managing WeaveDNS, and finally attaching Docker Containers via the Weave API Proxy. + +## Managing Containerized Applications + +* [Isolating Applications on a Weave Network] +* [Dynamically Attaching and Detaching Applications] +* [Integrating with the Host Network] +* [Managing Services - Exporting, Importing, Binding and Routing] + * [Exporting Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#exporting) + * [Importing Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#importing) + * [Binding Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#binding) + * [Routing Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#routing) + * [Dynamically Changing Service Locations](https://weave.works/docs/net/latest/tasks/manage/service-management/#change-location) +* [Securing Connections Across Untrusted Networks] +* [Adding and Removing Hosts Dynamically] +* [Using Fast Datapath] +* [Enabling Multi-Cloud, Multi-Hop Networking and Routing] +* [Configuring IP Routing on an Amazon Web Services Virtual Private Cloud] +* [Monitoring with Prometheus] + + +## Administering IP Addresses + +* [Allocating IP Addresses] + * [Initializing Peers on a Weave Network](https://weave.works/docs/net/latest/tasks/ipam/ipam/#initialization) + * [--ipalloc-init:consensus and How Quorum is Achieved](https://weave.works/docs/net/latest/tasks/ipam/ipam/#quorum) + * [Priming a Peer](https://weave.works/docs/net/latest/tasks/ipam/ipam/#priming-a-peer) + * [Choosing an Allocation Range](https://weave.works/docs/net/latest/tasks/ipam/ipam/#range) +* [Allocating IPs in a Specific Range] +* [Manually Specifying the IP Address of a Container] +* [Automatic Allocation Across Multiple Subnets] +* [Starting, Stopping and Removing Peers] +* [Troubleshooting the IP Allocator] + + +## Managing WeaveDNS + +* [Discovering Containers with WeaveDNS] +* [How Weave Finds Containers] +* [Load Balancing and Fault Resilience with weaveDNS] +* [Managing Domains] + * [Configuring the domain search path](https://weave.works/docs/net/latest/tasks/weavedns/managing-domains-weavedns/#domain-search-path) + * [Using a different local domain](https://weave.works/docs/net/latest/tasks/weavedns/managing-domains-weavedns/#local-domain) +* [Managing Domain Entries] + * [Adding and removing extra DNS entries](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#add-remove) + * [Resolving WeaveDNS entries from the Host](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#resolve-weavedns-entries-from-host) + * [Hot-swapping Service Containers](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#hot-swapping) + * [Configuring a Custom TTL](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#ttl) +* [Troubleshooting and Present Limitations] + +## Attaching Docker Containers via the Weave API Proxy + +* [Integrating Docker via the API Proxy] +* [Using The Weave Docker API Proxy] +* [Securing the Docker Communications With TLS] +* [Automatic IP Allocation and the Weave Proxy] +* [Using Automatic Discovery With the Weave Net Proxy] +* [Name resolution via `/etc/hosts`] +* [Launching Containers With Weave Run (without the Proxy)] From 136c4521d48dcadc9b90a1ff7bfbed8c45ee8e15 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 15:49:46 -0500 Subject: [PATCH 063/125] renamed introducing moved features to overview --- site/{introducing-weave.md => overview.md} | 0 site/{ => overview}/features.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename site/{introducing-weave.md => overview.md} (100%) rename site/{ => overview}/features.md (100%) diff --git a/site/introducing-weave.md b/site/overview.md similarity index 100% rename from site/introducing-weave.md rename to site/overview.md diff --git a/site/features.md b/site/overview/features.md similarity index 100% rename from site/features.md rename to site/overview/features.md From f37f8308c8ead1fa8d8bea3b9e7ca939fcd573a6 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:23:35 -0500 Subject: [PATCH 064/125] how it works renamed to concepts --- .../encryption-implementation.md | 0 site/{how-it-works => concepts}/encryption.md | 0 .../fastdp-how-it-works.md | 0 site/{ => concepts}/how-it-works.md | 6 ++---- site/{how-it-works => concepts}/ip-addresses.md | 0 site/{how-it-works => concepts}/network-topology.md | 0 .../router-encapsulation.md | 0 .../weave-frame-encapsulation-178x300.png | Bin .../weave-net-encap1-1024x459.png | Bin .../weave-net-fdp1-1024x454.png | Bin 10 files changed, 2 insertions(+), 4 deletions(-) rename site/{how-it-works => concepts}/encryption-implementation.md (100%) rename site/{how-it-works => concepts}/encryption.md (100%) rename site/{how-it-works => concepts}/fastdp-how-it-works.md (100%) rename site/{ => concepts}/how-it-works.md (97%) rename site/{how-it-works => concepts}/ip-addresses.md (100%) rename site/{how-it-works => concepts}/network-topology.md (100%) rename site/{how-it-works => concepts}/router-encapsulation.md (100%) rename site/{how-it-works => concepts}/weave-frame-encapsulation-178x300.png (100%) rename site/{how-it-works => concepts}/weave-net-encap1-1024x459.png (100%) rename site/{how-it-works => concepts}/weave-net-fdp1-1024x454.png (100%) diff --git a/site/how-it-works/encryption-implementation.md b/site/concepts/encryption-implementation.md similarity index 100% rename from site/how-it-works/encryption-implementation.md rename to site/concepts/encryption-implementation.md diff --git a/site/how-it-works/encryption.md b/site/concepts/encryption.md similarity index 100% rename from site/how-it-works/encryption.md rename to site/concepts/encryption.md diff --git a/site/how-it-works/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md similarity index 100% rename from site/how-it-works/fastdp-how-it-works.md rename to site/concepts/fastdp-how-it-works.md diff --git a/site/how-it-works.md b/site/concepts/how-it-works.md similarity index 97% rename from site/how-it-works.md rename to site/concepts/how-it-works.md index 14fda30b..4082b09f 100644 --- a/site/how-it-works.md +++ b/site/concepts/how-it-works.md @@ -1,11 +1,9 @@ --- -title: Understanding how Weave Net Works -menu_order: 90 +title: Understanding Weave Net +menu_order: 10 search_type: Documentation --- - - A Weave network consists of a number of 'peers' - Weave Net routers residing on different hosts. Each peer has a name, which tends to remain the same over restarts, a human friendly nickname for use in diff --git a/site/how-it-works/ip-addresses.md b/site/concepts/ip-addresses.md similarity index 100% rename from site/how-it-works/ip-addresses.md rename to site/concepts/ip-addresses.md diff --git a/site/how-it-works/network-topology.md b/site/concepts/network-topology.md similarity index 100% rename from site/how-it-works/network-topology.md rename to site/concepts/network-topology.md diff --git a/site/how-it-works/router-encapsulation.md b/site/concepts/router-encapsulation.md similarity index 100% rename from site/how-it-works/router-encapsulation.md rename to site/concepts/router-encapsulation.md diff --git a/site/how-it-works/weave-frame-encapsulation-178x300.png b/site/concepts/weave-frame-encapsulation-178x300.png similarity index 100% rename from site/how-it-works/weave-frame-encapsulation-178x300.png rename to site/concepts/weave-frame-encapsulation-178x300.png diff --git a/site/how-it-works/weave-net-encap1-1024x459.png b/site/concepts/weave-net-encap1-1024x459.png similarity index 100% rename from site/how-it-works/weave-net-encap1-1024x459.png rename to site/concepts/weave-net-encap1-1024x459.png diff --git a/site/how-it-works/weave-net-fdp1-1024x454.png b/site/concepts/weave-net-fdp1-1024x454.png similarity index 100% rename from site/how-it-works/weave-net-fdp1-1024x454.png rename to site/concepts/weave-net-fdp1-1024x454.png From 05ed63aaf4687b807519a009dcceff5b35a99b28 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:24:16 -0500 Subject: [PATCH 065/125] menu order --- site/concepts/router-encapsulation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/router-encapsulation.md b/site/concepts/router-encapsulation.md index f6b729d3..b15a3b2e 100644 --- a/site/concepts/router-encapsulation.md +++ b/site/concepts/router-encapsulation.md @@ -1,6 +1,6 @@ --- title: Weave Net Router Sleeve Encapsulation -menu_order: 10 +menu_order: 15 search_type: Documentation --- From b8a5d491004f941e78c21a319f926949ce5ba57a Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:24:49 -0500 Subject: [PATCH 066/125] menu reorder --- site/concepts/fastdp-how-it-works.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md index a1e52301..e5640c50 100644 --- a/site/concepts/fastdp-how-it-works.md +++ b/site/concepts/fastdp-how-it-works.md @@ -1,5 +1,5 @@ --- -title: How Fast Datapath Works +title: Fast Datapath & Weave Net menu_order: 30 search_type: Documentation --- From 8554f0f89668ea341efe3f5a419c493bdcd09b2f Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:25:14 -0500 Subject: [PATCH 067/125] menu order --- site/concepts/ip-addresses.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/ip-addresses.md b/site/concepts/ip-addresses.md index 58f9ff12..66210e38 100644 --- a/site/concepts/ip-addresses.md +++ b/site/concepts/ip-addresses.md @@ -1,6 +1,6 @@ --- title: IP Addresses, Routes and Networks -menu_order: 50 +menu_order: 40 search_type: Documentation --- From b551c15f5c5cc5f04be6d20fa8976024e958902b Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:25:42 -0500 Subject: [PATCH 068/125] menu order --- site/concepts/encryption.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/encryption.md b/site/concepts/encryption.md index f804a3a1..08231d5c 100644 --- a/site/concepts/encryption.md +++ b/site/concepts/encryption.md @@ -1,6 +1,6 @@ --- title: Encryption and Weave Net -menu_order: 60 +menu_order: 50 search_type: Documentation --- From 5379826662d469ecccfc5810b85f348ad09d7fd9 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:25:59 -0500 Subject: [PATCH 069/125] menu order --- site/concepts/encryption-implementation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/encryption-implementation.md b/site/concepts/encryption-implementation.md index 2d44bc4d..ff8511d6 100644 --- a/site/concepts/encryption-implementation.md +++ b/site/concepts/encryption-implementation.md @@ -1,6 +1,6 @@ --- title: How Weave Net Implements Encryption -menu_order: 70 +menu_order: 60 search_type: Documentation --- From 474ff5815b5a8e3db02f7235a6898bd4c774b3ed Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 16:26:41 -0500 Subject: [PATCH 070/125] initial index file --- site/concepts.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 site/concepts.md diff --git a/site/concepts.md b/site/concepts.md new file mode 100644 index 00000000..be2e7e5d --- /dev/null +++ b/site/concepts.md @@ -0,0 +1,6 @@ +--- +title: Weave Net Concepts Index +menu_order: 20 +search_type: Documentation +--- + From d356afd6cf3008e46141e2ca35262e76103fc686 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:06:47 -0500 Subject: [PATCH 071/125] renamed installing-weave to install moved cloud and launch to install --- site/{ => install}/installing-weave.md | 0 site/{installing-weave => install}/systemd.md | 0 site/{ => install}/using-weave.md | 0 site/{using-weave => install}/weave-cloud-token.png | Bin site/{using-weave => install}/weave-cloud.md | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => install}/installing-weave.md (100%) rename site/{installing-weave => install}/systemd.md (100%) rename site/{ => install}/using-weave.md (100%) rename site/{using-weave => install}/weave-cloud-token.png (100%) rename site/{using-weave => install}/weave-cloud.md (100%) diff --git a/site/installing-weave.md b/site/install/installing-weave.md similarity index 100% rename from site/installing-weave.md rename to site/install/installing-weave.md diff --git a/site/installing-weave/systemd.md b/site/install/systemd.md similarity index 100% rename from site/installing-weave/systemd.md rename to site/install/systemd.md diff --git a/site/using-weave.md b/site/install/using-weave.md similarity index 100% rename from site/using-weave.md rename to site/install/using-weave.md diff --git a/site/using-weave/weave-cloud-token.png b/site/install/weave-cloud-token.png similarity index 100% rename from site/using-weave/weave-cloud-token.png rename to site/install/weave-cloud-token.png diff --git a/site/using-weave/weave-cloud.md b/site/install/weave-cloud.md similarity index 100% rename from site/using-weave/weave-cloud.md rename to site/install/weave-cloud.md From d59aab3f71d9b56e69600ae36e044192019cb374 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:07:17 -0500 Subject: [PATCH 072/125] ordered menu --- site/install/systemd.md | 2 +- site/install/using-weave.md | 5 ++--- site/install/weave-cloud.md | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/site/install/systemd.md b/site/install/systemd.md index 50bebabc..4d725986 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -1,6 +1,6 @@ --- title: Using Weave with Systemd -menu_order: 130 +menu_order: 40 search_type: Documentation --- diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 89a4d4c9..d9c756ec 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -1,6 +1,6 @@ --- -title: Using Weave Net -menu_order: 40 +title: Launching Weave Net +menu_order: 20 search_type: Documentation --- @@ -13,7 +13,6 @@ This section contains the following topics: * [Testing Container Communications](#testing) * [Starting the Netcat Service](#start-netcat) - ### Launching Weave Net Before launching Weave Net and deploying your apps, ensure that Docker is [installed](https://docs.docker.com/engine/installation/) on both hosts. diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 785a95aa..96ed6679 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -1,6 +1,6 @@ --- title: Using Weave Cloud to get started with Weave Net -menu_order: 10 +menu_order: 30 search_type: Documentation --- From 599d5e4863e43171feed59ca8151de99ca66f3a1 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:28:43 -0500 Subject: [PATCH 073/125] docker plugin subdirectory of install --- site/{ => install}/plugin/plugin-how-it-works.md | 0 site/{ => install/plugin}/plugin-v2.md | 0 site/{ => install/plugin}/plugin.md | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => install}/plugin/plugin-how-it-works.md (100%) rename site/{ => install/plugin}/plugin-v2.md (100%) rename site/{ => install/plugin}/plugin.md (100%) diff --git a/site/plugin/plugin-how-it-works.md b/site/install/plugin/plugin-how-it-works.md similarity index 100% rename from site/plugin/plugin-how-it-works.md rename to site/install/plugin/plugin-how-it-works.md diff --git a/site/plugin-v2.md b/site/install/plugin/plugin-v2.md similarity index 100% rename from site/plugin-v2.md rename to site/install/plugin/plugin-v2.md diff --git a/site/plugin.md b/site/install/plugin/plugin.md similarity index 100% rename from site/plugin.md rename to site/install/plugin/plugin.md From 3086a6821b7831ca352db6bf25d383afeac36f1b Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:29:24 -0500 Subject: [PATCH 074/125] menu items ordered --- site/install/plugin.md | 6 ++++++ site/install/plugin/plugin-how-it-works.md | 2 +- site/install/plugin/plugin-v2.md | 2 +- site/install/plugin/plugin.md | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 site/install/plugin.md diff --git a/site/install/plugin.md b/site/install/plugin.md new file mode 100644 index 00000000..927cabfc --- /dev/null +++ b/site/install/plugin.md @@ -0,0 +1,6 @@ +--- +title: Weave Net Docker Plugin +menu_order: 50 +search_type: Documentation +--- + diff --git a/site/install/plugin/plugin-how-it-works.md b/site/install/plugin/plugin-how-it-works.md index 573277e8..48f55c1f 100644 --- a/site/install/plugin/plugin-how-it-works.md +++ b/site/install/plugin/plugin-how-it-works.md @@ -1,6 +1,6 @@ --- title: How the Weave Net Docker Network Plugins Work -menu_order: 20 +menu_order: 10 search_type: Documentation --- diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md index 00bfdc91..76988c18 100644 --- a/site/install/plugin/plugin-v2.md +++ b/site/install/plugin/plugin-v2.md @@ -1,6 +1,6 @@ --- title: Integrating Docker via the Network Plugin (V2) -menu_order: 65 +menu_order: 20 search_type: Documentation --- diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index fc359807..403211fa 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -1,6 +1,6 @@ --- title: Integrating Docker via the Network Plugin (Legacy) -menu_order: 60 +menu_order: 30 search_type: Documentation --- From 887d72e45fccc60fe7e999d38bccf3502f2f76c0 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:30:26 -0500 Subject: [PATCH 075/125] index files and subdirectory order --- site/install.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 site/install.md diff --git a/site/install.md b/site/install.md new file mode 100644 index 00000000..c33c0149 --- /dev/null +++ b/site/install.md @@ -0,0 +1,5 @@ +--- +title: Installing Weave Net +menu_order: 30 +search_type: Documentation +--- From 6e90c56d0371b09a01d4ac734ce590debdbabdb6 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:48:36 -0500 Subject: [PATCH 076/125] cni-plugin moved to kubernetes file kube-add moved --- site/cni-plugin.md | 115 ---------------------------- site/{ => kubernetes}/kube-addon.md | 0 2 files changed, 115 deletions(-) delete mode 100644 site/cni-plugin.md rename site/{ => kubernetes}/kube-addon.md (100%) diff --git a/site/cni-plugin.md b/site/cni-plugin.md deleted file mode 100644 index 2e5b3efd..00000000 --- a/site/cni-plugin.md +++ /dev/null @@ -1,115 +0,0 @@ ---- -title: Integrating Kubernetes and Mesos via the CNI Plugin -menu_order: 65 -search_type: Documentation ---- - -> The recommended way of using Weave with Kubernetes is via the new -> [Kubernetes Addon](/site/kube-addon.md). The instructions below -> remain valid however, and are still the recommended method for -> integrating with Mesos. - -CNI, the [_Container Network Interface_](https://github.com/containernetworking/cni), -is a proposed standard for configuring network interfaces for Linux -application containers. CNI is supported by -[Kubernetes](http://kubernetes.io/), [Apache Mesos](http://mesos.apache.org) -and -[others](https://github.com/containernetworking/cni#who-is-using-cni). - -### Installing the Weave Net CNI plugin - -If your machine has the directories normally used to host CNI plugins, -then the Weave Net CNI plugin is installed when you run `weave setup`. - -To create those directories, run (as root): - - mkdir -p /opt/cni/bin - mkdir -p /etc/cni/net.d - -Then run: - - weave setup - -#### Launching Weave Net - -To create a network that spans multiple hosts, the Weave peers must be connected to each other. -This is accomplished by specifying the other hosts during `weave launch` or via -[`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md). - -See [Creating Peer Connections Between Hosts](/site/using-weave.md#peer-connections) -for a discussion on peer connections. - - weave launch - -#### Using the CNI network configuration file - -All CNI plugins are configured by a JSON file in the directory -`/etc/cni/net.d/`. `weave setup` installs a minimal configuration -file named `10-weave.conf`, which you can alter to suit your needs. - -See the [CNI Spec](https://github.com/appc/cni/blob/master/SPEC.md#network-configuration) -for details on the format and contents of this file. - -By default, the Weave CNI plugin adds a default route out via an IP -address on the Weave bridge, so your containers can access resources -on the internet. If you do not want this, add a section to the config -file that specifies no routes: - - "ipam": { - "routes": [ ] - } - -The following other fields in the spec are supported: - -- `ipam / type` - default is to use Weave's own IPAM -- `ipam / subnet` - default is to use Weave's IPAM default subnet -- `ipam / gateway` - default is to use the Weave bridge IP address (allocated by `weave expose`) - -### Using the Weave Net CNI plugin - -#### Configuring Kubernetes to use the CNI Plugin - -After you've launched Weave and peered your hosts, you can configure -Kubernetes to use Weave, by adding the following options to the -`kubelet` command: - - --network-plugin=cni --network-plugin-dir=/etc/cni/net.d - -See the [`kubelet` documentation](http://kubernetes.io/v1.1/docs/admin/kubelet.html) -for more details. - -Now, whenever Kubernetes starts a pod, it will be attached to the Weave network. - -#### Configuring Mesos to use the CNI plugin - -To use the CNI plugin, the Mesos Agent must be started with reference -to the CNI configuration and binary directories: - - sudo mesos-slave - --network_cni_config_dir=/etc/cni/net.d - --network_cni_plugins_dir=/opt/cni/bin - ... - -To start a container that is connected to the Weave network via CNI, -use the name specified in the configuration file. This example starts -a alpine container running a `nc` server listening on port 1080 with -the `mesos-execute` command. From the Master, run: - - nohup sudo mesos-execute --command="ifconfig; nc -k -l 0.0.0.0 1080" --docker_image=alpine --master=localhost:5050 --name=example --networks=weave --resources=cpus:0.1 --shell test.log 2>&1 & - -After this task has started, it is possible to obtain the ip address of -the container and ping it from any of other agents (which are also -connected to the weave network)" - - nc -z -v 1080 - -For more information, see the -[Mesos documentation](http://mesos.apache.org/documentation/cni/). - -### Caveats - -- The program `nsenter` must be present on the host; it is required by - the CNI plugin. In some distros (e.g. Alpine, Ubuntu) it is in the - util-linux package -- The Weave Net router container must be running for CNI to allocate addresses -- The CNI plugin does not add entries to weaveDNS. diff --git a/site/kube-addon.md b/site/kubernetes/kube-addon.md similarity index 100% rename from site/kube-addon.md rename to site/kubernetes/kube-addon.md From 7af82945d9f4c410cbdb22f978c7ad71c857ffd4 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:48:58 -0500 Subject: [PATCH 077/125] ordered menu --- site/kubernetes/kube-addon.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index 78f1c207..c5f76bf3 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -1,6 +1,6 @@ --- title: Integrating Kubernetes via the Addon -menu_order: 63 +menu_order: 20 search_type: Documentation --- From e41b5d9a1c481004d703419594c7adadffa84aab Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 17:49:31 -0500 Subject: [PATCH 078/125] content from cni-plugin added --- site/kubernetes.md | 115 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 site/kubernetes.md diff --git a/site/kubernetes.md b/site/kubernetes.md new file mode 100644 index 00000000..2bacfa6a --- /dev/null +++ b/site/kubernetes.md @@ -0,0 +1,115 @@ +--- +title: Integrating Kubernetes and Mesos via the CNI Plugin +menu_order: 40 +search_type: Documentation +--- + +> The recommended way of using Weave with Kubernetes is via the new +> [Kubernetes Addon](/site/kube-addon.md). The instructions below +> remain valid however, and are still the recommended method for +> integrating with Mesos. + +CNI, the [_Container Network Interface_](https://github.com/containernetworking/cni), +is a proposed standard for configuring network interfaces for Linux +application containers. CNI is supported by +[Kubernetes](http://kubernetes.io/), [Apache Mesos](http://mesos.apache.org) +and +[others](https://github.com/containernetworking/cni#who-is-using-cni). + +### Installing the Weave Net CNI plugin + +If your machine has the directories normally used to host CNI plugins, +then the Weave Net CNI plugin is installed when you run `weave setup`. + +To create those directories, run (as root): + + mkdir -p /opt/cni/bin + mkdir -p /etc/cni/net.d + +Then run: + + weave setup + +#### Launching Weave Net + +To create a network that spans multiple hosts, the Weave peers must be connected to each other. +This is accomplished by specifying the other hosts during `weave launch` or via +[`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md). + +See [Creating Peer Connections Between Hosts](/site/using-weave.md#peer-connections) +for a discussion on peer connections. + + weave launch + +#### Using the CNI network configuration file + +All CNI plugins are configured by a JSON file in the directory +`/etc/cni/net.d/`. `weave setup` installs a minimal configuration +file named `10-weave.conf`, which you can alter to suit your needs. + +See the [CNI Spec](https://github.com/appc/cni/blob/master/SPEC.md#network-configuration) +for details on the format and contents of this file. + +By default, the Weave CNI plugin adds a default route out via an IP +address on the Weave bridge, so your containers can access resources +on the internet. If you do not want this, add a section to the config +file that specifies no routes: + + "ipam": { + "routes": [ ] + } + +The following other fields in the spec are supported: + +- `ipam / type` - default is to use Weave's own IPAM +- `ipam / subnet` - default is to use Weave's IPAM default subnet +- `ipam / gateway` - default is to use the Weave bridge IP address (allocated by `weave expose`) + +### Using the Weave Net CNI plugin + +#### Configuring Kubernetes to use the CNI Plugin + +After you've launched Weave and peered your hosts, you can configure +Kubernetes to use Weave, by adding the following options to the +`kubelet` command: + + --network-plugin=cni --network-plugin-dir=/etc/cni/net.d + +See the [`kubelet` documentation](http://kubernetes.io/v1.1/docs/admin/kubelet.html) +for more details. + +Now, whenever Kubernetes starts a pod, it will be attached to the Weave network. + +#### Configuring Mesos to use the CNI plugin + +To use the CNI plugin, the Mesos Agent must be started with reference +to the CNI configuration and binary directories: + + sudo mesos-slave + --network_cni_config_dir=/etc/cni/net.d + --network_cni_plugins_dir=/opt/cni/bin + ... + +To start a container that is connected to the Weave network via CNI, +use the name specified in the configuration file. This example starts +a alpine container running a `nc` server listening on port 1080 with +the `mesos-execute` command. From the Master, run: + + nohup sudo mesos-execute --command="ifconfig; nc -k -l 0.0.0.0 1080" --docker_image=alpine --master=localhost:5050 --name=example --networks=weave --resources=cpus:0.1 --shell test.log 2>&1 & + +After this task has started, it is possible to obtain the ip address of +the container and ping it from any of other agents (which are also +connected to the weave network)" + + nc -z -v 1080 + +For more information, see the +[Mesos documentation](http://mesos.apache.org/documentation/cni/). + +### Caveats + +- The program `nsenter` must be present on the host; it is required by + the CNI plugin. In some distros (e.g. Alpine, Ubuntu) it is in the + util-linux package +- The Weave Net router container must be running for CNI to allocate addresses +- The CNI plugin does not add entries to weaveDNS. From 9d0a0253c9701d84852da4d6d1495a07d628be57 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:26:15 -0500 Subject: [PATCH 079/125] added manage sd and mv using-weave to it --- site/{using-weave => tasks}/configuring-weave.md | 0 .../manage}/application-isolation.md | 0 site/{using-weave => tasks/manage}/awsvpc.md | 0 .../manage}/dynamically-attach-containers.md | 0 site/{using-weave => tasks/manage}/fastdp.md | 0 .../manage}/finding-adding-hosts-dynamically.md | 0 .../manage}/host-network-integration.md | 0 site/{ => tasks/manage}/metrics.md | 0 .../manage}/multi-cloud-multi-hop.md | 0 .../manage}/security-untrusted-networks.md | 0 .../manage}/service-management.md | 0 site/{using-weave => tasks}/manual-ip-address.md | 0 .../weave-net-awsvpc-1007x438.png | Bin 13 files changed, 0 insertions(+), 0 deletions(-) rename site/{using-weave => tasks}/configuring-weave.md (100%) rename site/{using-weave => tasks/manage}/application-isolation.md (100%) rename site/{using-weave => tasks/manage}/awsvpc.md (100%) rename site/{using-weave => tasks/manage}/dynamically-attach-containers.md (100%) rename site/{using-weave => tasks/manage}/fastdp.md (100%) rename site/{using-weave => tasks/manage}/finding-adding-hosts-dynamically.md (100%) rename site/{using-weave => tasks/manage}/host-network-integration.md (100%) rename site/{ => tasks/manage}/metrics.md (100%) rename site/{using-weave => tasks/manage}/multi-cloud-multi-hop.md (100%) rename site/{using-weave => tasks/manage}/security-untrusted-networks.md (100%) rename site/{using-weave => tasks/manage}/service-management.md (100%) rename site/{using-weave => tasks}/manual-ip-address.md (100%) rename site/{using-weave => tasks}/weave-net-awsvpc-1007x438.png (100%) diff --git a/site/using-weave/configuring-weave.md b/site/tasks/configuring-weave.md similarity index 100% rename from site/using-weave/configuring-weave.md rename to site/tasks/configuring-weave.md diff --git a/site/using-weave/application-isolation.md b/site/tasks/manage/application-isolation.md similarity index 100% rename from site/using-weave/application-isolation.md rename to site/tasks/manage/application-isolation.md diff --git a/site/using-weave/awsvpc.md b/site/tasks/manage/awsvpc.md similarity index 100% rename from site/using-weave/awsvpc.md rename to site/tasks/manage/awsvpc.md diff --git a/site/using-weave/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md similarity index 100% rename from site/using-weave/dynamically-attach-containers.md rename to site/tasks/manage/dynamically-attach-containers.md diff --git a/site/using-weave/fastdp.md b/site/tasks/manage/fastdp.md similarity index 100% rename from site/using-weave/fastdp.md rename to site/tasks/manage/fastdp.md diff --git a/site/using-weave/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md similarity index 100% rename from site/using-weave/finding-adding-hosts-dynamically.md rename to site/tasks/manage/finding-adding-hosts-dynamically.md diff --git a/site/using-weave/host-network-integration.md b/site/tasks/manage/host-network-integration.md similarity index 100% rename from site/using-weave/host-network-integration.md rename to site/tasks/manage/host-network-integration.md diff --git a/site/metrics.md b/site/tasks/manage/metrics.md similarity index 100% rename from site/metrics.md rename to site/tasks/manage/metrics.md diff --git a/site/using-weave/multi-cloud-multi-hop.md b/site/tasks/manage/multi-cloud-multi-hop.md similarity index 100% rename from site/using-weave/multi-cloud-multi-hop.md rename to site/tasks/manage/multi-cloud-multi-hop.md diff --git a/site/using-weave/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md similarity index 100% rename from site/using-weave/security-untrusted-networks.md rename to site/tasks/manage/security-untrusted-networks.md diff --git a/site/using-weave/service-management.md b/site/tasks/manage/service-management.md similarity index 100% rename from site/using-weave/service-management.md rename to site/tasks/manage/service-management.md diff --git a/site/using-weave/manual-ip-address.md b/site/tasks/manual-ip-address.md similarity index 100% rename from site/using-weave/manual-ip-address.md rename to site/tasks/manual-ip-address.md diff --git a/site/using-weave/weave-net-awsvpc-1007x438.png b/site/tasks/weave-net-awsvpc-1007x438.png similarity index 100% rename from site/using-weave/weave-net-awsvpc-1007x438.png rename to site/tasks/weave-net-awsvpc-1007x438.png From 7e265100c3d9f7a1d9f2ab3dff3b0566bbbed819 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:27:22 -0500 Subject: [PATCH 080/125] index files for tasks and manage directories --- site/tasks/manage.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 site/tasks/manage.md diff --git a/site/tasks/manage.md b/site/tasks/manage.md new file mode 100644 index 00000000..b45300bf --- /dev/null +++ b/site/tasks/manage.md @@ -0,0 +1,5 @@ +--- +title: Managing Containerized Applications +menu_order: 10 +search_type: Documentation +--- From 58dc68d1125f8f17b63d6b1df09c8cffd9937a1d Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:27:44 -0500 Subject: [PATCH 081/125] menu topic order --- site/tasks/manage/application-isolation.md | 2 +- site/tasks/manage/awsvpc.md | 4 ++-- site/tasks/manage/dynamically-attach-containers.md | 2 +- site/tasks/manage/fastdp.md | 2 +- site/tasks/manage/finding-adding-hosts-dynamically.md | 2 +- site/tasks/manage/host-network-integration.md | 2 +- site/tasks/manage/metrics.md | 2 +- site/tasks/manage/multi-cloud-multi-hop.md | 2 +- site/tasks/manage/security-untrusted-networks.md | 2 +- site/tasks/manage/service-management.md | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md index 8e89d28e..db1dd76b 100644 --- a/site/tasks/manage/application-isolation.md +++ b/site/tasks/manage/application-isolation.md @@ -1,6 +1,6 @@ --- title: Isolating Applications on a Weave Network -menu_order: 30 +menu_order: 5 search_type: Documentation --- diff --git a/site/tasks/manage/awsvpc.md b/site/tasks/manage/awsvpc.md index 02ce182b..a755034d 100644 --- a/site/tasks/manage/awsvpc.md +++ b/site/tasks/manage/awsvpc.md @@ -1,6 +1,6 @@ --- -title: Using IP Routing on an Amazon Web Services Virtual Private Cloud -menu_order: 110 +title: Configuring IP Routing on an Amazon Web Services Virtual Private Cloud +menu_order: 80 search_type: Documentation --- diff --git a/site/tasks/manage/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md index 0907e341..11384e92 100644 --- a/site/tasks/manage/dynamically-attach-containers.md +++ b/site/tasks/manage/dynamically-attach-containers.md @@ -1,6 +1,6 @@ --- title: Dynamically Attaching and Detaching Applications -menu_order: 40 +menu_order: 10 search_type: Documentation --- diff --git a/site/tasks/manage/fastdp.md b/site/tasks/manage/fastdp.md index 2711cfc8..7eb7a27b 100644 --- a/site/tasks/manage/fastdp.md +++ b/site/tasks/manage/fastdp.md @@ -1,6 +1,6 @@ --- title: Using Fast Datapath -menu_order: 96 +menu_order: 60 search_type: Documentation --- diff --git a/site/tasks/manage/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md index c0c623b7..3892d031 100644 --- a/site/tasks/manage/finding-adding-hosts-dynamically.md +++ b/site/tasks/manage/finding-adding-hosts-dynamically.md @@ -1,6 +1,6 @@ --- title: Adding and Removing Hosts Dynamically -menu_order: 90 +menu_order: 50 search_type: Documentation --- diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index 3ea2d494..b957bdef 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -1,6 +1,6 @@ --- title: Integrating with the Host Network -menu_order: 60 +menu_order: 20 search_type: Documentation --- diff --git a/site/tasks/manage/metrics.md b/site/tasks/manage/metrics.md index b116bde5..6f7d5f8d 100644 --- a/site/tasks/manage/metrics.md +++ b/site/tasks/manage/metrics.md @@ -1,6 +1,6 @@ --- title: Monitoring with Prometheus -menu_order: 105 +menu_order: 90 search_type: Documentation --- diff --git a/site/tasks/manage/multi-cloud-multi-hop.md b/site/tasks/manage/multi-cloud-multi-hop.md index e75144ae..405bfbd5 100644 --- a/site/tasks/manage/multi-cloud-multi-hop.md +++ b/site/tasks/manage/multi-cloud-multi-hop.md @@ -1,6 +1,6 @@ --- title: Enabling Multi-Cloud, Multi-Hop Networking and Routing -menu_order: 100 +menu_order: 70 search_type: Documentation --- diff --git a/site/tasks/manage/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md index 951ff12a..848a6ccb 100644 --- a/site/tasks/manage/security-untrusted-networks.md +++ b/site/tasks/manage/security-untrusted-networks.md @@ -1,6 +1,6 @@ --- title: Securing Connections Across Untrusted Networks -menu_order: 80 +menu_order: 40 search_type: Documentation --- diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index fac03585..68504e5b 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -1,6 +1,6 @@ --- title: Managing Services - Exporting, Importing, Binding and Routing -menu_order: 70 +menu_order: 30 search_type: Documentation --- From fa512ee22adb2325dcea4b8bfb8dc61dbbda85d4 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:28:09 -0500 Subject: [PATCH 082/125] index file for tasks section --- site/tasks.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 site/tasks.md diff --git a/site/tasks.md b/site/tasks.md new file mode 100644 index 00000000..e4969dde --- /dev/null +++ b/site/tasks.md @@ -0,0 +1,5 @@ +--- +title: Weave Net Tasks +menu_order: 50 +search_type: Documentation +--- From 14e97185b334f9a93a576e1cc88fd829b12af723 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:50:52 -0500 Subject: [PATCH 083/125] mv ipam tasks mv weavedns tasks mv image tasks/manage --- site/{ => tasks}/ipam/allocation-multi-ipam.md | 0 site/tasks/{ => ipam}/configuring-weave.md | 0 site/{ => tasks/ipam}/ipam.md | 0 site/tasks/{ => ipam}/manual-ip-address.md | 0 site/{ => tasks}/ipam/stop-remove-peers-ipam.md | 0 site/{ => tasks}/ipam/troubleshooting-ipam.md | 0 .../{ => manage}/weave-net-awsvpc-1007x438.png | Bin site/{ => tasks}/weavedns/how-works-weavedns.md | 0 .../weavedns/load-balance-fault-weavedns.md | 0 .../weavedns/managing-domains-weavedns.md | 0 .../weavedns/managing-entries-weavedns.md | 0 .../weavedns/troubleshooting-weavedns.md | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => tasks}/ipam/allocation-multi-ipam.md (100%) rename site/tasks/{ => ipam}/configuring-weave.md (100%) rename site/{ => tasks/ipam}/ipam.md (100%) rename site/tasks/{ => ipam}/manual-ip-address.md (100%) rename site/{ => tasks}/ipam/stop-remove-peers-ipam.md (100%) rename site/{ => tasks}/ipam/troubleshooting-ipam.md (100%) rename site/tasks/{ => manage}/weave-net-awsvpc-1007x438.png (100%) rename site/{ => tasks}/weavedns/how-works-weavedns.md (100%) rename site/{ => tasks}/weavedns/load-balance-fault-weavedns.md (100%) rename site/{ => tasks}/weavedns/managing-domains-weavedns.md (100%) rename site/{ => tasks}/weavedns/managing-entries-weavedns.md (100%) rename site/{ => tasks}/weavedns/troubleshooting-weavedns.md (100%) diff --git a/site/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md similarity index 100% rename from site/ipam/allocation-multi-ipam.md rename to site/tasks/ipam/allocation-multi-ipam.md diff --git a/site/tasks/configuring-weave.md b/site/tasks/ipam/configuring-weave.md similarity index 100% rename from site/tasks/configuring-weave.md rename to site/tasks/ipam/configuring-weave.md diff --git a/site/ipam.md b/site/tasks/ipam/ipam.md similarity index 100% rename from site/ipam.md rename to site/tasks/ipam/ipam.md diff --git a/site/tasks/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md similarity index 100% rename from site/tasks/manual-ip-address.md rename to site/tasks/ipam/manual-ip-address.md diff --git a/site/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md similarity index 100% rename from site/ipam/stop-remove-peers-ipam.md rename to site/tasks/ipam/stop-remove-peers-ipam.md diff --git a/site/ipam/troubleshooting-ipam.md b/site/tasks/ipam/troubleshooting-ipam.md similarity index 100% rename from site/ipam/troubleshooting-ipam.md rename to site/tasks/ipam/troubleshooting-ipam.md diff --git a/site/tasks/weave-net-awsvpc-1007x438.png b/site/tasks/manage/weave-net-awsvpc-1007x438.png similarity index 100% rename from site/tasks/weave-net-awsvpc-1007x438.png rename to site/tasks/manage/weave-net-awsvpc-1007x438.png diff --git a/site/weavedns/how-works-weavedns.md b/site/tasks/weavedns/how-works-weavedns.md similarity index 100% rename from site/weavedns/how-works-weavedns.md rename to site/tasks/weavedns/how-works-weavedns.md diff --git a/site/weavedns/load-balance-fault-weavedns.md b/site/tasks/weavedns/load-balance-fault-weavedns.md similarity index 100% rename from site/weavedns/load-balance-fault-weavedns.md rename to site/tasks/weavedns/load-balance-fault-weavedns.md diff --git a/site/weavedns/managing-domains-weavedns.md b/site/tasks/weavedns/managing-domains-weavedns.md similarity index 100% rename from site/weavedns/managing-domains-weavedns.md rename to site/tasks/weavedns/managing-domains-weavedns.md diff --git a/site/weavedns/managing-entries-weavedns.md b/site/tasks/weavedns/managing-entries-weavedns.md similarity index 100% rename from site/weavedns/managing-entries-weavedns.md rename to site/tasks/weavedns/managing-entries-weavedns.md diff --git a/site/weavedns/troubleshooting-weavedns.md b/site/tasks/weavedns/troubleshooting-weavedns.md similarity index 100% rename from site/weavedns/troubleshooting-weavedns.md rename to site/tasks/weavedns/troubleshooting-weavedns.md From 0c36b87bcce3e811b6d2dcc0928077177df1e798 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 18:51:37 -0500 Subject: [PATCH 084/125] ipam topic order --- site/tasks/ipam.md | 5 +++++ site/tasks/ipam/allocation-multi-ipam.md | 2 +- site/tasks/ipam/configuring-weave.md | 2 +- site/tasks/ipam/ipam.md | 2 +- site/tasks/ipam/stop-remove-peers-ipam.md | 2 +- site/tasks/ipam/troubleshooting-ipam.md | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 site/tasks/ipam.md diff --git a/site/tasks/ipam.md b/site/tasks/ipam.md new file mode 100644 index 00000000..eed33454 --- /dev/null +++ b/site/tasks/ipam.md @@ -0,0 +1,5 @@ +--- +title: Administering IP Addresses +menu_order: 20 +search_type: Documentation +--- \ No newline at end of file diff --git a/site/tasks/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md index 794e2c93..ba534aa1 100644 --- a/site/tasks/ipam/allocation-multi-ipam.md +++ b/site/tasks/ipam/allocation-multi-ipam.md @@ -1,6 +1,6 @@ --- title: Automatic Allocation Across Multiple Subnets -menu_order: 10 +menu_order: 30 search_type: Documentation --- diff --git a/site/tasks/ipam/configuring-weave.md b/site/tasks/ipam/configuring-weave.md index db7405cb..03e2755a 100644 --- a/site/tasks/ipam/configuring-weave.md +++ b/site/tasks/ipam/configuring-weave.md @@ -1,6 +1,6 @@ --- title: Allocating IPs in a Specific Range -menu_order: 15 +menu_order: 10 search_type: Documentation --- diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md index ca014269..82abb79a 100644 --- a/site/tasks/ipam/ipam.md +++ b/site/tasks/ipam/ipam.md @@ -1,6 +1,6 @@ --- title: Allocating IP Addresses -menu_order: 70 +menu_order: 5 search_type: Documentation --- diff --git a/site/tasks/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md index f76d1331..67f1113c 100644 --- a/site/tasks/ipam/stop-remove-peers-ipam.md +++ b/site/tasks/ipam/stop-remove-peers-ipam.md @@ -1,6 +1,6 @@ --- title: Starting, Stopping and Removing Peers -menu_order: 20 +menu_order: 40 search_type: Documentation --- diff --git a/site/tasks/ipam/troubleshooting-ipam.md b/site/tasks/ipam/troubleshooting-ipam.md index 3a5f80b9..e0ac44ee 100644 --- a/site/tasks/ipam/troubleshooting-ipam.md +++ b/site/tasks/ipam/troubleshooting-ipam.md @@ -1,6 +1,6 @@ --- title: Troubleshooting the IP Allocator -menu_order: 30 +menu_order: 50 search_type: Documentation --- From 61f83cd4639cd670c59186db8e4aa17b5b4177a7 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:07:23 -0500 Subject: [PATCH 085/125] added diagram to concepts mv weavedns --- site/{ => concepts}/top-diag1.png | Bin site/{ => tasks/weavedns}/weavedns.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => concepts}/top-diag1.png (100%) rename site/{ => tasks/weavedns}/weavedns.md (100%) diff --git a/site/top-diag1.png b/site/concepts/top-diag1.png similarity index 100% rename from site/top-diag1.png rename to site/concepts/top-diag1.png diff --git a/site/weavedns.md b/site/tasks/weavedns/weavedns.md similarity index 100% rename from site/weavedns.md rename to site/tasks/weavedns/weavedns.md From 3b029896c934995158e1dd2495057596c8761b97 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:07:51 -0500 Subject: [PATCH 086/125] menu topic order --- site/tasks/weavedns/weavedns.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/tasks/weavedns/weavedns.md b/site/tasks/weavedns/weavedns.md index a83e6fec..c0f3b4cc 100644 --- a/site/tasks/weavedns/weavedns.md +++ b/site/tasks/weavedns/weavedns.md @@ -1,6 +1,6 @@ --- title: Discovering Containers with WeaveDNS -menu_order: 80 +menu_order: 5 search_type: Documentation --- From e8310ab1b71bfcf7d45d58fe53d25df5c3da1557 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:08:10 -0500 Subject: [PATCH 087/125] index file --- site/tasks/weavedns.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 site/tasks/weavedns.md diff --git a/site/tasks/weavedns.md b/site/tasks/weavedns.md new file mode 100644 index 00000000..a1f13376 --- /dev/null +++ b/site/tasks/weavedns.md @@ -0,0 +1,5 @@ +--- +title: Managing WeaveDNS +menu_order: 30 +search_type: Documentation +--- \ No newline at end of file From 1d09a35bcdc9289c09278c5624023e3d283a248b Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:10:01 -0500 Subject: [PATCH 088/125] moved .dot file need this? --- site/{ => concepts}/top-diag1.dot | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename site/{ => concepts}/top-diag1.dot (100%) diff --git a/site/top-diag1.dot b/site/concepts/top-diag1.dot similarity index 100% rename from site/top-diag1.dot rename to site/concepts/top-diag1.dot From 2f9f500ecbdd6a0bb0e68dd03400e08e9dbd6198 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:14:00 -0500 Subject: [PATCH 089/125] moved screencast image to installing --- site/{ => install}/hello-screencast.png | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename site/{ => install}/hello-screencast.png (100%) diff --git a/site/hello-screencast.png b/site/install/hello-screencast.png similarity index 100% rename from site/hello-screencast.png rename to site/install/hello-screencast.png From d0ad4ad0225573b89fa30a08bf20ace516fc8a59 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:34:58 -0500 Subject: [PATCH 090/125] docker-api mv to tasks --- site/{ => tasks}/weave-docker-api/automatic-discovery-proxy.md | 0 site/{ => tasks}/weave-docker-api/ipam-proxy.md | 0 site/{ => tasks}/weave-docker-api/launching-without-proxy.md | 0 site/{ => tasks}/weave-docker-api/name-resolution-proxy.md | 0 site/{ => tasks}/weave-docker-api/securing-proxy.md | 0 site/{ => tasks}/weave-docker-api/using-proxy.md | 0 site/{ => tasks/weave-docker-api}/weave-docker-api.md | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename site/{ => tasks}/weave-docker-api/automatic-discovery-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/ipam-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/launching-without-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/name-resolution-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/securing-proxy.md (100%) rename site/{ => tasks}/weave-docker-api/using-proxy.md (100%) rename site/{ => tasks/weave-docker-api}/weave-docker-api.md (100%) diff --git a/site/weave-docker-api/automatic-discovery-proxy.md b/site/tasks/weave-docker-api/automatic-discovery-proxy.md similarity index 100% rename from site/weave-docker-api/automatic-discovery-proxy.md rename to site/tasks/weave-docker-api/automatic-discovery-proxy.md diff --git a/site/weave-docker-api/ipam-proxy.md b/site/tasks/weave-docker-api/ipam-proxy.md similarity index 100% rename from site/weave-docker-api/ipam-proxy.md rename to site/tasks/weave-docker-api/ipam-proxy.md diff --git a/site/weave-docker-api/launching-without-proxy.md b/site/tasks/weave-docker-api/launching-without-proxy.md similarity index 100% rename from site/weave-docker-api/launching-without-proxy.md rename to site/tasks/weave-docker-api/launching-without-proxy.md diff --git a/site/weave-docker-api/name-resolution-proxy.md b/site/tasks/weave-docker-api/name-resolution-proxy.md similarity index 100% rename from site/weave-docker-api/name-resolution-proxy.md rename to site/tasks/weave-docker-api/name-resolution-proxy.md diff --git a/site/weave-docker-api/securing-proxy.md b/site/tasks/weave-docker-api/securing-proxy.md similarity index 100% rename from site/weave-docker-api/securing-proxy.md rename to site/tasks/weave-docker-api/securing-proxy.md diff --git a/site/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md similarity index 100% rename from site/weave-docker-api/using-proxy.md rename to site/tasks/weave-docker-api/using-proxy.md diff --git a/site/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md similarity index 100% rename from site/weave-docker-api.md rename to site/tasks/weave-docker-api/weave-docker-api.md From a81720d64c2d86501c7c4a093b0c9f0137320efc Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:35:28 -0500 Subject: [PATCH 091/125] topic ordering --- site/tasks/weave-docker-api/automatic-discovery-proxy.md | 2 +- site/tasks/weave-docker-api/ipam-proxy.md | 2 +- site/tasks/weave-docker-api/launching-without-proxy.md | 2 +- site/tasks/weave-docker-api/name-resolution-proxy.md | 2 +- site/tasks/weave-docker-api/weave-docker-api.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/site/tasks/weave-docker-api/automatic-discovery-proxy.md b/site/tasks/weave-docker-api/automatic-discovery-proxy.md index d0ad1921..7b333ef7 100644 --- a/site/tasks/weave-docker-api/automatic-discovery-proxy.md +++ b/site/tasks/weave-docker-api/automatic-discovery-proxy.md @@ -1,6 +1,6 @@ --- title: Using Automatic Discovery With the Weave Net Proxy -menu_order: 30 +menu_order: 40 search_type: Documentation --- diff --git a/site/tasks/weave-docker-api/ipam-proxy.md b/site/tasks/weave-docker-api/ipam-proxy.md index f468ff10..231ca9e8 100644 --- a/site/tasks/weave-docker-api/ipam-proxy.md +++ b/site/tasks/weave-docker-api/ipam-proxy.md @@ -1,6 +1,6 @@ --- title: Automatic IP Allocation and the Weave Proxy -menu_order: 25 +menu_order: 30 search_type: Documentation --- diff --git a/site/tasks/weave-docker-api/launching-without-proxy.md b/site/tasks/weave-docker-api/launching-without-proxy.md index a261452f..d6cdd9e4 100644 --- a/site/tasks/weave-docker-api/launching-without-proxy.md +++ b/site/tasks/weave-docker-api/launching-without-proxy.md @@ -1,6 +1,6 @@ --- title: Launching Containers With Weave Run (without the Proxy) -menu_order: 50 +menu_order: 60 search_type: Documentation --- diff --git a/site/tasks/weave-docker-api/name-resolution-proxy.md b/site/tasks/weave-docker-api/name-resolution-proxy.md index 60635ae1..c0d42267 100644 --- a/site/tasks/weave-docker-api/name-resolution-proxy.md +++ b/site/tasks/weave-docker-api/name-resolution-proxy.md @@ -1,6 +1,6 @@ --- title: Name resolution via `/etc/hosts` -menu_order: 40 +menu_order: 50 search_type: Documentation --- diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md index 14e7b6ad..97ddcf0b 100644 --- a/site/tasks/weave-docker-api/weave-docker-api.md +++ b/site/tasks/weave-docker-api/weave-docker-api.md @@ -1,6 +1,6 @@ --- title: Integrating Docker via the API Proxy -menu_order: 50 +menu_order: 5 search_type: Documentation --- From 760a76cbd061406f624f6e9295e97934a0d04fd9 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 19:35:57 -0500 Subject: [PATCH 092/125] index file for directory --- site/tasks/weave-docker-api.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 site/tasks/weave-docker-api.md diff --git a/site/tasks/weave-docker-api.md b/site/tasks/weave-docker-api.md new file mode 100644 index 00000000..75382591 --- /dev/null +++ b/site/tasks/weave-docker-api.md @@ -0,0 +1,6 @@ +--- +title: Attaching Docker Containers via the Weave API Proxy +menu_order: 40 +search_type: Documentation +--- + From dd1fc02f9f159fe11bebfcc91c9a4614965e03cb Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 20:17:00 -0500 Subject: [PATCH 093/125] order topic --- site/building.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/building.md b/site/building.md index 50aac708..26d5109b 100644 --- a/site/building.md +++ b/site/building.md @@ -1,6 +1,6 @@ --- title: Building Weave Net -menu_order: 120 +menu_order: 220 search_type: Documentation --- You only need to build Weave Net if you want to work on the Weave Net codebase From 4e71e4db865e569ec2f7aa6669695a9d0e9fcfd8 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Tue, 11 Jul 2017 23:40:16 -0500 Subject: [PATCH 094/125] remove index from concepts title --- site/concepts.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts.md b/site/concepts.md index be2e7e5d..6b64f325 100644 --- a/site/concepts.md +++ b/site/concepts.md @@ -1,5 +1,5 @@ --- -title: Weave Net Concepts Index +title: Concepts in Weave Net menu_order: 20 search_type: Documentation --- From afc2f13841f4fb72021ee194ea6e35cbdc7e7de8 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 12:37:33 -0500 Subject: [PATCH 095/125] put installing first --- site/install/installing-weave.md | 2 +- site/install/using-weave.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 9f3e8042..7bfa1c3d 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -1,6 +1,6 @@ --- title: Installing Weave Net -menu_order: 30 +menu_order: 20 search_type: Documentation --- diff --git a/site/install/using-weave.md b/site/install/using-weave.md index d9c756ec..7b413e8a 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -1,6 +1,6 @@ --- title: Launching Weave Net -menu_order: 20 +menu_order: 30 search_type: Documentation --- From 35b4fca59f46214b286185bb1bc9a4f9a0b0013b Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 12:41:38 -0500 Subject: [PATCH 096/125] make launch 10 --- site/install/using-weave.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 7b413e8a..d397bba2 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -1,6 +1,6 @@ --- title: Launching Weave Net -menu_order: 30 +menu_order: 10 search_type: Documentation --- From bea58ef6dcca5a17e689f85c354082128a45fb01 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 12:45:13 -0500 Subject: [PATCH 097/125] better title for weave cloud and net --- site/install/weave-cloud.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 96ed6679..bd8f658f 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -1,5 +1,5 @@ --- -title: Using Weave Cloud to get started with Weave Net +title: Visualizing Weave Net in Weave Cloud menu_order: 30 search_type: Documentation --- From 773aeda98090d79e0861be85b5ae745e560efa77 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:06:34 -0500 Subject: [PATCH 098/125] replaced url for features --- site/install/installing-weave.md | 2 +- site/install/systemd.md | 2 +- site/overview.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 7bfa1c3d..8f22445f 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -66,7 +66,7 @@ To make encryption in fast datapath work on Google Cloud Platform, see * [Using Weave Net](/site/using-weave.md) * [Getting Started Guides](http://www.weave.works/guides/) - * [Features](/site/features.md) + * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) * [Building](/site/building.md) * [Using Weave with Systemd](/site/installing-weave/systemd.md) diff --git a/site/install/systemd.md b/site/install/systemd.md index 4d725986..9f5b8ed3 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -66,5 +66,5 @@ context with the commands shown below. You will need to have the * [Using Weave Net](/site/using-weave.md) * [Getting Started Guides](http://www.weave.works/guides/) - * [Features](/site/features.md) + * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) diff --git a/site/overview.md b/site/overview.md index 93fb9e9f..bedf4596 100644 --- a/site/overview.md +++ b/site/overview.md @@ -60,7 +60,7 @@ With Weave Net, deploy your applications - whether peer-to-peer file sharing, vo Weave Net is a good choice if you want one tool for everything. For example: In addition to Docker plugins, you can also use Weave as a Kubernetes plugin. You can also use Weave with Amazon ECS or with Mesos and Marathon. Refer to our Getting Started and Integration Guides for more information. -For a complete list and description of Weave Net’s current feature set see, [Weave Net Features](/site/features.md). +For a complete list and description of Weave Net’s current feature set see, [Weave Net Features](/site/overview/features.md). From f3e83dcdb9481a2f5b6970263990644b86d701a6 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:12:02 -0500 Subject: [PATCH 099/125] update how it works url --- site/concepts/encryption.md | 2 +- site/troubleshooting.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/concepts/encryption.md b/site/concepts/encryption.md index 08231d5c..084e6a12 100644 --- a/site/concepts/encryption.md +++ b/site/concepts/encryption.md @@ -6,7 +6,7 @@ search_type: Documentation Weave Net peers -[communicate with each other over both TCP and UDP](/site/how-it-works.md). This +[communicate with each other over both TCP and UDP](/site/concepts/how-it-works.md). This communication [can be encrypted](/site/using-weave/security-untrusted-networks.md). diff --git a/site/troubleshooting.md b/site/troubleshooting.md index d849c272..1bbdb2fc 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -79,7 +79,7 @@ $ weave status ``` The terms used here are explained further at -[How Weave Net Works](/site/how-it-works.md). +[How Weave Net Works](/site/concepts/how-it-works.md). * **Version** - shows the Weave Net version. If checkpoint is enabled (i.e. `CHECKPOINT_DISABLE` is not set), information about existence of a new version From ddf2c99240f3c3bd9136b5039018540cc93ac770 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:31:48 -0500 Subject: [PATCH 100/125] replaced urls /site/how-it-works/ with /site/concepts/ --- site/concepts/encryption-implementation.md | 4 ++-- site/concepts/encryption.md | 2 +- site/concepts/how-it-works.md | 4 ++-- site/concepts/network-topology.md | 2 +- site/concepts/router-encapsulation.md | 2 +- site/faq.md | 2 +- site/overview/features.md | 6 +++--- site/tasks/ipam/configuring-weave.md | 2 +- site/tasks/ipam/ipam.md | 2 +- site/tasks/ipam/manual-ip-address.md | 2 +- site/tasks/manage/fastdp.md | 6 +++--- site/tasks/manage/host-network-integration.md | 2 +- site/tasks/manage/security-untrusted-networks.md | 2 +- site/troubleshooting.md | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/site/concepts/encryption-implementation.md b/site/concepts/encryption-implementation.md index ff8511d6..21b534ef 100644 --- a/site/concepts/encryption-implementation.md +++ b/site/concepts/encryption-implementation.md @@ -5,7 +5,7 @@ search_type: Documentation --- This section describes some details of Weave Net's built-in -[encryption](/site/how-it-works/encryption.md): +[encryption](/site/concepts/encryption.md): * [Establishing the Ephemeral Session Key](#ephemeral-key) * [Key Generation](#csprng) @@ -148,7 +148,7 @@ follows: | Frame N: Captured payload | | +-----------------------------------+ -+ -This is very similar to the [non-crypto encapsulation](/site/how-it-works/router-encapsulation.md). +This is very similar to the [non-crypto encapsulation](/site/concepts/router-encapsulation.md). All of the frames on a connection are encrypted with the same ephemeral session key, and a nonce constructed from a message sequence diff --git a/site/concepts/encryption.md b/site/concepts/encryption.md index 084e6a12..dceafb62 100644 --- a/site/concepts/encryption.md +++ b/site/concepts/encryption.md @@ -41,5 +41,5 @@ the IP transformation framework (XFRM). **See Also** - * [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md) + * [How Weave Implements Encryption](/site/concepts/encryption-implementation.md) * [Securing Containers Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) diff --git a/site/concepts/how-it-works.md b/site/concepts/how-it-works.md index 4082b09f..4bde7068 100644 --- a/site/concepts/how-it-works.md +++ b/site/concepts/how-it-works.md @@ -45,5 +45,5 @@ first send it to peer 3: **See Also** - * [Weave Router Sleeve Encapsulation](/site/how-it-works/router-encapsulation.md) - * [How Weave Interprets Network Topology](/site/how-it-works/network-topology.md) + * [Weave Router Sleeve Encapsulation](/site/concepts/router-encapsulation.md) + * [How Weave Interprets Network Topology](/site/concepts/network-topology.md) diff --git a/site/concepts/network-topology.md b/site/concepts/network-topology.md index d168b5b0..111dd453 100644 --- a/site/concepts/network-topology.md +++ b/site/concepts/network-topology.md @@ -145,7 +145,7 @@ which time the topology should have updated. **See Also** - * [Weave Net Router Encapsulation](/site/how-it-works/router-encapsulation.md) + * [Weave Net Router Encapsulation](/site/concepts/router-encapsulation.md) diff --git a/site/concepts/router-encapsulation.md b/site/concepts/router-encapsulation.md index b15a3b2e..44806eeb 100644 --- a/site/concepts/router-encapsulation.md +++ b/site/concepts/router-encapsulation.md @@ -62,4 +62,4 @@ MAC discovery. **See Also** - * [How Weave Net Interprets Network Topology](/site/how-it-works/network-topology.md) + * [How Weave Net Interprets Network Topology](/site/concepts/network-topology.md) diff --git a/site/faq.md b/site/faq.md index 8f9c83aa..8cd4d12c 100644 --- a/site/faq.md +++ b/site/faq.md @@ -63,7 +63,7 @@ All virtualization techniques have some overhead, and Weave's overhead is typica Weave Net also automatically uses the fastest datapath between two hosts. When Weave Net can't use the fast datapath between two hosts, it falls back to the slower packet forwarding approach. Selecting the fastest forwarding approach is automatic, and is determined on a connection-by-connection basis. For example, a Weave network spanning two data centers might use fast datapath within the data centers, but not for the more constrained network link between them. -For more information about fast datapath see [How Fast Datapath Works](/site/how-it-works/fastdp-how-it-works.md). +For more information about fast datapath see [How Fast Datapath Works](/site/concepts/fastdp-how-it-works.md). diff --git a/site/overview/features.md b/site/overview/features.md index 03187e3a..8e2353c2 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -54,7 +54,7 @@ transport data between peers. The best performing of these (the 'fast datapath') offers near-native throughput and latency. See [Using Fast Datapath](/site/using-weave/fastdp.md) and -[How Fast Datapath Works](/site/how-it-works/fastdp-how-it-works.md). +[How Fast Datapath Works](/site/concepts/fastdp-how-it-works.md). ### Seamless Docker Integration (Weave Docker API Proxy) @@ -103,7 +103,7 @@ Instead of allowing Weave to automatically allocate addresses, an IP address and specified. See [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) for instructions. For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Management](/site/ipam.md). And also review the -[the basics of IP addressing](/site/how-it-works/ip-addresses.md) for an explanation of addressing and private networks. +[the basics of IP addressing](/site/concepts/ip-addresses.md) for an explanation of addressing and private networks. ### Naming and Discovery @@ -176,7 +176,7 @@ running alongside Weave. Weave Net implements encryption and security using the Go version of [Daniel J. Bernstein's NaCl library](http://nacl.cr.yp.to/index.html), and, additionally in the case of encrypted fast datapath using [the cryptography framework of the Linux kernel](https://en.wikipedia.org/wiki/Crypto_API_(Linux)). -For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/how-it-works/encryption.md) and [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md). +For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/concepts/encryption.md) and [How Weave Implements Encryption](/site/concepts/encryption-implementation.md). ### Host Network Integration diff --git a/site/tasks/ipam/configuring-weave.md b/site/tasks/ipam/configuring-weave.md index 03e2755a..22353e6e 100644 --- a/site/tasks/ipam/configuring-weave.md +++ b/site/tasks/ipam/configuring-weave.md @@ -40,4 +40,4 @@ Networks](https://en.wikipedia.org/wiki/Private_network). For example **See Also** - * [IP Addresses, Routes and Networks](/site/how-it-works/ip-addresses.md) + * [IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md index 82abb79a..4d3b0723 100644 --- a/site/tasks/ipam/ipam.md +++ b/site/tasks/ipam/ipam.md @@ -180,7 +180,7 @@ The range parameter is written in in this example "/16" means the first 16 bits of the address form the network address and the allocator is to allocate container addresses that all start 10.2. See [IP -addresses and routes](/site/how-it-works/ip-addresses.md) for more information. +addresses and routes](/site/concepts/ip-addresses.md) for more information. Weave shares the IP address range across all peers, dynamically according to their needs. If a group of peers becomes isolated from diff --git a/site/tasks/ipam/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md index c206e577..3edd1feb 100644 --- a/site/tasks/ipam/manual-ip-address.md +++ b/site/tasks/ipam/manual-ip-address.md @@ -11,7 +11,7 @@ Containers are automatically allocated an IP address that is unique across the W Weave Net detects when a container has exited and releases its allocated addresses so they can be re-used by the network. -See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/site/how-it-works/ip-addresses.md) for further details. +See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/site/concepts/ip-addresses.md) for further details. Instead of allowing Weave Net to allocate IP addresses automatically (using IPAM), there may be instances where you need to control a particular container or a cluster by setting an IP address for it. diff --git a/site/tasks/manage/fastdp.md b/site/tasks/manage/fastdp.md index 7eb7a27b..02b17fc3 100644 --- a/site/tasks/manage/fastdp.md +++ b/site/tasks/manage/fastdp.md @@ -9,7 +9,7 @@ The most important thing to know about fast datapath is that you don't need to c When Weave Net cannot use the fast data path between two hosts, it falls back to a slower packet forwarding approach called `sleeve`. Selecting the fastest forwarding approach is automatic, and is determined on a connection-by-connection basis. For example, a Weave network spanning two data centers might use fast data path within the data centers, but not for the more constrained network link between them. -See [How Fastdp Works](/site/how-it-works/fastdp-how-it-works.md) for a more in-depth discussion of this feature. +See [How Fastdp Works](/site/concepts/fastdp-how-it-works.md) for a more in-depth discussion of this feature. ### Disabling Fast Datapath @@ -26,7 +26,7 @@ Each encrypted dataplane packet is encapsulated into [ESP](https://tools.ietf.or thus in some networks a firewall rule for allowing ESP traffic needs to be installed. E.g. Google Cloud Platform denies ESP packets by default. -See [How Weave Implements Encryption](/site/how-it-works/encryption-implementation.md) +See [How Weave Implements Encryption](/site/concepts/encryption-implementation.md) for more details for the fastdp encryption. ### Viewing Connection Mode Fastdp or Sleeve @@ -72,5 +72,5 @@ frame" configuration: **See Also** * [Using Weave Net](/site/using-weave.md) - * [How Fastdp Works](/site/how-it-works/fastdp-how-it-works.md) + * [How Fastdp Works](/site/concepts/fastdp-how-it-works.md) * [Performance measurements](/blog/weave-docker-networking-performance-fast-data-path/) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index b957bdef..81788dcb 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -60,5 +60,5 @@ hosts. **See Also** * [Using Weave Net](/site/using-weave.md) - * [General information on IP Addresses, Routes and Networks](/site/how-it-works/ip-addresses.md) + * [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) diff --git a/site/tasks/manage/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md index 848a6ccb..f05ecae2 100644 --- a/site/tasks/manage/security-untrusted-networks.md +++ b/site/tasks/manage/security-untrusted-networks.md @@ -53,5 +53,5 @@ Be aware that: **See Also** - * [Weave Encryption](/site/how-it-works/encryption.md) + * [Weave Encryption](/site/concepts/encryption.md) * [Using Fast Datapath](/site/using-weave/fastdp.md) diff --git a/site/troubleshooting.md b/site/troubleshooting.md index 1bbdb2fc..9e31a2a0 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -95,7 +95,7 @@ can be overridden by using the `--nickname` argument at `weave launch`. * **Encryption** - indicates whether -[encryption](/site/how-it-works/encryption.md) is in use for communication +[encryption](/site/concepts/encryption.md) is in use for communication between peers. * **PeerDiscovery** - indicates whether From 5fc94ca01d178bb08e6f00634bb1b30268101fdd Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:35:45 -0500 Subject: [PATCH 101/125] replaced urls /site/installing-weave.md w /site/install/installing-weave.md --- site/install/systemd.md | 2 +- site/install/using-weave.md | 2 +- site/install/weave-cloud.md | 2 +- site/overview/features.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/install/systemd.md b/site/install/systemd.md index 9f5b8ed3..cb32ce9f 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -5,7 +5,7 @@ search_type: Documentation --- -Having installed Weave Net as per [Installing Weave](/site/installing-weave.md), you might find it convenient to configure the +Having installed Weave Net as per [Installing Weave](/site/install/installing-weave.md), you might find it convenient to configure the init daemon to start Weave on boot. Most recent Linux distribution releases ship with [systemd](http://www.freedesktop.org/wiki/Software/systemd/). The information below provides you with some initial guidance on getting a Weave Net service configured on a systemd-based OS. ## Weave Net Service Unit and Configuration diff --git a/site/install/using-weave.md b/site/install/using-weave.md index d397bba2..58ce1799 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -134,7 +134,7 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex **See Also** - * [Installing Weave Net](/site/installing-weave.md) + * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Cloud to get started with Weave Net](/site/using-weave/weave-cloud.md) * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index bd8f658f..c1ea7ef0 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -121,7 +121,7 @@ connect to it. **See Also** - * [Installing Weave Net](/site/installing-weave.md) + * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Net](/site/using-weave.md) * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) diff --git a/site/overview/features.md b/site/overview/features.md index 8e2353c2..2f17d65a 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -44,7 +44,7 @@ a container network. Broadcast and Multicast protocols can also be used over Weave Net. -To start using Weave Net, see [Installing Weave Net](/site/installing-weave.md) +To start using Weave Net, see [Installing Weave Net](/site/install/installing-weave.md) and [Using Weave Net](/site/using-weave.md). ### Fast Datapath From a2602bb7122ba791af27001f4b64022c7e5294d8 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:46:56 -0500 Subject: [PATCH 102/125] replaced URLs for install and docker plugins --- site/install/plugin/plugin-how-it-works.md | 4 ++-- site/install/plugin/plugin-v2.md | 4 ++-- site/install/plugin/plugin.md | 4 ++-- site/install/using-weave.md | 4 ++-- site/install/weave-cloud.md | 4 ++-- site/overview.md | 2 +- site/overview/features.md | 4 ++-- site/tasks/ipam/ipam.md | 2 +- site/tasks/weave-docker-api/weave-docker-api.md | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/site/install/plugin/plugin-how-it-works.md b/site/install/plugin/plugin-how-it-works.md index 48f55c1f..28e78d39 100644 --- a/site/install/plugin/plugin-how-it-works.md +++ b/site/install/plugin/plugin-how-it-works.md @@ -51,6 +51,6 @@ The plugin accepts the following options via `docker network create ... --opt`: **See Also** - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) + * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md index 76988c18..6b82b2e1 100644 --- a/site/install/plugin/plugin-v2.md +++ b/site/install/plugin/plugin-v2.md @@ -76,5 +76,5 @@ Or to start a container: **See Also** - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [How the Weave Network Plugins Work](/site/plugin/plugin-how-it-works.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) + * [How the Weave Network Plugins Work](/site/install/plugin/plugin-how-it-works.md) diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index 403211fa..f8633941 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -63,7 +63,7 @@ this between hosts requires that you run Docker in ["swarm mode"](https://docs.d ["key-value store"](https://docs.docker.com/engine/userguide/networking/get-started-overlay/#/set-up-a-key-value-store). To operate in swarm mode, you are required to use the plugin v2 of Weave Net. -See [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md) for +See [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) for more details. If your Docker installation has a key-value store, create a network @@ -96,4 +96,4 @@ If you are using `systemd` with Docker 1.9, it is advised that you modify the Do **See Also** - * [How the Weave Network Plugins Work](/site/plugin/plugin-how-it-works.md) + * [How the Weave Network Plugins Work](/site/install/plugin/plugin-how-it-works.md) diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 58ce1799..cae0f8a5 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -137,5 +137,5 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Cloud to get started with Weave Net](/site/using-weave/weave-cloud.md) * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) + * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index c1ea7ef0..64fa8f03 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -124,5 +124,5 @@ connect to it. * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Net](/site/using-weave.md) * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) - * [Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) + * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/overview.md b/site/overview.md index bedf4596..7772aa0a 100644 --- a/site/overview.md +++ b/site/overview.md @@ -27,7 +27,7 @@ Weave Net implements service discovery by providing a fast "micro DNS" server at All other Docker networking plugins, including Docker's own "Overlay" driver, require that you set up Docker with a cluster store – a central database like Consul or Zookeeper – before you can even use them. Besides being difficult to set up, maintain and manage, every Docker host must also be in constant contact with the cluster store: if you lose the connection, even temporarily, then you cannot start or stop any containers. Weave Net is bundled with a Docker Network plugin that doesn't require an external cluster store. You can get started right away and you can start and stop containers even when there are network connectivity problems. -For information about the Weave Docker Plugin, see [How The Weave Network Plugin Works](/site/plugin/plugin-how-it-works.md). +For information about the Weave Docker Plugin, see [How The Weave Network Plugin Works](/site/install/plugin/plugin-how-it-works.md). ### Operates in Partially Connected Networks diff --git a/site/overview/features.md b/site/overview/features.md index 2f17d65a..bfe6a781 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -84,8 +84,8 @@ named `weave` is created by `weave launch`, which is used as follows: Using the Weave plugin enables you to take advantage of [Docker's network functionality](https://docs.docker.com/engine/extend/plugins_network/). There are two plugin implementations for Weave Net: the -["Legacy"](/site/plugin.md) plugin which doesn't require an external -cluster store, and the ["V2"](/site/plugin-v2.md) plugin which +["Legacy"](/site/install/plugin/plugin.md) plugin which doesn't require an external +cluster store, and the ["V2"](/site/install/plugin/plugin-v2.md) plugin which supports Docker swarm mode. ### Weave Network CNI Plugin diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md index 4d3b0723..d5351ae5 100644 --- a/site/tasks/ipam/ipam.md +++ b/site/tasks/ipam/ipam.md @@ -203,4 +203,4 @@ named `weavedb` is used to store this data. **See Also** * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) - * [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) + * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md index 97ddcf0b..2dd2d6cd 100644 --- a/site/tasks/weave-docker-api/weave-docker-api.md +++ b/site/tasks/weave-docker-api/weave-docker-api.md @@ -28,8 +28,8 @@ Docker containers are started with the --net flag, for example: Note that if a Docker container is started with the --net flag, then the Weave Docker API Proxy is automatically disabled and is not used to attach containers. -See [Integrating Docker via the Network Plugin (Legacy)](/site/plugin.md) and -[Integrating Docker via the Network Plugin (V2)](/site/plugin-v2.md). +See [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) and +[Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md). **3.** Containers can also be attached to the Weave network with `weave attach` commands. This method also does not use the Weave Docker API Proxy. From 70924f6f3a6291a858a21c289d951bba9ea6751d Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 14:53:18 -0500 Subject: [PATCH 103/125] replace URLs for kubernetes section --- site/kubernetes.md | 2 +- site/kubernetes/kube-addon.md | 2 +- site/overview/features.md | 4 ++-- site/tasks/manage/metrics.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/site/kubernetes.md b/site/kubernetes.md index 2bacfa6a..d6751b7e 100644 --- a/site/kubernetes.md +++ b/site/kubernetes.md @@ -5,7 +5,7 @@ search_type: Documentation --- > The recommended way of using Weave with Kubernetes is via the new -> [Kubernetes Addon](/site/kube-addon.md). The instructions below +> [Kubernetes Addon](/site/kubernetes/kube-addon.md). The instructions below > remain valid however, and are still the recommended method for > integrating with Mesos. diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index c5f76bf3..befbb55d 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -43,7 +43,7 @@ recommend your master node has at least two CPU cores. > Alternatively, you can [configure CNI yourself](http://kubernetes.io/docs/admin/network-plugins/#cni) **Note:** If using the [Weave CNI -Plugin](/site/cni-plugin.md) from a prior full install of Weave Net with your +Plugin](/site/kubernetes.md) from a prior full install of Weave Net with your cluster, you must first uninstall it before applying the Weave-kube addon. Shut down Kubernetes, and _on all nodes_ perform the following: diff --git a/site/overview/features.md b/site/overview/features.md index bfe6a781..33e458c0 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -92,7 +92,7 @@ supports Docker swarm mode. Weave can be used as a plugin to systems that support the [Container Network Interface](https://github.com/appc/cni), such as Kubernetes and Mesosphere. -See [Integrating Kubernetes and Mesos via the CNI Plugin](/site/cni-plugin.md) for more details. +See [Integrating Kubernetes and Mesos via the CNI Plugin](/site/kubernetes.md) for more details. ### IP Address Management (IPAM) @@ -138,7 +138,7 @@ technique with Weave Net. ### Network Policy -The Weave [Kubernetes Addon](/site/kube-addon.md) includes a network +The Weave [Kubernetes Addon](/site/kubernetes/kube-addon.md) includes a network policy controller that implements [Kubernetes Network Policies](http://kubernetes.io/docs/user-guide/networkpolicies/). diff --git a/site/tasks/manage/metrics.md b/site/tasks/manage/metrics.md index 6f7d5f8d..93cbbbe7 100644 --- a/site/tasks/manage/metrics.md +++ b/site/tasks/manage/metrics.md @@ -5,8 +5,8 @@ search_type: Documentation --- Two endpoints are exposed: one for the Weave Net router, and, when deployed as -a [Kubernetes Addon](/site/kube-addon.md), one for the [network policy -controller](/site/kube-addon.md#npc). +a [Kubernetes Addon](/site/kubernetes/kube-addon.md), one for the [network policy +controller](/site/kubernetes/kube-addon.md#npc). ### Router Metrics From 324d013f88b9a80c3c5aa575b1002c12b866e55c Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:05:23 -0500 Subject: [PATCH 104/125] replaced urls for tasks/manage section --- site/concepts/encryption-implementation.md | 2 +- site/concepts/encryption.md | 4 ++-- site/concepts/fastdp-how-it-works.md | 2 +- site/concepts/how-it-works.md | 2 +- site/concepts/router-encapsulation.md | 2 +- site/faq.md | 10 +++++----- site/install/plugin/plugin-v2.md | 4 ++-- site/install/systemd.md | 4 ++-- site/install/using-weave.md | 4 ++-- site/install/weave-cloud.md | 2 +- site/kubernetes/kube-addon.md | 2 +- site/overview.md | 2 +- site/overview/features.md | 16 ++++++++-------- site/tasks/ipam/allocation-multi-ipam.md | 4 ++-- site/tasks/ipam/manual-ip-address.md | 2 +- site/tasks/ipam/stop-remove-peers-ipam.md | 2 +- site/tasks/manage/application-isolation.md | 2 +- .../manage/finding-adding-hosts-dynamically.md | 2 +- site/tasks/manage/host-network-integration.md | 2 +- site/tasks/manage/security-untrusted-networks.md | 2 +- site/tasks/manage/service-management.md | 2 +- .../weave-docker-api/launching-without-proxy.md | 2 +- site/tasks/weave-docker-api/weave-docker-api.md | 2 +- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/site/concepts/encryption-implementation.md b/site/concepts/encryption-implementation.md index 21b534ef..ab2ab5a5 100644 --- a/site/concepts/encryption-implementation.md +++ b/site/concepts/encryption-implementation.md @@ -211,4 +211,4 @@ Integrity Check Value of AES-GCM. * [architecture documentation](https://github.com/weaveworks/weave/blob/master/docs/architecture.txt) * [fastdp encryption](https://github.com/weaveworks/weave/blob/master/docs/fastdp-crypto.md) - * [Securing Containers Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) + * [Securing Containers Across Untrusted Networks](/site/tasks/manage/security-untrusted-networks.md) diff --git a/site/concepts/encryption.md b/site/concepts/encryption.md index dceafb62..b7d1cb4d 100644 --- a/site/concepts/encryption.md +++ b/site/concepts/encryption.md @@ -8,7 +8,7 @@ search_type: Documentation Weave Net peers [communicate with each other over both TCP and UDP](/site/concepts/how-it-works.md). This communication -[can be encrypted](/site/using-weave/security-untrusted-networks.md). +[can be encrypted](/site/tasks/manage/security-untrusted-networks.md). Encryption of control plane traffic (TCP) and data plane traffic (UDP) of sleeve overlay is accomplished using the [NaCl](http://nacl.cr.yp.to/) @@ -42,4 +42,4 @@ the IP transformation framework (XFRM). **See Also** * [How Weave Implements Encryption](/site/concepts/encryption-implementation.md) - * [Securing Containers Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) + * [Securing Containers Across Untrusted Networks](/site/tasks/manage/security-untrusted-networks.md) diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md index e5640c50..13a092e9 100644 --- a/site/concepts/fastdp-how-it-works.md +++ b/site/concepts/fastdp-how-it-works.md @@ -26,6 +26,6 @@ Prior to version 1.2, Weave Net used a custom encapsulation format. Fast datapat **See Also** * [Using Weave Net](/site/using-weave.md) - * [Using Fast Datapath](/site/using-weave/fastdp.md) + * [Using Fast Datapath](/site/tasks/manage/fastdp.md) diff --git a/site/concepts/how-it-works.md b/site/concepts/how-it-works.md index 4bde7068..d5412ec9 100644 --- a/site/concepts/how-it-works.md +++ b/site/concepts/how-it-works.md @@ -25,7 +25,7 @@ is given an IP address and netmask supplied either by the user or by Weave Net's IP address allocator. Weave Net routes packets between containers on different hosts via two -methods: a [fast data path](/site/using-weave/fastdp.md) method, which operates +methods: a [fast data path](/site/tasks/manage/fastdp.md) method, which operates entirely in kernel space, and a fallback `sleeve` method, in which packets destined for non-local containers are captured by the kernel and processed by the Weave Net router in user space, forwarded over diff --git a/site/concepts/router-encapsulation.md b/site/concepts/router-encapsulation.md index 44806eeb..fc031530 100644 --- a/site/concepts/router-encapsulation.md +++ b/site/concepts/router-encapsulation.md @@ -5,7 +5,7 @@ search_type: Documentation --- When the Weave Net router forwards packets to peers in `sleeve` mode -(rather than via the [fast data path](/site/using-weave/fastdp.md)), the +(rather than via the [fast data path](/site/tasks/manage/fastdp.md)), the encapsulation looks something like this: +-----------------------------------+ diff --git a/site/faq.md b/site/faq.md index 8cd4d12c..cd267553 100644 --- a/site/faq.md +++ b/site/faq.md @@ -25,7 +25,7 @@ For more information, refer to [Manually Specifying the IP Address of a Containe **Q: How do I expose one of my containers to the outside world?** -Exposing a container to the outside world is described in [Exporting Services](/site/using-weave/service-management.md#exporting). +Exposing a container to the outside world is described in [Exporting Services](/site/tasks/manage/service-management.md#exporting). @@ -37,7 +37,7 @@ For example, you have a Weave network that runs on hosts A, B, C. and you have a A simple way to accomplish this would be to run Weave on the host and then run, `weave expose` to expose the network to any running containers. Or you set up a route from P to one of A, B or C. See [Integrating a Network Host](/site/using-weave/host-network-integration.md). -Yet another option is to expose a port from the container on host B and then connect to it. You can read about exposing ports in [Exporting Services](/site/using-weave/service-management.md#exporting). +Yet another option is to expose a port from the container on host B and then connect to it. You can read about exposing ports in [Exporting Services](/site/tasks/manage/service-management.md#exporting). @@ -71,7 +71,7 @@ For more information about fast datapath see [How Fast Datapath Works](/site/con To view whether Weave is using fastdp or not, you can run, `weave status connections` -For more information on this command, see [Using Fast Datapath](/site/using-weave/fastdp.md). +For more information on this command, see [Using Fast Datapath](/site/tasks/manage/fastdp.md). @@ -79,12 +79,12 @@ For more information on this command, see [Using Fast Datapath](/site/using-weav Yes, 1.9 version of Weave Net added the encryption feature to fastdp. -See [Using Fast Datapath](/site/using-weave/fastdp.md) for more information. +See [Using Fast Datapath](/site/tasks/manage/fastdp.md) for more information. **Q: Can I create multiple networks where containers can communicate on one network, but are isolated from containers on other networks?** -Yes, of course! Weave allows you to run isolated networks and still allow open communications between individual containers from those isolated networks. You can find information on how to do this in [Application Isolation](/site/using-weave/application-isolation.md). +Yes, of course! Weave allows you to run isolated networks and still allow open communications between individual containers from those isolated networks. You can find information on how to do this in [Application Isolation](/site/tasks/manage/application-isolation.md). **Q: Which ports does Weave Net use (e.g. if I am configuring a firewall) ?** diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md index 6b82b2e1..24592212 100644 --- a/site/install/plugin/plugin-v2.md +++ b/site/install/plugin/plugin-v2.md @@ -34,14 +34,14 @@ There are several configuration parameters which can be set with: The parameters include: * `WEAVE_PASSWORD` - if non empty, it will instruct Weave Net to encrypt - traffic - see [here](/site/using-weave/security-untrusted-networks.md) for + traffic - see [here](/site/tasks/manage/security-untrusted-networks.md) for more details. * `WEAVE_MULTICAST` - set to 1 on each host running the plugin to enable multicast traffic on any Weave Net network. * `WEAVE_MTU` - Weave Net defaults to 1376 bytes, but you can set a smaller size if your underlying network has a tighter limit, or set a larger size for better performance if your network supports jumbo - frames - see [here](/site/using-weave/fastdp.md#mtu) for more + frames - see [here](/site/tasks/manage/fastdp.md#mtu) for more details. * `IPALLOC_RANGE` - the range of IP addresses used by Weave Net and the subnet they are placed in (CIDR format; default 10.32.0.0/12). diff --git a/site/install/systemd.md b/site/install/systemd.md index cb32ce9f..16cc99ac 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -34,9 +34,9 @@ create the `/etc/sysconfig/weave` environment file using the following format: You can also use the [`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md) command to add participating hosts dynamically. -Additionally, if you want to enable [encryption](/site/using-weave/security-untrusted-networks.md) specify a +Additionally, if you want to enable [encryption](/site/tasks/manage/security-untrusted-networks.md) specify a password using `WEAVE_PASSWORD="wfvAwt7sj"` in the `/etc/sysconfig/weave` environment file, and it will get picked up by -Weave Net on launch. Recommendations for choosing a suitably strong password can be found [here](/site/using-weave/security-untrusted-networks.md). +Weave Net on launch. Recommendations for choosing a suitably strong password can be found [here](/site/tasks/manage/security-untrusted-networks.md). You can now launch Weave Net using diff --git a/site/install/using-weave.md b/site/install/using-weave.md index cae0f8a5..088bf8ae 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -93,7 +93,7 @@ Standard firewall rules can be deployed to restrict access to the Weave Net control and data ports. For communication across untrusted networks, connections can be -[encrypted](/site/using-weave/security-untrusted-networks.md). +[encrypted](/site/tasks/manage/security-untrusted-networks.md). ### Testing Container Communications @@ -136,6 +136,6 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Cloud to get started with Weave Net](/site/using-weave/weave-cloud.md) - * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) + * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 64fa8f03..ad72f5fe 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -123,6 +123,6 @@ connect to it. * [Installing Weave Net](/site/install/installing-weave.md) * [Using Weave Net](/site/using-weave.md) - * [Using Fastdp With Weave Net](/site/using-weave/fastdp.md) + * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/kubernetes/kube-addon.md b/site/kubernetes/kube-addon.md index befbb55d..d165268e 100644 --- a/site/kubernetes/kube-addon.md +++ b/site/kubernetes/kube-addon.md @@ -252,7 +252,7 @@ The list of variables you can set is: * `WEAVE_MTU` - Weave Net defaults to 1376 bytes, but you can set a smaller size if your underlying network has a tighter limit, or set a larger size for better performance if your network supports jumbo - frames - see [here](/site/using-weave/fastdp.md#mtu) for more + frames - see [here](/site/tasks/manage/fastdp.md#mtu) for more details. Example: diff --git a/site/overview.md b/site/overview.md index 7772aa0a..850a030e 100644 --- a/site/overview.md +++ b/site/overview.md @@ -37,7 +37,7 @@ Weave Net can forward traffic between nodes, and it works even if the mesh netwo Weave Net automatically chooses the fastest path between two hosts, offering near native throughput and latency, all without your intervention. -See [How Fast Datapath Works](/site/using-weave/fastdp.md) for more information. +See [How Fast Datapath Works](/site/tasks/manage/fastdp.md) for more information. ### Network Operations Friendly diff --git a/site/overview/features.md b/site/overview/features.md index 33e458c0..2b5540b1 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -53,7 +53,7 @@ Weave Net automatically chooses the fastest available method to transport data between peers. The best performing of these (the 'fast datapath') offers near-native throughput and latency. -See [Using Fast Datapath](/site/using-weave/fastdp.md) and +See [Using Fast Datapath](/site/tasks/manage/fastdp.md) and [How Fast Datapath Works](/site/concepts/fastdp-how-it-works.md). ### Seamless Docker Integration (Weave Docker API Proxy) @@ -132,7 +132,7 @@ _isolation-through-subnets_ technique. This common strategy techniques can be used to deploy your applications to containers. -See [Isolating Applications](/site/using-weave/application-isolation.md) +See [Isolating Applications](/site/tasks/manage/application-isolation.md) for information on how to use the isolation-through-subnets technique with Weave Net. @@ -149,7 +149,7 @@ given container in advance. In these cases, you can take advantage of Weave's ability to attach and detach running containers to and from any network. -See [Dynamically Attaching and Detaching Containers](/site/using-weave/dynamically-attach-containers.md) +See [Dynamically Attaching and Detaching Containers](/site/tasks/manage/dynamically-attach-containers.md) for details. @@ -176,7 +176,7 @@ running alongside Weave. Weave Net implements encryption and security using the Go version of [Daniel J. Bernstein's NaCl library](http://nacl.cr.yp.to/index.html), and, additionally in the case of encrypted fast datapath using [the cryptography framework of the Linux kernel](https://en.wikipedia.org/wiki/Crypto_API_(Linux)). -For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/using-weave/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/concepts/encryption.md) and [How Weave Implements Encryption](/site/concepts/encryption-implementation.md). +For information on how to secure your Docker network connections, see [Securing Connections Across Untrusted Networks](/site/tasks/manage/security-untrusted-networks.md) and for a more technical discussion on how Weave implements encryption see, [Weave Encryption](/site/concepts/encryption.md) and [How Weave Implements Encryption](/site/concepts/encryption-implementation.md). ### Host Network Integration @@ -193,7 +193,7 @@ See [Integrating with the Host Network](/site/using-weave/host-network-integrati * **Binding Services** - A container can be bound to a particular IP and port without having to change your application code, while at the same time will maintain its original endpoint. * **Routing Services** - By combining the importing and exporting features, you can connect to disjointed networks, even when separated by firewalls and where there may be overlapping IP addresses. -See [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) for instructions on how to manage services on a Weave container network. +See [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) for instructions on how to manage services on a Weave container network. ### Multi-Cloud Networking @@ -203,7 +203,7 @@ of containers that run on [Google Compute Engine](https://cloud.google.com/compu (GCE), [Amazon Elastic Compute Cloud](https://aws.amazon.com/ec2/) (EC2) and in a local data centre all at the same time. -See [Enabling Multi-Cloud networking and Muti-hop Routing](/site/using-weave/multi-cloud-multi-hop.md). +See [Enabling Multi-Cloud networking and Muti-hop Routing](/site/tasks/manage/multi-cloud-multi-hop.md). ### Multi-Hop Routing @@ -213,7 +213,7 @@ even when there is only partial connectivity between the hosts. Weave Net routes traffic between containers as long as there is at least one *path* of connected hosts between them. -See [Enabling Multi-Cloud networking and Multi-hop Routing](/site/using-weave/multi-cloud-multi-hop.md). +See [Enabling Multi-Cloud networking and Multi-hop Routing](/site/tasks/manage/multi-cloud-multi-hop.md). ### Dynamic Topologies @@ -230,7 +230,7 @@ reconfiguration or, in many cases, restarts of other containers. All that is required is for the migrated container to be started with the same IP address as it was given originally. -See [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md), in particular, Routing Services for more information on container mobility. +See [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md), in particular, Routing Services for more information on container mobility. ### Fault Tolerance diff --git a/site/tasks/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md index ba534aa1..9f624ff8 100644 --- a/site/tasks/ipam/allocation-multi-ipam.md +++ b/site/tasks/ipam/allocation-multi-ipam.md @@ -10,7 +10,7 @@ puts all containers into a subnet that spans the entire allocation range, so that every Weave-attached container can communicate with every other Weave-attached container. -If you want some [isolation](/site/using-weave/application-isolation.md), you +If you want some [isolation](/site/tasks/manage/application-isolation.md), you can choose to run containers on different subnets. To request the allocation of an address from a particular subnet, set the `WEAVE_CIDR` environment variable to `net:` when creating the @@ -64,5 +64,5 @@ for manual allocation. **See Also** * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) - * [Isolating Applications on a Weave Network](/site/using-weave/application-isolation.md) + * [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md) * [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) diff --git a/site/tasks/ipam/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md index 3edd1feb..2c9ecb71 100644 --- a/site/tasks/ipam/manual-ip-address.md +++ b/site/tasks/ipam/manual-ip-address.md @@ -52,7 +52,7 @@ Individual IP addresses given to containers must, of course, be unique. If you p **See Also** - * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) + * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) * [Allocating IPs in a Specific Range](/site/using-weave/configuring-weave.md) * [Automatic IP Address Management](/site/ipam.md) diff --git a/site/tasks/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md index 67f1113c..6932e34e 100644 --- a/site/tasks/ipam/stop-remove-peers-ipam.md +++ b/site/tasks/ipam/stop-remove-peers-ipam.md @@ -58,4 +58,4 @@ dropping attempted connections with peers in other cliques. * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) - * [Isolating Applications on a Weave Network](/site/using-weave/application-isolation.md) + * [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md) diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md index db1dd76b..eb589c3b 100644 --- a/site/tasks/manage/application-isolation.md +++ b/site/tasks/manage/application-isolation.md @@ -67,4 +67,4 @@ isolation between application containers, that feature needs to be disabled by [ **See Also** * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) - * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) + * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) diff --git a/site/tasks/manage/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md index 3892d031..10ee2092 100644 --- a/site/tasks/manage/finding-adding-hosts-dynamically.md +++ b/site/tasks/manage/finding-adding-hosts-dynamically.md @@ -68,5 +68,5 @@ with `weave launch` and `weave connect` run: **See Also** - * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/using-weave/multi-cloud-multi-hop.md) + * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md) * [Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index 81788dcb..713fa7b0 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -61,4 +61,4 @@ hosts. * [Using Weave Net](/site/using-weave.md) * [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) - * [Managing Services - Exporting, Importing, Binding and Routing](/site/using-weave/service-management.md) + * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) diff --git a/site/tasks/manage/security-untrusted-networks.md b/site/tasks/manage/security-untrusted-networks.md index f05ecae2..de7cfb49 100644 --- a/site/tasks/manage/security-untrusted-networks.md +++ b/site/tasks/manage/security-untrusted-networks.md @@ -54,4 +54,4 @@ Be aware that: **See Also** * [Weave Encryption](/site/concepts/encryption.md) - * [Using Fast Datapath](/site/using-weave/fastdp.md) + * [Using Fast Datapath](/site/tasks/manage/fastdp.md) diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index 68504e5b..478a05d4 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -114,5 +114,5 @@ For example, you can move the netcat service to `$HOST4:2211` and it will retai **See Also** * [Adding and Removing Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) - * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/using-weave/multi-cloud-multi-hop.md) + * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md) diff --git a/site/tasks/weave-docker-api/launching-without-proxy.md b/site/tasks/weave-docker-api/launching-without-proxy.md index d6cdd9e4..6ecf26cb 100644 --- a/site/tasks/weave-docker-api/launching-without-proxy.md +++ b/site/tasks/weave-docker-api/launching-without-proxy.md @@ -14,7 +14,7 @@ limitations, we have removed `weave run`. If you have scripts using `weave run`, you can achieve exactly the same effect by combining `docker run` and `weave attach`; see [Dynamically Attaching and Detaching -Containers](/site/using-weave/dynamically-attach-containers.md) for +Containers](/site/tasks/manage/dynamically-attach-containers.md) for details. The `weave start` and `weave restart` commands have also been removed, diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md index 2dd2d6cd..1c825b45 100644 --- a/site/tasks/weave-docker-api/weave-docker-api.md +++ b/site/tasks/weave-docker-api/weave-docker-api.md @@ -33,7 +33,7 @@ See [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/pl **3.** Containers can also be attached to the Weave network with `weave attach` commands. This method also does not use the Weave Docker API Proxy. -See [Dynamically Attaching and Detaching Containers](/site/using-weave/dynamically-attach-containers.md). +See [Dynamically Attaching and Detaching Containers](/site/tasks/manage/dynamically-attach-containers.md). ### Setting Up The Weave Net Docker API Proxy From 8cc3179a3618fa19e213cb6d1fb9979730b9a00d Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:14:47 -0500 Subject: [PATCH 105/125] replaced more urls for /site/tasks/manage section --- site/faq.md | 2 +- site/install/installing-weave.md | 2 +- site/install/plugin/plugin.md | 2 +- site/install/systemd.md | 2 +- site/install/using-weave.md | 2 +- site/kubernetes.md | 2 +- site/operational-guide/concepts.md | 2 +- site/overview/features.md | 2 +- site/tasks/manage/dynamically-attach-containers.md | 2 +- site/tasks/manage/multi-cloud-multi-hop.md | 2 +- site/tasks/manage/service-management.md | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/site/faq.md b/site/faq.md index cd267553..be48e21e 100644 --- a/site/faq.md +++ b/site/faq.md @@ -92,7 +92,7 @@ Yes, of course! Weave allows you to run isolated networks and still allow open You must permit traffic to flow through TCP 6783 and UDP 6783/6784, which are Weave’s control and data ports. -The daemon also uses TCP port 6782 for [metrics](/site/metrics.md), but +The daemon also uses TCP port 6782 for [metrics](/site/tasks/manage/metrics.md), but you would only need to open up this port if you wish to collect metrics from another host. diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 8f22445f..172882ec 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -55,7 +55,7 @@ for the latest Weave AMIs and [here](https://www.weave.works/docs/tutorials/old- If you're on Amazon EC2, the standard installation instructions at the top of this page, provide the simplest setup and the most flexibility. -A [special no-overlay mode for EC2](/site/using-weave/awsvpc.md) can +A [special no-overlay mode for EC2](/site/tasks/manage/awsvpc.md) can optionally be enabled, which allows containers to communicate at the full speed of the underlying network. diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index f8633941..ab2b6510 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -14,7 +14,7 @@ Networking Plugin is fast and easy to use, and, unlike other networking plugins, does not require an external cluster store. To create a network which can span multiple Docker hosts, Weave Net peers must be connected to each other, by specifying the other hosts during `weave launch` or via -[`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md). +[`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). See [Using Weave Net](/site/using-weave.md#peer-connections) for a discussion on peer connections. diff --git a/site/install/systemd.md b/site/install/systemd.md index 16cc99ac..f6129613 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -32,7 +32,7 @@ create the `/etc/sysconfig/weave` environment file using the following format: PEERS="HOST1 HOST2 .. HOSTn" -You can also use the [`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md) command to add participating hosts dynamically. +You can also use the [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md) command to add participating hosts dynamically. Additionally, if you want to enable [encryption](/site/tasks/manage/security-untrusted-networks.md) specify a password using `WEAVE_PASSWORD="wfvAwt7sj"` in the `/etc/sysconfig/weave` environment file, and it will get picked up by diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 088bf8ae..60f798b2 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -81,7 +81,7 @@ For example: host2$ weave launch -Peers can also be dynamically added. See [Adding Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) for more information. +Peers can also be dynamically added. See [Adding Hosts Dynamically](/site/tasks/manage/finding-adding-hosts-dynamically.md) for more information. #### Restricting Access diff --git a/site/kubernetes.md b/site/kubernetes.md index d6751b7e..f06df09f 100644 --- a/site/kubernetes.md +++ b/site/kubernetes.md @@ -34,7 +34,7 @@ Then run: To create a network that spans multiple hosts, the Weave peers must be connected to each other. This is accomplished by specifying the other hosts during `weave launch` or via -[`weave connect`](/site/using-weave/finding-adding-hosts-dynamically.md). +[`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). See [Creating Peer Connections Between Hosts](/site/using-weave.md#peer-connections) for a discussion on peer connections. diff --git a/site/operational-guide/concepts.md b/site/operational-guide/concepts.md index 604db86d..8a77f1e1 100644 --- a/site/operational-guide/concepts.md +++ b/site/operational-guide/concepts.md @@ -72,7 +72,7 @@ detail below. Peer discovery is a mechanism that allows peers to learn about new Weave Net hosts from existing peers without being explicitly told. Peer discovery is -[enabled by default](/site/using-weave/finding-adding-hosts-dynamically.md). +[enabled by default](/site/tasks/manage/finding-adding-hosts-dynamically.md). ## Network Partition diff --git a/site/overview/features.md b/site/overview/features.md index 2b5540b1..51a7fcef 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -220,7 +220,7 @@ See [Enabling Multi-Cloud networking and Multi-hop Routing](/site/tasks/manage/m Hosts can be added to or removed from a Weave network without stopping or reconfiguring the remaining hosts. See [Adding and Removing Hosts -Dynamically.](/site/using-weave/finding-adding-hosts-dynamically.md) +Dynamically.](/site/tasks/manage/finding-adding-hosts-dynamically.md) ### Container Mobility diff --git a/site/tasks/manage/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md index 11384e92..5887b620 100644 --- a/site/tasks/manage/dynamically-attach-containers.md +++ b/site/tasks/manage/dynamically-attach-containers.md @@ -69,4 +69,4 @@ Finally, multiple addresses can be attached or detached using a single command: **See Also** - * [Adding and Removing Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) + * [Adding and Removing Hosts Dynamically](/site/tasks/manage/finding-adding-hosts-dynamically.md) diff --git a/site/tasks/manage/multi-cloud-multi-hop.md b/site/tasks/manage/multi-cloud-multi-hop.md index 405bfbd5..25c82844 100644 --- a/site/tasks/manage/multi-cloud-multi-hop.md +++ b/site/tasks/manage/multi-cloud-multi-hop.md @@ -39,6 +39,6 @@ traffic via the local data center. **See Also** - * [Finding and Adding Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) + * [Finding and Adding Hosts Dynamically](/site/tasks/manage/finding-adding-hosts-dynamically.md) diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index 478a05d4..b64f2dbe 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -113,6 +113,6 @@ For example, you can move the netcat service to `$HOST4:2211` and it will retai **See Also** - * [Adding and Removing Hosts Dynamically](/site/using-weave/finding-adding-hosts-dynamically.md) + * [Adding and Removing Hosts Dynamically](/site/tasks/manage/finding-adding-hosts-dynamically.md) * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md) From afbc7aaa146bde9012514b99e5d8dba324f32ee8 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:16:58 -0500 Subject: [PATCH 106/125] replaced URLs for host network int. --- site/faq.md | 2 +- site/overview/features.md | 2 +- site/tasks/manage/service-management.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/site/faq.md b/site/faq.md index be48e21e..f970431a 100644 --- a/site/faq.md +++ b/site/faq.md @@ -35,7 +35,7 @@ Yes you can. For example, you have a Weave network that runs on hosts A, B, C. and you have an additional host, that we'll call P, where neither Weave nor Docker are running. However, you need to connect from a process running on host P to a specific container running on host B on the Weave network. Since the Weave network is completely separate from any network that P is connected to, you cannot connect the container using the container's IP address. -A simple way to accomplish this would be to run Weave on the host and then run, `weave expose` to expose the network to any running containers. Or you set up a route from P to one of A, B or C. See [Integrating a Network Host](/site/using-weave/host-network-integration.md). +A simple way to accomplish this would be to run Weave on the host and then run, `weave expose` to expose the network to any running containers. Or you set up a route from P to one of A, B or C. See [Integrating a Network Host](/site/tasks/manage/host-network-integration.md). Yet another option is to expose a port from the container on host B and then connect to it. You can read about exposing ports in [Exporting Services](/site/tasks/manage/service-management.md#exporting). diff --git a/site/overview/features.md b/site/overview/features.md index 51a7fcef..f31f683d 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -184,7 +184,7 @@ For information on how to secure your Docker network connections, see [Securing Weave Net application networks can be integrated with a host's network, and establish connectivity between the host and application containers anywhere. -See [Integrating with the Host Network](/site/using-weave/host-network-integration.md). +See [Integrating with the Host Network](/site/tasks/manage/host-network-integration.md). ### Managing Services: Exporting, Importing, Binding and Routing diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index b64f2dbe..a3b2ecd0 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -24,7 +24,7 @@ located. Returning to the [netcat example service](/site/using-weave.md), you can expose the netcat service running on `HOST1` and make it accessible to the outside world via `$HOST2`. -First, expose the application network to `$HOST2`, as explained in [Integrating with the Host Network](/site/using-weave/host-network-integration.md): +First, expose the application network to `$HOST2`, as explained in [Integrating with the Host Network](/site/tasks/manage/host-network-integration.md): host2$ weave expose 10.2.1.132 @@ -53,7 +53,7 @@ Expanding on the [netcat service example](/site/using-weave.md), you now decide An additional caveat is that `$HOST3` can only be reached from `$HOST1`, which is not accessible via `$HOST2`. Nonetheless, you still need to make the `$HOST3` service available to an application that is running in a container on `$HOST2`. -To satisfy this scenario, first [expose the application network to the host](/site/using-weave/host-network-integration.md) by running the following on `$HOST1`: +To satisfy this scenario, first [expose the application network to the host](/site/tasks/manage/host-network-integration.md) by running the following on `$HOST1`: host1$ weave expose -h host1.weave.local 10.2.1.3 From 0e6e5e3a4db0c758fdb1686607d6f08e982a9916 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:18:56 -0500 Subject: [PATCH 107/125] replaced URL to weave cloud --- site/install/using-weave.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 60f798b2..40666175 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -135,7 +135,7 @@ Weave Net supports *any* protocol, and it doesn't have to be over TCP/IP. For ex **See Also** * [Installing Weave Net](/site/install/installing-weave.md) - * [Using Weave Cloud to get started with Weave Net](/site/using-weave/weave-cloud.md) + * [Using Weave Cloud to get started with Weave Net](/site/install/weave-cloud.md) * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) From 7ea8761685918e66ed9de9ca259e271b0861a595 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:27:23 -0500 Subject: [PATCH 108/125] replaced URLs for ipam section --- site/concepts/ip-addresses.md | 4 ++-- site/faq.md | 8 ++++---- site/install/plugin/plugin-v2.md | 2 +- site/install/weave-cloud.md | 4 ++-- site/operational-guide/concepts.md | 2 +- site/operational-guide/tasks.md | 6 +++--- site/overview/features.md | 4 ++-- site/tasks/ipam/allocation-multi-ipam.md | 4 ++-- site/tasks/ipam/ipam.md | 2 +- site/tasks/ipam/manual-ip-address.md | 6 +++--- site/tasks/ipam/stop-remove-peers-ipam.md | 6 +++--- site/tasks/ipam/troubleshooting-ipam.md | 2 +- site/tasks/manage/application-isolation.md | 2 +- site/tasks/manage/finding-adding-hosts-dynamically.md | 2 +- site/tasks/manage/host-network-integration.md | 2 +- site/tasks/weave-docker-api/ipam-proxy.md | 6 +++--- site/tasks/weave-docker-api/using-proxy.md | 2 +- site/troubleshooting.md | 4 ++-- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/site/concepts/ip-addresses.md b/site/concepts/ip-addresses.md index 66210e38..e510c1c6 100644 --- a/site/concepts/ip-addresses.md +++ b/site/concepts/ip-addresses.md @@ -8,7 +8,7 @@ search_type: Documentation Weave Net runs containers on a private network, which means that IP addresses are isolated from the rest of the Internet, and that you don't have to worry about addresses clashing. -You can of course also manually change the IP of any given container or subnet on a Weave network. See, [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) +You can of course also manually change the IP of any given container or subnet on a Weave network. See, [How to Manually Specify IP Addresses and Subnets](/site/tasks/ipam/manual-ip-address.md) ### Some Definitions @@ -64,4 +64,4 @@ find a match, so uses the default rule. **See Also** - * [Allocating IPs in a Specific Range](/site/using-weave/configuring-weave.md) + * [Allocating IPs in a Specific Range](/site/tasks/ipam/configuring-weave.md) diff --git a/site/faq.md b/site/faq.md index f970431a..1e0cd0fd 100644 --- a/site/faq.md +++ b/site/faq.md @@ -19,7 +19,7 @@ See [Troubleshooting Weave - List attached containers](/site/troubleshooting.md# You can manually change the IP of a container using [Classless Inter-Domain Routing or CIDR notation](https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing). -For more information, refer to [Manually Specifying the IP Address of a Container](/site/using-weave/manual-ip-address.md). +For more information, refer to [Manually Specifying the IP Address of a Container](/site/tasks/ipam/manual-ip-address.md). @@ -45,7 +45,7 @@ Yet another option is to expose a port from the container on host B and then con Under normal circumstances, this should never happen, but it can occur if `weave rmpeer` was run on more than one host. -For more information see [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md). +For more information see [Starting, Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md). @@ -53,7 +53,7 @@ For more information see [Starting, Stopping and Removing Peers](/site/ipam/stop When a node goes out of service, the best option is to call `weave rmpeer` on one host and then `weave forget` on all the other hosts. -See [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) for an in-depth discussion. +See [Starting, Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) for an in-depth discussion. @@ -116,6 +116,6 @@ Ubuntu image with those two commands added. **See Also** * [Troubleshooting Weave](/site/troubleshooting.md) - * [Troubleshooting IPAM](/site/ipam.md) + * [Troubleshooting IPAM](/site/tasks/ipam/ipam.md) * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md) diff --git a/site/install/plugin/plugin-v2.md b/site/install/plugin/plugin-v2.md index 24592212..be5ecb4d 100644 --- a/site/install/plugin/plugin-v2.md +++ b/site/install/plugin/plugin-v2.md @@ -45,7 +45,7 @@ The parameters include: details. * `IPALLOC_RANGE` - the range of IP addresses used by Weave Net and the subnet they are placed in (CIDR format; default 10.32.0.0/12). - See [here](/site/using-weave/configuring-weave.md) for more details. + See [here](/site/tasks/ipam/configuring-weave.md) for more details. Before setting any parameter, the plugin has to be disabled with: diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index ad72f5fe..9d5260a2 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -110,12 +110,12 @@ error message in its log and exit. To check the logs run: host1$ docker logs weave When a Weave Net instance is formed for the first time, the peers must -initialize the [IP Allocation Manager](/site/ipam.md). This process, +initialize the [IP Allocation Manager](/site/tasks/ipam/ipam.md). This process, and the configuration options available, are unchanged when using Weave Cloud. When you shut down a peer for good, use [the `weave reset` -command](/site/ipam/stop-remove-peers-ipam.md) and it will be removed +command](/site/tasks/ipam/stop-remove-peers-ipam.md) and it will be removed from the Weave Cloud database so future peers will not attempt to connect to it. diff --git a/site/operational-guide/concepts.md b/site/operational-guide/concepts.md index 8a77f1e1..0ffda7b6 100644 --- a/site/operational-guide/concepts.md +++ b/site/operational-guide/concepts.md @@ -85,7 +85,7 @@ partition, healing automatically once the partition is over. ## IP Address Manager (IPAM) -[IPAM](/site/ipam.md) is the subsystem responsible for dividing up a +[IPAM](/site/tasks/ipam/ipam.md) is the subsystem responsible for dividing up a large contiguous block of IP addresses (known as the IP allocation range) amongst peers so that individual addresses may be uniquely assigned to containers anywhere on the overlay network. diff --git a/site/operational-guide/tasks.md b/site/operational-guide/tasks.md index 3cb14c87..703773f4 100644 --- a/site/operational-guide/tasks.md +++ b/site/operational-guide/tasks.md @@ -66,7 +66,7 @@ after which one of the remaining peers could decide unilaterally that it is safe to appropriate the space for itself, and so an administrative action is required to reclaim it. -The [`weave rmpeer`](/site/ipam/stop-remove-peers-ipam.md) +The [`weave rmpeer`](/site/tasks/ipam/stop-remove-peers-ipam.md) command is provided to perform this task, and must be executed on _one_ of the remaining peers. That peer will then take ownership of the freed address space. @@ -115,6 +115,6 @@ you can issue the following command: **See Also** - * [Allocating IP Addresses](/site/ipam.md) - * [Troubleshooting the IP Allocator](/site/ipam/troubleshooting-ipam.md) + * [Allocating IP Addresses](/site/tasks/ipam/ipam.md) + * [Troubleshooting the IP Allocator](/site/tasks/ipam/troubleshooting-ipam.md) diff --git a/site/overview/features.md b/site/overview/features.md index f31f683d..44eb9953 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -100,9 +100,9 @@ See [Integrating Kubernetes and Mesos via the CNI Plugin](/site/kubernetes.md) f Containers are automatically allocated a unique IP address. To view the addresses allocated by Weave, run `weave ps`. Instead of allowing Weave to automatically allocate addresses, an IP address and a network can be explicitly -specified. See [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) for instructions. +specified. See [How to Manually Specify IP Addresses and Subnets](/site/tasks/ipam/manual-ip-address.md) for instructions. -For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Management](/site/ipam.md). And also review the +For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Management](/site/tasks/ipam/ipam.md). And also review the [the basics of IP addressing](/site/concepts/ip-addresses.md) for an explanation of addressing and private networks. diff --git a/site/tasks/ipam/allocation-multi-ipam.md b/site/tasks/ipam/allocation-multi-ipam.md index 9f624ff8..908e74e4 100644 --- a/site/tasks/ipam/allocation-multi-ipam.md +++ b/site/tasks/ipam/allocation-multi-ipam.md @@ -63,6 +63,6 @@ for manual allocation. **See Also** - * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) + * [Address Allocation with IP Address Management (IPAM)](/site/tasks/ipam/ipam.md) * [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md) - * [Starting, Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) + * [Starting, Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) diff --git a/site/tasks/ipam/ipam.md b/site/tasks/ipam/ipam.md index d5351ae5..97be9031 100644 --- a/site/tasks/ipam/ipam.md +++ b/site/tasks/ipam/ipam.md @@ -202,5 +202,5 @@ named `weavedb` is used to store this data. **See Also** - * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) + * [Automatic Allocation Across Multiple Subnets](/site/tasks/ipam/allocation-multi-ipam.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) diff --git a/site/tasks/ipam/manual-ip-address.md b/site/tasks/ipam/manual-ip-address.md index 2c9ecb71..78287e1b 100644 --- a/site/tasks/ipam/manual-ip-address.md +++ b/site/tasks/ipam/manual-ip-address.md @@ -11,7 +11,7 @@ Containers are automatically allocated an IP address that is unique across the W Weave Net detects when a container has exited and releases its allocated addresses so they can be re-used by the network. -See the [Automatic IP Address Management](/site/ipam.md) and also an explanation of [the basics of IP addressing](/site/concepts/ip-addresses.md) for further details. +See the [Automatic IP Address Management](/site/tasks/ipam/ipam.md) and also an explanation of [the basics of IP addressing](/site/concepts/ip-addresses.md) for further details. Instead of allowing Weave Net to allocate IP addresses automatically (using IPAM), there may be instances where you need to control a particular container or a cluster by setting an IP address for it. @@ -53,6 +53,6 @@ Individual IP addresses given to containers must, of course, be unique. If you p **See Also** * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) - * [Allocating IPs in a Specific Range](/site/using-weave/configuring-weave.md) - * [Automatic IP Address Management](/site/ipam.md) + * [Allocating IPs in a Specific Range](/site/tasks/ipam/configuring-weave.md) + * [Automatic IP Address Management](/site/tasks/ipam/ipam.md) diff --git a/site/tasks/ipam/stop-remove-peers-ipam.md b/site/tasks/ipam/stop-remove-peers-ipam.md index 6932e34e..c70f033a 100644 --- a/site/tasks/ipam/stop-remove-peers-ipam.md +++ b/site/tasks/ipam/stop-remove-peers-ipam.md @@ -24,7 +24,7 @@ later rejoin the Weave network, the same IP address may be allocated twice. Assume you had started the three peers in the -[overview example](/site/ipam.md), and then host3 +[overview example](/site/tasks/ipam/ipam.md), and then host3 caught fire, you can go to one of the other hosts and run: host1$ weave rmpeer host3 @@ -56,6 +56,6 @@ dropping attempted connections with peers in other cliques. **See Also** - * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) - * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) + * [Address Allocation with IP Address Management (IPAM)](/site/tasks/ipam/ipam.md) + * [Automatic Allocation Across Multiple Subnets](/site/tasks/ipam/allocation-multi-ipam.md) * [Isolating Applications on a Weave Network](/site/tasks/manage/application-isolation.md) diff --git a/site/tasks/ipam/troubleshooting-ipam.md b/site/tasks/ipam/troubleshooting-ipam.md index e0ac44ee..34f46277 100644 --- a/site/tasks/ipam/troubleshooting-ipam.md +++ b/site/tasks/ipam/troubleshooting-ipam.md @@ -64,4 +64,4 @@ Columns are as follows: ipam` was run; whilst this could be a transient condition due to a partition, it may be because the peer has failed and needs to be removed administratively - see [Starting, Stopping and Removing - Peers](/site/ipam/stop-remove-peers-ipam.md) for more details. + Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) for more details. diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md index eb589c3b..d479c340 100644 --- a/site/tasks/manage/application-isolation.md +++ b/site/tasks/manage/application-isolation.md @@ -66,5 +66,5 @@ isolation between application containers, that feature needs to be disabled by [ **See Also** - * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md) + * [Automatic Allocation Across Multiple Subnets](/site/tasks/ipam/allocation-multi-ipam.md) * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) diff --git a/site/tasks/manage/finding-adding-hosts-dynamically.md b/site/tasks/manage/finding-adding-hosts-dynamically.md index 10ee2092..12dc350a 100644 --- a/site/tasks/manage/finding-adding-hosts-dynamically.md +++ b/site/tasks/manage/finding-adding-hosts-dynamically.md @@ -69,4 +69,4 @@ with `weave launch` and `weave connect` run: **See Also** * [Enabling Multi-Cloud, Multi-Hop Networking and Routing](/site/tasks/manage/multi-cloud-multi-hop.md) - * [Stopping and Removing Peers](/site/ipam/stop-remove-peers-ipam.md) + * [Stopping and Removing Peers](/site/tasks/ipam/stop-remove-peers-ipam.md) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index 713fa7b0..ea9afbeb 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -53,7 +53,7 @@ for example, `10.2.0.0/16` or `10.32.0.0/12` and, * `` is the address of the machine on which you ran `weave expose`. >**Note:** You must ensure that the [IP subnet used by Weave -Net](/site/ipam.md#range) does not clash with anything on those other +Net](/site/tasks/ipam/ipam.md#range) does not clash with anything on those other hosts. diff --git a/site/tasks/weave-docker-api/ipam-proxy.md b/site/tasks/weave-docker-api/ipam-proxy.md index 231ca9e8..8b81bdae 100644 --- a/site/tasks/weave-docker-api/ipam-proxy.md +++ b/site/tasks/weave-docker-api/ipam-proxy.md @@ -5,7 +5,7 @@ search_type: Documentation --- -If [automatic IP address allocation](/site/ipam.md) is enabled in Weave Net (by default IPAM is enabled), +If [automatic IP address allocation](/site/tasks/ipam/ipam.md) is enabled in Weave Net (by default IPAM is enabled), then containers started via the proxy are automatically assigned an IP address, *without having to specify any special environment variables or any other options*. @@ -38,5 +38,5 @@ container with a blank `WEAVE_CIDR`, for example: **See Also** - * [Address Allocation with IP Address Management (IPAM)](/site/ipam.md) - * [How to Manually Specify IP Addresses and Subnets](/site/using-weave/manual-ip-address.md) + * [Address Allocation with IP Address Management (IPAM)](/site/tasks/ipam/ipam.md) + * [How to Manually Specify IP Addresses and Subnets](/site/tasks/ipam/manual-ip-address.md) diff --git a/site/tasks/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md index aa46b0b5..913271fc 100644 --- a/site/tasks/weave-docker-api/using-proxy.md +++ b/site/tasks/weave-docker-api/using-proxy.md @@ -10,7 +10,7 @@ modified to wait for the Weave network interface to become available. When they are started via the Weave Net proxy, containers are -[automatically assigned IP addresses](/site/ipam.md) and connected to the +[automatically assigned IP addresses](/site/tasks/ipam/ipam.md) and connected to the Weave network. ### Creating and Starting Containers with the Weave Net Proxy diff --git a/site/troubleshooting.md b/site/troubleshooting.md index 9e31a2a0..80846668 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -99,7 +99,7 @@ launch`. between peers. * **PeerDiscovery** - indicates whether -[automatic peer discovery](/site/ipam/allocation-multi-ipam.md) is +[automatic peer discovery](/site/tasks/ipam/allocation-multi-ipam.md) is enabled (which is the default). * **Targets** - are the number of hosts that the local Weave Router has been @@ -307,5 +307,5 @@ and the container image versions as git hashes. **See Also** - * [Troubleshooting IPAM](/site/ipam/troubleshooting-ipam.md) + * [Troubleshooting IPAM](/site/tasks/ipam/troubleshooting-ipam.md) * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md) From c3d96ca4489335373eaa073decdff71028165594 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:32:15 -0500 Subject: [PATCH 109/125] replaced URLs for weavedns section --- site/install/plugin/plugin.md | 2 +- site/overview/features.md | 6 +++--- site/tasks/weave-docker-api/automatic-discovery-proxy.md | 6 +++--- site/tasks/weave-docker-api/using-proxy.md | 2 +- site/tasks/weavedns/how-works-weavedns.md | 6 +++--- site/tasks/weavedns/load-balance-fault-weavedns.md | 8 ++++---- site/tasks/weavedns/managing-domains-weavedns.md | 4 ++-- site/tasks/weavedns/managing-entries-weavedns.md | 6 +++--- site/tasks/weavedns/weavedns.md | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index ab2b6510..a090352a 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -25,7 +25,7 @@ After you've launched Weave Net and peered your hosts, you can start containers on any of the hosts, and they can all communicate with each other using any protocol, even multicast. -In order to use Weave Net's [Service Discovery](/site/weavedns.md) you +In order to use Weave Net's [Service Discovery](/site/tasks/weavedns/weavedns.md) you must pass the additional arguments `--dns` and `-dns-search`, for which a helper is provided in the Weave script: diff --git a/site/overview/features.md b/site/overview/features.md index 44eb9953..02dba740 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -108,16 +108,16 @@ For a discussion on how Weave Net uses IPAM, see [Automatic IP Address Managemen ### Naming and Discovery -Named containers are automatically registered in [weaveDNS](/site/weavedns.md), +Named containers are automatically registered in [weaveDNS](/site/tasks/weavedns/weavedns.md), and are discoverable by using standard, simple name lookups: host1$ docker run -dti --name=service weaveworks/ubuntu host1$ docker run -ti weaveworks/ubuntu root@7b21498fb103:/# ping service -WeaveDNS also supports [load balancing](/site/weavedns/load-balance-fault-weavedns.md), [fault resilience](/site/weavedns/load-balance-fault-weavedns.md) and [hot swapping](/site/weavedns/managing-entries-weavedns.md). +WeaveDNS also supports [load balancing](/site/tasks/weavedns/load-balance-fault-weavedns.md), [fault resilience](/site/tasks/weavedns/load-balance-fault-weavedns.md) and [hot swapping](/site/tasks/weavedns/managing-entries-weavedns.md). -See [Discovering Containers with WeaveDNS](/site/weavedns.md). +See [Discovering Containers with WeaveDNS](/site/tasks/weavedns/weavedns.md). ### Application Isolation diff --git a/site/tasks/weave-docker-api/automatic-discovery-proxy.md b/site/tasks/weave-docker-api/automatic-discovery-proxy.md index 7b333ef7..c0b94603 100644 --- a/site/tasks/weave-docker-api/automatic-discovery-proxy.md +++ b/site/tasks/weave-docker-api/automatic-discovery-proxy.md @@ -4,9 +4,9 @@ menu_order: 40 search_type: Documentation --- -Containers launched via the proxy use [weaveDNS](/site/weavedns.md) +Containers launched via the proxy use [weaveDNS](/site/tasks/weavedns/weavedns.md) automatically if it is running when they are started - -see the [weaveDNS usage](/site/weavedns.md#usage) section for an in depth +see the [weaveDNS usage](/site/tasks/weavedns/weavedns.md#usage) section for an in depth explanation of the behaviour and how to control it. Typically, the proxy passes on container names as-is to weaveDNS @@ -57,4 +57,4 @@ to the proxy, the specified label takes precedence over the container's name. **See Also** * [Name resolution via `/etc/hosts`](/site/weave-docker-api/name-resolution-proxy.md) - * [How Weave Finds Containers](/site/weavedns/how-works-weavedns.md) + * [How Weave Finds Containers](/site/tasks/weavedns/how-works-weavedns.md) diff --git a/site/tasks/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md index 913271fc..c6074483 100644 --- a/site/tasks/weave-docker-api/using-proxy.md +++ b/site/tasks/weave-docker-api/using-proxy.md @@ -55,7 +55,7 @@ route, add the `--no-multicast-route` flag to `weave launch`. ### Other Weave Proxy options - * `--without-dns` -- stop telling containers to use [WeaveDNS](/site/weavedns.md) + * `--without-dns` -- stop telling containers to use [WeaveDNS](/site/tasks/weavedns/weavedns.md) * `--log-level=debug|info|warning|error` -- controls how much information to emit for debugging * `--no-restart` -- remove the default policy of `--restart=always`, if diff --git a/site/tasks/weavedns/how-works-weavedns.md b/site/tasks/weavedns/how-works-weavedns.md index 0f6a5882..a7bae14f 100644 --- a/site/tasks/weavedns/how-works-weavedns.md +++ b/site/tasks/weavedns/how-works-weavedns.md @@ -43,6 +43,6 @@ $ sudo DOCKER_BRIDGE=someother weave attach ... **See Also** - * [Using WeaveDNS](/site/weavedns.md) - * [Load Balancing with weaveDNS](/site/weavedns/load-balance-fault-weavedns.md) - * [Managing Domain Entries](/site/weavedns/managing-domains-weavedns.md) + * [Using WeaveDNS](/site/tasks/weavedns/weavedns.md) + * [Load Balancing with weaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) + * [Managing Domain Entries](/site/tasks/weavedns/managing-domains-weavedns.md) diff --git a/site/tasks/weavedns/load-balance-fault-weavedns.md b/site/tasks/weavedns/load-balance-fault-weavedns.md index d55c416a..3421f8bd 100644 --- a/site/tasks/weavedns/load-balance-fault-weavedns.md +++ b/site/tasks/weavedns/load-balance-fault-weavedns.md @@ -10,7 +10,7 @@ It is permissible to register multiple containers with the same name: weaveDNS returns all addresses, in a random order, for each request. This provides a basic load balancing capability. -Expanding the [overview example](/site/weavedns.md), let us start an additional `pingme` container on a second host, and then run +Expanding the [overview example](/site/tasks/weavedns/weavedns.md), let us start an additional `pingme` container on a second host, and then run some ping tests. ``` @@ -49,11 +49,11 @@ WeaveDNS removes the addresses of any container that dies. This offers a simple way to implement redundancy. E.g. if in our example we stop one of the `pingme` containers and re-run the ping tests, eventually (within ~30s at most, since that is the weaveDNS -[cache expiry time](/site/weavedns/managing-entries-weavedns.md#ttl)) we will only be hitting the address of the +[cache expiry time](/site/tasks/weavedns/managing-entries-weavedns.md#ttl)) we will only be hitting the address of the container that is still alive. **See Also** * [How Weave Finds Containers](/site/how-works-weavedns.md) - * [Managing Domains](/site/weavedns/managing-domains-weavedns.md) - * [Managing Domain Entries](/site/weavedns/managing-entries-weavedns.md) + * [Managing Domains](/site/tasks/weavedns/managing-domains-weavedns.md) + * [Managing Domain Entries](/site/tasks/weavedns/managing-entries-weavedns.md) diff --git a/site/tasks/weavedns/managing-domains-weavedns.md b/site/tasks/weavedns/managing-domains-weavedns.md index 49a12b57..cc640db5 100644 --- a/site/tasks/weavedns/managing-domains-weavedns.md +++ b/site/tasks/weavedns/managing-domains-weavedns.md @@ -46,5 +46,5 @@ link-local as per [RFC6762](https://tools.ietf.org/html/rfc6762), * [How Weave Finds Containers](/site/how-works-weavedns.md) - * [Load Balancing and Fault Resilience with WeaveDNS](/site/weavedns/load-balance-fault-weavedns.md) - * [Managing Domain Entries](/site/weavedns/managing-entries-weavedns.md) + * [Load Balancing and Fault Resilience with WeaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) + * [Managing Domain Entries](/site/tasks/weavedns/managing-entries-weavedns.md) diff --git a/site/tasks/weavedns/managing-entries-weavedns.md b/site/tasks/weavedns/managing-entries-weavedns.md index 7600c573..75bfa6e1 100644 --- a/site/tasks/weavedns/managing-entries-weavedns.md +++ b/site/tasks/weavedns/managing-entries-weavedns.md @@ -78,6 +78,6 @@ weaveDNS instance will receive. **See Also** - * [How Weave Finds Containers](/site/weavedns/how-works-weavedns.md) - * [Load Balancing and Fault Resilience with WeaveDNS](/site/weavedns/load-balance-fault-weavedns.md) - * [Managing Domains](/site/weavedns/managing-domains-weavedns.md) + * [How Weave Finds Containers](/site/tasks/weavedns/how-works-weavedns.md) + * [Load Balancing and Fault Resilience with WeaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) + * [Managing Domains](/site/tasks/weavedns/managing-domains-weavedns.md) diff --git a/site/tasks/weavedns/weavedns.md b/site/tasks/weavedns/weavedns.md index c0f3b4cc..8231b97b 100644 --- a/site/tasks/weavedns/weavedns.md +++ b/site/tasks/weavedns/weavedns.md @@ -46,4 +46,4 @@ disable weaveDNS itself, launch weave with the `--no-dns` option. **See Also** * [Integrating Docker via the API Proxy](/site/weave-docker-api.md) - * [Load Balancing and Fault Resilience with WeaveDNS](/site/weavedns/load-balance-fault-weavedns.md) + * [Load Balancing and Fault Resilience with WeaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) From 905d92388037dba200c6106d8c13538dba61d259 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:41:04 -0500 Subject: [PATCH 110/125] replaced URLs for weave proxy section --- site/faq.md | 2 +- site/install/installing-weave.md | 2 +- site/overview/features.md | 4 ++-- site/tasks/manage/dynamically-attach-containers.md | 2 +- site/tasks/weave-docker-api/automatic-discovery-proxy.md | 2 +- site/tasks/weave-docker-api/name-resolution-proxy.md | 2 +- site/tasks/weave-docker-api/securing-proxy.md | 2 +- site/tasks/weave-docker-api/using-proxy.md | 4 ++-- site/tasks/weave-docker-api/weave-docker-api.md | 6 +++--- site/tasks/weavedns/managing-domains-weavedns.md | 2 +- site/tasks/weavedns/weavedns.md | 2 +- site/troubleshooting.md | 4 ++-- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/site/faq.md b/site/faq.md index 1e0cd0fd..7afc207c 100644 --- a/site/faq.md +++ b/site/faq.md @@ -117,5 +117,5 @@ Ubuntu image with those two commands added. * [Troubleshooting Weave](/site/troubleshooting.md) * [Troubleshooting IPAM](/site/tasks/ipam/ipam.md) - * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md) + * [Troubleshooting the Proxy](/site/tasks/weave-docker-api/using-proxy.md) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 172882ec..3e6759a7 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -17,7 +17,7 @@ If you are on OSX and you are using Docker Machine ensure that a VM is running a before downloading Weave Net. To set up a VM see [the Docker Machine documentation](https://docs.docker.com/installation/mac/#from-your-shell) or refer to ["Part 1: Launching Weave Net with Docker Machine"](/guides/part-1-launching-weave-net-with-docker-machine/). -After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/weave-docker-api/using-proxy.md). +After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md). With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Using Weave Net](/site/using-weave.md). diff --git a/site/overview/features.md b/site/overview/features.md index 02dba740..3ce1418f 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -58,7 +58,7 @@ See [Using Fast Datapath](/site/tasks/manage/fastdp.md) and ### Seamless Docker Integration (Weave Docker API Proxy) -Weave Net includes a [Docker API Proxy](/site/weave-docker-api.md), which can be +Weave Net includes a [Docker API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md), which can be used to start containers using the Docker [command-line interface](https://docs.docker.com/reference/commandline/cli/) or the [remote API](https://docs.docker.com/reference/api/docker_remote_api/), and attach them to the Weave network before they begin execution. To use the proxy, run: @@ -71,7 +71,7 @@ Containers started in this way that subsequently restart, either by an explicit `docker restart` command or by Docker restart policy, are re-attached to the Weave network by the `Weave Docker API Proxy`. -See [Integrating Docker via the API Proxy](/site/weave-docker-api.md). +See [Integrating Docker via the API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md). ### Weave Network Docker Plugin diff --git a/site/tasks/manage/dynamically-attach-containers.md b/site/tasks/manage/dynamically-attach-containers.md index 5887b620..d64c18c4 100644 --- a/site/tasks/manage/dynamically-attach-containers.md +++ b/site/tasks/manage/dynamically-attach-containers.md @@ -32,7 +32,7 @@ with the `--without-dns` argument). 10.32.0.1 If you would like `/etc/hosts` to contain the Weave Net address (the -same way [the proxy does](/site/weave-docker-api/name-resolution-proxy.md)), +same way [the proxy does](/site/tasks/weave-docker-api/name-resolution-proxy.md)), specify `--rewrite-hosts` when running `weave attach`: host1$ weave attach --rewrite-hosts c1 diff --git a/site/tasks/weave-docker-api/automatic-discovery-proxy.md b/site/tasks/weave-docker-api/automatic-discovery-proxy.md index c0b94603..127cc622 100644 --- a/site/tasks/weave-docker-api/automatic-discovery-proxy.md +++ b/site/tasks/weave-docker-api/automatic-discovery-proxy.md @@ -56,5 +56,5 @@ to the proxy, the specified label takes precedence over the container's name. **See Also** - * [Name resolution via `/etc/hosts`](/site/weave-docker-api/name-resolution-proxy.md) + * [Name resolution via `/etc/hosts`](/site/tasks/weave-docker-api/name-resolution-proxy.md) * [How Weave Finds Containers](/site/tasks/weavedns/how-works-weavedns.md) diff --git a/site/tasks/weave-docker-api/name-resolution-proxy.md b/site/tasks/weave-docker-api/name-resolution-proxy.md index c0d42267..3a2e0a74 100644 --- a/site/tasks/weave-docker-api/name-resolution-proxy.md +++ b/site/tasks/weave-docker-api/name-resolution-proxy.md @@ -31,5 +31,5 @@ Docker-managed networks), the proxy must be launched using the **See Also** - * [Using Automatic Discovery With the Weave Proxy](/site/weave-docker-api/automatic-discovery-proxy.md) + * [Using Automatic Discovery With the Weave Proxy](/site/tasks/weave-docker-api/automatic-discovery-proxy.md) diff --git a/site/tasks/weave-docker-api/securing-proxy.md b/site/tasks/weave-docker-api/securing-proxy.md index feb9f26f..4431a691 100644 --- a/site/tasks/weave-docker-api/securing-proxy.md +++ b/site/tasks/weave-docker-api/securing-proxy.md @@ -56,4 +56,4 @@ proxy port. **See Also** - * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md) + * [Setting Up The Weave Docker API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) diff --git a/site/tasks/weave-docker-api/using-proxy.md b/site/tasks/weave-docker-api/using-proxy.md index c6074483..00f49596 100644 --- a/site/tasks/weave-docker-api/using-proxy.md +++ b/site/tasks/weave-docker-api/using-proxy.md @@ -70,5 +70,5 @@ If for some reason you need to disable the proxy, but still want to start other **See Also** - * [Setting Up The Weave Docker API Proxy](/site/weave-docker-api.md) - * [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md) + * [Setting Up The Weave Docker API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) + * [Securing Docker Communications With TLS](/site/tasks/weave-docker-api/securing-proxy.md) diff --git a/site/tasks/weave-docker-api/weave-docker-api.md b/site/tasks/weave-docker-api/weave-docker-api.md index 1c825b45..c44613b6 100644 --- a/site/tasks/weave-docker-api/weave-docker-api.md +++ b/site/tasks/weave-docker-api/weave-docker-api.md @@ -89,8 +89,8 @@ to the original settings prior to running `stop`. **See Also** - * [Using The Weave Docker API Proxy](/site/weave-docker-api/using-proxy.md) - * [Securing Docker Communications With TLS](/site/weave-docker-api/securing-proxy.md) - * [Launching Containers With Weave Run (without the Proxy)](/site/weave-docker-api/launching-without-proxy.md) + * [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md) + * [Securing Docker Communications With TLS](/site/tasks/weave-docker-api/securing-proxy.md) + * [Launching Containers With Weave Run (without the Proxy)](/site/tasks/weave-docker-api/launching-without-proxy.md) diff --git a/site/tasks/weavedns/managing-domains-weavedns.md b/site/tasks/weavedns/managing-domains-weavedns.md index cc640db5..083c9cbc 100644 --- a/site/tasks/weavedns/managing-domains-weavedns.md +++ b/site/tasks/weavedns/managing-domains-weavedns.md @@ -12,7 +12,7 @@ The following topics are discussed: ## Configuring the domain search paths If you don't supply a domain search path (with `--dns-search=`), Weave -Net (via the [proxy](/site/weave-docker-api.md) or via `weave attach`) +Net (via the [proxy](/site/tasks/weave-docker-api/weave-docker-api.md) or via `weave attach`) tells a container to look for "bare" hostnames, like `pingme`, in its own domain (or in `weave.local` if it has no domain). diff --git a/site/tasks/weavedns/weavedns.md b/site/tasks/weavedns/weavedns.md index 8231b97b..c66da58f 100644 --- a/site/tasks/weavedns/weavedns.md +++ b/site/tasks/weavedns/weavedns.md @@ -45,5 +45,5 @@ disable weaveDNS itself, launch weave with the `--no-dns` option. **See Also** - * [Integrating Docker via the API Proxy](/site/weave-docker-api.md) + * [Integrating Docker via the API Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) * [Load Balancing and Fault Resilience with WeaveDNS](/site/tasks/weavedns/load-balance-fault-weavedns.md) diff --git a/site/troubleshooting.md b/site/troubleshooting.md index 80846668..03661925 100644 --- a/site/troubleshooting.md +++ b/site/troubleshooting.md @@ -286,7 +286,7 @@ on reboot. This can be disabled via: Note that the Weave Net router will create the `weave` network bridge if necessary when it restarts, and the [Weave Net Docker API -Proxy](/site/weave-docker-api.md) will re-attach any application +Proxy](/site/tasks/weave-docker-api/weave-docker-api.md) will re-attach any application containers that it originally attached to the Weave network when they restart. @@ -308,4 +308,4 @@ and the container image versions as git hashes. **See Also** * [Troubleshooting IPAM](/site/tasks/ipam/troubleshooting-ipam.md) - * [Troubleshooting the Proxy](/site/weave-docker-api/using-proxy.md) + * [Troubleshooting the Proxy](/site/tasks/weave-docker-api/using-proxy.md) From 5483e81d75dbdc0f78fe5e10ff56a30e49a9e2e5 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:43:55 -0500 Subject: [PATCH 111/125] misc link replaced topology still going to router-topology --- site/concepts/how-it-works.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/concepts/how-it-works.md b/site/concepts/how-it-works.md index d5412ec9..165aa8b2 100644 --- a/site/concepts/how-it-works.md +++ b/site/concepts/how-it-works.md @@ -13,7 +13,7 @@ the router is concerned, although the name defaults to a MAC address. Weave Net routers establish TCP connections with each other, over which they perform a protocol handshake and subsequently exchange -[topology](/site/router-topology/network-topology.md) information. +[topology](/site/concepts/network-topology.md) information. These connections are encrypted if so configured. Peers also establish UDP "connections", possibly encrypted, which carry encapsulated network packets. These From dff0f08cb57b751aea0c7fc7300e9ba9b1a14c62 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:55:10 -0500 Subject: [PATCH 112/125] replaced URLs systemd and installing-weave --- site/concepts/fastdp-how-it-works.md | 2 +- site/install/installing-weave.md | 6 +++--- site/install/plugin/plugin.md | 2 +- site/install/systemd.md | 2 +- site/install/weave-cloud.md | 2 +- site/kubernetes.md | 2 +- site/operational-guide/autoscaling.md | 2 +- site/operational-guide/tasks.md | 2 +- site/operational-guide/uniform-dynamic-cluster.md | 4 ++-- site/operational-guide/uniform-fixed-cluster.md | 4 ++-- site/overview/features.md | 4 ++-- site/tasks/manage/application-isolation.md | 2 +- site/tasks/manage/awsvpc.md | 2 +- site/tasks/manage/fastdp.md | 2 +- site/tasks/manage/host-network-integration.md | 4 ++-- site/tasks/manage/service-management.md | 6 +++--- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md index 13a092e9..fbc855c8 100644 --- a/site/concepts/fastdp-how-it-works.md +++ b/site/concepts/fastdp-how-it-works.md @@ -25,7 +25,7 @@ Prior to version 1.2, Weave Net used a custom encapsulation format. Fast datapat **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [Using Fast Datapath](/site/tasks/manage/fastdp.md) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 3e6759a7..9420b708 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -19,7 +19,7 @@ documentation](https://docs.docker.com/installation/mac/#from-your-shell) or ref After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md). -With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Using Weave Net](/site/using-weave.md). +With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Using Weave Net](/site/install/using-weave.md). ### Quick Start Screencast @@ -64,10 +64,10 @@ To make encryption in fast datapath work on Google Cloud Platform, see **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [Getting Started Guides](http://www.weave.works/guides/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) * [Building](/site/building.md) - * [Using Weave with Systemd](/site/installing-weave/systemd.md) + * [Using Weave with Systemd](/site/install/systemd.md) diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index a090352a..aedaa989 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -16,7 +16,7 @@ networking plugins, does not require an external cluster store. To create a network which can span multiple Docker hosts, Weave Net peers must be connected to each other, by specifying the other hosts during `weave launch` or via [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). -See [Using Weave Net](/site/using-weave.md#peer-connections) for a discussion on peer connections. +See [Using Weave Net](/site/install/using-weave.md#peer-connections) for a discussion on peer connections. After you've launched Weave Net and peered your hosts, you can start containers using the following, for example: diff --git a/site/install/systemd.md b/site/install/systemd.md index f6129613..357cdde9 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -64,7 +64,7 @@ context with the commands shown below. You will need to have the **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [Getting Started Guides](http://www.weave.works/guides/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 9d5260a2..0a1d4ecf 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -122,7 +122,7 @@ connect to it. **See Also** * [Installing Weave Net](/site/install/installing-weave.md) - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/kubernetes.md b/site/kubernetes.md index f06df09f..0c8b13f8 100644 --- a/site/kubernetes.md +++ b/site/kubernetes.md @@ -36,7 +36,7 @@ To create a network that spans multiple hosts, the Weave peers must be connected This is accomplished by specifying the other hosts during `weave launch` or via [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). -See [Creating Peer Connections Between Hosts](/site/using-weave.md#peer-connections) +See [Creating Peer Connections Between Hosts](/site/install/using-weave.md#peer-connections) for a discussion on peer connections. weave launch diff --git a/site/operational-guide/autoscaling.md b/site/operational-guide/autoscaling.md index 41ccf719..79a0db40 100644 --- a/site/operational-guide/autoscaling.md +++ b/site/operational-guide/autoscaling.md @@ -25,7 +25,7 @@ and partitions. ### Scaling Out On the additional dynamic peer, at boot, via -[systemd](/site/installing-weave/systemd.md) or equivalent: +[systemd](/site/install/systemd.md) or equivalent: weave launch --no-restart --ipalloc-init=observer $PEERS diff --git a/site/operational-guide/tasks.md b/site/operational-guide/tasks.md index 703773f4..3c703b97 100644 --- a/site/operational-guide/tasks.md +++ b/site/operational-guide/tasks.md @@ -21,7 +21,7 @@ once and your system is configured to start Docker on boot, then Weave Net will start automatically on system restarts. If you are aiming for a non-interactive installation, use -[systemd](/site/installing-weave/systemd.md) or a similar init system to +[systemd](/site/install/systemd.md) or a similar init system to launch Weave using the `--no-restart` flag after Docker has been started. ## Detecting and Reclaiming Lost IP Address Space diff --git a/site/operational-guide/uniform-dynamic-cluster.md b/site/operational-guide/uniform-dynamic-cluster.md index fe067618..c33456d7 100644 --- a/site/operational-guide/uniform-dynamic-cluster.md +++ b/site/operational-guide/uniform-dynamic-cluster.md @@ -18,7 +18,7 @@ A uniform dynamic cluster has the following characteristics: ## Bootstrapping On each initial peer N, at boot, via -[systemd](/site/installing-weave/systemd.md): +[systemd](/site/install/systemd.md): hostN$ weave launch --no-restart --name ::N --ipalloc-init seed=$SEED $PEERS @@ -45,7 +45,7 @@ Where ## Adding a Peer On each new peer, at boot, via -[systemd](/site/installing-weave/systemd.md): +[systemd](/site/install/systemd.md): hostN$ weave launch --no-restart --name ::N --ipalloc-init seed=$SEED $PEERS diff --git a/site/operational-guide/uniform-fixed-cluster.md b/site/operational-guide/uniform-fixed-cluster.md index 0913fbc7..fa9c56d4 100644 --- a/site/operational-guide/uniform-fixed-cluster.md +++ b/site/operational-guide/uniform-fixed-cluster.md @@ -24,7 +24,7 @@ A uniform fixed cluster has the following characteristics: ### Bootstrapping On each initial peer, at boot, via -[systemd](/site/installing-weave/systemd.md): +[systemd](/site/install/systemd.md): weave launch --no-restart $PEERS @@ -56,7 +56,7 @@ that](/site/troubleshooting.md) before moving on. ### Adding a Peer On the new peer, at boot, via -[systemd](/site/installing-weave/systemd.md) run: +[systemd](/site/install/systemd.md) run: weave launch --no-restart $PEERS diff --git a/site/overview/features.md b/site/overview/features.md index 3ce1418f..259cad3b 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -26,7 +26,7 @@ search_type: Documentation * [Container Mobility](#container-mobility) * [Fault Tolerance](#fault-tolerance) -For step-by-step instructions on how to use Weave Net, see [Using Weave Net](/site/using-weave.md). +For step-by-step instructions on how to use Weave Net, see [Using Weave Net](/site/install/using-weave.md). ### Virtual Ethernet Switch @@ -45,7 +45,7 @@ Broadcast and Multicast protocols can also be used over Weave Net. To start using Weave Net, see [Installing Weave Net](/site/install/installing-weave.md) -and [Using Weave Net](/site/using-weave.md). +and [Using Weave Net](/site/install/using-weave.md). ### Fast Datapath diff --git a/site/tasks/manage/application-isolation.md b/site/tasks/manage/application-isolation.md index d479c340..956dc0d6 100644 --- a/site/tasks/manage/application-isolation.md +++ b/site/tasks/manage/application-isolation.md @@ -14,7 +14,7 @@ techniques can still be used to deploy applications to a container network. To begin isolating an application (or parts of an application), configure Weave Net's IP allocator to manage multiple subnets. -Using [the netcat example](/site/using-weave.md), configure multiple subsets: +Using [the netcat example](/site/install/using-weave.md), configure multiple subsets: host1$ weave launch --ipalloc-range 10.2.0.0/16 --ipalloc-default-subnet 10.2.1.0/24 host1$ eval $(weave env) diff --git a/site/tasks/manage/awsvpc.md b/site/tasks/manage/awsvpc.md index a755034d..7857631c 100644 --- a/site/tasks/manage/awsvpc.md +++ b/site/tasks/manage/awsvpc.md @@ -101,5 +101,5 @@ In AWS-VPC mode you can run the following: **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) diff --git a/site/tasks/manage/fastdp.md b/site/tasks/manage/fastdp.md index 02b17fc3..64a6f034 100644 --- a/site/tasks/manage/fastdp.md +++ b/site/tasks/manage/fastdp.md @@ -71,6 +71,6 @@ frame" configuration: **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [How Fastdp Works](/site/concepts/fastdp-how-it-works.md) * [Performance measurements](/blog/weave-docker-networking-performance-fast-data-path/) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index ea9afbeb..b4f96b57 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -6,7 +6,7 @@ search_type: Documentation Weave application networks can be integrated with an external host network, establishing connectivity between the host and with application containers running anywhere. -For example, returning to the [netcat example](/site/using-weave.md), you’ve now decided that you need to have the application containers that are running on `$HOST2` accessible by other hosts and containers. +For example, returning to the [netcat example](/site/install/using-weave.md), you’ve now decided that you need to have the application containers that are running on `$HOST2` accessible by other hosts and containers. On `$HOST2` run: @@ -59,6 +59,6 @@ hosts. **See Also** - * [Using Weave Net](/site/using-weave.md) + * [Using Weave Net](/site/install/using-weave.md) * [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) diff --git a/site/tasks/manage/service-management.md b/site/tasks/manage/service-management.md index a3b2ecd0..4114bbbb 100644 --- a/site/tasks/manage/service-management.md +++ b/site/tasks/manage/service-management.md @@ -21,7 +21,7 @@ accessible to the outside world (and, more generally, to other networks) from any Weave Net host, irrespective of where the service containers are located. -Returning to the [netcat example service](/site/using-weave.md), +Returning to the [netcat example service](/site/install/using-weave.md), you can expose the netcat service running on `HOST1` and make it accessible to the outside world via `$HOST2`. First, expose the application network to `$HOST2`, as explained in [Integrating with the Host Network](/site/tasks/manage/host-network-integration.md): @@ -49,7 +49,7 @@ Similar NAT rules to the above can be used to expose services not just to the ou Applications running in containers on a Weave network can be given access to services, which are only reachable from certain Weave hosts, regardless of where the actual application containers are located. -Expanding on the [netcat service example](/site/using-weave.md), you now decide to add a third, non-containerized, netcat service. This additional netcat service runs on `$HOST3`, and listens on port 2211, but it is not on the Weave network. +Expanding on the [netcat service example](/site/install/using-weave.md), you now decide to add a third, non-containerized, netcat service. This additional netcat service runs on `$HOST3`, and listens on port 2211, but it is not on the Weave network. An additional caveat is that `$HOST3` can only be reached from `$HOST1`, which is not accessible via `$HOST2`. Nonetheless, you still need to make the `$HOST3` service available to an application that is running in a container on `$HOST2`. @@ -88,7 +88,7 @@ You can combine the service export and service import features to establish conn Each network imports its services into Weave Net, while at the same time, exports from Weave Net any services that are required by its applications. In this scenario, there are no application containers (although, there could be). Weave Net is acting as an address translation and routing facility, and uses the Weave container network as an intermediary. -Expanding on the [netcat example](/site/using-weave.md), you can also import an additional netcat service running on `$HOST3` into Weave Net via `$HOST1`. +Expanding on the [netcat example](/site/install/using-weave.md), you can also import an additional netcat service running on `$HOST3` into Weave Net via `$HOST1`. Begin importing the service onto `$HOST2` by first exposing the application network: From e1e40fc68c9b5134d1b4fa67d23a58dcbba7924f Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 15:59:40 -0500 Subject: [PATCH 113/125] replaced getting started guides with tutorials --- site/install/installing-weave.md | 2 +- site/install/systemd.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 9420b708..5818033b 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -65,7 +65,7 @@ To make encryption in fast datapath work on Google Cloud Platform, see **See Also** * [Using Weave Net](/site/install/using-weave.md) - * [Getting Started Guides](http://www.weave.works/guides/) + * [Tutorials](https://www.weave.works/docs/tutorials/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) * [Building](/site/building.md) diff --git a/site/install/systemd.md b/site/install/systemd.md index 357cdde9..ac1fce27 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -65,6 +65,6 @@ context with the commands shown below. You will need to have the **See Also** * [Using Weave Net](/site/install/using-weave.md) - * [Getting Started Guides](http://www.weave.works/guides/) + * [Tutorials](https://www.weave.works/docs/tutorials/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) From 2651fe2ed487e0e8510a7860df1cfa4aad763575 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 16:09:04 -0500 Subject: [PATCH 114/125] replaced Using Weave Net with Launching Weave Net --- site/concepts/fastdp-how-it-works.md | 2 +- site/install/installing-weave.md | 4 ++-- site/install/plugin/plugin.md | 2 +- site/install/systemd.md | 2 +- site/install/weave-cloud.md | 2 +- site/overview/features.md | 4 ++-- site/tasks/manage/awsvpc.md | 2 +- site/tasks/manage/fastdp.md | 2 +- site/tasks/manage/host-network-integration.md | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/site/concepts/fastdp-how-it-works.md b/site/concepts/fastdp-how-it-works.md index fbc855c8..4774c6a2 100644 --- a/site/concepts/fastdp-how-it-works.md +++ b/site/concepts/fastdp-how-it-works.md @@ -25,7 +25,7 @@ Prior to version 1.2, Weave Net used a custom encapsulation format. Fast datapat **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [Using Fast Datapath](/site/tasks/manage/fastdp.md) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 5818033b..36dc65ca 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -19,7 +19,7 @@ documentation](https://docs.docker.com/installation/mac/#from-your-shell) or ref After your VM is setup with Docker Machine, Weave Net can be launched directly from the OSX host. Weave Net respects the environment variable `DOCKER_HOST`, so that you can run and control a Weave Network locally on a remote host. See [Using The Weave Docker API Proxy](/site/tasks/weave-docker-api/using-proxy.md). -With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Using Weave Net](/site/install/using-weave.md). +With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weave network and deploy apps onto it. See [Launching Weave Net](/site/install/using-weave.md). ### Quick Start Screencast @@ -64,7 +64,7 @@ To make encryption in fast datapath work on Google Cloud Platform, see **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [Tutorials](https://www.weave.works/docs/tutorials/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) diff --git a/site/install/plugin/plugin.md b/site/install/plugin/plugin.md index aedaa989..3691e191 100644 --- a/site/install/plugin/plugin.md +++ b/site/install/plugin/plugin.md @@ -16,7 +16,7 @@ networking plugins, does not require an external cluster store. To create a network which can span multiple Docker hosts, Weave Net peers must be connected to each other, by specifying the other hosts during `weave launch` or via [`weave connect`](/site/tasks/manage/finding-adding-hosts-dynamically.md). -See [Using Weave Net](/site/install/using-weave.md#peer-connections) for a discussion on peer connections. +See [Launching Weave Net](/site/install/using-weave.md#peer-connections) for a discussion on peer connections. After you've launched Weave Net and peered your hosts, you can start containers using the following, for example: diff --git a/site/install/systemd.md b/site/install/systemd.md index ac1fce27..e2794cf7 100644 --- a/site/install/systemd.md +++ b/site/install/systemd.md @@ -64,7 +64,7 @@ context with the commands shown below. You will need to have the **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [Tutorials](https://www.weave.works/docs/tutorials/) * [Features](/site/overview/features.md) * [Troubleshooting](/site/troubleshooting.md) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 0a1d4ecf..4c3e02af 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -122,7 +122,7 @@ connect to it. **See Also** * [Installing Weave Net](/site/install/installing-weave.md) - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [Using Fastdp With Weave Net](/site/tasks/manage/fastdp.md) * [Integrating Docker via the Network Plugin (Legacy)](/site/install/plugin/plugin.md) * [Integrating Docker via the Network Plugin (V2)](/site/install/plugin/plugin-v2.md) diff --git a/site/overview/features.md b/site/overview/features.md index 259cad3b..925171c5 100644 --- a/site/overview/features.md +++ b/site/overview/features.md @@ -26,7 +26,7 @@ search_type: Documentation * [Container Mobility](#container-mobility) * [Fault Tolerance](#fault-tolerance) -For step-by-step instructions on how to use Weave Net, see [Using Weave Net](/site/install/using-weave.md). +For step-by-step instructions on how to use Weave Net, see [Launching Weave Net](/site/install/using-weave.md). ### Virtual Ethernet Switch @@ -45,7 +45,7 @@ Broadcast and Multicast protocols can also be used over Weave Net. To start using Weave Net, see [Installing Weave Net](/site/install/installing-weave.md) -and [Using Weave Net](/site/install/using-weave.md). +and [Launching Weave Net](/site/install/using-weave.md). ### Fast Datapath diff --git a/site/tasks/manage/awsvpc.md b/site/tasks/manage/awsvpc.md index 7857631c..4e648147 100644 --- a/site/tasks/manage/awsvpc.md +++ b/site/tasks/manage/awsvpc.md @@ -101,5 +101,5 @@ In AWS-VPC mode you can run the following: **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) diff --git a/site/tasks/manage/fastdp.md b/site/tasks/manage/fastdp.md index 64a6f034..b0adce64 100644 --- a/site/tasks/manage/fastdp.md +++ b/site/tasks/manage/fastdp.md @@ -71,6 +71,6 @@ frame" configuration: **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [How Fastdp Works](/site/concepts/fastdp-how-it-works.md) * [Performance measurements](/blog/weave-docker-networking-performance-fast-data-path/) diff --git a/site/tasks/manage/host-network-integration.md b/site/tasks/manage/host-network-integration.md index b4f96b57..e8a3c723 100644 --- a/site/tasks/manage/host-network-integration.md +++ b/site/tasks/manage/host-network-integration.md @@ -59,6 +59,6 @@ hosts. **See Also** - * [Using Weave Net](/site/install/using-weave.md) + * [Launching Weave Net](/site/install/using-weave.md) * [General information on IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) * [Managing Services - Exporting, Importing, Binding and Routing](/site/tasks/manage/service-management.md) From 81c0d44c097f9f78ffae7d4fa7edf15872d4c79c Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 16:29:36 -0500 Subject: [PATCH 115/125] fixed url with anchor and broken link --- site/install/weave-cloud.md | 2 +- site/tasks/manage/awsvpc.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/weave-cloud.md b/site/install/weave-cloud.md index 4c3e02af..85780780 100644 --- a/site/install/weave-cloud.md +++ b/site/install/weave-cloud.md @@ -86,7 +86,7 @@ first and automatically create a connection to it. >**Note:** If there is a firewall between `$HOST1` and `$HOST2`, you must permit traffic to flow through TCP 6783 and UDP 6783/6784, which are Weave’s control and data ports. -Now you can proceed to [test container communications](/site/using-weave#testing) +Now you can proceed to [test container communications](/site/install/using-weave#testing) ### How Peer Discovery Works diff --git a/site/tasks/manage/awsvpc.md b/site/tasks/manage/awsvpc.md index 4e648147..386e2f66 100644 --- a/site/tasks/manage/awsvpc.md +++ b/site/tasks/manage/awsvpc.md @@ -75,7 +75,7 @@ your cluster. is all or nothing. In this mode, all hosts in a cluster must be AWS instances. (We hope to ease this limitation in future.) - The `weave launch` command waits until the - [IP address manager](/site//operational-guide/concepts.md#ip-address-manager-ipam) + [IP address manager](/site/operational-guide/concepts.md#ip-address-manager-ipam) is ready, i.e. until after this peer has been able to make contact with other peers and confirm that it has joined the cluster the bridge. Without AWS-VPC, `weave launch` returns without waiting. From c9559666ef14e5dc6882fa12db5f5df248a37352 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 17:04:04 -0500 Subject: [PATCH 116/125] remove code format from title --- site/install/plugin/plugin-how-it-works.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/install/plugin/plugin-how-it-works.md b/site/install/plugin/plugin-how-it-works.md index 28e78d39..ef42a9a8 100644 --- a/site/install/plugin/plugin-how-it-works.md +++ b/site/install/plugin/plugin-how-it-works.md @@ -11,7 +11,7 @@ named `weave` that can only work with one (like Docker's overlay driver), while the V2 plugin provides *one* - `store/weaveworks/net-plugin:latest_release` operating only in swarm mode. -### `weavemesh` driver +### weavemesh driver * Weave Net handles all co-ordination between hosts (referred to by Docker as a "local scope" driver) * Supports a single network only. A network named `weave` is automatically created for you. @@ -19,7 +19,7 @@ operating only in swarm mode. If you do create additional networks using the `weavemesh` driver, containers attached to them will be able to communicate with containers attached to `weave`. There is no isolation between those networks. -### `weave` driver +### weave driver * This runs in what Docker calls "global scope", which requires an external cluster store * Supports multiple networks that must be created using `docker network create --driver weave ...` @@ -41,7 +41,7 @@ The plugin accepts the following options via `docker network create ... --opt`: network created when the plugin is first launched has the multicast option turned on, but for any networks you create it defaults to off. -### `store/weaveworks/net-plugin:latest_release` driver +### store/weaveworks/net-plugin:latest_release driver * The driver runs within the plugin V2. * Requires Docker to run in [swarm mode](https://docs.docker.com/engine/swarm/swarm-mode/). From 9ec9e72ade271253e6e6c9a43fc8dfcc988a7e77 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 17:28:26 -0500 Subject: [PATCH 117/125] test anchor --- site/install/installing-weave.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 36dc65ca..a05b3a8d 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -32,7 +32,7 @@ With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weav Weave Net [periodically contacts Weaveworks servers for available versions](https://github.com/weaveworks/go-checkpoint). New versions are announced in the log and in [the status -summary](/site/troubleshooting.md#weave-status). +summary](/site/troubleshooting#weave-status). The information sent in this check is: From 0eded20bdfa8872af3120ea6cedfbf353f2814bd Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 17:39:33 -0500 Subject: [PATCH 118/125] test anchor --- site/install/installing-weave.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index a05b3a8d..ba4d3a1c 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -32,7 +32,7 @@ With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weav Weave Net [periodically contacts Weaveworks servers for available versions](https://github.com/weaveworks/go-checkpoint). New versions are announced in the log and in [the status -summary](/site/troubleshooting#weave-status). +summary](/site/troubleshooting.md/#weave-status). The information sent in this check is: @@ -60,7 +60,7 @@ optionally be enabled, which allows containers to communicate at the full speed of the underlying network. To make encryption in fast datapath work on Google Cloud Platform, see -[here](/site/faq.md#ports). +[here](/site/faq.md/#ports). **See Also** From fe852d8519a1b95cb2bbd164cd020e43e9443574 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 18:25:47 -0500 Subject: [PATCH 119/125] concepts toc --- site/concepts.md | 13 +++++++++++++ site/install/installing-weave.md | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/site/concepts.md b/site/concepts.md index 6b64f325..18e61741 100644 --- a/site/concepts.md +++ b/site/concepts.md @@ -4,3 +4,16 @@ menu_order: 20 search_type: Documentation --- +The section contains topics about how Weave Net works as well as providing a technical deep dive on how Weave Net implements encryption, and fast data path. + +* [Understanding Weave Net](/site/concepts/how-it-works.md) +* [Weave Net Router Sleeve Encapsulation](/site/concepts/router-encapsulation.md) +* [How Weave Net Interprets Network Topology](/site/concepts/network-topology.md) + * [Communicating Topology Among Peers](/site/concepts/network-topology#topology) + * [How Messages are Formed](/site/concepts/network-topology#messages) + * [Removing Peers](/site/concepts/network-topology#removing-peers) + * [What Happens When The Topology is Out of Date?](/site/concepts/network-topology#out-of-date-topology) +* [Fast Datapath & Weave Net](/site/concepts/fastdp-how-it-works.md) +* [IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) +* [Encryption and Weave Net](/site/concepts/encryption.md) + * [How Weave Net Implements Encryption](/site/concepts/encryption-implementation.md) \ No newline at end of file diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index ba4d3a1c..36dc65ca 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -32,7 +32,7 @@ With Weave Net downloaded onto your VMs or hosts, you are ready to launch a Weav Weave Net [periodically contacts Weaveworks servers for available versions](https://github.com/weaveworks/go-checkpoint). New versions are announced in the log and in [the status -summary](/site/troubleshooting.md/#weave-status). +summary](/site/troubleshooting.md#weave-status). The information sent in this check is: @@ -60,7 +60,7 @@ optionally be enabled, which allows containers to communicate at the full speed of the underlying network. To make encryption in fast datapath work on Google Cloud Platform, see -[here](/site/faq.md/#ports). +[here](/site/faq.md#ports). **See Also** From 34767f498612319c829010e0b5bdc335d6f9380a Mon Sep 17 00:00:00 2001 From: abuehrle Date: Thu, 13 Jul 2017 19:53:14 -0500 Subject: [PATCH 120/125] update links in readme anchors --- README.md | 10 +++++----- site/concepts.md | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ec2066f1..b01e3248 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,13 @@ [Weaveworks](https://www.weave.works) is the company that delivers the most productive way for developers to connect, observe and control Docker containers. -This repository contains [Weave Net](https://www.weave.works/products/weave-net/), the first product developed by Weaveworks, and with over 8 million downloads to date, it enables you to get started with Docker clusters and portable apps in a fraction of the time compared with other solutions. +This repository contains [Weave Net](https://www.weave.works/products/weave-net/), the first product developed by Weaveworks, and with over 8 million downloads to date, enables you to get started with Docker clusters and portable apps in a fraction of the time compared with other solutions. ## Weave Cloud: [Weave Cloud](https://www.weave.works/product/cloud/) is software-as-a-service that simplifies deployment, monitoring and management for containers and microservices. It extends and complements popular orchestrators, and enables developers and DevOps to realize faster deployments, insightful monitoring, visualization and networking. -Weave Cloud is built using these Open Source projects: [Weave Scope](https://www.weave.works/products/weave-scope/), a powerful container monitoring tool that automatically maps Docker containers and their interactions, [Weave Cortex](https://github.com/weaveworks/cortex), a horizontally-scalable version of Prometheus, and [Weave Flux](https://www.weave.works/products/weave-flux/), a continuous deployment tool that works with Kubernetes. +Weave Cloud is built using these Open Source projects: [Weave Scope](https://www.weave.works/products/weave-scope/), a powerful container visualization tool that automatically maps Docker containers and their interactions, [Weave Cortex](https://github.com/weaveworks/cortex), a horizontally-scalable version of Prometheus, and [Weave Flux](https://www.weave.works/products/weave-flux/), a continuous deployment tool that works with Kubernetes. # Weave Net @@ -28,7 +28,7 @@ Services provided by application containers on the Weave network can be exposed If you have any questions about, feedback for or a problem with Weave Net: -- Read [the Weave Net docs](https://www.weave.works/docs/net/latest/introducing-weave/). +- Read [the Weave Net docs](https://www.weave.works/docs/net/latest/overview). - Invite yourself to the #weave-community slack channel. - Ask a question on the #weave-community slack channel. - Join the Weave User Group and get invited to online talks, hands-on training and meetups in your area. @@ -39,5 +39,5 @@ Your feedback is always welcome! ## Further Information -* [Installing Weave Net](https://www.weave.works/docs/net/latest/installing-weave/) -* [Weave Net Product Overview](https://www.weave.works/products/weave-net/) +* [Installing Weave Net](https://www.weave.works/docs/net/latest/install/installing-weave) +* [Weave Net Product Overview](https://www.weave.works/products/weave-net) diff --git a/site/concepts.md b/site/concepts.md index 18e61741..e6cffdfd 100644 --- a/site/concepts.md +++ b/site/concepts.md @@ -10,8 +10,8 @@ The section contains topics about how Weave Net works as well as providing a tec * [Weave Net Router Sleeve Encapsulation](/site/concepts/router-encapsulation.md) * [How Weave Net Interprets Network Topology](/site/concepts/network-topology.md) * [Communicating Topology Among Peers](/site/concepts/network-topology#topology) - * [How Messages are Formed](/site/concepts/network-topology#messages) - * [Removing Peers](/site/concepts/network-topology#removing-peers) + * [How Messages are Formed](/site/concepts/network-topology/#messages) + * [Removing Peers](/site/concepts/network-topology/#removing-peers) * [What Happens When The Topology is Out of Date?](/site/concepts/network-topology#out-of-date-topology) * [Fast Datapath & Weave Net](/site/concepts/fastdp-how-it-works.md) * [IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) From 029c6f9caf6e613bd54eea3f966bad4c5c88df7a Mon Sep 17 00:00:00 2001 From: abuehrle Date: Fri, 14 Jul 2017 16:56:43 -0500 Subject: [PATCH 121/125] add full urls instead --- site/concepts.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/site/concepts.md b/site/concepts.md index e6cffdfd..eb361228 100644 --- a/site/concepts.md +++ b/site/concepts.md @@ -4,16 +4,20 @@ menu_order: 20 search_type: Documentation --- -The section contains topics about how Weave Net works as well as providing a technical deep dive on how Weave Net implements encryption, and fast data path. +The section contains topics about how Weave Net works as well as providing a technical deep dive on how Weave Net implements fast datapath, and encryption. * [Understanding Weave Net](/site/concepts/how-it-works.md) * [Weave Net Router Sleeve Encapsulation](/site/concepts/router-encapsulation.md) * [How Weave Net Interprets Network Topology](/site/concepts/network-topology.md) - * [Communicating Topology Among Peers](/site/concepts/network-topology#topology) - * [How Messages are Formed](/site/concepts/network-topology/#messages) - * [Removing Peers](/site/concepts/network-topology/#removing-peers) - * [What Happens When The Topology is Out of Date?](/site/concepts/network-topology#out-of-date-topology) + * [Communicating Topology Among Peers](https://weave.works/docs/net/latest/concepts/network-topology/#topology) + * [How Messages are Formed](https://weave.works/docs/net/latest/concepts/network-topology/#messages) + * [Removing Peers](https://weave.works/docs/net/latest/concepts/network-topology/#removing-peers) + * [What Happens When The Topology is Out of Date?](https://weave.works/docs/net/latest/concepts/network-topology/#out-of-date-topology) * [Fast Datapath & Weave Net](/site/concepts/fastdp-how-it-works.md) * [IP Addresses, Routes and Networks](/site/concepts/ip-addresses.md) * [Encryption and Weave Net](/site/concepts/encryption.md) - * [How Weave Net Implements Encryption](/site/concepts/encryption-implementation.md) \ No newline at end of file + * [How Weave Net Implements Encryption](/site/concepts/encryption-implementation.md) + * [Establishing the Emphemeral Session Key](https://weave.works/docs/net/latest/concepts/network-topology/#ephemeral-key) + * [Key Generation and the Linux CSPRIN](https://weave.works/docs/net/latest/concepts/network-topology/#cspring) + * [Encrypting and Decrypting TCP Messages](https://weave.works/docs/net/latest/concepts/network-topology/#tcp) + * [Encrypting and Decrypting UDP Messages](https://weave.works/docs/net/latest/concepts/network-topology/#udp) \ No newline at end of file From acf2b4dc7d3525ad4b9cec9f4a4f2ae624e73d49 Mon Sep 17 00:00:00 2001 From: abuehrle Date: Fri, 14 Jul 2017 16:57:40 -0500 Subject: [PATCH 122/125] rearrange install and launch --- site/install/installing-weave.md | 2 +- site/install/using-weave.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/install/installing-weave.md b/site/install/installing-weave.md index 36dc65ca..599d12ee 100644 --- a/site/install/installing-weave.md +++ b/site/install/installing-weave.md @@ -1,6 +1,6 @@ --- title: Installing Weave Net -menu_order: 20 +menu_order: 10 search_type: Documentation --- diff --git a/site/install/using-weave.md b/site/install/using-weave.md index 40666175..937933d9 100644 --- a/site/install/using-weave.md +++ b/site/install/using-weave.md @@ -1,6 +1,6 @@ --- title: Launching Weave Net -menu_order: 10 +menu_order: 20 search_type: Documentation --- From 9cc98b0ee8e39e27262e9173aaac03266de7e04f Mon Sep 17 00:00:00 2001 From: abuehrle Date: Sun, 16 Jul 2017 12:40:47 -0500 Subject: [PATCH 123/125] install toc added - full urls --- site/install.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/site/install.md b/site/install.md index c33c0149..ab0a3a84 100644 --- a/site/install.md +++ b/site/install.md @@ -3,3 +3,40 @@ title: Installing Weave Net menu_order: 30 search_type: Documentation --- + +Install Weave Net from the command line on its own or if you are using Docker, Kubernetes or Mesosphere as a Docker or a CNI plugin. Weave Net can also be launched it as a cloud agent within Weave Cloud to visualize and troubleshoot peer connections. + + +## Installing Weave Net Stand-alone and in Weave Cloud + +* [Installing Weave Net](https://www.weave.works/docs/net/latest/install/installing-weave/) +* [Launching Weave Net](https://www.weave.works/docs/net/latest/install/using-weave/) +* [Visualizing Weave Net in Weave Cloud](https://www.weave.works/docs/net/latest/install/weave-cloud/) +* [Using Weave with Systemd](https://www.weave.works/docs/net/latest/install/systemd/) + + +## Weave Net Docker Plugin + +* [How the Weave Net Docker Network Plugins Work](https://www.weave.works/docs/net/latestplugin/plugin-how-it-works/) +* [Integrating Docker via the Network Plugin (V2)](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/) + * [Installation](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#installation) + * [Configuring the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#configuring) + * [Running Services or Containers Using the Plugin]((https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#usage) +* [Integrating Docker via the Network Plugin (Legacy)](https://www.weave.works/docs/net/latest/install/plugin/plugin/) + * [Launching Weave Net and Running Containers Using the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin/#launching) + * [Restarting the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin/#restarting) + +## Weave Net CNI plugin for Kubernetes and Mesosphere + +* [Integrating Kubernetes and Mesos via the CNI Plugin](https://www.weave.works/docs/net/latest/kubernetes/) +* [Integrating Kubernetes via the Addon](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/) + * [Installation](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#install) + * [Upgrading Kubernetes to version 1.6](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#kube-1.6-upgrade) + * [Upgrading the Daemon Sets](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#daemon-sets) + * [CPU and Memory Requirements](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#resources) + * [Pod Eviction](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#eviction) + * [Network Policy Controller](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#npc) + * [Troubleshooting Blocked Connections](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#blocked-connections) + * [Changing Configuration Options](https://www.weave.works/docs/net/latest/kubernetes/kube-addon/#configuration-options) + + From 4dfcaa470ad66840ec8b33b7f5c415e022d033fd Mon Sep 17 00:00:00 2001 From: abuehrle Date: Sun, 16 Jul 2017 12:41:56 -0500 Subject: [PATCH 124/125] taks toc - full urls added --- site/tasks.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/site/tasks.md b/site/tasks.md index e4969dde..e6fd9843 100644 --- a/site/tasks.md +++ b/site/tasks.md @@ -3,3 +3,63 @@ title: Weave Net Tasks menu_order: 50 search_type: Documentation --- + +The section describes the configuration options available in Weave Net. It is divided into: Managing Containerized Applications, Administering IP Addresses, Managing WeaveDNS, and finally attaching Docker Containers via the Weave API Proxy. + +## Managing Containerized Applications + +* [Isolating Applications on a Weave Network] +* [Dynamically Attaching and Detaching Applications] +* [Integrating with the Host Network] +* [Managing Services - Exporting, Importing, Binding and Routing] + * [Exporting Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#exporting) + * [Importing Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#importing) + * [Binding Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#binding) + * [Routing Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#routing) + * [Dynamically Changing Service Locations](https://weave.works/docs/net/latest/tasks/manage/service-management/#change-location) +* [Securing Connections Across Untrusted Networks] +* [Adding and Removing Hosts Dynamically] +* [Using Fast Datapath] +* [Enabling Multi-Cloud, Multi-Hop Networking and Routing] +* [Configuring IP Routing on an Amazon Web Services Virtual Private Cloud] +* [Monitoring with Prometheus] + + +## Administering IP Addresses + +* [Allocating IP Addresses] + * [Initializing Peers on a Weave Network](https://weave.works/docs/net/latest/tasks/ipam/ipam/#initialization) + * [--ipalloc-init:consensus and How Quorum is Achieved](https://weave.works/docs/net/latest/tasks/ipam/ipam/#quorum) + * [Priming a Peer](https://weave.works/docs/net/latest/tasks/ipam/ipam/#priming-a-peer) + * [Choosing an Allocation Range](https://weave.works/docs/net/latest/tasks/ipam/ipam/#range) +* [Allocating IPs in a Specific Range] +* [Manually Specifying the IP Address of a Container] +* [Automatic Allocation Across Multiple Subnets] +* [Starting, Stopping and Removing Peers] +* [Troubleshooting the IP Allocator] + + +## Managing WeaveDNS + +* [Discovering Containers with WeaveDNS] +* [How Weave Finds Containers] +* [Load Balancing and Fault Resilience with weaveDNS] +* [Managing Domains] + * [Configuring the domain search path](https://weave.works/docs/net/latest/tasks/weavedns/managing-domains-weavedns/#domain-search-path) + * [Using a different local domain](https://weave.works/docs/net/latest/tasks/weavedns/managing-domains-weavedns/#local-domain) +* [Managing Domain Entries] + * [Adding and removing extra DNS entries](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#add-remove) + * [Resolving WeaveDNS entries from the Host](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#resolve-weavedns-entries-from-host) + * [Hot-swapping Service Containers](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#hot-swapping) + * [Configuring a Custom TTL](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#ttl) +* [Troubleshooting and Present Limitations] + +## Attaching Docker Containers via the Weave API Proxy + +* [Integrating Docker via the API Proxy] +* [Using The Weave Docker API Proxy] +* [Securing the Docker Communications With TLS] +* [Automatic IP Allocation and the Weave Proxy] +* [Using Automatic Discovery With the Weave Net Proxy] +* [Name resolution via `/etc/hosts`] +* [Launching Containers With Weave Run (without the Proxy)] From d06eaf14afc752439afe03399a969a48b9b7721b Mon Sep 17 00:00:00 2001 From: abuehrle Date: Sun, 16 Jul 2017 14:14:12 -0500 Subject: [PATCH 125/125] add more urls fix others --- site/install.md | 2 +- site/tasks.md | 64 +++++++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/site/install.md b/site/install.md index ab0a3a84..16d0f822 100644 --- a/site/install.md +++ b/site/install.md @@ -21,7 +21,7 @@ Install Weave Net from the command line on its own or if you are using Docker, K * [Integrating Docker via the Network Plugin (V2)](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/) * [Installation](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#installation) * [Configuring the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#configuring) - * [Running Services or Containers Using the Plugin]((https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#usage) + * [Running Services or Containers Using the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin-v2/#usage) * [Integrating Docker via the Network Plugin (Legacy)](https://www.weave.works/docs/net/latest/install/plugin/plugin/) * [Launching Weave Net and Running Containers Using the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin/#launching) * [Restarting the Plugin](https://www.weave.works/docs/net/latest/install/plugin/plugin/#restarting) diff --git a/site/tasks.md b/site/tasks.md index e6fd9843..255996f4 100644 --- a/site/tasks.md +++ b/site/tasks.md @@ -6,60 +6,66 @@ search_type: Documentation The section describes the configuration options available in Weave Net. It is divided into: Managing Containerized Applications, Administering IP Addresses, Managing WeaveDNS, and finally attaching Docker Containers via the Weave API Proxy. + ## Managing Containerized Applications -* [Isolating Applications on a Weave Network] -* [Dynamically Attaching and Detaching Applications] -* [Integrating with the Host Network] -* [Managing Services - Exporting, Importing, Binding and Routing] + +* [Isolating Applications on a Weave Network](https://weave.works/docs/net/latest/tasks/manage/application-isolation/) +* [Dynamically Attaching and Detaching Applications](https://weave.works/docs/net/latest/tasks/dynamically-attach-containers/) +* [Integrating with the Host Network](https://weave.works/docs/net/latest/tasks/host-network-integration/) +* [Managing Services - Exporting, Importing, Binding and Routing](https://weave.works/docs/net/latest/tasks/manage/service-management/) * [Exporting Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#exporting) * [Importing Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#importing) * [Binding Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#binding) * [Routing Services](https://weave.works/docs/net/latest/tasks/manage/service-management/#routing) * [Dynamically Changing Service Locations](https://weave.works/docs/net/latest/tasks/manage/service-management/#change-location) -* [Securing Connections Across Untrusted Networks] -* [Adding and Removing Hosts Dynamically] -* [Using Fast Datapath] -* [Enabling Multi-Cloud, Multi-Hop Networking and Routing] -* [Configuring IP Routing on an Amazon Web Services Virtual Private Cloud] -* [Monitoring with Prometheus] +* [Securing Connections Across Untrusted Networks](https://weave.works/docs/net/latest/tasks//manage/security-untrusted-networks/) +* [Adding and Removing Hosts Dynamically](https://weave.works/docs/net/latest/tasks/manage/finding-adding-hosts-dynamically/) +* [Using Fast Datapath](https://weave.works/docs/net/latest/tasks/manage/fastdp/) +* [Enabling Multi-Cloud, Multi-Hop Networking and Routing](https://weave.works/docs/net/latest/tasks/manage/multi-cloud-multi-hop/) +* [Configuring IP Routing on an Amazon Web Services Virtual Private Cloud](https://weave.works/docs/net/latest/tasks/manage/awsvpc/) +* [Monitoring with Prometheus](https://weave.works/docs/net/latest/tasks/manage/metrics/) ## Administering IP Addresses -* [Allocating IP Addresses] + +* [Allocating IP Addresses](https://weave.works/docs/net/latest/tasks/ipam/ipam/) * [Initializing Peers on a Weave Network](https://weave.works/docs/net/latest/tasks/ipam/ipam/#initialization) * [--ipalloc-init:consensus and How Quorum is Achieved](https://weave.works/docs/net/latest/tasks/ipam/ipam/#quorum) * [Priming a Peer](https://weave.works/docs/net/latest/tasks/ipam/ipam/#priming-a-peer) * [Choosing an Allocation Range](https://weave.works/docs/net/latest/tasks/ipam/ipam/#range) -* [Allocating IPs in a Specific Range] -* [Manually Specifying the IP Address of a Container] -* [Automatic Allocation Across Multiple Subnets] -* [Starting, Stopping and Removing Peers] -* [Troubleshooting the IP Allocator] +* [Allocating IPs in a Specific Range](https://weave.works/docs/net/latest/tasks/ipam/configuring-weave/) +* [Manually Specifying the IP Address of a Container](https://weave.works/docs/net/latest/tasks/ipam/manual-ip-address/) +* [Automatic Allocation Across Multiple Subnets](https://weave.works/docs/net/latest/tasks/ipam/allocation-multi-ipam/) +* [Starting, Stopping and Removing Peers](https://weave.works/docs/net/latest/tasks/ipam/stop-remove-peers-ipam/) +* [Troubleshooting the IP Allocator](https://weave.works/docs/net/latest/tasks/ipam/troubleshooting-ipam/) ## Managing WeaveDNS -* [Discovering Containers with WeaveDNS] -* [How Weave Finds Containers] -* [Load Balancing and Fault Resilience with weaveDNS] -* [Managing Domains] + +* [Discovering Containers with WeaveDNS](https://weave.works/docs/net/latest/tasks/weavedns/weavedns/) +* [How Weave Finds Containers](https://weave.works/docs/net/latest/tasks/weavedns/how-works-weavedns/) +* [Load Balancing and Fault Resilience with weaveDNS](https://weave.works/docs/net/latest/tasks/weavedns/load-balance-fault-weavedns/) +* [Managing Domains](https://weave.works/docs/net/latest/tasks/weavedns/managing-domains-weavedns/) * [Configuring the domain search path](https://weave.works/docs/net/latest/tasks/weavedns/managing-domains-weavedns/#domain-search-path) * [Using a different local domain](https://weave.works/docs/net/latest/tasks/weavedns/managing-domains-weavedns/#local-domain) -* [Managing Domain Entries] +* [Managing Domain Entries](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/) * [Adding and removing extra DNS entries](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#add-remove) * [Resolving WeaveDNS entries from the Host](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#resolve-weavedns-entries-from-host) * [Hot-swapping Service Containers](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#hot-swapping) * [Configuring a Custom TTL](https://weave.works/docs/net/latest/tasks/weavedns/managing-entries-weavedns/#ttl) -* [Troubleshooting and Present Limitations] +* [Troubleshooting and Present Limitations](https://weave.works/docs/net/latest/tasks/weavedns/troubleshooting-weavedns/) + ## Attaching Docker Containers via the Weave API Proxy -* [Integrating Docker via the API Proxy] -* [Using The Weave Docker API Proxy] -* [Securing the Docker Communications With TLS] -* [Automatic IP Allocation and the Weave Proxy] -* [Using Automatic Discovery With the Weave Net Proxy] -* [Name resolution via `/etc/hosts`] -* [Launching Containers With Weave Run (without the Proxy)] + +* [Integrating Docker via the API Proxy](https://weave.works/docs/net/latest/tasks/weave-docker-api/weave-docker-api/) +* [Using The Weave Docker API Proxy](https://weave.works/docs/net/latest/tasks/weave-docker-api/using-proxy/) +* [Securing the Docker Communications With TLS](https://weave.works/docs/net/latest/tasks/weave-docker-api/securing-proxy/) +* [Automatic IP Allocation and the Weave Proxy](https://weave.works/docs/net/latest/tasks/weave-docker-api/ipam-proxy/) +* [Using Automatic Discovery With the Weave Net Proxy](https://weave.works/docs/net/latest/tasks/weave-docker-api/automatic-discovery-proxy/) +* [Name resolution via `/etc/hosts`](https://weave.works/docs/net/latest/tasks/weave-docker-api/name-resolution-proxy/) +* [Launching Containers With Weave Run (without the Proxy)](https://weave.works/docs/net/latest/tasks/weave-docker-api/launching-without-proxy/)