Fix OpsGenie notifier and add unit tests #1224
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
stuartnelson3
suggested changes
Feb 6, 2018
| @@ -987,45 +1013,39 @@ func (n *OpsGenie) Notify(ctx context.Context, as ...*types.Alert) (bool, error) | |||
|
|
|||
| apiURL = n.conf.APIURL + "v2/alerts" | |||
| var teams []map[string]string | |||
| for _, t := range strings.Split(string(tmpl(n.conf.Teams)), ",") { | |||
| for _, t := range safeSplit(string(tmpl(n.conf.Teams)), ",") { | |||
There was a problem hiding this comment.
I think this should be returned to just strings.Split and then check each t for being an empty string. If someone enters "team1," in their config, it'll still end up adding "name":"" in the json.
There was a problem hiding this comment.
done, and added a test for it
2628106 to
32596f0
Compare
notify/impl.go
Outdated
|
|
||
| // Like Split but filter out empty strings. | ||
| func safeSplit(s string, sep string) []string { | ||
| // https://github.com/golang/go/wiki/SliceTricks#filtering-without-allocating |
stuartnelson3
approved these changes
Feb 6, 2018
See prometheus#1223, looks like OpsGenie now sometimes returns a 422 when you don't specify a team. This change cleans up the JSON output and add a few unit tests.
|
Is there some reason why Alertmanager doesn't simply use https://github.com/opsgenie/opsgenie-go-sdk? |
|
Not that I'm aware of. Potentially it didn't exist when this was written. Also, the entire implementation in our codebase is ~150 lines of code. Maybe it wasn't viewed as necessary to add the dependency. |
|
I don't believe we were aware of it. We had problems even finding what API docs there were. |
hh
pushed a commit
to ii/alertmanager
that referenced
this pull request
Feb 8, 2019
* Rename interface to device in netclass collector This makes it consistent with other networking metrics like node_network_receive_bytes_total This closes prometheus#1223 Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
See #1223, looks like OpsGenie now sometimes returns a 422 when you
don't specify a team. This change cleans up the JSON output and
add a few unit tests.