-
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
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
ee8d5ce
Add in support for looking for substring in response
lrsmith a0d537a
Add note to CHANGELOG.md
lrsmith ea0f471
Switch from substring match to regex match
lrsmith 3b7ce56
Requested code changes
lrsmith 174c28a
Make requested changes and refactor to avoid nested if-else.
lrsmith 7d93fd6
Convert tabs to space and compile regex once
lrsmith File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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 substring or regex match in body of the response | ||
## response_string_match = "\"service_status\": \"up\"" | ||
## response_string_match = "ok" | ||
## response_string_match = "\".*_status\".?:.?\"up\"" | ||
|
||
## Optional SSL Config | ||
# ssl_ca = "/etc/telegraf/ca.pem" | ||
# ssl_cert = "/etc/telegraf/cert.pem" | ||
|
@@ -137,6 +146,31 @@ 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 |
||
return fields, nil | ||
} | ||
|
||
bodyBytes, err := ioutil.ReadAll(resp.Body) | ||
if err != nil { | ||
log.Printf("E! Failed to read body of HTTP Response : %s", err) | ||
fields["response_string_match"] = 0 | ||
return fields, nil | ||
} | ||
|
||
if regex.Match(bodyBytes) { | ||
fields["response_string_match"] = 1 | ||
} else { | ||
fields["response_string_match"] = 0 | ||
} | ||
|
||
} | ||
|
||
return fields, nil | ||
} | ||
|
||
|
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
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.
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.
2 spaces instead of a tab here