diff --git a/site/ami.md b/site/ami.md index 3b8993471..e607550a2 100644 --- a/site/ami.md +++ b/site/ami.md @@ -43,7 +43,6 @@ For more information about Weave AMIs and running them see: * [Peer Discovery with Weave Net](#peer-discovery-weave-net) * [How to Run Weave Scope](#how-to-run-weave-scope) * [Standalone mode](#running-weave-scope-in-standalone-mode) - * [In Weave Cloud](#running-weave-scope-in-weave-cloud) * [Upgrading Weave Scope and Weave Net](#upgrading-weave-scope-and-weave-net) * [Creating Your Own Customized Weave ECS AMI](#creating-your-own-customized-weave-ecs-ami) @@ -123,10 +122,9 @@ When running `Weave Scope` in Standalone mode, probes discover apps with the sam ## How to Run Weave Scope -There are two methods for running `Weave Scope` within the Weave ECS AMIs: +To run `Weave Scope` within the Weave ECS AMIs: * [Standalone mode](#running-weave-scope-in-standalone-mode) -* [In Weave Cloud](#running-weave-scope-in-weave-cloud) You can prevent Weave Scope from automatically starting at boot time by removing  `/etc/init/scope.conf`. @@ -156,8 +154,6 @@ However, running the app on all instances impacts performance, resulting in `N * N = N^2` connections in the Auto Scaling Group with N instances (i.e. all (N) probes talk to all (N) apps in every instances). -To avoid this problem, it is recommended that you run `Weave Scope` in [Weave Cloud](https://cloud.weave.works). - The `Weave Scope` app runs a web-based application, which listens on TCP port 4040 where you can connect with your browser. @@ -166,31 +162,6 @@ port 4040. Ensure that your Amazon ECS container instances can talk to each other on that port before running `Weave Scope` in standalone mode (see [Required Open Ports](#required-open-ports) for more details). -### Running `Weave Scope` in Weave Cloud - -In Weave Cloud, you can visualize Amazon ECS containers as well as monitor Tasks -and Services all from within in Weave Cloud at [https://cloud.weave.works](https://cloud.weave.works). -In this case, Amazon ECS container instances run a `Weave Scope` probe and reports -data from the container instances to [Weave Cloud](http://cloud.weave.works). - -To configure your ECS container instances to communicate with Weave Cloud, -store the `Weave Scope` cloud token in the`/etc/weave/scope.config` -file. - ->Note: The `Weave Scope` cloud token can be found in your Weave Cloud account at [http://cloud.weave.works](http://cloud.weave.works). - -For example, this command configures the instance to communicate with Weave -Cloud using token `3hud3h6ys3jhg9bq66n8xxa4b147dt5z`. - -~~~bash -echo SERVICE_TOKEN=3hud3h6ys3jhg9bq66n8xxa4b147dt5z >> /etc/weave/scope.config -~~~ - -You can do this at instance-initialization time using -[User Data](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html#user-data-shell-scripts), -which is similar to how -[ECS Cluster Mapping is configured](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/launch_container_instance.html#instance-launch-user-data-step). - ## Upgrading Weave Scope and Weave Net The AMIs are updated regularly (~monthly) to include the latest versions of Weave Net and Weave Scope. However, it is possible to upgrade Weave Net and Weave Scope in your running EC2 instances without needing to wait for a new AMI release or by rebuilding your cluster. diff --git a/site/faq.md b/site/faq.md index 979849ea5..1c456c967 100644 --- a/site/faq.md +++ b/site/faq.md @@ -19,7 +19,7 @@ Can be done by using the `probe.no-controls` option and set it to true for the s ## RBAC and Weave Scope OSS -OSS Scope has no user concept, this is only available in Weave Cloud. To limit the access to the UI, +OSS Scope has no user concept. To limit the access to the UI, - setup a reverse proxy with auth and block access to non admin users, - capture the calls with something like Chrome network console to get the endpoints to know which requests to authenticate in the proxy server. diff --git a/site/how-it-works.md b/site/how-it-works.md index 2e3a50ebb..da89cf901 100644 --- a/site/how-it-works.md +++ b/site/how-it-works.md @@ -6,7 +6,6 @@ search_type: Documentation The following topics are discussed: -* [Weave Cloud](#service-mode) * [Standalone Mode](#stand-alone-mode) * [Disabling Automatic Updates](#disable) @@ -46,35 +45,6 @@ When running Scope in a cluster, each probe sends its reports to a dedicated app | +-----------------+ | | +-----------------+ | +-----------------------+ +-----------------------+ -## Weave Cloud - -Scope can also be used to feed reports to Weave Cloud. With Weave Cloud, you can centrally manage and share access to your Scope UI. In this configuration, the probe is run locally and the apps are hosted for you. - - .-~~~-. - .- ~'` )_ ___ - / `-' )_ - | cloud.weave.works \ - \ .' - ~-______________..--' - ^^ - || - || - +--Docker host----------+ || +--Docker host----------+ - | +--Container------+ | || | +--Container------+ | - | | | | || | | | | - | | +-------------+ | | / \ | | +-------------+ | | - | | | scope-probe |-----' '-----| scope-probe | | | - | | +-------------+ | | | | +-------------+ | | - | | | | | | | | - | +-----------------+ | | +-----------------+ | - +-----------------------+ +-----------------------+ - -To register with Weave Cloud, go to [https://cloud.weave.works](https://cloud.weave.works), enter your email address and wait for the confirmation email. - -The cloud token is accessible from the settings page after you've clicked 'Explore': - -![Weave Cloud Token](images/weave-cloud-token.png) - ## Disabling Automatic Updates Scope periodically checks with our servers to see if a new version is available. You can disable this by setting: diff --git a/site/installing.md b/site/installing.md index e6eb21cfe..aadbeb0a1 100644 --- a/site/installing.md +++ b/site/installing.md @@ -4,9 +4,8 @@ menu_order: 20 search_type: Documentation --- -Weave Scope consists of three parts: the probe, the app and the user interface. Scope can be deployed in either a standalone configuration, where you run everything yourself, or you can use Weave Cloud, in which case only the probes run in your environment, and the app and UI are hosted by Weave Cloud. +Weave Scope consists of three parts: the probe, the app and the user interface. - * [Installing on any Platform and Orchestrator, via Weave Cloud](#weave-cloud) * [Installing on Docker](#docker) * [Single-node](#docker-single-node) * [Cluster](#docker-cluster) @@ -19,23 +18,6 @@ Weave Scope consists of three parts: the probe, the app and the user interface. * [minimesos](#minimesos) * [Mesosphere DC/OS](#dcos) -## Installing on any Platform and Orchestrator, via Weave Cloud - -Weave Cloud is a SaaS that simplifies deployment, monitoring and -management of your containers and microservices. Installing Weave -Scope via Weave Cloud is the recommended option if: - - * You are new to Weave Scope. - * You are deploying to larger clusters. - * You require secure remote access. - * You want to share access with your coworkers. - * You want to minimize Weave Scope memory and CPU usage. - * You want to benefit from Weave Cloud features beyond Weave Scope. - -Weave Cloud provides easy step-by-step instructions for installation -on a variety of platforms and orchestrators. To get started with Weave -Cloud, [sign up for a free trial](https://cloud.weave.works/). - ## Installing on Docker ### Single-node @@ -56,7 +38,7 @@ Where, * `` is the name you gave to your virtual machine with docker-machine. ->**Note:** Scope allows anyone with access to the user interface, control over your containers. As such, the Scope app endpoint (port 4040) should not be made accessible on the Internet. Also traffic between the app and the probe is insecure and should not traverse the Internet. This means that you should either use the private / internal IP addresses of your nodes when setting it up, or route this traffic through Weave Net. Put Scope behind a password, by using an application like [Caddy](https://github.com/mholt/caddy) to protect the endpoint and by making port 4040 available to localhost with Caddy proxying it. Or you can skip these steps, and just use Weave Cloud to manage the security for you. +>**Note:** Scope allows anyone with access to the user interface, control over your containers. As such, the Scope app endpoint (port 4040) should not be made accessible on the Internet. Also traffic between the app and the probe is insecure and should not traverse the Internet. This means that you should either use the private / internal IP addresses of your nodes when setting it up, or route this traffic through Weave Net. Put Scope behind a password, by using an application like [Caddy](https://github.com/mholt/caddy) to protect the endpoint and by making port 4040 available to localhost with Caddy proxying it. ### Cluster @@ -229,7 +211,6 @@ To access the Scope app from the browser, please refer to Kubernetes instruction There are currently three options for launching Weave Scope in ECS: -* A [CloudFormation template](https://www.weave.works/deploy-weave-aws-cloudformation-template/) to launch and easily evaluate Scope directly from your browser. * An [Amazon Machine Image (AMI)](/site/ami.md) for each ECS region. * [A simple way to tailor the AMIs to your needs](https://github.com/weaveworks/integrations/tree/master/aws/ecs#creating-your-own-customized-weave-ecs-ami). diff --git a/site/introducing.md b/site/introducing.md index 307164a34..af907febb 100644 --- a/site/introducing.md +++ b/site/introducing.md @@ -13,7 +13,7 @@ To install Scope on your local Docker machine, run the following commands: sudo chmod a+x /usr/local/bin/scope scope launch -Scope can be used in standalone mode, where you deploy it locally onto your hosts, or you can use Weave Scope in [Weave Cloud](https://cloud.weave.works). Scope can be deployed to Kubernetes, DCOS and ECS clusters. See [Installing Weave Scope](/site/installing.md) for more information. +Scope can be deployed to Kubernetes, DCOS and ECS clusters. See [Installing Weave Scope](/site/installing.md) for more information. ## Getting Microservices Under Control