This repository has been archived by the owner on Mar 26, 2018. It is now read-only.
Expose blocked connection metrics #23
Merged
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
awh
changed the title
brb
reviewed
Oct 19, 2016
| http.Handle("/metrics", promhttp.Handler()) | ||
|
|
||
| go func() { | ||
| if err := http.ListenAndServe(":8686", nil); err != nil { |
There was a problem hiding this comment.
Probably the port could be passed as a parameter?
brb
reviewed
Oct 19, 2016
| func gatherMetrics() { | ||
| pipe, err := os.Open("/var/log/ulogd.pcap") | ||
| if err != nil { | ||
| log.Fatal(err) |
There was a problem hiding this comment.
For a debug purpose, I'd add some context to logging messages, e.g. log.Fatal("cannot open /var/log/ulogd.pcap: %s", err).
There was a problem hiding this comment.
Turns out it's already contextualised:
2016-10-19 12:29:12.213983 I | open /var/log/ulogd.pcap: no such file or directory
There was a problem hiding this comment.
Sorry, I meant all occurrences of thelog.Fatal statement.
awh
force-pushed
the
issues/7-blocked-connection-metrics
branch
2 times, most recently
from
7b89ee4
to
4ad1ea2
Compare
Include the ulogd Alpine package in the container image, along with a configuration file that receives NFLOG messages from group 86 and logs them in PCAP dump format to a named pipe in a well known location.
Exec the ulogd daemon on weave-npc startup, copying any log output to our own logs. Exit if the ulogd process terminates for any reason.
awh
force-pushed
the
issues/7-blocked-connection-metrics
branch
from
4ad1ea2
to
7d2b417
Compare
|
I have added |
brb
reviewed
Oct 19, 2016
| @@ -158,3 +172,16 @@ func main() { | |||
| signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM) | |||
| log.Fatalf("Exiting: %v", <-signals) | |||
| } | |||
|
|
|||
| var RootCmd = &cobra.Command{ | |||
There was a problem hiding this comment.
nitpicking: s/RootCmd/rootCmd ?
|
LGTM, just one nitpick. |
Read and parse packets from the ulogd named pipe, and serve statistics via the Prometheus client.
awh
force-pushed
the
issues/7-blocked-connection-metrics
branch
from
7d2b417
to
57b6621
Compare
|
Nit picked! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #7; depends on weaveworks/weave#2549. See commit messages for implementation details.