Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix probe connected status #275

Merged
merged 4 commits into from
Jan 14, 2016
Merged

Fix probe connected status #275

merged 4 commits into from
Jan 14, 2016

Conversation

foot
Copy link
Contributor

@foot foot commented Dec 18, 2015

fixes #255

@foot
Copy link
Contributor Author

foot commented Dec 18, 2015

@davkal RFR

@davkal
Copy link

davkal commented Dec 23, 2015

Code looks good. Still need to see it in action. Is it deployed to dev?

@foot
Copy link
Contributor Author

foot commented Dec 29, 2015

Nope, you can test it w/ the BACKEND_HOST trick:

$ BACKEND_HOST=frontend.dev.weave.works npm start

You can add probes to dev.weave.works by applying this to scope

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b38721d..7f1fea6 100755
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -108,7 +108,7 @@ while true; do
                 shift
             fi
             PROBE_ARGS="$PROBE_ARGS -token=$ARG_VALUE"
-            echo "scope.weave.works:80" >/etc/weave/apps
+            echo "frontend.dev.weave.works:80" >/etc/weave/apps
             touch /etc/service/app/down
             ;;
         --no-app)

and running

make && ./scope stop && ./scope launch

ORRR.... we could deploy this branch to dev? :)

@foot
Copy link
Contributor Author

foot commented Dec 29, 2015

weaveworks/scope#777 suggests you shouldn't have to apply that diff and that you can just start w/

$ scope launch --service-token=abc frontend.dev.weave.works:80 # for dev

@foot
Copy link
Contributor Author

foot commented Dec 29, 2015

But the scope ws:// is not getting correctly connected up w/ the BACKEND_PROXY hack right now... not sure if thats possible, having a quick look..

@foot foot changed the title fix probe connected status Fix probe connected status Jan 4, 2016
@davkal
Copy link

davkal commented Jan 13, 2016

the code looks good. @2opremio would it be ok if you test it on your next deploy to dev?

@davkal
Copy link

davkal commented Jan 13, 2016

Just tried to test this, but running into the JS error from #285 . Need to merge #284 asap

@davkal davkal force-pushed the 255-fix-probe-connected-status branch from 7375bae to 5c90838 Compare January 14, 2016 08:33
foot and others added 3 commits January 14, 2016 11:45
We take this as probe.lastSeen > 15s.
Server was strangely changing the order they were returned in.
@davkal davkal force-pushed the 255-fix-probe-connected-status branch from 7a3bafd to 9f6e0fb Compare January 14, 2016 10:45
@davkal
Copy link

davkal commented Jan 14, 2016

screen shot 2016-01-14 at 12 03 04
screen shot 2016-01-14 at 12 03 39

LGTM!!

foot added a commit that referenced this pull request Jan 14, 2016
@foot foot merged commit 186bd93 into master Jan 14, 2016
@foot foot deleted the 255-fix-probe-connected-status branch January 14, 2016 11:14
@jml jml unassigned davkal Aug 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Probe marked as '(connected)' when it isn't
2 participants