From 0372c0b43235e6068c843b7dabf3117f12441a5e Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 7 Feb 2017 15:34:01 +0000 Subject: [PATCH 01/10] Update Scope version in docs --- site/installing.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site/installing.md b/site/installing.md index 539e7982ed..f3836dd2b8 100644 --- a/site/installing.md +++ b/site/installing.md @@ -121,7 +121,7 @@ After it’s been launched, open your browser to `http://localhost:4040`. **Docker Compose Format Version 1:** scope: - image: weaveworks/scope:1.1.0 + image: weaveworks/scope:1.2.0 net: "host" pid: "host" privileged: true @@ -137,7 +137,7 @@ After it’s been launched, open your browser to `http://localhost:4040`. version: '2' services: scope: - image: weaveworks/scope:1.1.0 + image: weaveworks/scope:1.2.0 network_mode: "host" pid: "host" privileged: true @@ -169,7 +169,7 @@ After it’s been launched, open your web browser to [https://cloud.weave.works] **Docker Compose Format Version 1:** probe: - image: weaveworks/scope:1.1.0 + image: weaveworks/scope:1.2.0 net: "host" pid: "host" privileged: true @@ -186,7 +186,7 @@ After it’s been launched, open your web browser to [https://cloud.weave.works] version: '2' services: probe: - image: weaveworks/scope:1.1.0 + image: weaveworks/scope:1.2.0 network_mode: "host" pid: "host" privileged: true From 9e33e7e07f315cd3c0fa66ebc75691eb9a195b8e Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Tue, 7 Feb 2017 18:05:35 +0000 Subject: [PATCH 02/10] Release 1.2.0 --- CHANGELOG.md | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 19754fe7ea..e95fc0215d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,149 @@ +## Release 1.2.0 + +Highlights: +- Performance improvements (both in UI and probes). +- Scope now requires Docker version >= 1.10. + +New features and enhancements: +- ECS: service details panel should list its tasks + [#2041](https://github.com/weaveworks/scope/issues/2041) +- Prioritize ecs topologies on initial load if available + [#2105](https://github.com/weaveworks/scope/pull/2105) +- Add control status icon to Terminal header + [#2087](https://github.com/weaveworks/scope/pull/2087) +- scope launch script improvements + [#2077](https://github.com/weaveworks/scope/pull/2077) + [#2093](https://github.com/weaveworks/scope/pull/2093) +- Maintain focus on hovered node table rows + [#2115](https://github.com/weaveworks/scope/pull/2115) +- Add control to reset local view state + [#2080](https://github.com/weaveworks/scope/pull/2080) +- Check that conntrack events are enabled in the kernel + [#2112](https://github.com/weaveworks/scope/pull/2112) +- Hardcode 127.0.0.1 as loopback IP for default target + [#2103](https://github.com/weaveworks/scope/pull/2103) +- prog/main: use flags.app.port for default target + [#2096](https://github.com/weaveworks/scope/pull/2096) + +Performance improvements: +- Graph layout optimizations + [#2128](https://github.com/weaveworks/scope/pull/2128) + [#2179](https://github.com/weaveworks/scope/pull/2179) + [#2180](https://github.com/weaveworks/scope/pull/2180) +- Disable XML in conntrack parsing + [#2095](https://github.com/weaveworks/scope/pull/2095) + [#2118](https://github.com/weaveworks/scope/pull/2118) + +Bug fixes: +- ECS reporter throttled by AWS API + [#2050](https://github.com/weaveworks/scope/issues/2050) +- Already closed connections showing up in the containers tab + [#2181](https://github.com/weaveworks/scope/issues/2181) +- Node details spinner Chrome display bug fix + [#2177](https://github.com/weaveworks/scope/pull/2177) +- fix error when docker daemon is running with user namespace enabled. + [#2161](https://github.com/weaveworks/scope/pull/2161) + [#2176](https://github.com/weaveworks/scope/pull/2176) +- DNSSnooper: Support Dot1Q and limit decoding errors + [#2155](https://github.com/weaveworks/scope/issues/2155) +- Contrast mode not working + [#2165](https://github.com/weaveworks/scope/issues/2165) + [#2138](https://github.com/weaveworks/scope/issues/2138) +- Scope does not create special nodes within the same VPC + [#2163](https://github.com/weaveworks/scope/issues/2163) +- default view fails to select 'application containers only' + [#2120](https://github.com/weaveworks/scope/issues/2120) +- ECS: Missing link to task on container details panel + [#2040](https://github.com/weaveworks/scope/issues/2040) +- kubernetes reporter is broken on katacoda + [#2049](https://github.com/weaveworks/scope/pull/2049) +- probe's procspy does not report netcat's half-duplex long-lived connections + [#1972](https://github.com/weaveworks/scope/issues/1972) +- Sparkline component throws errors when a container is turned off + [#2072](https://github.com/weaveworks/scope/pull/2072) +- Graph/table buttons don't resize nicely + [#2056](https://github.com/weaveworks/scope/issues/2056) +- JS error on edges with lots of waypoints + [#1187](https://github.com/weaveworks/scope/issues/1187) +- Fix two bugs caused by transition to D3 v4 + [#2048](https://github.com/weaveworks/scope/pull/2048) + +Documentation: +- Fix Scope arguments in Docker Compose installation docs + [#2143](https://github.com/weaveworks/scope/pull/2143) +- Document how to run tests on website + [#2131](https://github.com/weaveworks/scope/pull/2131) +- Follow redirections in curl when getting k8s resources + [#2067](https://github.com/weaveworks/scope/pull/2067) + +Internal improvements and cleanup: +- Embed and require Docker >= 1.10 + [#2190](https://github.com/weaveworks/scope/pull/2190) +- don't attempt to make 'make clean' work on old checkouts + [#2189](https://github.com/weaveworks/scope/pull/2189) +- Fix linter errors + [#2068](https://github.com/weaveworks/scope/pull/2068) + [#2166](https://github.com/weaveworks/scope/pull/2166) +- Fix ownership issues with client/build-external + [#2153](https://github.com/weaveworks/scope/pull/2153) +- Allow Scope UI to be installed as a Node module + [#2144](https://github.com/weaveworks/scope/pull/2144) + [#2159](https://github.com/weaveworks/scope/pull/2159) +- Upgrade container base image to alpine:3.5 + [#2158](https://github.com/weaveworks/scope/pull/2158) +- Use Sass instead of Less + [#2141](https://github.com/weaveworks/scope/pull/2141) +- probe: refactor probeMain + [#2148](https://github.com/weaveworks/scope/pull/2148) +- Update to go1.7.4 + [#2147](https://github.com/weaveworks/scope/pull/2147) +- Bump tools subtree and fix integration tests + [#2136](https://github.com/weaveworks/scope/pull/2136) +- Add support for generic multicolumn tables + [#2109](https://github.com/weaveworks/scope/pull/2109) +- extras/dialer: move dialer.go to sub directory + [#2108](https://github.com/weaveworks/scope/pull/2108) +- Forward OS/Kernel version to checkpoint + [#2101](https://github.com/weaveworks/scope/pull/2101) +- Fix force-push to master + [#2094](https://github.com/weaveworks/scope/pull/2094) +- Upgraded eslint & eslint-config-airbnb +- Reapplied all the eslint upgrade changes + [#2058](https://github.com/weaveworks/scope/pull/2058) + [#2084](https://github.com/weaveworks/scope/pull/2084) + [#2089](https://github.com/weaveworks/scope/pull/2089) +- ecs reporter: Fix some log lines that were passing *string instead of string + [#2060](https://github.com/weaveworks/scope/pull/2060) +- Add flag for logging headers + [#2086](https://github.com/weaveworks/scope/pull/2086) +- Add extras/dialer + [#2082](https://github.com/weaveworks/scope/pull/2082) +- Remove wcloud + [#2081](https://github.com/weaveworks/scope/pull/2081) +- Add client linting to CI config + [#2076](https://github.com/weaveworks/scope/pull/2076) +- Importing lodash util functions explicitly + [#2053](https://github.com/weaveworks/scope/pull/2053) +- procspy: use a Reader to copy the background reader buffer + [#2020](https://github.com/weaveworks/scope/pull/2020) +- Use newly-created 'common' repo + [#2061](https://github.com/weaveworks/scope/pull/2061) +- Fix all the npm library versions + [#2057](https://github.com/weaveworks/scope/pull/2057) +- linter: fix punctuation and capitalization + [#2021](https://github.com/weaveworks/scope/pull/2021) +- Using `webpack-dev-middleware` instead of `webpack-dev-server` directly + [#2034](https://github.com/weaveworks/scope/pull/2034) + +Weave Cloud related changes: +- Deploy to quay when merging to master + [#2134](https://github.com/weaveworks/scope/pull/2134) +- Removed leading slash from getAllNodes() api request + [#2124](https://github.com/weaveworks/scope/pull/2124) +- Correctly instrument websocket handshakes + [#2074](https://github.com/weaveworks/scope/pull/2074) + + ## Release 1.1.0 Highlights: From 7acebad756ec80125484a30747c5640eb71657f7 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Wed, 8 Feb 2017 17:02:14 +0000 Subject: [PATCH 03/10] Push latest_release tag to Docker Hub on each release --- bin/release | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/release b/bin/release index 4bb1c2b0e8..24e8502f30 100755 --- a/bin/release +++ b/bin/release @@ -172,6 +172,8 @@ publish() { echo "== Tagging and pushing images on docker hub as user $DOCKERHUB_USER" $SUDO docker tag -f "$DOCKERHUB_USER"/scope "$DOCKERHUB_USER/scope:$VERSION" $SUDO docker push "$DOCKERHUB_USER/scope:$VERSION" + $SUDO docker tag -f "$DOCKERHUB_USER/scope:$VERSION" "$DOCKERHUB_USER/scope:latest_release" + $SUDO docker push "$DOCKERHUB_USER/scope:latest_release" echo "** Docker images tagged and pushed" echo "== Publishing pre-release on GitHub" @@ -205,6 +207,8 @@ publish() { echo "== Tagging and pushing images on docker hub as user $DOCKERHUB_USER" $SUDO docker tag -f "$DOCKERHUB_USER"/scope "$DOCKERHUB_USER/scope:$VERSION" $SUDO docker push "$DOCKERHUB_USER"/scope:$"VERSION" + $SUDO docker tag -f "$DOCKERHUB_USER/scope:$VERSION" "$DOCKERHUB_USER/scope:latest_release" + $SUDO docker push "$DOCKERHUB_USER/scope:latest_release" echo "** Docker images tagged and pushed" echo "== Publishing release on GitHub" From 047ce43d2a898f1782009608cf9b6a85892180c9 Mon Sep 17 00:00:00 2001 From: Simon Howe Date: Wed, 8 Feb 2017 18:08:13 +0100 Subject: [PATCH 04/10] Fixes base font-size of popped out terminal. Share the rest of the base styles too so the embedded and popped out terminal are working from a common style base. --- client/app/styles/_base.scss | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/client/app/styles/_base.scss b/client/app/styles/_base.scss index 01e7df8df9..7e8c7a83e3 100644 --- a/client/app/styles/_base.scss +++ b/client/app/styles/_base.scss @@ -61,7 +61,7 @@ opacity: 0; } -.scope-app { +.scope-app, .terminal-app { -webkit-font-smoothing: antialiased; background: $body-background-color; bottom: 0; @@ -977,11 +977,6 @@ .terminal { &-app { - position: fixed; - top: 0; - bottom: 0; - left: 0; - right: 0; display: flex; flex-flow: column; } From 14a555ffab17799aca3fba70d0382a427307d777 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Wed, 8 Feb 2017 17:10:41 +0000 Subject: [PATCH 05/10] Stop using tag -f (It's been removed from Docker) --- bin/release | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/release b/bin/release index 24e8502f30..8410567bb6 100755 --- a/bin/release +++ b/bin/release @@ -170,9 +170,9 @@ publish() { if [ "$RELEASE_TYPE" = 'PRERELEASE' ]; then echo "== Tagging and pushing images on docker hub as user $DOCKERHUB_USER" - $SUDO docker tag -f "$DOCKERHUB_USER"/scope "$DOCKERHUB_USER/scope:$VERSION" + $SUDO docker tag "$DOCKERHUB_USER"/scope "$DOCKERHUB_USER/scope:$VERSION" $SUDO docker push "$DOCKERHUB_USER/scope:$VERSION" - $SUDO docker tag -f "$DOCKERHUB_USER/scope:$VERSION" "$DOCKERHUB_USER/scope:latest_release" + $SUDO docker tag "$DOCKERHUB_USER/scope:$VERSION" "$DOCKERHUB_USER/scope:latest_release" $SUDO docker push "$DOCKERHUB_USER/scope:latest_release" echo "** Docker images tagged and pushed" @@ -205,9 +205,9 @@ publish() { echo '** Sanity checks OK for publishing tag' "$LATEST_TAG" as "$DOCKERHUB_USER/scope:$VERSION" echo "== Tagging and pushing images on docker hub as user $DOCKERHUB_USER" - $SUDO docker tag -f "$DOCKERHUB_USER"/scope "$DOCKERHUB_USER/scope:$VERSION" + $SUDO docker tag "$DOCKERHUB_USER"/scope "$DOCKERHUB_USER/scope:$VERSION" $SUDO docker push "$DOCKERHUB_USER"/scope:$"VERSION" - $SUDO docker tag -f "$DOCKERHUB_USER/scope:$VERSION" "$DOCKERHUB_USER/scope:latest_release" + $SUDO docker tag "$DOCKERHUB_USER/scope:$VERSION" "$DOCKERHUB_USER/scope:latest_release" $SUDO docker push "$DOCKERHUB_USER/scope:latest_release" echo "** Docker images tagged and pushed" From c8c6dd84c24a12dbee566c51e0b8f9b4b09ca009 Mon Sep 17 00:00:00 2001 From: Filip Barl Date: Wed, 8 Feb 2017 18:25:05 +0100 Subject: [PATCH 06/10] Fixed the node stack display bug. --- client/app/scripts/charts/node-shape-stack.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/client/app/scripts/charts/node-shape-stack.js b/client/app/scripts/charts/node-shape-stack.js index 638db478a0..268ab1c040 100644 --- a/client/app/scripts/charts/node-shape-stack.js +++ b/client/app/scripts/charts/node-shape-stack.js @@ -1,9 +1,12 @@ import React from 'react'; + +import { NODE_BASE_SIZE } from '../constants/styles'; import { isContrastMode } from '../utils/contrast-utils'; export default function NodeShapeStack(props) { - const dy = isContrastMode() ? 0.15 : 0.1; - const highlightScale = [1, 1 + dy]; + const shift = isContrastMode() ? 0.15 : 0.1; + const highlightScale = [1, 1 + shift]; + const dy = NODE_BASE_SIZE * shift; const Shape = props.shape; return ( From df2193cd9544a989269d845f387845bb7d883660 Mon Sep 17 00:00:00 2001 From: Filip Barl Date: Wed, 8 Feb 2017 18:41:46 +0100 Subject: [PATCH 07/10] Fix rounded square node shadow radius --- client/app/scripts/charts/node-shape-square.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/scripts/charts/node-shape-square.js b/client/app/scripts/charts/node-shape-square.js index 921653bbf1..1400487ea4 100644 --- a/client/app/scripts/charts/node-shape-square.js +++ b/client/app/scripts/charts/node-shape-square.js @@ -34,7 +34,7 @@ export default function NodeShapeSquare({ id, highlighted, color, rx = 0, ry = 0 {hasMetric && getClipPathDefinition(clipId, height)} {highlighted && } - + {hasMetric && Date: Wed, 8 Feb 2017 18:14:21 +0000 Subject: [PATCH 08/10] Update CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e95fc0215d..f9281f52ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ Performance improvements: [#2128](https://github.com/weaveworks/scope/pull/2128) [#2179](https://github.com/weaveworks/scope/pull/2179) [#2180](https://github.com/weaveworks/scope/pull/2180) + [#2210](https://github.com/weaveworks/scope/pull/2210) - Disable XML in conntrack parsing [#2095](https://github.com/weaveworks/scope/pull/2095) [#2118](https://github.com/weaveworks/scope/pull/2118) @@ -67,6 +68,10 @@ Bug fixes: [#1187](https://github.com/weaveworks/scope/issues/1187) - Fix two bugs caused by transition to D3 v4 [#2048](https://github.com/weaveworks/scope/pull/2048) +- Popped out terminal styles don't quite align with in-scope terminal styles + [#2209](https://github.com/weaveworks/scope/issues/2209) +- Radii of rounded-corner shape don't quite align + [#2212](https://github.com/weaveworks/scope/issues/2212) Documentation: - Fix Scope arguments in Docker Compose installation docs From 7d5ef4bccb23e44316e0d664a0e8dfb1b14724c7 Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Wed, 8 Feb 2017 18:18:14 +0000 Subject: [PATCH 09/10] Minor CHANGELOG update --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9281f52ef..b9d59af5cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -113,7 +113,6 @@ Internal improvements and cleanup: - Fix force-push to master [#2094](https://github.com/weaveworks/scope/pull/2094) - Upgraded eslint & eslint-config-airbnb -- Reapplied all the eslint upgrade changes [#2058](https://github.com/weaveworks/scope/pull/2058) [#2084](https://github.com/weaveworks/scope/pull/2084) [#2089](https://github.com/weaveworks/scope/pull/2089) @@ -139,7 +138,9 @@ Internal improvements and cleanup: [#2021](https://github.com/weaveworks/scope/pull/2021) - Using `webpack-dev-middleware` instead of `webpack-dev-server` directly [#2034](https://github.com/weaveworks/scope/pull/2034) - +- Create `latest_release` Docker image tag during release process + [#2216](https://github.com/weaveworks/scope/issues/2216) + Weave Cloud related changes: - Deploy to quay when merging to master [#2134](https://github.com/weaveworks/scope/pull/2134) From 86528281e7bd35778d3c8c519023092286a5919a Mon Sep 17 00:00:00 2001 From: Alfonso Acosta Date: Wed, 8 Feb 2017 23:07:13 +0000 Subject: [PATCH 10/10] Fix release shell script bug Introduced by 43d9f38c5e672fa5f11722164f29ae562f1cbea0 and found during release --- bin/release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/release b/bin/release index 8410567bb6..f229aee0f8 100755 --- a/bin/release +++ b/bin/release @@ -206,7 +206,7 @@ publish() { echo "== Tagging and pushing images on docker hub as user $DOCKERHUB_USER" $SUDO docker tag "$DOCKERHUB_USER"/scope "$DOCKERHUB_USER/scope:$VERSION" - $SUDO docker push "$DOCKERHUB_USER"/scope:$"VERSION" + $SUDO docker push "$DOCKERHUB_USER/scope:$VERSION" $SUDO docker tag "$DOCKERHUB_USER/scope:$VERSION" "$DOCKERHUB_USER/scope:latest_release" $SUDO docker push "$DOCKERHUB_USER/scope:latest_release" echo "** Docker images tagged and pushed"