github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-09-06 10:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,888 Commits 85 Branches 64 Tags
24ffaa5ea92e52f93b6e4a856db3485a61241c06
Commit Graph
5888 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Boreham 24ffaa5ea9 fix: merging active controls on host 
Need to do the special-case merge before `n.Latest.Merge()`, otherwise
it picks just one set of controls.

Also modified the test to call `Merge()` where the problem happened.
 2021-05-21 09:19:08 +00:00
Bryan Boreham fc518cb602 Merge branch '3810-cordon-control' 2021-05-20 15:53:24 +00:00
Bryan Boreham 51da22ccb1 Merge pull request #3858 from weaveworks/bill-real-hosts 
multitenant: only count real hosts for billing
 2021-05-20 16:52:22 +01:00
Bryan Boreham aa0aab4094 multitenant: only count real hosts for billing 
PR #3822 made the kubernetes probe send host nodes, so we need to
exclude them from counting when billing.
 2021-05-20 14:29:39 +00:00
Bryan Boreham 63109b9abf Merge pull request #3856 from weaveworks/fix-websocket-crash 
fix: copy report before modifying
 2021-05-18 15:21:32 +01:00
Bryan Boreham f800f6457b Use const for host topology name 2021-05-18 14:08:45 +00:00
Bryan Boreham c6def0a92b refactor: add a generic MergeActiveControls method 
Use this instead of hard-coded knowledge about expected
controls and counts when merging host topology.
 2021-05-18 14:07:35 +00:00
Bryan Boreham f4bc57b1fc fix: copy report before modifying 
We call `UnsafeRemovePartMergedNodes()` which modifies the data,
so all implementations of Report() must ensure they return a new object,
not one which is cached or shared across goroutines.
 2021-05-18 09:33:29 +00:00
Bryan Boreham dacfd66e4d cosmetic: remove trailing space 2021-05-17 17:37:15 +00:00
Bryan Boreham 7e226fb9d6 Merge pull request #3851 from Kielek/feature/read-password-from-file 
allow to read password from file
 2021-05-17 18:18:06 +01:00
Bryan Boreham c36b339bfc Merge pull request #3854 from weaveworks/live-collector 
Add multitenant-live collector
 2021-05-14 13:28:30 +01:00
Bryan Boreham 1b0979057c multitenant: add metrics for reports received 
Previously we were reporting data on reports stored
 2021-05-14 11:13:10 +00:00
Bryan Boreham 2dcb319ef5 Refactor: move collector metrics where they are used 2021-05-11 16:16:08 +00:00
Bryan Boreham 5833259963 Register liveCollector metrics in init 
Otherwise they don't get registered for the awsCollector
 2021-05-11 16:10:16 +00:00
Bryan Boreham b3a40b7453 Add multitenant-live collector 
For when we want to collect reports in memory, but not save them to store.
Extract this functionality out of awsCollector to create new
liveCollector object.
 2021-05-11 11:45:55 +00:00
Bryan Boreham 2639a1309c Re-order imports to match convention 2021-05-11 11:15:54 +00:00
Piotr Kiełkowicz 8bdb0d62ab allow to read password from file 
it enables option to utilize docker swarm secret storage for password instead of env variables or app switches
 2021-04-27 14:28:57 +02:00
Bryan Boreham ad63f05ed0 Merge pull request #3845 from linux-on-ibm-z/s390x-support 
Add s390x support
 2021-04-27 12:37:20 +01:00
Bryan Boreham c28847d67c Merge pull request #3850 from weaveworks/remove-unmerged-nodes 
Remove partially merged nodes from deltas
 2021-04-23 12:05:52 +01:00
Bryan Boreham 33acfa1e59 Log part-merged nodes dropped to tracing 
So we have more idea what happened, in case of issue.
 2021-04-23 10:51:24 +00:00
Bryan Boreham 4dbf908cde Remove partially merged nodes from deltas 
Scope probes send full reports and deltas. If a node is eliminated
between two full reports, then the app might only have a delta of its
last state. Remove all such nodes before rendering.
 2021-04-23 09:38:45 +00:00
Bryan Boreham 4e2f364381 Merge pull request #3849 from weaveworks/cancel-join-result 
Exit joinResults.result() if context cancelled
 2021-04-22 12:22:07 +01:00
Bryan Boreham 67408cf8f9 More tracing on mapEndpoints 2021-04-22 10:54:25 +00:00
Bryan Boreham dc14bd04df Exit joinResults.result() if context cancelled 
These can be long-running operations, and if the client retries we get
the cancelled one running in parallel with the retry, slowing both down
and making it likely the next one will time out too.
 2021-04-22 10:53:06 +00:00
