Commit Graph

5675 Commits

Author SHA1 Message Date
Bryan Boreham
f66e91e37f Merge pull request #3748 from weaveworks/move-counters-to-latest
Move Counters into Latest
2020-03-11 21:14:01 +00:00
Bryan Boreham
ba9ecdd9e2 Merge pull request #3752 from weaveworks/report-window
Set timestamp and window on each report
2020-03-11 21:12:02 +00:00
Bryan Boreham
aee14088db Merge pull request #3755 from weaveworks/update-security
Update babel, jest, webpack bits
2020-03-11 12:17:44 +00:00
Daniel Holbach
795eaab7f5 update Circle CI config with new image too 2020-03-10 14:50:50 +01:00
Bryan Boreham
ffa90719b0 Change containers-by-hostname renderer from Map to Renderer
It was relying on the previous behaviour of Merge() adding up counters.
2020-03-10 13:16:10 +00:00
Bryan Boreham
62d4fbd94e Add a second container to fixture to check counts 2020-03-10 12:30:05 +00:00
Bryan Boreham
c03aeb5d43 Move Counters into Latest
The only place Counters are used is in rendering, for the number of
nodes under a topology, so the overhead of holding a unique data
structure in every Node is unwarranted.

Counters are not set in the probe, so we don't need any
backwards-compatibility in report decoding. Similarly they are not set
until after all nodes are merged, so we don't need that logic.
2020-03-10 12:30:05 +00:00
Bryan Boreham
1ce1ecad7c In unit tests, check counters 2020-03-10 11:30:25 +00:00
Daniel Holbach
8dfd0abbc9 Update babel, jest, webpack bits
This should fix the handlebars and serialize-javascript
	security alerts on GH at least.

	It also updates the node requirement (I think through the
	jest update this was necessary) - somebody should check
	if we can actually make	the jump.
2020-03-10 12:22:35 +01:00
Bryan Boreham
e6eaf11fb6 Merge pull request #3753 from weaveworks/cache-intervals
Cache the last-known report interval per user
2020-03-06 19:13:59 +00:00
Bryan Boreham
53701aca1f Cache the last-known report interval per user
Delta reports don't contain the string we are looking for, so remember
it from the last full report.
2020-03-06 18:03:51 +00:00
Bryan Boreham
72145dc378 Set the Window duration which each report covers
This is used by the multi-tenant code.
2020-03-06 15:43:54 +00:00
Bryan Boreham
3098267be4 Add a timestamp on each report saying when it was generated
Not currently used in the code, but useful when troubleshooting.
2020-03-06 15:39:06 +00:00
Bryan Boreham
a47cf0a2aa Remove copying Merge() on Report
It was only used in a few places, and all of those were better off
using the Unsafe variant.
2020-03-06 15:03:43 +00:00
Bryan Boreham
e04dc86dba Merge pull request #3751 from weaveworks/billing-window
Improve calculation of usage in multitenant code
2020-03-06 14:14:00 +00:00
Bryan Boreham
329023b7c5 Improve calculation of usage in multitenant code
Use the duration supplied, if there is one.

It was looking for a process named "scope-probe", whereas the
executable is just named "scope".
2020-03-06 13:29:54 +00:00
Bryan Boreham
b07bfb294b Merge pull request #3747 from weaveworks/simplify-renderers
Simplify some renderers
2020-02-25 11:07:55 +00:00
Bryan Boreham
8aca4d6452 Remove MapToEmpty() - no longer used 2020-02-18 12:14:18 +00:00
Bryan Boreham
2c2671ee2e Merge pull request #3745 from weaveworks/pipe-tracing
Add tracing for pipe operations; updates weaveworks, jaeger and aws dependencies
2020-02-04 12:31:41 +00:00
Bryan Boreham
574c76ac40 Merge pull request #3709 from weaveworks/report-endpoint-subset
Report a subset of connections from/to the same endpoint
2020-01-27 22:42:47 +00:00
Bryan Boreham
f732eed3a5 refactor: remove unused parameterisation of containerWithImageNameRenderer 2020-01-27 21:30:52 +00:00
Bryan Boreham
875fdba352 rendering: simplify ContainerHostnameRenderer
The second half of the render added all the same nodes, except for
those with no Docker image information, so we could show a figure for
those filtered out on that basis.

