Add support for body_path in HTTP probe config.
#392
Conversation
config/config.go
Outdated
| @@ -135,6 +139,13 @@ func (s *HTTPProbe) UnmarshalYAML(unmarshal func(interface{}) error) error { | |||
| if err := s.HTTPClientConfig.Validate(); err != nil { | |||
| return err | |||
| } | |||
| if s.BodyPath != "" { | |||
There was a problem hiding this comment.
This should be opened and read in the request. It should also be an error for both to be specified.
There was a problem hiding this comment.
Updated to be opened within ProbeHTTP. I left the current os.Open call in config.go in order to fail fast on bad configs. This is different from BearerToken/BearerTokenFile (https://github.com/prometheus/common/blob/master/config/http_config.go#L81).
Let me know if I should drop opening the file during config validation.
Fixes prometheus#391. Signed-off-by: Emmanuel Gomez <[email protected]>
Signed-off-by: Emmanuel Gomez <[email protected]>
Signed-off-by: Emmanuel Gomez <[email protected]>
emmanuel
force-pushed
the
add_body_path
branch
from
06c592f to
427d68b
Compare
|
Added DCO. I'm not sure why the Travis build is failing, but from my (short) look, it appears related to git remotes, and not the content of these changes. |
config/config.go
Outdated
| return errors.New("at most one of body & body_file may be configured") | ||
| } | ||
| if s.BodyFile != "" { | ||
| _, err := os.Open(s.BodyFile) |
There was a problem hiding this comment.
You should close the file
| if httpConfig.Body != "" { | ||
| body = strings.NewReader(httpConfig.Body) | ||
| } | ||
| // If a body path is configured, add it to the request. | ||
| if httpConfig.BodyFile != "" { | ||
| file, err := os.Open(httpConfig.BodyFile) |
There was a problem hiding this comment.
Make sure this gets closed
prober/http_test.go
Outdated
| HTTP: config.HTTPProbe{ | ||
| IPProtocolFallback: true, | ||
| Method: "POST", | ||
| BodyFile: "./http.go", |
There was a problem hiding this comment.
You can create a testdata directory, and a file with known contents there - plus verify that's what's coming through.
There was a problem hiding this comment.
You should still change this to use explicit testdata files, rather than the source itself
emmanuel
force-pushed
the
add_body_path
branch
from
c71b8b7 to
b72856c
Compare
|
This has gone stale, let us know if you still wish to work on this. |
Fixes #391.