From 5b256ba4738c57ce9388dc730870ccfbfc46a5b6 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Tue, 20 Aug 2019 14:22:53 +0000
Subject: [PATCH] Release 1.11.5

---
 CHANGELOG.md                                | 11 +++++++++++
 examples/cri/deploy.yaml                    |  2 +-
 examples/cri/ds.yaml                        |  2 +-
 examples/docker/docker-compose-probe-v1.yml |  2 +-
 examples/docker/docker-compose-probe-v2.yml |  2 +-
 examples/k8s/deploy.yaml                    |  2 +-
 examples/k8s/ds.yaml                        |  2 +-
 examples/k8s/probe-deploy.yaml              |  2 +-
 examples/mesos/minimesos.json               |  2 +-
 site/installing.md                          |  4 ++--
 10 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1018e02472..36df04afa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## Release 1.11.5
+
+A few small improvements:
+
+- Expose probe metrics to Prometheus, if an http-listen address is given
+	[#3600](https://github.com/weaveworks/scope/pull/3600)
+- Reduce probe resource usage caused by occasional leaks in probe endpoint reporter
+	[#3661](https://github.com/weaveworks/scope/pull/3661)
+- Update 'eslint' JavaScript checking tool, and resolve warnings
+	[#3643](https://github.com/weaveworks/scope/pull/3643)
+
 ## Release 1.11.4
 
 This release contains a few fixes, one of which should improve
diff --git a/examples/cri/deploy.yaml b/examples/cri/deploy.yaml
index b4b778c43c..785e8a1c7f 100644
--- a/examples/cri/deploy.yaml
+++ b/examples/cri/deploy.yaml
@@ -25,7 +25,7 @@ spec:
           args:
             - '--no-probe'
           env: []
-          image: weaveworks/scope:1.11.4
+          image: weaveworks/scope:1.11.5
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 4040
diff --git a/examples/cri/ds.yaml b/examples/cri/ds.yaml
index 28587b1b57..42459e5a0e 100644
--- a/examples/cri/ds.yaml
+++ b/examples/cri/ds.yaml
@@ -34,7 +34,7 @@ spec:
                 fieldRef:
                   apiVersion: v1
                   fieldPath: spec.nodeName
-          image: weaveworks/scope:1.11.4
+          image: weaveworks/scope:1.11.5
           imagePullPolicy: IfNotPresent
           securityContext:
             privileged: true
diff --git a/examples/docker/docker-compose-probe-v1.yml b/examples/docker/docker-compose-probe-v1.yml
index 4c459d3546..2d1b88bf74 100644
--- a/examples/docker/docker-compose-probe-v1.yml
+++ b/examples/docker/docker-compose-probe-v1.yml
@@ -1,5 +1,5 @@
 probe:
-  image: weaveworks/scope:1.11.4
+  image: weaveworks/scope:1.11.5
   net: "host"
   pid: "host"
   privileged: true
diff --git a/examples/docker/docker-compose-probe-v2.yml b/examples/docker/docker-compose-probe-v2.yml
index 9d84c710e8..4ee8566e09 100644
--- a/examples/docker/docker-compose-probe-v2.yml
+++ b/examples/docker/docker-compose-probe-v2.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   probe:
-    image: weaveworks/scope:1.11.4
+    image: weaveworks/scope:1.11.5
     network_mode: "host"
     pid: "host"
     privileged: true
diff --git a/examples/k8s/deploy.yaml b/examples/k8s/deploy.yaml
index 1d636b785b..0f6a4836fe 100644
--- a/examples/k8s/deploy.yaml
+++ b/examples/k8s/deploy.yaml
@@ -28,7 +28,7 @@ spec:
           args:
             - '--no-probe'
           env: []
-          image: weaveworks/scope:1.11.4
+          image: weaveworks/scope:1.11.5
           imagePullPolicy: IfNotPresent
           ports:
             - containerPort: 4040
diff --git a/examples/k8s/ds.yaml b/examples/k8s/ds.yaml
index 580d1a9b7a..61a2ac95d8 100644
--- a/examples/k8s/ds.yaml
+++ b/examples/k8s/ds.yaml
@@ -31,7 +31,7 @@ spec:
             - '--probe.docker.bridge=docker0'
             - '--probe.docker=true'
             - 'weave-scope-app.weave.svc.cluster.local.:80'
-          image: weaveworks/scope:1.11.4
+          image: weaveworks/scope:1.11.5
           imagePullPolicy: IfNotPresent
           resources:
             requests:
diff --git a/examples/k8s/probe-deploy.yaml b/examples/k8s/probe-deploy.yaml
index 71df93f1b0..fc9b1d502c 100644
--- a/examples/k8s/probe-deploy.yaml
+++ b/examples/k8s/probe-deploy.yaml
@@ -35,7 +35,7 @@ spec:
             - 'weave-scope-app.weave.svc.cluster.local.:80'
           command:
             - /home/weave/scope
-          image: 'docker.io/weaveworks/scope:1.11.4'
+          image: 'docker.io/weaveworks/scope:1.11.5'
           imagePullPolicy: IfNotPresent
           resources:
             requests:
diff --git a/examples/mesos/minimesos.json b/examples/mesos/minimesos.json
index b2d1b5a979..25150a902c 100644
--- a/examples/mesos/minimesos.json
+++ b/examples/mesos/minimesos.json
@@ -12,7 +12,7 @@
   "container": {
     "type": "DOCKER",
     "docker": {
-      "image": "weaveworks/scope:1.11.4",
+      "image": "weaveworks/scope:1.11.5",
       "network": "HOST",
       "privileged": true,
       "parameters": [
diff --git a/site/installing.md b/site/installing.md
index 70b7e1bd87..4a77a707fb 100644
--- a/site/installing.md
+++ b/site/installing.md
@@ -112,7 +112,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
 **Docker Compose Format Version 1:**
 
     scope:
-      image: weaveworks/scope:1.11.4
+      image: weaveworks/scope:1.11.5
       net: "host"
       pid: "host"
       privileged: true
@@ -128,7 +128,7 @@ After it’s been launched, open your browser to `http://localhost:4040`.
     version: '2'
     services:
       scope:
-        image: weaveworks/scope:1.11.4
+        image: weaveworks/scope:1.11.5
         network_mode: "host"
         pid: "host"
         privileged: true