diff --git a/postfix.grok b/postfix.grok index 98c9836..c13665f 100644 --- a/postfix.grok +++ b/postfix.grok @@ -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} @@ -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} diff --git a/test/postsuper_0001.yaml b/test/postsuper_0001.yaml index 52787e4..65b9577 100644 --- a/test/postsuper_0001.yaml +++ b/test/postsuper_0001.yaml @@ -2,4 +2,4 @@ pattern: POSTFIX_POSTSUPER data: "D4F2023DB: removed" results: postfix_queueid: D4F2023DB - postfix_postsuper_id_action: removed + postfix_postsuper_action: removed diff --git a/test/postsuper_0002.yaml b/test/postsuper_0002.yaml index f745a45..7595768 100644 --- a/test/postsuper_0002.yaml +++ b/test/postsuper_0002.yaml @@ -2,4 +2,4 @@ pattern: POSTFIX_POSTSUPER data: "D4F2023DB: requeued" results: postfix_queueid: D4F2023DB - postfix_postsuper_id_action: requeued + postfix_postsuper_action: requeued diff --git a/test/postsuper_0003.yaml b/test/postsuper_0003.yaml index bf940c7..e17d353 100644 --- a/test/postsuper_0003.yaml +++ b/test/postsuper_0003.yaml @@ -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 diff --git a/test/postsuper_0004.yaml b/test/postsuper_0004.yaml index 1fae17e..7db2b36 100644 --- a/test/postsuper_0004.yaml +++ b/test/postsuper_0004.yaml @@ -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