Bryan Boreham 8316a201f0 Merge pull request #3848 from weaveworks/cancel-map-render 
Break out of Map.Render loop if context cancelled
 2021-04-22 10:18:15 +01:00
Bryan Boreham 947b4cc9c8 Break out of Map.Render loop if context cancelled 
These can be long-running operations, and if the client retries we get
the cancelled one running in parallel with the retry, slowing both down
and making it likely the next one will time out too.
 2021-04-22 09:03:05 +00:00
Bryan Boreham 43dabb97e0 Merge pull request #3846 from weaveworks/query-collectors 
Multitenant mode: fetch live data from collectors
 2021-04-20 14:42:44 +01:00
Bryan Boreham ced99f5008 multitenant: serialise report to buffer before sending 
Seems to be faster
 2021-04-18 19:25:13 +00:00
Bryan Boreham 5856f372db multitenant: resolve collectors less frequently 
DNS records don't change that fast
 2021-04-18 19:25:13 +00:00
Bryan Boreham 9b62023266 Do REST calls from to collectors in parallel 2021-04-18 19:25:13 +00:00
Bryan Boreham 99582ba835 Implement HasReports for live data from collectors 2021-04-18 19:25:13 +00:00
Bryan Boreham 055ca53241 refactor: extract fn to check whether collector or querier 2021-04-18 19:25:13 +00:00
Bryan Boreham bea8db3683 Log/trace data size before decoding report 
This lets us see when the reading finished and decoding started
 2021-04-18 19:25:13 +00:00
Bryan Boreham 5032cca5c0 Multitenant mode: fetch live data from collectors 
Collectors hold recent reports in memory.
When querier needs 'live' data, fetch it from collectors instead
of from the long-term store.

Send reports from collector to querier in msgpack; disable compression
on REST call, otherwise Go silently decompresses, which takes longer.
 2021-04-18 19:25:13 +00:00
Bryan Boreham 667daef81b Refactor: extract function reportsFromStore() 
To help clarify subsequent changes
 2021-04-18 19:01:44 +00:00
Bryan Boreham 5d12b7ff65 Refactor: extract multitenant collection of 'live' reports 
To help clarify subsequent changes
 2021-04-18 19:01:44 +00:00
Bryan Boreham b9c8cf6998 Add flag for querier to talk to collectors 2021-04-18 19:01:44 +00:00
Bryan Boreham 1eb57c2e40 Multitenant collector now always saves async 
Removed support for saving all reports immediately
 2021-04-18 18:59:12 +00:00
Deepak c3cd3afad9 probe: merge controls from different probes 
This change creates a host topology from cluster-wide probe using
kubernetes nodes with cordon/un-cordon control. This also adds the
logic to merge the controls coming from different probes for host
topology.
 2021-04-19 00:10:52 +05:30
Deepak ee9ffbff60 Merge branch 'master' into 3810-cordon-control 2021-04-15 23:27:33 +05:30
Bryan Boreham 082ab61946 Merge pull request #3844 from dholbach/security-updates 
update dependencies
 2021-04-14 15:08:46 +01:00
vibhutisawant dddd5e1b8e Adds s390x support 2021-04-12 19:15:13 +05:30
Daniel Holbach e4c4b2b52f update dependencies 
update y18n, elliptic, ini, args-parser
	run "yarn-deduplicate"
 2021-04-12 10:40:38 +02:00
Deepak 5f0a605643 sync with master 2021-04-10 17:38:13 +05:30
Bryan Boreham 053afd5689 Merge pull request #3843 from weaveworks/release-1.13 
Release 1.13.2
 2021-04-09 11:15:32 +01:00
Bryan Boreham 0e1d3f84d9 Release 1.13.2 v1.13.2 2021-04-09 09:46:09 +00:00
Bryan Boreham 189789ecb2 Skip rebuilding UI assets in deploy step 2021-04-07 10:37:54 +00:00
Bryan Boreham f0b4094a6b Merge pull request #3841 from weaveworks/aws-cli-docker 
Run AWS CLI from a container image
 2021-04-07 11:15:03 +01:00
Bryan Boreham 85770038a2 Run AWS CLI from a container image 
So we don't have to install it, or Python.
Need to run in 'machine' executor on CircleCI so we can mount
volumes into the Docker command.
 2021-04-07 10:12:45 +00:00
Bryan Boreham 2b9a7a0ce7 Add missing vendor'd files 2021-04-07 09:28:35 +00:00