github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-04 18:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,214 Commits 85 Branches 64 Tags
ec0b6dd8d09d85dbbedcadf3fc1db0eb2971c72e
Commit Graph

3214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iago López Galeiras
ec0b6dd8d0 backend: add shfmt command to the docker image 2017-01-09 16:40:16 +01:00
Iago López Galeiras
643827d9a7 Re-add generate_latest_map script 
It was removed from the build-tools repository. Add it to extra/ and fix
a couple of linter errors.
 2017-01-09 16:40:16 +01:00
Iago López Galeiras
5d06a23fe1 tools: remove generate_latest_map 
It seems it was added directly to the scope repo instead of adding it to
the build-tools repo so we need to delete it manually.
 2017-01-09 16:40:16 +01:00
Iago López Galeiras
3522a3f556 Merge commit 'd9ce1d58e9cbcd67823ee0abe8dd346a9aa6d120' into iaguis/fix-lint 2017-01-09 14:40:34 +01:00
Iago López Galeiras
d9ce1d58e9 Squashed 'tools/' changes from b990f488..4b7d5c61 
4b7d5c61 Merge pull request #59 from weaveworks/57-fix-lint-properly
b7f0e692 Merge pull request #58 from weaveworks/fix-lint
794702c7 Pin version of shfmt
ab1b11de Fix lint
81d80f35 Merge pull request #55 from weaveworks/lint-tf
05ad5f27 Review feedback
4c0d0469 Use hclfmt to lint terraform.
fd875e27 Fix test wrt shellcheck
54ec2d92 Don't capitalise error messages
19d3b6e2 Merge pull request #49 from weaveworks/pin-shfmt
fea98f66 Go get from the vendor dir
1d867b06 Try and vendor a specific version of shfmt
76619c2d Merge pull request #48 from weaveworks/revert-41-user-tokens
4f96c519 Revert "Add experimental support for user tokens"
d00033fd Merge pull request #41 from weaveworks/user-tokens
245ed267 Merge pull request #47 from weaveworks/46-shfmt
c1d7815a Fix shfmt error
cb397466 Don't overright lint_result with 0 when shellcheck succeeds
8ab80e87 Merge pull request #45 from weaveworks/lint
83d5bd1f getting integration/config and test shellcheck-compliant
cff9ec36 Fix some shellcheck errors
7a843d6d run shellcheck as part of lint if it is installed
31552a0e removing spurious space from test
6ca7c5f0 Merge pull request #44 from weaveworks/shfmt
952356d8 Allow lint to lint itself
b7ac59c3 Run shfmt on all shell files in this repo
5570b0e9 Add shfmt formatting of shell files in lint
0a675941 fix circle build by splatting gopath permissions
354e0838 Fixing lint
586060b2 Add experimental support for user tokens

git-subtree-dir: tools
git-subtree-split: 4b7d5c617e662acb8b1bee4203d7671fb0aa1cba
 2017-01-09 14:40:34 +01:00
Alfonso Acosta
b4e1fc7074 Merge pull request #2112 from weaveworks/2032-ensure-conntrack-events 
Check that conntrack events are enabled in the kernel
 2017-01-02 23:11:52 +01:00
Alfonso Acosta
5c3ea83846 Fix minor typo 2017-01-02 14:28:22 +00:00
Alfonso Acosta
dfb52f0d93 Clarify even further that proc/PID/net/tcp varies by namespace 2017-01-02 14:27:37 +00:00
Alfonso Acosta
64f1a5d0f5 Check that conntrack events are enabled in the kernel 2017-01-02 09:22:26 +00:00
Alfonso Acosta
ab28a0bfac Fix linter errors in ignored file 2016-12-22 11:12:16 +00:00
Simon
bf2432ddb1 Merge pull request #2105 from weaveworks/2042-prio-ecs-view 
Prioritize ecs topologies on initial load if available
 2016-12-22 11:48:35 +01:00
