github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-05-22 00:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,916 Commits 85 Branches 64 Tags
98dda9d4a992a810953536b2620fda926058edde
Commit Graph

5916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Holbach
98dda9d4a9 Docs fixes 
- Make markdownlint happier
	- Fix some typos
	- Make it clear that meetings are currently on hold

Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-13 12:16:16 +02:00
Daniel Holbach
d436feb88c Merge pull request #3877 from weaveworks/security-updates 
Security updates
 2021-07-09 09:52:30 +02:00
Daniel Holbach
3da265e402 update jest and babel-jest 
Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-09 09:36:33 +02:00
Daniel Holbach
2aac2395e1 update webpack-cli 
Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-09 09:34:23 +02:00
Daniel Holbach
70485ee871 update eslint-loader 
Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-09 09:32:25 +02:00
Daniel Holbach
e0ac3fdbb4 Merge pull request #3874 from weaveworks/security-updates 
Security updates
 2021-07-09 09:23:00 +02:00
Daniel Holbach
13dec00efc update ui-components 
Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-09 09:06:43 +02:00
Daniel Holbach
0ff2a8a514 update rc-slider and react-router 
Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-07 12:46:22 +02:00
Daniel Holbach
b75106d734 update jest and jest-cli 
Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-07 12:36:26 +02:00
Daniel Holbach
e2aa0d4b96 update babel/cli, eslint, watchpack, webpack to get rid of old glob-parent 
Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-07 12:26:32 +02:00
Daniel Holbach
44c745e49d update stylelint and stylelint-declaration-use-variable 
Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-07 12:16:26 +02:00
Daniel Holbach
a065b5d65a Merge pull request #3869 from weaveworks/dependabot/npm_and_yarn/client/browserslist-4.16.6 
Bump browserslist from 4.9.1 to 4.16.6 in /client
 2021-07-07 10:42:14 +02:00
Daniel Holbach
a285a8f982 Merge pull request #3872 from weaveworks/dependabot/npm_and_yarn/client/ws-7.5.2 
Bump ws from 7.1.2 to 7.5.2 in /client
 2021-07-07 10:41:56 +02:00
dependabot[bot]
86ae351151 Bump ws from 7.1.2 to 7.5.2 in /client 
Bumps [ws](https://github.com/websockets/ws) from 7.1.2 to 7.5.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/compare/7.1.2...7.5.2)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 08:26:19 +00:00
Daniel Holbach
8503c5b6a4 Merge pull request #3871 from weaveworks/dependabot/npm_and_yarn/client/postcss-7.0.36 
Bump postcss from 7.0.17 to 7.0.36 in /client
 2021-07-07 10:25:37 +02:00
Daniel Holbach
4e2ac89ab6 Merge pull request #3870 from weaveworks/dependabot/npm_and_yarn/client/hosted-git-info-2.8.9 
Bump hosted-git-info from 2.5.0 to 2.8.9 in /client
 2021-07-07 10:23:42 +02:00
Daniel Holbach
4ddd898829 Merge pull request #3866 from weaveworks/dependabot/npm_and_yarn/client/lodash-4.17.21 
Bump lodash from 4.17.20 to 4.17.21 in /client
 2021-07-07 10:11:27 +02:00
Daniel Holbach
e81a3c71f0 Merge pull request #3867 from weaveworks/dependabot/npm_and_yarn/client/ua-parser-js-0.7.28 
Bump ua-parser-js from 0.7.17 to 0.7.28 in /client
 2021-07-07 10:08:19 +02:00
dependabot[bot]
d285a6c3a0 Bump postcss from 7.0.17 to 7.0.36 in /client 
Bumps [postcss](https://github.com/postcss/postcss) from 7.0.17 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss/compare/7.0.17...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 08:07:43 +00:00
dependabot[bot]
f488dc6b61 Bump hosted-git-info from 2.5.0 to 2.8.9 in /client 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.5.0 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.5.0...v2.8.9)

---
updated-dependencies:
- dependency-name: hosted-git-info
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 08:07:42 +00:00
dependabot[bot]
aad36e0f5b Bump browserslist from 4.9.1 to 4.16.6 in /client 
Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.9.1 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/browserslist/browserslist/compare/4.9.1...4.16.6)

---
updated-dependencies:
- dependency-name: browserslist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 08:07:37 +00:00
Daniel Holbach
da541e3e75 Merge pull request #3868 from weaveworks/dependabot/npm_and_yarn/client/ssri-6.0.2 
Bump ssri from 6.0.1 to 6.0.2 in /client
 2021-07-07 10:07:24 +02:00
dependabot[bot]
d956fd6cbf Bump ssri from 6.0.1 to 6.0.2 in /client 
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: ssri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 07:55:27 +00:00
dependabot[bot]
1e3d59c2a0 Bump ua-parser-js from 0.7.17 to 0.7.28 in /client 
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.17 to 0.7.28.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.17...0.7.28)

---
updated-dependencies:
- dependency-name: ua-parser-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 07:55:25 +00:00
dependabot[bot]
fefe5caa62 Bump lodash from 4.17.20 to 4.17.21 in /client 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

---
updated-dependencies:
- dependency-name: lodash
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-07 07:55:22 +00:00
Bryan Boreham
5373b5ea31 Merge pull request #3861 from weaveworks/change-bryan-email 
Update email address of Bryan Boreham as maintainer
 2021-05-22 14:18:45 +01:00
Bryan Boreham
8fd749e42e Update email address of Bryan Boreham as maintainer 2021-05-21 13:01:54 +00:00
Bryan Boreham
0956d5e170 Merge pull request #3859 from weaveworks/fix-merge-active 
fix: merging active controls on host
 2021-05-21 10:35:00 +01:00
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