Added field to make batch size configurable for IMAP inputs (#21)

jorritfolmer · Sep 23, 2018 · d68dd09 · d68dd09
1 parent 50a04fb
commit d68dd09
Show file tree

Hide file tree

Showing 10 changed files with 351 additions and 307 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.1.0
+
+- Added field to make batch size configurable for IMAP inputs
+
 ## 3.0.2
 
 - Lowercase keys and values in policy_published and records

diff --git a/README.md b/README.md
@@ -332,6 +332,7 @@ This add-on is maintained by Jorrit Folmer. These people and organisations have
 - Christopher G Andrews (ChristopherGAndrews)
 - John (john-9c54a80b)
 - Mike Kolk
+- Samuel Haper (sharperer)
 - Steve Myers (stmyers)
 - Steven Hilton (malvidin)
 - [SMTware](https://www.smtware.com/en/services)

diff --git a/README/inputs.conf.spec b/README/inputs.conf.spec
@@ -1,12 +1,3 @@
-[dmarc_imap://<name>]
-global_account = Use the account configured in the setup tab
-imap_server = Connect to the specified IMAP server with TLS (port 993)
-resolve_ip = Resolve the source_ip field in the DMARC aggregate reports.
-validate_xml = Validate the aggregate reports against the DMARC XSD. Results are included in the field vendor_rua_xsd_validation.
-validate_dkim = (Beta) Validate the DKIM signatures in the mail headers. Results are currently only available in DEBUG log.
-imap_mailbox = Select the IMAP mailbox to poll. Default: INBOX
-output_format = 
-
 [dmarc_pop3://<name>]
 global_account = 
 pop3_server = Connect to the specified POP3 server with TLS (port 995)
@@ -20,4 +11,14 @@ dmarc_directory = Directory containing DMARC aggregate reports
 quiet_time = Ignore files that have a modification time of less than n seconds ago.
 resolve_ip = Resolve the source_ip field in the DMARC XML aggregate report
 validate_xml = Validate the aggregate report XML against the DMARC XSD. Results are included in the field vendor_rua_xsd_validation.
-output_format =
+output_format = 
+
+[dmarc_imap://<name>]
+global_account = Use the account configured in the setup tab
+imap_server = Connect to the specified IMAP server with TLS (port 993)
+resolve_ip = Resolve the source_ip field in the DMARC aggregate reports.
+validate_xml = Validate the aggregate reports against the DMARC XSD. Results are included in the field vendor_rua_xsd_validation.
+validate_dkim = (Beta) Validate the DKIM signatures in the mail headers. Results are currently only available in DEBUG log.
+imap_mailbox = Select the IMAP mailbox to poll. Default: INBOX
+output_format = 
+batch_size = Max number of messages to fetch per batch to prevent connection timeouts and resets
diff --git a/app.manifest b/app.manifest
@@ -5,7 +5,7 @@
     "id": {
       "group": null,
       "name": "TA-dmarc",
-      "version": "3.0.2"
+      "version": "3.0.3"
     },
     "author": [
       {
@@ -50,4 +50,4 @@
       "Enterprise": "*"
     }
   }
-}
+}