Alfonso Acosta
0126f07a80 Merge pull request #2108 from kinvolk/schu/dialer-fixup 
extras/dialer: move dialer.go to sub directory
 2016-12-22 11:46:36 +01:00
Alfonso Acosta
a2d09b4c23 Run gofmt (file was ignored by linter) 2016-12-22 10:04:35 +00:00
Alfonso Acosta
2cd76130a1 Merge pull request #2095 from weaveworks/1991-conntrack-parsing 
Disable XML in conntrack parsing
 2016-12-22 11:00:51 +01:00
Alfonso Acosta
9d352e96f5 Review feedback 2016-12-22 09:33:52 +00:00
Michael Schubert
e8f9bc11e7 extras/dialer: move dialer.go to sub directory 
`extras/dialer` contains both a dialer script and dialer.go, the go
sources for the dialer server and client, to allow users to build the
dialer container themselves. Move dialer.go to a sub directory `src`
since `make clean` (running `go clean ./...`) deletes the dialer script
otherwise.

Fixup for 4d20a91a97

Signed-off-by: Michael Schubert <michael@kinvolk.io>
 2016-12-22 10:32:07 +01:00
Simon Howe
9f9148ac24 Prioritize ecs topologies on initial load if available 
Global topo order priority:
 - Check url for topoid
 - Check localStorage for topoid
 - Check topo-utils.js for what to show first!
 2016-12-22 10:08:06 +01:00
Alfonso Acosta
d22d64c710 Cleanup 
* Remove XML traces
* Improve performance
* Fix tests
 2016-12-21 19:35:37 +00:00
Alfonso Acosta
bae1533b12 Add comment regarding loopback address hardcoding 2016-12-21 10:10:00 +00:00
Alfonso Acosta
00c4a7cf86 Merge pull request #2103 from weaveworks/2102-hardcode-loopback-ip 
Hardcode 127.0.0.1 as loopback IP for default target
 2016-12-21 09:36:01 +01:00
jpellizzari
b7002610ea Fixed linting error 2016-12-20 08:12:06 -08:00
Jordan Pellizzari
32bb7c37aa Merge pull request #2087 from weaveworks/1982-control-indicator 
Add control status icon to Terminal header
 2016-12-20 07:39:30 -08:00
Alfonso Acosta
8b45525305 Hardcode 127.0.0.1 as loopback IP for default target 2016-12-20 11:18:13 +00:00
Alfonso Acosta
293c87fda6 Merge pull request #2101 from weaveworks/checkpoint-kernel-version 
Forward OS/Kernel version to checkpoint
 2016-12-20 09:11:43 +01:00
Alfonso Acosta
06ff64d477 Forward OS/Kernel version to checkpoint 
Useful to prioritize ebpf testing

Also:
* Make treatment of kernel release and version consistent across Darwin/Linux
 2016-12-19 20:08:08 +00:00
Alfonso Acosta
f19889f63c Reduce garbage 2016-12-19 19:30:23 +00:00
Alfonso Acosta
faad9533b3 Merge pull request #2097 from kinvolk/schu/scope-container-name 
scope launcher script: allow setting SCOPE{_APP,}_CONTAINER_NAME
 2016-12-19 17:56:12 +01:00
Alfonso Acosta
5c02dfcbd2 Complete hacky manual parser 2016-12-19 11:30:00 +00:00
Alfonso Acosta
710c3bf82e [WIP] Diable XML in conntrack parsing 
Not working yet
 2016-12-19 11:30:00 +00:00
Michael Schubert
c3bd60b544 scope launcher script: allow setting SCOPE{_APP,}_CONTAINER_NAME 
Helpful when you want to run multiple instances of scope on your system,
e.g. for testing.

Signed-off-by: Michael Schubert <michael@kinvolk.io>
 2016-12-19 11:12:28 +01:00