This just isn't worth the effort.
2020-01-27 21:28:23 +00:00
Bryan Boreham
bbce9e3d69 refactor: simplify ContainerImageRenderer
Crunch a Map and Reduce into a single Renderer that has the same function.
2020-01-27 21:27:49 +00:00
Bryan Boreham
4eae4a9701 Merge pull request #3740 from weaveworks/update-ruby-version
Update Ruby version for the benefit of Netlify build
2020-01-27 16:55:00 +00:00
Bryan Boreham
6d4e914201 Update Ruby version for the benefit of Netlify build
Picked 2.6.2 based on message from Netlify build:
"Included versions: 2.3.6 2.5.4 2.4.5 2.4.3 2.2.9 2.6.2"
2020-01-27 16:25:58 +00:00
Bryan Boreham
7dc7215a26 Refactor: improve readability based on review feedback 2020-01-23 15:04:51 +00:00
Bryan Boreham
53297eb07c Merge pull request #3743 from weaveworks/more-pause
kubernetes: detect more 'pause' containers
2020-01-23 14:43:06 +00:00
Bryan Boreham
a375a54546 Merge pull request #3714 from weaveworks/simplify-control-serialisation
performance: send active controls as a single string per node
2020-01-23 12:15:21 +00:00
Bryan Boreham
880daa78ff Extend K8s tagger test to cover pause containers 2020-01-23 11:47:40 +00:00
Bryan Boreham
f1b06a020e Update jaeger-client package and dependencies 2020-01-21 16:34:34 +00:00
Bryan Boreham
321dbeef6d Update weaveworks/common and dependencies 2020-01-21 16:26:13 +00:00
Bryan Boreham
634e8f1158 Add tracing for pipe operations 2020-01-21 15:51:00 +00:00
Bryan Boreham
35451b4826 Merge pull request #3742 from weaveworks/go-modules
Convert to Go modules
2020-01-15 12:20:30 +00:00
Bryan Boreham
92b8a489e7 kubernetes: detect more 'pause' containers
Dockershim has added a label `io.kubernetes.docker.type` for at least
four years, where the pause container is of type `podsandbox`.  This
should be more reliable than trying to keep up with everyone's name
for the pause container.
2020-01-15 10:26:10 +00:00
Bryan Boreham
f70f2481c7 Update tcptracer-bpf version so we don't need manual workaround 2020-01-14 14:58:08 +00:00
Bryan Boreham
15bb96bb67 Remove outdated instructions about rebuilding Go libraries
This bit is unnecessary with newer versions of Go that cache builds
for different tags in different places.
2020-01-14 13:22:33 +00:00
Bryan Boreham
bc4ec26bf5 Turn off module use for codecgen build
There is no way to pass `-mod=vendor` through to the Go compilation
that codecgen runs.
2020-01-14 12:33:49 +00:00
Bryan Boreham
aae86877c7 Add back runsvint dependency
This is a small program used to watch app and probe running inside
the container.  We need to go round a few houses to be able to build
it from vendor directory.
2020-01-14 12:29:31 +00:00
Bryan Boreham
54a513c9fc fixup: manually add C files that 'go mod' doesn't bring in
Need workaround until a fix upstream such as
https://github.com/iovisor/gobpf/pull/206/files is merged.
2020-01-14 11:12:48 +00:00
Bryan Boreham
3a991eca99 build: use vendored files when building 2020-01-13 17:29:07 +00:00
Bryan Boreham
3357551619 build: don't need -i flag
This was useful to cache dependent library builds, but Go does that
better now so we don't need the flag.
2020-01-13 17:28:18 +00:00
Bryan Boreham
2171e21cae Ensure ugorji code-generation dependencies are vendored 2020-01-13 17:27:13 +00:00
Bryan Boreham
0bb92227a2 build: update vendor directory 2020-01-13 16:56:01 +00:00
Bryan Boreham
b6c25e6cfe build: update docker dependency to fix compile error in fsouza 2020-01-13 16:56:00 +00:00
Bryan Boreham
20898ea352 build: tweak version of iovisor and its dependencies
Without this we get a build error:

	github.com/Sirupsen/logrus: github.com/Sirupsen/logrus@v1.4.2: parsing go.mod:
	module declares its path as: github.com/sirupsen/logrus
	        but was required as: github.com/Sirupsen/logrus
2020-01-13 16:55:59 +00:00
Bryan Boreham
2bfe2146e5 build: initial modules conversion
Created by running `go mod init`; all versions the same as before.
2020-01-13 16:55:55 +00:00
Bryan Boreham
1dcdfab05a fixup: from review feedback
Fix a logic error in ECS scale-down button, bad copy/paste in
ActiveControls() and neaten the switch cases in container controls.

Co-Authored-By: Filip Barl <filip@weave.works>
2020-01-13 14:48:38 +00:00
Filip Barl
1f51495e59 Merge pull request #3733 from weaveworks/dedupe-yarn-with-integrity
Dedupe yarn.lock
2020-01-13 12:08:24 +01:00
Bryan Boreham
de939cc39b tests: add an integration test to check connection thinning 2020-01-13 08:59:51 +00:00
Bryan Boreham
b7b245ed48 tests: connection subset testing
Utility functions to create fake sets of connections for testing, and
then exercising the subset filtering code to check that quantities
come out as expected.
2020-01-13 08:59:51 +00:00