This repository was archived by the owner on Jan 17, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 11
Added summary from hits collection #5
Open
robbanp
wants to merge
2
commits into
graylog-labs:master
Choose a base branch
from
robbanp:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 hidden or 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 |
---|---|---|
|
@@ -50,7 +50,7 @@ public URI getURL() { | |
|
||
@Override | ||
public Version getVersion() { | ||
return new Version(1, 3, 1, "SNAPSHOT"); | ||
return new Version(1, 3, 2, "SNAPSHOT"); | ||
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. Please revert this unrelated change. |
||
} | ||
|
||
@Override | ||
|
This file contains hidden or 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 |
---|---|---|
|
@@ -154,13 +154,15 @@ private PagerDutyEvent buildPagerDutyEvent(final Stream stream, final AlertCondi | |
final String description = "[ " + stream.getTitle() + " ] " + checkResult.getResultDescription() + " - " | ||
+ buildStreamLink(clientUrl, stream); | ||
|
||
final List<Message> backlog_items = getAlarmBacklog(checkResult); | ||
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. Please use camelCase for variable names, e. g. |
||
final String backlog_summary = getAlarmBacklogSummary(backlog_items); | ||
return new PagerDutyEvent( | ||
serviceKey, "trigger", description, incidentKey, clientName, buildStreamLink(clientUrl, stream), | ||
ImmutableMap.<String, Object>of( | ||
"stream_id", stream.getId(), | ||
"stream_title", stream.getTitle(), | ||
"backlog", checkResult.getTriggeredCondition().getBacklog(), | ||
"search_hits", getAlarmBacklog(checkResult).size(), | ||
"hits", backlog_summary, | ||
"alert_description", alertDescription | ||
), | ||
ImmutableList.<Object>of( | ||
|
@@ -173,6 +175,19 @@ private PagerDutyEvent buildPagerDutyEvent(final Stream stream, final AlertCondi | |
); | ||
} | ||
|
||
protected String getAlarmBacklogSummary(List<Message> messages) { | ||
final StringBuilder sb = new StringBuilder(); | ||
for (Message message : messages) { | ||
final String msg = message.getMessage(); | ||
if (msg.length() > 225) { | ||
sb.append("Message: {").append(msg.substring(0, 255)).append("... } "); | ||
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. Shouldn't this use the same number in the condition (225) and inside the block (255)? |
||
} else { | ||
sb.append("Message: {").append(msg).append("} "); | ||
} | ||
} | ||
return sb.toString(); | ||
} | ||
|
||
protected List<Message> getAlarmBacklog(AlertCondition.CheckResult result) { | ||
final AlertCondition alertCondition = result.getTriggeredCondition(); | ||
final List<MessageSummary> matchingMessages = result.getMatchingMessages(); | ||
|
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.
Please revert this unrelated change.