Fix outstanding problems in claiming and add SOCKS5 support. #8406
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Manage this branch in SquashTest this branch here: https://amossclaiming-0wxk7.squash.io |
mfundul
previously approved these changes
Mar 16, 2020
|
@mfundul I didn't see your comments before I merged in @underhood 's commits and Github won't show them to me now. Could you dig them out and stick them in a fresh comment or send them to me on Slack? |
amoss
changed the title
I had only approved the commits. No comments. |
2 tasks
amoss
changed the title
mfundul
reviewed
Mar 16, 2020
mfundul
reviewed
Mar 16, 2020
mfundul
previously approved these changes
Mar 17, 2020
amoss
requested review from
a user and
mfundul
and removed request for
joelhans and
a user
mfundul
approved these changes
Mar 17, 2020
stelfrag
approved these changes
Mar 17, 2020
Saruspete
pushed a commit
to Saruspete/netdata
that referenced
this pull request
May 21, 2020
…#8406) This commit fixes the known problems in claiming: incorrect reports of success, better treatment of error code and improved visibility of what the script is doing. There has been extensive testing against both environments to check that it works. The socks5 proxy support has been integrated and works for both methods of calling the claiming script. Co-authored-by: Timotej Šiškovič <timotej@netdata.cloud>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Closes #8090
Closes #8263
Fix the problems in running the claiming script.
Merging from other PR (will integrete shortly).
some things in claiming script have to be fixed as well for this to be 100% (see #8263) - therefore this PR works and brings SOCKS5 proxy but there are error reporting issues that will be fixes in #8263.
If agent configured with SOCKS5 proxy [agent_cloud_link] key proxy it should pass that setting to curl when claiming script is called from within netdata agent with netdata -D -Wclaim.
Component Name
ACLK
Test Plan
-verboseflag shows the JSON and raw curl command.https_proxyset in the environment.-proxy=option on the script.-W claim "-url=....Merging from other PR (will integrate shortly):
Make sure claiming script can be found by $PATH (e.g. if you test with NETDATA installed in custom dir)!
Test with local cloud test environment hidden behind socks5 proxy. (example: run agent on VM that doesn't have direct access to local cloud environment)
In config file of Netdata set options:
[agent_cloud_link]
proxy = socks5://X.X.X.X:YYYY
and for other test
proxy = none
When curl not present in system and wget present. Show error when trying to use SOCKS with wget (as wget doesn't have support).
Additional Information