github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-02-14 18:09:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,930 Commits 85 Branches 64 Tags
cri-container-state
Commit Graph

5930 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bryan Boreham
41b35cc4c6 probe: translate CRI container state 
Use values consistent with what we use for Docker.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2022-02-28 18:23:31 +00:00
Daniel Holbach
5c228dc898 Merge pull request #3893 from weaveworks/dependabot/npm_and_yarn/client/follow-redirects-1.14.7 
Bump follow-redirects from 1.13.0 to 1.14.7 in /client
 2022-01-25 11:42:02 +01:00
dependabot[bot]
2a9cfbbe25 Bump follow-redirects from 1.13.0 to 1.14.7 in /client 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.0 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.0...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-25 10:17:21 +00:00
Daniel Holbach
a0a08ab698 Merge pull request #3888 from weaveworks/dependabot/npm_and_yarn/client/tmpl-1.0.5 
Bump tmpl from 1.0.4 to 1.0.5 in /client
 2021-10-08 12:13:58 +02:00
dependabot[bot]
d187d2aaa2 Bump tmpl from 1.0.4 to 1.0.5 in /client 
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-08 09:53:33 +00:00
Daniel Holbach
76c47b635c Merge pull request #3885 from weaveworks/dependabot/npm_and_yarn/client/tar-4.4.19 
Bump tar from 4.4.15 to 4.4.19 in /client
 2021-09-03 10:24:42 +02:00
dependabot[bot]
92b91f7a2c Bump tar from 4.4.15 to 4.4.19 in /client 
Bumps [tar](https://github.com/npm/node-tar) from 4.4.15 to 4.4.19.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.15...v4.4.19)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-03 07:57:19 +00:00
Daniel Holbach
7dee388e7f Merge pull request #3883 from weaveworks/dependabot/npm_and_yarn/client/path-parse-1.0.7 
Bump path-parse from 1.0.6 to 1.0.7 in /client
 2021-08-11 17:05:23 +02:00
dependabot[bot]
16bc95bb50 Bump path-parse from 1.0.6 to 1.0.7 in /client 
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-11 14:45:56 +00:00
Daniel Holbach
5e3a5d8fff Merge pull request #3882 from weaveworks/dependabot/npm_and_yarn/client/tar-4.4.15 
Bump tar from 4.4.8 to 4.4.15 in /client
 2021-08-09 15:24:03 +02:00
dependabot[bot]
b5d08d597e Bump tar from 4.4.8 to 4.4.15 in /client 
Bumps [tar](https://github.com/npm/node-tar) from 4.4.8 to 4.4.15.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v4.4.8...v4.4.15)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-09 12:53:32 +00:00
Daniel Holbach
14ba625605 Merge pull request #3879 from weaveworks/remove-netlify-config 
remove netlify preview build
 2021-07-13 16:22:34 +02:00
Daniel Holbach
c73bd14720 remove netlify preview build 
Signed-off-by: Daniel Holbach <daniel@weave.works>
 2021-07-13 16:09:13 +02:00
Daniel Holbach
e9804567c9 Merge pull request #3878 from weaveworks/docs-fixes 
Docs fixes
 2021-07-13 14:53:51 +02:00
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