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

Add monitoring and healthz based on tunnel health. #11250

Merged
merged 1 commit into from
Jul 15, 2015

Conversation

brendandburns
Copy link
Contributor

@cjcullen @thockin

This is in response to some observed issues in GKE.

@brendandburns
Copy link
Contributor Author

Closes #11251

@k8s-bot
Copy link

k8s-bot commented Jul 14, 2015

GCE e2e build/test passed for commit f80b02f74a80aa7fd1c5df9d7d090c8941bdb98e.

@thockin
Copy link
Member

thockin commented Jul 14, 2015

I don't know the SSH logic well, but this changes seems plausible.

@thockin
Copy link
Member

thockin commented Jul 14, 2015

LGTM, but @cjcullen who maybe has better context

}

m.lastSyncMetric = prometheus.NewGaugeFunc(prometheus.GaugeOpts{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be inside the above if block? I don't know prometheus well enough to know the implications, but this metric only makes sense in the ssh-tunnel case.

@brendandburns
Copy link
Contributor Author

Updated to reflect offline conversation with @cjcullen move the metric inside the if ssh-tunnels block.

ptal.

@k8s-bot
Copy link

k8s-bot commented Jul 14, 2015

GCE e2e build/test passed for commit b791948e2f179716a2cfd97a1f5345271a9c3037.

@k8s-bot
Copy link

k8s-bot commented Jul 14, 2015

GCE e2e build/test passed for commit 25d3834.

@brendandburns
Copy link
Contributor Author

@thockin @cjcullen can I get an LGTM and an ok-to-merge?

@cjcullen
Copy link
Member

Sorry, thought I had already.

LGTM

@cjcullen cjcullen added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 15, 2015
@cjcullen cjcullen self-assigned this Jul 15, 2015
@erictune
Copy link
Member

I'm not merging any code until Jenkins is green for a turn.

erictune added a commit that referenced this pull request Jul 15, 2015
Add monitoring and healthz based on tunnel health.
@erictune erictune merged commit ef0b68d into kubernetes:master Jul 15, 2015
zmerlynn added a commit that referenced this pull request Jul 16, 2015
…-#11250-upstream-release-1.0

Automated cherry pick of #11250
@zmerlynn zmerlynn mentioned this pull request Jul 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants