github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-18 03:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,222 Commits 85 Branches 64 Tags
scope-cortex-singleton
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul BellamyandGitHub b0624e7f58 Merge pull request #2422 from weaveworks/billing-host-seconds 
Add NodeSeconds to billing emitter
 2017-04-04 11:01:33 +01:00
Paul Bellamy 619ab90502 gvt update github.com/weaveworks/billing-client 2017-04-04 10:38:43 +01:00
Paul Bellamy fbf74b8d40 Add NodeSeconds to billing emitter 2017-04-04 10:33:19 +01:00
Paul BellamyandTom Wilkie 9228f7a7fa Container Seconds should not be Container Nanoseconds (#2372) 2017-03-22 17:34:46 +00:00
Paul BellamyandGitHub 6102f2a5bc Merge pull request #2359 from weaveworks/kinesis-summary-emitter 
Fluent Billing Emitter
 2017-03-22 12:05:54 +00:00
Paul Bellamy e68ffd467e Add app/multitenant/billing_emitter to emit billing events 2017-03-22 10:41:34 +00:00
Paul BellamyandGitHub 6b54cd28b2 Merge pull request #2081 from weaveworks/remove-wcloud 
Remove wcloud
 2016-12-12 15:24:09 +00:00
Paul Bellamy 2caa2b6770 Remove wcloud 2016-12-12 10:07:09 +00:00
Paul BellamyandGitHub 8da5ca32ee Merge pull request #1920 from weaveworks/probe-client-timeouts 
Add timeouts to the probe http client
 2016-10-13 11:56:51 +01:00
Paul Bellamy 002770d394 use hashicorp/clean-http to get better http client defaults 2016-10-13 09:45:27 +01:00
Paul Bellamy 28213a00a4 Add timeouts to the probe http client 2016-10-12 17:20:47 +01:00
Paul BellamyandGitHub ce21bac7d3 Merge pull request #1873 from kinvolk/alessandro/http-plugin-fix 
plugins/http-requests: change plugin id
 2016-09-21 12:43:37 +01:00
Paul BellamyandGitHub d5c3e30f31 Merge pull request #1837 from kinvolk/alessandro/tcd-status 
Traffic Control plugin: first iteration
 2016-09-09 15:36:06 +01:00
Paul BellamyandGitHub 3527b56b0b Merge pull request #34 from weaveworks/repo-branch 
[wcloud] Add support for repo_branch option
 2016-08-24 10:59:01 +01:00
Paul Bellamy 92cd0b84ad [wcloud] Add support for repo_branch option 2016-08-24 10:16:44 +01:00
Paul BellamyandGitHub 6e2fe78cab Merge pull request #1682 from kinvolk/krnowak/plugin-controls 
RFC: forwarding control requests to plugins
 2016-08-16 13:44:42 +01:00
Paul BellamyandGitHub c40a1b0c3d Merge pull request #1751 from kinvolk/krnowak/lint 
Lint fixes
 2016-08-09 09:45:10 +01:00
Paul BellamyandGitHub 2bba18dbfa Merge pull request #1710 from kinvolk/alban/hub2 
circle.yml: another fix for deploy master with non-upstream hub accounts
 2016-08-03 13:48:59 +01:00
Paul BellamyandGitHub 683727eaa2 Merge pull request #1723 from weaveworks/name-routes 
Name our routes, so /metrics gives more sensible aggregations
 2016-07-26 13:45:24 +01:00
Paul BellamyandGitHub 0a77d60261 Merge pull request #1722 from weaveworks/summary-execution 
Delete unused instrumentation code
 2016-07-26 12:55:21 +01:00
Paul Bellamy 274158493d Name our routes, so /metrics gives more sensible aggregations 2016-07-26 12:49:04 +01:00
Paul BellamyandGitHub 5b9b3140c2 Merge pull request #24 from weaveworks/find-files 
Find files correctly
 2016-07-14 17:03:38 +01:00
Paul BellamyandGitHub 60c284b5f8 Merge pull request #1670 from weaveworks/2wget2curl 
Replace wget in instructions with curl, as it's more widely avail. on macs
 2016-07-13 18:01:42 +01:00
Paul BellamyandGitHub f643920d11 Merge pull request #23 from weaveworks/only-lint-git-files 
Only lint git files
 2016-07-13 15:18:21 +01:00
Paul Bellamy 985912f964 Replace wget in instructions with curl, as it's more widely avail. on macs 2016-07-13 14:25:13 +01:00
Paul BellamyandGitHub d4c66bfe5b Merge pull request #1665 from weaveworks/use-histograms 
Use histograms over summaries
 2016-07-12 11:38:26 +01:00
Paul BellamyandGitHub ce2fd1e477 Merge pull request #1659 from weaveworks/demo 
Adding a static report file mode.
 2016-07-11 14:43:04 +01:00
Paul BellamyandGitHub 2a8938ec1a Merge pull request #1662 from weaveworks/count-memcache-errors 
Count memcache requests even if they time out
 2016-07-11 13:37:52 +01:00
Paul Bellamy 7a37577f71 Review Feedback 2016-07-11 13:36:22 +01:00
Paul Bellamy 691ad042c7 adding a demo json report to the scope dockerfile 2016-07-11 11:50:28 +01:00
Paul Bellamy bcddfd82c3 Added file collector, to serve a static report from file 2016-07-11 11:50:27 +01:00
Paul BellamyandGitHub b89e9ec891 Merge pull request #1641 from weaveworks/fix-column-widths 
Force some known column widths to prevent truncation of others
 2016-07-05 14:39:18 +01:00
Paul BellamyandGitHub 8cb1ecdf2c Merge pull request #1642 from weaveworks/refactoring-timing 
refactor some timing helpers into a common lib
 2016-07-05 13:01:28 +01:00
Paul Bellamy 7736564337 refactor some timing helpers into a common lib 2016-07-05 12:29:00 +01:00
Paul BellamyandTom Wilkie 85aee27ef6 If k8s objects only have one container, show that container's metrics on them (#1473) 2016-06-04 08:03:51 +01:00
Paul Bellamy d13784092b Merge pull request #1533 from weaveworks/missing-return 
Various fix ups for multitenancy
 2016-05-24 09:50:21 +01:00
Paul Bellamy d03c5b3bc4 Merge pull request #1530 from weaveworks/1514-deployment-pods 
Propagate the pod counter from replicasets for deployments.
 2016-05-19 14:31:20 +01:00
Paul BellamyandTom Wilkie 5d8b1c003e Add pod status to summary table (#1523) 
Had to shorten the title of # Containers, as it was being truncated.
 2016-05-19 10:59:58 +01:00
Paul Bellamy 2bb102dfcf Merge pull request #1511 from weaveworks/flag-disable-processes 
Add flag to disable reporting of processes (and procspied endpoints)
 2016-05-18 14:39:25 +01:00
Paul Bellamy 4177f4e84f Merge pull request #1508 from weaveworks/1400-ramp-up-dns-resolution 
Fast start the dns resolution ticker to improve first report latency.
 2016-05-16 12:59:08 +01:00
Paul Bellamy 100915b268 Merge pull request #1503 from weaveworks/1501-wrong-host 
Don't merge in container image metadata into containers anymore.
 2016-05-13 11:42:59 +01:00
Paul BellamyandTom Wilkie 8cae3b0496 remove recursive children in MapX2Host, so container images don't also provide containers. (#1487) 2016-05-12 14:50:04 +01:00
Paul Bellamy a7e15e438a Merge pull request #1484 from weaveworks/1477-publish-to-localhost 
Don't require the user to specify localhost when manually listing hosts
 2016-05-12 12:38:57 +01:00
Paul Bellamy 45c6c00dea Merge pull request #1461 from weaveworks/1452-k8s-111111111111111111 
Disable deployments and replica sets if k8s is 1.1
 2016-05-11 14:10:13 +01:00
Paul Bellamy 743cf80f92 Disable deployments and replica sets if k8s is 1.1 2016-05-11 11:19:15 +01:00
Paul Bellamy 4e151c4258 Merge pull request #1459 from weaveworks/k8s-dont-filter-out-pods 
Don't filter out Services etc which don't have pods
 2016-05-10 13:21:07 +01:00
Paul BellamyandTom Wilkie 291c9afe58 Add scale up/down controls on deployments, replica sets, and replication controllers (#1451) 2016-05-10 12:43:52 +02:00
Paul Bellamy 7a58e1115e Merge pull request #1458 from weaveworks/meassure-report-sizes 
Meassure report sizes
 2016-05-10 11:27:10 +01:00
Paul Bellamy 52c2498373 adding benchmark for LatestMap.Merge 2016-05-10 10:48:54 +01:00
Paul Bellamy 2d10a6a9a6 Merge pull request #1447 from weaveworks/1441-cache-size 
Remove cache from SmartMerger.
 2016-05-09 10:51:23 +01:00
Paul Bellamy c749bb9f20 Merge pull request #1436 from weaveworks/1372-deployment-view 
Deployment and Replica Set views
 2016-05-09 09:44:49 +01:00
Paul Bellamy d0633d0d80 Render replica set and deployment parents 2016-05-09 09:19:11 +01:00
Paul Bellamy 541699d193 Review Feedback 2016-05-09 09:19:11 +01:00
Paul Bellamy 16a5c738d9 Deployment and ReplicaSet views for k8s 2016-05-09 09:03:57 +01:00
Paul Bellamy 0178babb0e Index services by UID, and refactor out common k8s metadata handling 2016-05-09 09:03:56 +01:00
Paul BellamyandTom Wilkie bb284edee8 set 'default' as the default namespace filter instead of 'all' (#1445) 2016-05-06 18:17:32 +01:00
Paul Bellamy 90f2f7f621 Merge pull request #1438 from weaveworks/1430-filter-kube-system-containers 
Filter out docker containers for pods in the kube-system namespace
 2016-05-06 13:57:05 +01:00
Paul Bellamy 447bfe2935 Merge pull request #1435 from weaveworks/k8s-child-tables 
Show Pod IP and # container in the children table in details panel.
 2016-05-05 14:32:38 +01:00
Paul Bellamy c671c58d93 Merge pull request #1418 from weaveworks/log-n-report-merger 
A caching, log(n) complexity report merger
 2016-05-05 11:17:17 +01:00
Paul Bellamy d8e8365acf Merge pull request #1422 from weaveworks/1364-kuber-kuber-kuber-kuber-kuber-kuber-kuber-kuber-netes 
Add a condition to rendering any kubernetes nodes at all
 2016-05-04 11:32:04 +01:00
Paul Bellamy 26b3c17ff3 Merge pull request #1419 from weaveworks/service-token-flag 
Honour the --service-token flag properly.
 2016-05-03 16:39:45 +01:00
Paul Bellamy f2546dc7db Merge pull request #1398 from weaveworks/1212-whitelist 
Don't merge nodes in the rendering pipeline
 2016-05-03 16:27:31 +01:00
Paul Bellamy 57bc6f7c90 Merge pull request #1386 from weaveworks/1340-k8s-filter-namespace 
Filter by Kubernetes Namespaces
 2016-05-03 13:48:22 +01:00
Paul Bellamy 0456df9d0a Merge branch 'master' of github.com:weaveworks/scope 2016-05-03 13:46:14 +01:00
Paul Bellamy c40f29caf2 cleaning up old todo 2016-05-03 13:45:54 +01:00
Paul Bellamy 0e70f70ffd Review feedback 2016-05-03 12:49:02 +01:00
Paul Bellamy 4187ea2107 fixing up tests 2016-05-03 12:49:00 +01:00
Paul Bellamy 02a0e752e3 fix up stats on sub-topologies 2016-05-03 12:47:26 +01:00
Paul Bellamy fe853e3f0f filter out deleted pods when calculating available namespaces 2016-05-03 12:47:26 +01:00
Paul Bellamy 8758921215 pass nil for Noop a few other places 2016-05-03 12:47:26 +01:00
Paul Bellamy 2af2b1f15a Filter by Kubernetes Namespaces 2016-05-03 12:47:24 +01:00
Paul Bellamy a81b116672 Merge pull request #1409 from weaveworks/1396-pod-ip 
Show Pod IP in details panel.
 2016-04-29 14:49:39 +01:00
Paul Bellamy eba1cce47b Merge pull request #1397 from weaveworks/perf 
Pass nil for the decorator in the rendering pipeline when possible
 2016-04-29 12:58:51 +01:00
Paul Bellamy 0b9f78367d Merge pull request #1368 from weaveworks/k8s-delete-pod-service 
Add pod delete controls
 2016-04-29 11:02:55 +01:00
Paul Bellamy 64450a4830 Merge pull request #1371 from weaveworks/1219-grouped-node-counts-2 
Fixing grouped node count for filtered children nodes
 2016-04-28 13:30:15 +01:00
Paul Bellamy 3d3aed2bb3 Fixing grouped node count for filtered children nodes 
Squash of:

* We have to keep all the container hostnames until the end so we can
  count how many we've filtered

* Adding tests for ContainerHostnameRenderer and PodServiceRenderer with
  filters

* Because we filter on image name we need the image name before
  filtering

* Alternative approach to passing decorators.

* Refactor out some of the decorator capture

* Don't memoise decorated calls to Render

* Fixing filtered counts on containers topology

  Tricky, because we need the filters to be silent sometimes (when they're
  in the middle), but not when they're at the top, so we take the "top"
  filter's stats. However, this means we have to compose all
  user-specified filters into a single Filter layer, so we can get all
  stats.

  There are no more Silent filters, as all filters are silent (unless they
  are at the top).

  Additionally, I clarified some of the filters as their usage/terminology
  was inconsistent and confused. Now Filter(IsFoo, ...) *keeps* only nodes
  where IsFoo is true.
 2016-04-28 12:23:43 +01:00
Paul Bellamy 0f3b6bc497 Merge pull request #1381 from weaveworks/middleware 
Add generic path rewrite middleware
 2016-04-27 14:51:03 +01:00
Paul Bellamy 3bfb8c4c85 Merge pull request #1356 from pidster/1355-add-swarm-to-system-containers 
Add swarm-agent, swarm-agent master to sys container filters
 2016-04-26 11:08:38 +01:00
Paul Bellamy 9adbfa9f50 Merge pull request #1378 from weaveworks/1343-k8s-external-ip 
Show the k8s load balancer IP if it is set
 2016-04-26 11:08:11 +01:00
Paul Bellamy 6c491c7ae8 Merge pull request #1377 from weaveworks/1322-probe-name-and-version 
Report hostname and version in probe struct, and version in host node.
 2016-04-26 10:48:04 +01:00
Paul Bellamy d559a6c160 Show the k8s load balancer IP if it is set 2016-04-25 14:45:53 +01:00
Paul Bellamy 10c6eaa6d2 Merge pull request #1374 from weaveworks/815-container-image-labels 
Don't show container labels on container images
 2016-04-25 13:05:41 +01:00
Paul Bellamy a374ad334a Don't show container labels on container images 
Images have their own labels. We can still use the container labels for
filtering, as the filters are "System Containers", not "System Images".
 2016-04-25 10:32:33 +01:00
Paul Bellamy fdaafd2208 Check counters on expected rendered topologies 2016-04-22 14:14:31 +01:00
Paul Bellamy e7ebb83e23 Prune is only used in tests, so let's move it there 2016-04-22 14:14:30 +01:00
Paul Bellamy 1539e668e7 Merge pull request #1290 from weaveworks/remove-container-control 
Add control for removing stopped docker containers.
 2016-04-22 14:13:40 +01:00
Paul Bellamy f727bd6c21 Merge pull request #1360 from weaveworks/render-reorg 
Reorganise the render/ package
 2016-04-22 11:51:38 +01:00
Paul Bellamy a4e68b9598 Merge pull request #1363 from weaveworks/1072-docker-rm 
Immediately remove deleted containers from the UI.
 2016-04-22 10:29:14 +01:00
Paul Bellamy 3ec7e0227b Merge pull request #1362 from weaveworks/go1.6.2 
Upgrade to go1.6.2
 2016-04-22 10:19:54 +01:00
Paul Bellamy c4d4514278 Merge pull request #1359 from weaveworks/1121-reverse-resolution 
Use reverse-resolved DNS info in the connections table.
 2016-04-21 17:53:10 +01:00
Paul Bellamy 1b10a39313 add a button to download the report as JSON 2016-04-21 17:49:36 +01:00
Paul Bellamy 3c1b068633 Merge pull request #1357 from weaveworks/1312-arg-parsing 
Move all the flag parsing to main.go; implement `scope help`
 2016-04-20 17:03:13 +01:00
Paul Bellamy f61e29e324 Merge pull request #1358 from weaveworks/1081-flaky 
Add buffer to mockPublisher channel to prevent deadlock between Publish() and Stop()
 2016-04-20 16:44:16 +01:00
Paul Bellamy b85e287a22 Merge pull request #1327 from weaveworks/1213-group-summariser 
Add explicit group node summariser instead of doing it in the other summaries
 2016-04-20 16:11:56 +01:00
Paul Bellamy 99c611f594 Fixing up tests for shape and sublabel moving to topologies 2016-04-20 15:46:26 +01:00
Paul Bellamy 4bd3832219 move counting sublabel definition to the topologies 2016-04-20 12:17:46 +01:00
Paul Bellamy 4ad1ae80df move shapes determination to the topology 2016-04-20 12:17:46 +01:00
Paul Bellamy 43a29db73c Add explicit group node summariser instead of doing it in the other summaires 2016-04-20 11:59:04 +01:00
Paul Bellamy 8f3402f3e6 Merge pull request #1350 from weaveworks/1246-k8s-unmanaged 
Add a 'Unmanaged' node to k8s views which included non-k8s containers.
 2016-04-20 10:26:29 +01:00
Paul Bellamy c9b12db612 Merge pull request #1352 from weaveworks/1349-k8s-pod-count 
Show number of pods in service minor
 2016-04-20 09:59:53 +01:00