Commit Graph

3521 Commits

Author SHA1 Message Date
Alfonso Acosta
052ff39bf1 Merge pull request #2309 from weaveworks/2258-fix-kubelet-access
Fix kubelet failure fallback and make port configurable
2017-03-08 10:15:21 -08:00
Alfonso Acosta
380d6cf8ba Merge pull request #2312 from weaveworks/secure-integration-tests
Secure integration tests
2017-03-08 08:27:04 -08:00
Alfonso Acosta
a7d37ed366 Merge commit 'b92447c6abbc8f8e6f1d33a8a4c961ba340dbf23' into secure-integration-tests 2017-03-08 16:23:06 +00:00
Alfonso Acosta
b92447c6ab Squashed 'tools/' changes from 52d695c..9e32194
9e32194 Secure GCP servers for Scope: open port 80.
a22536a Secure GCP servers for Scope.
89c3a29 Merge pull request #78 from weaveworks/lint-merge-rebase-issue-in-docs
73ad56d Add linter function to avoid bad merge/rebase artefact

git-subtree-dir: tools
git-subtree-split: 9e32194cf16f8f6eee7acb5dbf311c9003f0fedb
2017-03-08 16:23:04 +00:00
Alfonso Acosta
4c4b21ec66 Revert "Don't run integration tests, as the VMs are being compromised."
This reverts commit 093c21c207.
2017-03-08 14:43:33 +00:00
Tom Wilkie
093c21c207 Don't run integration tests, as the VMs are being compromised. 2017-03-08 14:30:15 +00:00
Alfonso Acosta
8bf753a51b Revert "Revert "Add options to hide args and env vars (#2306)"" (#2311)
* Revert "Revert "Add options to hide args and env vars (#2306)""

* Make linter happy
2017-03-08 02:16:42 -08:00
Matthias Radestock
1e53d590c7 Merge pull request #2310 from weaveworks/revert-2306-wip-2222
Revert "Add options to hide args and env vars (#2306)"
2017-03-08 06:01:17 +00:00
Matthias Radestock
69c80828d0 Merge pull request #2305 from weaveworks/quantise-reports
quantise reports
2017-03-08 05:27:48 +00:00
Alfonso Acosta
dcc7389127 Revert "Add options to hide args and env vars (#2306)"
This reverts commit 764afb6301.
2017-03-07 17:51:27 +01:00
Mike Bryant
764afb6301 Add options to hide args and env vars (#2306)
* Add options to hide args and env vars

To allow for use of weave-scope in an unauthenticated environment,
add options to the probe to hide comand line arguments and
environment variables, which might contain secret data.

Fixes #2222

* Change docker.NewRegistry arguments to be a struct

* Remove redundant declarations of default values

* Move registry options outside to improve readability
2017-03-07 08:51:18 -08:00
Alfonso Acosta
fb64f1102f Fix tests 2017-03-07 13:53:17 +00:00
Alfonso Acosta
c1fa5bb665 Fix kubelet failure fallback and make port configurable 2017-03-07 13:29:02 +00:00
Matthias Radestock
56892addfc quantise reports
Merge all reports received within a specified interval, discarding the
originals. This improves performance of Report() on repeated
invocation since it ends up merging fewer reports.

For example, if reports are received every second (e.g. 3 probes
reporting at the default probe.publishInterval of 3s), and the
app.windows is 15s (the default) and the report generation interval is
5s (e.g. one UI accessing every TOPOLOGY_INTERVAL; the default), then
the original code would have to merge 15 reports per UI access,
whereas this code will only need to merge 8 to 9 reports (3-4 merged
reports from previous invocation plus 5 recently received reports).
2017-03-06 10:33:03 +00:00
Matthias Radestock
a391ae8a3d Merge pull request #2301 from weaveworks/report-playback
report playback
2017-03-05 13:03:53 +00:00
Matthias Radestock
6bba59c3a0 Merge pull request #2300 from weaveworks/2299-probe-only
parse --probe-only as intended

Fixes #2299.
2017-03-05 12:06:05 +00:00
Matthias Radestock
289b4c63af report playback
Now you can launch the scope app with something like

./prog/scope --mode=app --weave=false --app.collector=file:///tmp/reports

and if the specified dir contains reports with filenames in the form
<timestamp>.{msgpack|json}[.gz],
e.g. "1488557088545489008.msgpack.gz", then these reports are replayed
in a loop at a sequence and speed determined by the timestamps.
2017-03-04 22:04:50 +00:00
Matthias Radestock
0aec6feed0 consistency: --no-app is used elsewhere; --probe-only isn't 2017-03-04 11:32:14 +00:00
Matthias Radestock
df41a808c2 parse probe-only flag as intended 2017-03-04 11:22:00 +00:00
Alban Crequy
32550f60f2 integration: restart docker daemon after each test (#2298)
To be sure that containers from previous tests are not running in the
next test.
2017-03-04 09:47:40 +01:00
Jordan Pellizzari
29b521b686 Merge pull request #2294 from weaveworks/2293-route-overflow
Removed contrastMode from url state
2017-03-02 19:17:29 -08:00
jpellizzari
a2ddc27a15 Removed contrastMode from url state 2017-03-02 15:43:35 -08:00
Anita Buehrle
4818cd873e Merge pull request #2289 from weaveworks/merge-error-fix
Removed missed merge text and made terminology consistent
2017-03-02 07:18:24 -06:00
abuehrle
437d0edfdb datacenters datacenter 2017-03-02 07:13:10 -06:00
abuehrle
719f51cc8a fix sentence 2017-03-01 16:00:44 -06:00
abuehrle
51a50ee163 removed incorrect screen capture 2017-03-01 16:00:05 -06:00
abuehrle
3c59a99343 changed service to weave cloud 2017-03-01 15:53:55 -06:00
abuehrle
748a11e048 removed missed merge text 2017-03-01 15:42:01 -06:00
Filip Barl
4f24d9bba8 Merge pull request #2275 from weaveworks/move-zoom-cache-to-global-state
Move zoomCache to the global state
2017-03-01 15:18:24 +01:00
Filip Barl
19202a2e44 Fixed the selectors performance leaks. 2017-03-01 12:14:36 +01:00
Filip Barl
11ce5638c5 Moved nodes-chart-layout.
Moved nodes-chart-zoom.

Moved zoomCache to global state.

Moved nodes-chart-focus.

Fixed some bugs and polished the code.

Keeping track of topology options in zoomCache.

Fixed forceRelayout and circular layout.

Unified graph complexity heuristic criterion.
2017-03-01 12:14:36 +01:00
jpellizzari
b417bcda80 Fix for .fail undefined on doRequest 2017-02-28 21:55:56 -08:00
Anita Buehrle
e1bbc5ac5a Merge pull request #2252 from weaveworks/fix-links
Documentation improvements
2017-02-28 07:49:39 -06:00
jpellizzari
3d0e109ea7 Fix for make ui-pkg-upload job rename 2017-02-27 11:53:13 -08:00
jpellizzari
4f9725612b Fixed window undefined condition for CSRF token 2017-02-27 11:26:29 -08:00
Alfonso Acosta
98395bb595 Create cloud agent image (#2284)
* Create cloud-agent image

* Refactor Makefile

* Push the image from CircleCI and releases

* Review feedback

* Review feedback

* Review feedback
2017-02-27 17:49:26 +01:00
Alfonso Acosta
5516f7b7d0 Revert "Disable Scope integration tests."
This reverts commit fe7ec8f133.
2017-02-27 11:54:40 +01:00
Tom Wilkie
4d6e8d4623 Don't collect coverage artifacts 2017-02-26 18:14:34 +00:00
Tom Wilkie
fe7ec8f133 Disable Scope integration tests. 2017-02-26 17:51:34 +00:00
Jordan Pellizzari
107a933530 Merge pull request #2281 from weaveworks/ui-pkg-fix
Changed ui-build-pkg job to use a docker container
2017-02-24 14:24:59 -08:00
jpellizzari
efdd8e4b0e Changed ui-build-pkg job to use a docker container 2017-02-24 14:03:05 -08:00
Alfonso Acosta
0ebc0b9a3e Merge pull request #2277 from weaveworks/2276-use-recent-client-as-1.10
Embed Docker 1.13.1 (but force protocol 1.22)
2017-02-24 15:38:53 +01:00
Alfonso Acosta
f892cb14a0 Review feedback 2017-02-24 14:36:25 +00:00
Alfonso Acosta
41c7451795 Review feedback 2017-02-24 13:50:20 +00:00
Alfonso Acosta
051884d26a Embed Docker 1.13.1 (but force protocol 1.22) 2017-02-24 13:50:19 +00:00
Alfonso Acosta
96e7c6b414 Bump google.golang.org/grpc to make github.com/weaveworks/common happy 2017-02-24 13:50:18 +00:00
Alfonso Acosta
e8cb4fb4c6 Bump github.com/weaveworks/common 2017-02-24 13:43:06 +00:00
Alfonso Acosta
bc1c964828 Merge pull request #2278 from weaveworks/copy-weaveutil
Embed a copy of weaveutil instead of calling via docker
2017-02-24 13:53:59 +01:00
Alfonso Acosta
9c2009f63e Simplify copying of weaveutil 2017-02-24 12:31:11 +00:00
Bryan Boreham
a60192d98a Install weaveutil so we don't have to run it via docker 2017-02-24 12:31:10 +00:00