Alfonso Acosta
e70f2b98c0 Merge pull request #2096 from kinvolk/schu/mode-probe-port-fix 
prog/main: use flags.app.port for default target
 2016-12-16 18:59:08 +01:00
Michael Schubert
3f969f20f2 prog/main: use flags.app.port for default target 
User can control the webserver listen address with `-app.http.address`.
If they do, `scope --mode probe ...` should use the port part of address
in the default target and not ':4040'. Otherwise we encounter a
`dial tcp 127.0.0.1:4040: getsockopt: connection refused` error and
`scope-probe` cannot report.

Signed-off-by: Michael Schubert <michael@kinvolk.io>
 2016-12-16 17:15:03 +01:00
Alfonso Acosta
8e78c0c814 Merge pull request #2094 from weaveworks/maybe-old-master 
Fix force-push to master
 2016-12-15 18:26:29 +01:00
Simon
ffeeabd839 Merge pull request #2093 from weaveworks/2092-start-probe-d4m 
Fixes ./scope launch starting probe under d4m
 2016-12-15 15:58:09 +01:00
Filip Barl
29d91aa2a9 Merge pull request #2089 from weaveworks/reapply-eslint-update 
Reapplied all the eslint upgrade changes
 2016-12-15 15:29:01 +01:00
Simon Howe
71e04a27ba Fixes ./scope launch starting probe under d4m 2016-12-15 15:26:20 +01:00
Filip Barl
e345f42b18 Moved font-awesome-webpack to devDependencies. 2016-12-15 15:04:53 +01:00
Filip Barl
26b3e9efc9 Reapplied all the eslint upgrade changes 2016-12-15 15:04:53 +01:00
Mike Lang
5ed63de306 Merge pull request #2060 from weaveworks/mike/awsecs/fix-log-formatting 
ecs reporter: Fix some log lines that were passing *string instead of string
 2016-12-14 11:20:59 -08:00
Jonathan Lange
3560bbc73a Merge pull request #2086 from weaveworks/log-request-headers 
Add flag for logging headers
 2016-12-14 17:29:38 +00:00
Alfonso Acosta
a1d9db867f Merge pull request #2082 from kinvolk/schu/tools-dialer 
Add extras/dialer
 2016-12-14 11:49:09 +01:00
jpellizzari
2b83ebd74c Added control status icon to Terminal header 2016-12-13 10:04:05 -08:00
Michael Schubert
4d20a91a97 Add extras/dialer 
Based on the dialer.sh script by @alban:
https://gist.github.com/alban/7abe7f6307184c58be7429e63a2d9053

Signed-off-by: Michael Schubert <michael@kinvolk.io>
 2016-12-13 09:31:57 +01:00
Mike Lang
bbcf184031 Merge pull request #2077 from weaveworks/mike/scope-script/shellcheck 
scope launch script improvements
 2016-12-12 14:30:46 -08:00
Mike Lang
2562567de4 scope launch script: Don't try to detect if listing scope binary args worked 
We can't easily do this since scope exits failure when -h is passed, so we
can't distinugish between success and failure.
 2016-12-12 11:26:01 -08:00
Mike Lang
3000adfb9a scope launch script: Don't print container id 
It's not useful and it's confusing.
Replaced with a generic "it worked" message.
 2016-12-12 11:26:01 -08:00
Mike Lang
7333b99b89 scope launch script: Make the default port clear 2016-12-12 11:26:01 -08:00
Mike Lang
0e4e95e4fa scope launch script: Edit help text to make positional args clearer 2016-12-12 11:26:01 -08:00
Mike Lang
3a69c19d6e scope launch script: Also recongize -h, -help and --help 2016-12-12 11:26:01 -08:00
Mike Lang
90709b61aa scope launch script: Fix and consolidate usage info 
Instead of different usage info for "scope help", show the same always.
Also correct it for what the script actually does,
and always display the scope binary args.
 2016-12-12 11:26:01 -08:00