Merge pull request #362 from weaveworks/release-0.6.0

v0.6.0

CHANGELOG.md

@@ -1,3 +1,45 @@
+## Release 0.6.0
+
+New features:
+- Probes now push data to the app, instead of the app pulling it.
+  [#342](https://github.com/weaveworks/scope/pull/342)
+- Allow probe and app to be started independently, via --no-app and
+  --no-probe flags.
+  [#345](https://github.com/weaveworks/scope/pull/345)
+- Close details pane when changing topology view.
+  [#297](https://github.com/weaveworks/scope/issues/297)
+- Add support for --probe.foo=bar style flags, in addition to
+  --probe.foo bar, which is already supported.
+  [#347](https://github.com/weaveworks/scope/pull/347)
+- Added X-Scope-Probe-ID header to identify probes when sending
+  information to the app.
+  [#351](https://github.com/weaveworks/scope/pull/351)
+
+Bug fixes:
+- Update scope script to work with master version of weave, where DNS
+  has been embedded in the router.
+  [#321](https://github.com/weaveworks/scope/issues/321)
+- Fixed regression where process names weren't appearing for Darwin
+  probes.
+  [#320](https://github.com/weaveworks/scope/pull/320)
+- Fixed rendering bug resulting in orphaned nodes.
+  [#339](https://github.com/weaveworks/scope/pull/339)
+- App now only logs to stderr, to match the probe.
+  [#343](https://github.com/weaveworks/scope/pull/343)
+- Use relative paths for all URLs in the UI.
+  [#344](https://github.com/weaveworks/scope/pull/344)
+- Removed temporary containers created by the scope script.
+  [#348](https://github.com/weaveworks/scope/issues/348)
+
+Experimental features:
+- Added support for pcap based packet sniffing, to provide bandwidth
+  usage information. It can be enabled via the --capture flag. When
+  enabled the probe will monitor packets for a portion of the time, and
+  estimate bandwidth usage. Network throughput will be affected if
+  capture is enabled.
+  [#317](https://github.com/weaveworks/scope/pull/317)
+
+
 ## Release 0.5.0
 
 New features:

app/main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
 	"math/rand"
 	"net/http"
@@ -20,11 +21,17 @@ var version = "dev"
 
 func main() {
 	var (
-		window = flag.Duration("window", 15*time.Second, "window")
-		listen = flag.String("http.address", ":"+strconv.Itoa(xfer.AppPort), "webserver listen address")
+		window       = flag.Duration("window", 15*time.Second, "window")
+		listen       = flag.String("http.address", ":"+strconv.Itoa(xfer.AppPort), "webserver listen address")
+		printVersion = flag.Bool("version", false, "print version number and exit")
 	)
 	flag.Parse()
 
+	if *printVersion {
+		fmt.Println(version)
+		return
+	}
+
 	rand.Seed(time.Now().UnixNano())
 	id := strconv.FormatInt(rand.Int63(), 16)
 	log.Printf("app starting, version %s, ID %s", version, id)

bin/release

@@ -53,7 +53,7 @@ build() {
     sed -i -e "s/^SCRIPT_VERSION=.*$/SCRIPT_VERSION=\"$VERSION\"/" ./scope
     make SUDO=$SUDO SCOPE_VERSION=$VERSION DOCKERHUB_USER=$DOCKERHUB_USER
 
-    if ./bin/test; then
+    if $(go list -e -f {{.Dir}} github.com/weaveworks/tools)/test; then
         echo -e '\u2713 Tests pass'
     else
         echo -e "\u2757 Tests failed, probably best not publish this one" >&2

probe/main.go

@@ -45,9 +45,15 @@ func main() {
 		captureInterfaces  = flag.String("capture.interfaces", interfaces(), "packet capture on these interfaces")
 		captureOn          = flag.Duration("capture.on", 1*time.Second, "packet capture duty cycle 'on'")
 		captureOff         = flag.Duration("capture.off", 5*time.Second, "packet capture duty cycle 'off'")
+		printVersion       = flag.Bool("version", false, "print version number and exit")
 	)
 	flag.Parse()
 
+	if *printVersion {
+		fmt.Println(version)
+		return
+	}
+
 	var (
 		hostName = hostname()
 		hostID   = hostName // TODO: we should sanitize the hostname

scope

@@ -21,6 +21,7 @@ IMAGE_VERSION=${VERSION:-$IMAGE_VERSION}
 SCOPE_IMAGE=weaveworks/scope:$IMAGE_VERSION
 SCOPE_CONTAINER_NAME=weavescope
 WEAVE_CONTAINER_NAME=weave
+WEAVEDNS_CONTAINER_NAME=weavedns
 HOSTNAME=scope
 DOMAINNAME=weave.local
 FQDN=$HOSTNAME.$DOMAINNAME
@@ -94,7 +95,7 @@ weave_dns_add() {
 }
 
 weave_dns_present() {
-    return $(docker run --rm gliderlabs/alpine nc -z $DOCKER_BRIDGE_IP 53; echo $?)
+    docker run --rm gliderlabs/alpine nc -z $DOCKER_BRIDGE_IP 53 || is_running $WEAVEDNS_CONTAINER_NAME
 }
 
 set_docker_bridge_ip() {