Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Renamed some variables
  • Loading branch information
whyscream committed Sep 29, 2016
commit 9ad44afd01b6ceac67b25b8ad7071a32dcca6e27
10 changes: 5 additions & 5 deletions postfix.grok
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ POSTFIX_PIPE_ANY %{POSTFIX_QUEUEID:postfix_queueid}: %{GREEDYDATA:postfix_keyval
POSTFIX_ERROR_ANY %{POSTFIX_QUEUEID:postfix_queueid}: %{GREEDYDATA:postfix_keyvalue_data}, status=%{WORD:postfix_status} \(%{GREEDYDATA:postfix_error_response}\)

# postsuper patterns
POSTFIX_POSTSUPER_QUEUEID_ACTION (removed|requeued|placed on hold|released from hold)
POSTFIX_POSTSUPER_QUEUEID %{POSTFIX_QUEUEID:postfix_queueid}: %{POSTFIX_POSTSUPER_QUEUEID_ACTION:postfix_postsuper_id_action}
POSTFIX_POSTSUPER_SUMMARY_ACTION (Deleted|Requeued|Placed on hold|Released from hold)
POSTFIX_POSTSUPER_SUMMARY %{POSTFIX_POSTSUPER_SUMMARY_ACTION:postfix_postsuper_summary_action}: %{NUMBER:postfix_postsuper_summary_count} messages?
POSTFIX_POSTSUPER_ACTIONS (removed|requeued|placed on hold|released from hold)
POSTFIX_POSTSUPER_ACTION %{POSTFIX_QUEUEID:postfix_queueid}: %{POSTFIX_POSTSUPER_ACTIONS:postfix_postsuper_action}
POSTFIX_POSTSUPER_SUMMARY_ACTIONS (Deleted|Requeued|Placed on hold|Released from hold)
POSTFIX_POSTSUPER_SUMMARY %{POSTFIX_POSTSUPER_SUMMARY_ACTIONS:postfix_postsuper_summary_action}: %{NUMBER:postfix_postsuper_summary_count} messages?

# postscreen patterns
POSTFIX_PS_CONNECT CONNECT from %{POSTFIX_CLIENT_INFO} to \[%{IP:postfix_server_ip}\]:%{INT:postfix_server_port}
Expand Down Expand Up @@ -111,4 +111,4 @@ POSTFIX_TLSMGR %{POSTFIX_WARNING}
POSTFIX_LOCAL %{POSTFIX_KEYVALUE}
POSTFIX_VIRTUAL %{POSTFIX_SMTP_DELIVERY}
POSTFIX_ERROR %{POSTFIX_ERROR_ANY}
POSTFIX_POSTSUPER %{POSTFIX_POSTSUPER_QUEUEID}|%{POSTFIX_POSTSUPER_SUMMARY}
POSTFIX_POSTSUPER %{POSTFIX_POSTSUPER_ACTION}|%{POSTFIX_POSTSUPER_SUMMARY}
2 changes: 1 addition & 1 deletion test/postsuper_0001.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pattern: POSTFIX_POSTSUPER
data: "D4F2023DB: removed"
results:
postfix_queueid: D4F2023DB
postfix_postsuper_id_action: removed
postfix_postsuper_action: removed
2 changes: 1 addition & 1 deletion test/postsuper_0002.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pattern: POSTFIX_POSTSUPER
data: "D4F2023DB: requeued"
results:
postfix_queueid: D4F2023DB
postfix_postsuper_id_action: requeued
postfix_postsuper_action: requeued
2 changes: 1 addition & 1 deletion test/postsuper_0003.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pattern: POSTFIX_POSTSUPER
data: "D4F2023DB: placed on hold"
results:
postfix_queueid: D4F2023DB
postfix_postsuper_id_action: placed on hold
postfix_postsuper_action: placed on hold
2 changes: 1 addition & 1 deletion test/postsuper_0004.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ pattern: POSTFIX_POSTSUPER
data: "D4F2023DB: released from hold"
results:
postfix_queueid: D4F2023DB
postfix_postsuper_id_action: released from hold
postfix_postsuper_action: released from hold