github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-04 10:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,193 Commits 85 Branches 64 Tags
bae1533b12841ba23cc07fb12c2d8a3923f80db0
Commit Graph

3193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Mike Lang
b1a1c7d427 scope launch script: Attempt to quote args in "scope command" 
As indicated by the TODO, any args passed into the command do not get escaped
when output, so for example:
	scope command "foo bar"
would output results like:
	foo bar
instead of
	"foo bar"
or
	foo\ bar

The "right" way to do this seems to be printf %q, which prints a quoted version of the string.
However this format specifier is not available in POSIX sh (though it does work in many
implementations of it, such as the ones provided by bash which make up the likely majority of
real-world usage).
This code is a compromise that uses the added functionality where available,
while still falling back to the old behaviour when it isn't.
 2016-12-12 11:26:00 -08:00
Mike Lang
21431bb4b0 scope launch script: Fix shellcheck linter warnings 
By far the majority of these were variables which were not quoted.
While, yes, right now we can guarentee most of these variables will never contain spaces,
this could someday change and applying quoting as a universal rule prevents future mistakes.

The ARGS="$@" -> "$*" change is purely stylistic and mainly is used to indicate the intent that
we actually wanted to concatenate all the args by spaces, not keep them seperated as "$@" would
in many situations, but not this one.

Several warnings remain, in places where we intentionally want to split a variable on whitespace,
or otherwise do what shellcheck is warning us against.

Of note is shellcheck warning SC2166, which says to prefer [ foo ] || [ bar ] over [ foo -o bar ]
as the -a and -o flags have differing behaviour on some systems.
I've opted to keep these for now, since the version check test command would need to be replaced by
a LOT of subshells to achieve the same effect, which feels dirtier.
 2016-12-12 11:26:00 -08:00
Jordan Pellizzari
670d52f191 Merge pull request #2078 from weaveworks/2072-sparkline-errors 
Fix sparkline crashing on stopped nodes
 2016-12-12 10:19:58 -08:00
Jonathan Lange
a8ba7b2c86 Log whether it's a websocket request 2016-12-12 17:57:48 +00:00
Jonathan Lange
256e480acc Vendor new weaveworks/common 2016-12-12 17:40:46 +00:00
Jonathan Lange
626e8a3e9f Neater way of doing it 2016-12-12 17:40:15 +00:00
Jonathan Lange
4fcf9a1e36 Add flag for logging headers 2016-12-12 17:12:28 +00:00
Paul Bellamy
6b54cd28b2 Merge pull request #2081 from weaveworks/remove-wcloud 
Remove wcloud
 2016-12-12 15:24:09 +00:00
David
d8f16c9a32 Merge pull request #2084 from weaveworks/revert-2058-update-eslint 
Revert "Upgraded eslint & eslint-config-airbnb"
 2016-12-12 16:06:58 +01:00
David
99bfab89b7 Revert "Upgraded eslint & eslint-config-airbnb" 2016-12-12 16:06:13 +01:00
Filip Barl
0921af04d5 Merge pull request #2058 from weaveworks/update-eslint 
Upgraded eslint & eslint-config-airbnb
 2016-12-12 14:01:53 +01:00
Filip Barl
be9b640130 Addressed @davkal's and @jpellizzari's comments 2016-12-12 11:36:43 +01:00
Filip Barl
a1d1b49aeb Addressed @jpellizzari's comment 2016-12-12 11:23:09 +01:00
Paul Bellamy
2caa2b6770 Remove wcloud 2016-12-12 10:07:09 +00:00
Filip Barl
1b5f3ae4bf Using individual D3 modules 2016-12-12 11:04:49 +01:00
Filip Barl
71f44e8b70 Got rid of findDOMNode helper 2016-12-12 11:04:49 +01:00
Filip Barl
90685c89f1 Applied 'jsx-no-target-blank' lint rule 2016-12-12 11:04:15 +01:00
Filip Barl
86d61cf0d6 Extracted 'static' methods outside of classes for the 'class-methods-use-this' lint rule 2016-12-12 11:04:15 +01:00
Filip Barl
8dce4e8f36 Fixed the failing test 2016-12-12 11:03:16 +01:00
Filip Barl
776b4d72eb Applied no-mixed-operators linting rule 2016-12-12 11:03:16 +01:00
Filip Barl
e60418a986 Applied label-has-for linting rule 2016-12-12 11:03:16 +01:00