-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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
http_response : Add in support for looking for substring in response #2204
Changes from 4 commits
ee8d5ce
a0d537a
ea0f471
3b7ce56
174c28a
7d93fd6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,11 @@ package http_response | |
import ( | ||
"errors" | ||
"io" | ||
"io/ioutil" | ||
"log" | ||
"net/http" | ||
"net/url" | ||
"regexp" | ||
"strings" | ||
"time" | ||
|
||
|
@@ -15,12 +18,13 @@ import ( | |
|
||
// HTTPResponse struct | ||
type HTTPResponse struct { | ||
Address string | ||
Body string | ||
Method string | ||
ResponseTimeout internal.Duration | ||
Headers map[string]string | ||
FollowRedirects bool | ||
Address string | ||
Body string | ||
Method string | ||
ResponseTimeout internal.Duration | ||
Headers map[string]string | ||
FollowRedirects bool | ||
ResponseStringMatch string | ||
|
||
// Path to CA file | ||
SSLCA string `toml:"ssl_ca"` | ||
|
@@ -54,6 +58,11 @@ var sampleConfig = ` | |
# {'fake':'data'} | ||
# ''' | ||
|
||
## Optional : Look for substring in body of the response. Can use regex | ||
# response_string_match = "\"service_status\": \"up\"" | ||
# or | ||
# response_string_match = "ok" | ||
|
||
## Optional SSL Config | ||
# ssl_ca = "/etc/telegraf/ca.pem" | ||
# ssl_cert = "/etc/telegraf/cert.pem" | ||
|
@@ -137,6 +146,25 @@ func (h *HTTPResponse) HTTPGather() (map[string]interface{}, error) { | |
} | ||
fields["response_time"] = time.Since(start).Seconds() | ||
fields["http_response_code"] = resp.StatusCode | ||
|
||
// Check the response for a regex match | ||
if h.ResponseStringMatch != "" { | ||
regex, err := regexp.Compile(h.ResponseStringMatch) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. you still need to change this to only compile the regex once |
||
if err != nil { | ||
log.Printf("E! Failed to compile regular expression %s : %s", h.ResponseStringMatch, err) | ||
fields["response_string_match"] = 0 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. print an Error log message here to indicate that the regex compile failed |
||
} else { | ||
|
||
bodyBytes, _ := ioutil.ReadAll(resp.Body) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. don't ignore the error here. If there is an error, log it and continue. |
||
bodyString := string(bodyBytes) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do not convert the response body to a string, you can use regex.Match below (instead of regex.MatchString) |
||
if regex.MatchString(bodyString) { | ||
fields["response_string_match"] = 1 | ||
} else { | ||
fields["response_string_match"] = 0 | ||
} | ||
} | ||
} | ||
|
||
return fields, nil | ||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change the sample config here to match the README