From 16fb12c79d0f81b530ed8bce34ff27e9b05a8473 Mon Sep 17 00:00:00 2001
From: Arne Oslebo <arne.oslebo@uninett.no>
Date: Fri, 22 Jan 2021 15:56:10 +0100
Subject: [PATCH] integrating nifi and misp

---
 group_vars/all/main.yml                 |    6 +-
 roles/misp/tasks/config.yml             |   30 +-
 roles/nifi/tasks/start.yml              |    8 +
 roles/nifi/tasks/update-config.yml      |    8 +
 roles/nifi/templates/flow.xml.j2        | 1549 +++--------------------
 roles/nifi/templates/nifi.properties.j2 |    4 +-
 startsoctools.yml                       |   10 +-
 7 files changed, 241 insertions(+), 1374 deletions(-)

diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml
index 63e2668..0c1c3d2 100644
--- a/group_vars/all/main.yml
+++ b/group_vars/all/main.yml
@@ -2,6 +2,8 @@
 
 soctoolsproxy: "<CHANGE_ME:hostname>"
 
+maxmind_key: ""
+
 docker_build_dir: "{{playbook_dir}}/build"
 
 # TheHive Button plugin
@@ -36,6 +38,7 @@ zookeeper_img: "{{repo}}/zookeeper:{{version}}{{suffix}}"
 
 misp_name: "soctools-misp"
 misp_img: "{{repo}}/misp:{{version}}{{suffix}}"
+misp_url: "https://{{soctoolsproxy}}:6443"
 
 nifi_img: "{{repo}}/nifi:{{version}}{{suffix}}"
 
@@ -79,9 +82,6 @@ openid_subjkey: preferred_username
 keycloak_img: "{{repo}}/keycloak:{{version}}{{suffix}}"
 
 elastic_username: "admin"
-misp_token: ""
-misp_url: ""
-maxmind_key: ""
 
 misp_dbname: "mispdb"
 misp_dbuser: "misp"
diff --git a/roles/misp/tasks/config.yml b/roles/misp/tasks/config.yml
index a23c5e8..864c61d 100644
--- a/roles/misp/tasks/config.yml
+++ b/roles/misp/tasks/config.yml
@@ -33,12 +33,6 @@
    misp_api_key: "{{ get_output.stdout }}"
   when: '"initialised" in init_output.stdout'   
 
-- name: Store API key
-  copy:
-    content: "{{misp_api_key}}"
-    dest: "{{playbook_dir}}/secrets/tokens/misp"
-  delegate_to: 127.0.0.1
-
 - name: add users
   uri:
    url: "https://{{soctoolsproxy}}:6443/admin/users/add/1"
@@ -53,6 +47,16 @@
   with_items:
     - "{{soctools_users}}"
 
+- name: Get user API key
+  shell: '/var/www/MISP/app/Console/cake Admin getAuthkey {{soctools_users[0].email}} | /usr/bin/tail -n1'
+  register: user_key
+
+- name: Store user API key
+  copy:
+    content: "{{ user_key.stdout }}"
+    dest: "{{playbook_dir}}/secrets/tokens/misp"
+  delegate_to: 127.0.0.1
+
 - name: Enable feed
   uri:
    url: "https://{{soctoolsproxy}}:6443/feeds/edit/1"
@@ -70,7 +74,19 @@
     - fetchFeed
     - cacheFeed
 
-- name: Set Autostart for supervisord's services
+- name: Add example event
+  uri:
+   url:
+   url: "https://{{soctoolsproxy}}:6443/events"
+   method: POST
+   body_format: json
+   headers:
+    Authorization: "{{misp_api_key}}"
+    Accept: "application/json"
+    Content-type: "application/json"
+   body: '{"Event":{"date":"{{ansible_date_time.date}}","threat_level_id":"1","info":"testevent","published":true,"analysis":"0","distribution":"0","Attribute":[{"type":"domain","category":"Network activity","to_ids":false,"distribution":"0","comment":"","value":"example.evil"},{"type":"ip-dst","category":"Network activity","to_ids":false,"distribution":"0","comment":"","value":"10.10.10.10"}]}}'
+
+- name: Set Autostart for supervisord services
   replace:
     path: /etc/supervisord.conf
     regexp: '^autostart=false$'
diff --git a/roles/nifi/tasks/start.yml b/roles/nifi/tasks/start.yml
index 901ca08..99420a5 100644
--- a/roles/nifi/tasks/start.yml
+++ b/roles/nifi/tasks/start.yml
@@ -20,11 +20,18 @@
     - "{{playbook_dir}}/secrets/CA/cacerts.jks"
     - common-cacerts.jks
 
+- name: Check if flow.xml already exists
+  remote_user: nifi
+  stat:
+    path: "{{ ansible_facts.env['NIFI_HOME'] }}/conf/flow.xml"
+  register: flowfile
+
 - name: Configure flow.xml
   remote_user: nifi
   template:
     src:  "flow.xml.j2"
     dest: "{{ ansible_facts.env['NIFI_HOME'] }}/conf/flow.xml"
+  when: not flowfile.stat.exists
 
 - name: Gzip flow.xml
   remote_user: nifi
@@ -32,6 +39,7 @@
     path: "{{ ansible_facts.env['NIFI_HOME'] }}/conf/flow.xml"
     dest: "{{ ansible_facts.env['NIFI_HOME'] }}/conf/flow.xml.gz"
     format: gz
+  when: not flowfile.stat.exists
 
 - name: Get openid authkey
   remote_user: nifi
diff --git a/roles/nifi/tasks/update-config.yml b/roles/nifi/tasks/update-config.yml
index a9ae696..ddadbd3 100644
--- a/roles/nifi/tasks/update-config.yml
+++ b/roles/nifi/tasks/update-config.yml
@@ -1,10 +1,17 @@
 ---
 
+- name: Check if flow.xml already exists
+  remote_user: nifi
+  stat:
+    path: "{{ ansible_facts.env['NIFI_HOME'] }}/conf/flow.xml"
+  register: flowfile
+
 - name: Configure flow.xml
   remote_user: nifi
   template:
     src:  "flow.xml.j2"
     dest: "{{ ansible_facts.env['NIFI_HOME'] }}/conf/flow.xml"
+  when: not flowfile.stat.exists
 
 - name: Gzip flow.xml
   remote_user: nifi
@@ -12,6 +19,7 @@
     path: "{{ ansible_facts.env['NIFI_HOME'] }}/conf/flow.xml"
     dest: "{{ ansible_facts.env['NIFI_HOME'] }}/conf/flow.xml.gz"
     format: gz
+  when: not flowfile.stat.exists
 
 - name: Configure NiFi boostrap properties
   remote_user: nifi
diff --git a/roles/nifi/templates/flow.xml.j2 b/roles/nifi/templates/flow.xml.j2
index 01b9231..ec45218 100644
--- a/roles/nifi/templates/flow.xml.j2
+++ b/roles/nifi/templates/flow.xml.j2
@@ -629,6 +629,7 @@
                   <name>key</name>
                   <value>${enrich_fqdn1}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>c31f9f4a-becc-35c3-b9c0-b836d061e364</id>
@@ -644,10 +645,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>8811d4ff-bf71-38a6-8cf0-e5732840e1de</id>
-                <position x="-1204.5503424650574" y="470.375701251353" />
-              </funnel>
               <connection>
                 <id>99b11d95-dfb3-34cf-8657-0c141d1e9f63</id>
                 <name />
@@ -688,26 +685,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>badc00ed-f022-3045-bcfd-8a4839fef4bf</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>ce84ada1-58b8-3c28-bc5a-64fc4f39e008</sourceId>
-                <sourceGroupId>c763d1fd-ae0f-3297-bab7-abf22759310d</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>8811d4ff-bf71-38a6-8cf0-e5732840e1de</destinationId>
-                <destinationGroupId>c763d1fd-ae0f-3297-bab7-abf22759310d</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <processGroup>
               <id>1de23f54-e22a-19df-8dd2-9235ae248d29</id>
@@ -770,6 +747,7 @@
                   <name>key</name>
                   <value>${enrich_fqdn1}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>844331e5-cd55-1c55-889b-d447dfba57a2</id>
@@ -785,10 +763,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>955031c2-ce26-1380-99d8-6b295a09c648</id>
-                <position x="152.0" y="248.0" />
-              </funnel>
               <connection>
                 <id>6153303e-0c09-1d36-9b87-6c2d0a5ed15a</id>
                 <name />
@@ -829,26 +803,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>4f303cbd-ab21-1acd-a311-b07bdb2805ef</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>16d53f41-fc96-1292-b434-9a157e27eaf3</sourceId>
-                <sourceGroupId>1de23f54-e22a-19df-8dd2-9235ae248d29</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>955031c2-ce26-1380-99d8-6b295a09c648</destinationId>
-                <destinationGroupId>1de23f54-e22a-19df-8dd2-9235ae248d29</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>60 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <connection>
               <id>98ec93c8-a52d-3df8-8ae5-c95ababd783b</id>
@@ -1188,6 +1142,7 @@
                   <name>key</name>
                   <value>${enrich_ip1}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>57c1773b-65c7-3cdb-b161-a44fa977291a</id>
@@ -1203,10 +1158,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>3f92a75f-ec3e-3f4c-9467-e5c0e981f032</id>
-                <position x="-1312.0" y="792.0" />
-              </funnel>
               <connection>
                 <id>7f5a13cb-a049-385d-9ebc-3ef4aa8ff541</id>
                 <name />
@@ -1247,26 +1198,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>d6c427a3-f4fb-39a5-b399-ebd9b0482039</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>68dc57d7-2016-3e27-ac1f-092c63909a63</sourceId>
-                <sourceGroupId>9b3b9cc7-49bf-3b66-b213-09f2f5df634e</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>3f92a75f-ec3e-3f4c-9467-e5c0e981f032</destinationId>
-                <destinationGroupId>9b3b9cc7-49bf-3b66-b213-09f2f5df634e</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <processGroup>
               <id>88a2dcc1-ccce-3396-9f4d-bc1e31c70063</id>
@@ -1333,6 +1264,7 @@
                   <name>pretty_print</name>
                   <value>false</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <processor>
                 <id>11668896-2c3e-3712-905a-eb406bf33c2a</id>
@@ -1459,6 +1391,7 @@
                   <name>key</name>
                   <value>${enrich_ip1:substring(1):contains('/'):ifElse('${enrich_ip1:substringBeforeLast(\"/\")}',${enrich_ip1:append('_')}):append("/geo/country_iso_code")}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>e6d573f8-a297-3611-a1ff-f1918a2cbabc</id>
@@ -1474,30 +1407,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>b68c4522-cddb-30bf-8545-73a2644cd35e</id>
-                <position x="-1560.0" y="336.0" />
-              </funnel>
-              <connection>
-                <id>349b353b-a821-1197-ffff-ffff8676b0e0</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>349b3525-a821-1197-0000-00006e02758e</sourceId>
-                <sourceGroupId>88a2dcc1-ccce-3396-9f4d-bc1e31c70063</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>b68c4522-cddb-30bf-8545-73a2644cd35e</destinationId>
-                <destinationGroupId>88a2dcc1-ccce-3396-9f4d-bc1e31c70063</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
               <connection>
                 <id>790863c1-3cfc-383f-ab9f-5d7ead5c0fe1</id>
                 <name />
@@ -1579,26 +1488,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>c831c34b-2a1a-3d24-963b-079b00961407</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>fb1a97b2-5e15-3bca-9284-f23a9cc90eed</sourceId>
-                <sourceGroupId>88a2dcc1-ccce-3396-9f4d-bc1e31c70063</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>b68c4522-cddb-30bf-8545-73a2644cd35e</destinationId>
-                <destinationGroupId>88a2dcc1-ccce-3396-9f4d-bc1e31c70063</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <processGroup>
               <id>3cb64c25-8af7-361d-b6e7-e002defe7411</id>
@@ -1661,6 +1550,7 @@
                   <name>key</name>
                   <value>${enrich_ip1}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>eb136a03-4809-3d2f-a85e-e739ffa665cd</id>
@@ -1676,10 +1566,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>44794379-111e-3f28-bf84-bf5850f42587</id>
-                <position x="-1412.2104124778762" y="829.0775745939713" />
-              </funnel>
               <connection>
                 <id>c681313a-f2c8-3439-8c00-70f9783fea67</id>
                 <name />
@@ -1720,26 +1606,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>ad32e629-d5a2-38b7-a50e-9acf0ad9d768</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>fd52d735-a256-3c52-9b90-fbe71f010fbe</sourceId>
-                <sourceGroupId>3cb64c25-8af7-361d-b6e7-e002defe7411</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>44794379-111e-3f28-bf84-bf5850f42587</destinationId>
-                <destinationGroupId>3cb64c25-8af7-361d-b6e7-e002defe7411</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <connection>
               <id>3831c5df-c2a8-3a1b-9d67-8f37abf05365</id>
@@ -1904,6 +1770,7 @@
                   <name>key</name>
                   <value>${enrich_ip2:substring(1):contains('/'):ifElse('${enrich_ip2:substringBeforeLast(\"/\")}',${enrich_ip2:append('_')}):append("/geo/country_iso_code")}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <processor>
                 <id>e16581ea-ff17-3cec-bd39-b1fe52797bd2</id>
@@ -2034,6 +1901,7 @@
                   <name>pretty_print</name>
                   <value>false</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>aa73b938-03ee-3d90-ba6f-0998b568ac36</id>
@@ -2049,10 +1917,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>8e8abe4a-9ed6-3ec8-9e9d-719242be1a2b</id>
-                <position x="-1560.0" y="336.0" />
-              </funnel>
               <connection>
                 <id>9ed935f0-7bd4-150a-ffff-ffffaed76b62</id>
                 <name />
@@ -2073,26 +1937,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>a4870f06-f96b-328a-83d8-4eeb6db5cc93</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>d467bca6-15df-38bb-8f9b-65ae1f9dceaa</sourceId>
-                <sourceGroupId>a8873c56-d149-34d1-8344-a35b339e6187</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>8e8abe4a-9ed6-3ec8-9e9d-719242be1a2b</destinationId>
-                <destinationGroupId>a8873c56-d149-34d1-8344-a35b339e6187</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
               <connection>
                 <id>4b08f253-ef28-33de-b42f-3e0d64785d08</id>
                 <name />
@@ -2134,26 +1978,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>9ed935f2-7bd4-150a-ffff-ffffc9a121a0</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>9ed935e9-7bd4-150a-913d-e6a4dedb2939</sourceId>
-                <sourceGroupId>a8873c56-d149-34d1-8344-a35b339e6187</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>8e8abe4a-9ed6-3ec8-9e9d-719242be1a2b</destinationId>
-                <destinationGroupId>a8873c56-d149-34d1-8344-a35b339e6187</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
               <connection>
                 <id>fa792c57-5b74-38da-9c05-bd1883dfaff5</id>
                 <name />
@@ -2236,6 +2060,7 @@
                   <name>key</name>
                   <value>${enrich_ip2}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>1c42374a-61ad-3d92-9f86-1f1ae9bae6d0</id>
@@ -2251,10 +2076,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>4bad43e2-bfed-3e45-a9d1-fdabb2ab85ea</id>
-                <position x="-1403.592919640183" y="819.7224736847786" />
-              </funnel>
               <connection>
                 <id>0b2f9272-06fe-3a8c-a322-9972ac5c0466</id>
                 <name />
@@ -2295,28 +2116,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>fe67c36a-4ae0-3e30-8aad-a988a481df4b</id>
-                <name />
-                <bendPoints>
-                  <bendPoint x="-1088.0" y="832.0" />
-                </bendPoints>
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>adae2d07-ad4f-38f2-9a8c-b7638863cac7</sourceId>
-                <sourceGroupId>33258978-2057-3612-be77-0a763431ee29</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>4bad43e2-bfed-3e45-a9d1-fdabb2ab85ea</destinationId>
-                <destinationGroupId>33258978-2057-3612-be77-0a763431ee29</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <processGroup>
               <id>de2bc05d-fbd2-35bc-9192-b82041176492</id>
@@ -2379,6 +2178,7 @@
                   <name>key</name>
                   <value>${enrich_ip2}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>d6490898-79c0-3eb5-a102-718ff8ab68e6</id>
@@ -2394,10 +2194,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>d259fdb6-aa03-35b1-b439-b5baccc57a1e</id>
-                <position x="-1264.0" y="784.0" />
-              </funnel>
               <connection>
                 <id>d2bfc9ce-5c85-3dc2-a0c5-83bbf0c77277</id>
                 <name />
@@ -2419,7 +2215,7 @@
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
               <connection>
-                <id>2475c41e-5711-3de0-bbec-2e977cd1f40a</id>
+                <id>2a95cb88-0177-1000-ffff-ffffc8a50166</id>
                 <name />
                 <bendPoints />
                 <labelIndex>1</labelIndex>
@@ -2438,26 +2234,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>a7505eac-df84-3e17-8c40-687c159877a7</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>2cd2029e-53ae-3575-bf35-785203683c7f</sourceId>
-                <sourceGroupId>de2bc05d-fbd2-35bc-9192-b82041176492</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>d259fdb6-aa03-35b1-b439-b5baccc57a1e</destinationId>
-                <destinationGroupId>de2bc05d-fbd2-35bc-9192-b82041176492</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <connection>
               <id>2ba90add-0172-1000-ffff-ffffb69e0af7</id>
@@ -2737,9 +2513,9 @@
                 <schedulingPeriod>0 sec</schedulingPeriod>
                 <penalizationPeriod>30 sec</penalizationPeriod>
                 <yieldPeriod>1 sec</yieldPeriod>
-                <bulletinLevel>WARN</bulletinLevel>
+                <bulletinLevel>ERROR</bulletinLevel>
                 <lossTolerant>false</lossTolerant>
-                <scheduledState>STOPPED</scheduledState>
+                <scheduledState>RUNNING</scheduledState>
                 <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
                 <executionNode>ALL</executionNode>
                 <runDurationNanos>0</runDurationNanos>
@@ -2782,6 +2558,7 @@
                   <name>Frequency File</name>
                   <value>/opt/nifi/nifi-current/conf/enrich/freq/alexa.json</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>84dfe3a1-a6f4-3b80-9161-93a59b88ad8b</id>
@@ -2797,10 +2574,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>7297c375-d15a-36a2-a115-6b2680fbef2b</id>
-                <position x="128.0" y="360.0" />
-              </funnel>
               <connection>
                 <id>2bea3770-0172-1000-ffff-ffff9cd568b2</id>
                 <name />
@@ -2821,38 +2594,18 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>bf938168-0171-1000-0000-00003e6fd9c5</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>bf907759-0171-1000-0000-0000022727cd</sourceId>
-                <sourceGroupId>89e761fa-669e-30c2-9590-ab8f806ffaff</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>7297c375-d15a-36a2-a115-6b2680fbef2b</destinationId>
-                <destinationGroupId>89e761fa-669e-30c2-9590-ab8f806ffaff</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
               <connection>
                 <id>27f7d6f4-0172-1000-ffff-ffffc65ffd5e</id>
                 <name />
                 <bendPoints />
-                <labelIndex>1</labelIndex>
+                <labelIndex>0</labelIndex>
                 <zIndex>0</zIndex>
                 <sourceId>84dfe3a1-a6f4-3b80-9161-93a59b88ad8b</sourceId>
                 <sourceGroupId>89e761fa-669e-30c2-9590-ab8f806ffaff</sourceGroupId>
                 <sourceType>INPUT_PORT</sourceType>
-                <destinationId>2ef455b6-6c77-39ae-87bf-d21b988f4c52</destinationId>
+                <destinationId>bf907759-0171-1000-0000-0000022727cd</destinationId>
                 <destinationGroupId>89e761fa-669e-30c2-9590-ab8f806ffaff</destinationGroupId>
-                <destinationType>OUTPUT_PORT</destinationType>
+                <destinationType>PROCESSOR</destinationType>
                 <relationship />
                 <maxWorkQueueSize>10000</maxWorkQueueSize>
                 <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
@@ -2923,6 +2676,7 @@
                   <name>key</name>
                   <value>${enrich_domain1}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>9ed93645-7bd4-150a-ffff-fffff6fa372f</id>
@@ -2938,10 +2692,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>9ed93653-7bd4-150a-0000-00005bccbc75</id>
-                <position x="152.0" y="248.0" />
-              </funnel>
               <connection>
                 <id>9ed9364f-7bd4-150a-0000-000019b6beab</id>
                 <name />
@@ -2962,26 +2712,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>9ed93654-7bd4-150a-ffff-ffff99a32980</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>9ed93644-7bd4-150a-0000-00003c8c3388</sourceId>
-                <sourceGroupId>9ed9363a-7bd4-150a-0000-00000cc58ac4</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>9ed93653-7bd4-150a-0000-00005bccbc75</destinationId>
-                <destinationGroupId>9ed9363a-7bd4-150a-0000-00000cc58ac4</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>60 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
               <connection>
                 <id>9ed93647-7bd4-150a-0000-00000e5782ec</id>
                 <name />
@@ -3064,6 +2794,7 @@
                   <name>key</name>
                   <value>${enrich_domain1}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>c7b3b6c4-6418-3dbe-a037-387e3c85cb19</id>
@@ -3079,10 +2810,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>85764070-cd41-38a1-a352-929737e563c6</id>
-                <position x="-1152.0" y="512.0" />
-              </funnel>
               <connection>
                 <id>002d4937-dcb5-3cf1-8075-8d5533667510</id>
                 <name />
@@ -3104,35 +2831,15 @@
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
               <connection>
-                <id>1af92349-7a45-30ec-b6fc-6d881dcd8b26</id>
+                <id>8d7da7f5-2a03-32fd-9bd6-a3eec6e8351a</id>
                 <name />
                 <bendPoints />
                 <labelIndex>1</labelIndex>
                 <zIndex>0</zIndex>
-                <sourceId>ccab62e9-53cd-3d5e-aca3-6fa2e1b95597</sourceId>
+                <sourceId>c7b3b6c4-6418-3dbe-a037-387e3c85cb19</sourceId>
                 <sourceGroupId>df54305f-551e-38ff-8e1c-a1c272c238c0</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>85764070-cd41-38a1-a352-929737e563c6</destinationId>
-                <destinationGroupId>df54305f-551e-38ff-8e1c-a1c272c238c0</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
-              <connection>
-                <id>8d7da7f5-2a03-32fd-9bd6-a3eec6e8351a</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>c7b3b6c4-6418-3dbe-a037-387e3c85cb19</sourceId>
-                <sourceGroupId>df54305f-551e-38ff-8e1c-a1c272c238c0</sourceGroupId>
-                <sourceType>INPUT_PORT</sourceType>
-                <destinationId>ccab62e9-53cd-3d5e-aca3-6fa2e1b95597</destinationId>
+                <sourceType>INPUT_PORT</sourceType>
+                <destinationId>ccab62e9-53cd-3d5e-aca3-6fa2e1b95597</destinationId>
                 <destinationGroupId>df54305f-551e-38ff-8e1c-a1c272c238c0</destinationGroupId>
                 <destinationType>PROCESSOR</destinationType>
                 <relationship />
@@ -3307,6 +3014,7 @@
                   <name>key</name>
                   <value>${enrich_domain2}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>7f5c3719-3707-1577-ad0d-945c5da3a77b</id>
@@ -3322,10 +3030,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>9c0d3b04-b340-15e1-9364-52812d4bb46d</id>
-                <position x="152.0" y="248.0" />
-              </funnel>
               <connection>
                 <id>9cf430ed-a82c-1272-853f-4eeb68c144e2</id>
                 <name />
@@ -3366,26 +3070,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>9efe37d0-3c13-1671-a937-3cafae67aeae</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>2a1b3c82-c06f-1184-b6ec-245bb0032b5a</sourceId>
-                <sourceGroupId>3514302f-5e74-1185-b5c5-edc034d911a6</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>9c0d3b04-b340-15e1-9364-52812d4bb46d</destinationId>
-                <destinationGroupId>3514302f-5e74-1185-b5c5-edc034d911a6</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>60 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <processGroup>
               <id>db261d6a-ab4a-3a2e-854a-cd42492788c5</id>
@@ -3410,7 +3094,7 @@
                 <schedulingPeriod>0 sec</schedulingPeriod>
                 <penalizationPeriod>30 sec</penalizationPeriod>
                 <yieldPeriod>1 sec</yieldPeriod>
-                <bulletinLevel>WARN</bulletinLevel>
+                <bulletinLevel>ERROR</bulletinLevel>
                 <lossTolerant>false</lossTolerant>
                 <scheduledState>RUNNING</scheduledState>
                 <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
@@ -3455,6 +3139,7 @@
                   <name>Frequency File</name>
                   <value>/opt/nifi/nifi-current/conf/enrich/freq/alexa.json</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>ecc214d7-667d-3d81-affa-93e712a87abe</id>
@@ -3470,22 +3155,18 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>1667ea62-481a-3dfb-8745-8033f80ab5a7</id>
-                <position x="144.0" y="352.0" />
-              </funnel>
               <connection>
                 <id>bf99e121-0171-1000-0000-0000487c681e</id>
                 <name />
                 <bendPoints />
-                <labelIndex>1</labelIndex>
+                <labelIndex>0</labelIndex>
                 <zIndex>0</zIndex>
                 <sourceId>ecc214d7-667d-3d81-affa-93e712a87abe</sourceId>
                 <sourceGroupId>db261d6a-ab4a-3a2e-854a-cd42492788c5</sourceGroupId>
                 <sourceType>INPUT_PORT</sourceType>
-                <destinationId>10c439ea-f35c-3171-836c-d83af1403698</destinationId>
+                <destinationId>eff73930-f310-1a2e-b248-812b172b7415</destinationId>
                 <destinationGroupId>db261d6a-ab4a-3a2e-854a-cd42492788c5</destinationGroupId>
-                <destinationType>OUTPUT_PORT</destinationType>
+                <destinationType>PROCESSOR</destinationType>
                 <relationship />
                 <maxWorkQueueSize>10000</maxWorkQueueSize>
                 <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
@@ -3514,26 +3195,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>bf9a2f76-0171-1000-ffff-fffffcafce73</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>eff73930-f310-1a2e-b248-812b172b7415</sourceId>
-                <sourceGroupId>db261d6a-ab4a-3a2e-854a-cd42492788c5</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>1667ea62-481a-3dfb-8745-8033f80ab5a7</destinationId>
-                <destinationGroupId>db261d6a-ab4a-3a2e-854a-cd42492788c5</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <processGroup>
               <id>bd4c02d9-77f7-3984-8aa0-ad78099693a7</id>
@@ -3596,6 +3257,7 @@
                   <name>key</name>
                   <value>${enrich_domain2}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>a7e674e2-60b2-3417-ad31-d69248774c3f</id>
@@ -3611,30 +3273,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>bf17534a-3723-3f7d-9ca1-dc1b61022e90</id>
-                <position x="-1152.0" y="512.0" />
-              </funnel>
-              <connection>
-                <id>3264d31c-6569-3dde-b174-ddff9f7d3835</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>4598e8b8-b54a-3855-b6b7-5ac2721745a2</sourceId>
-                <sourceGroupId>bd4c02d9-77f7-3984-8aa0-ad78099693a7</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>bf17534a-3723-3f7d-9ca1-dc1b61022e90</destinationId>
-                <destinationGroupId>bd4c02d9-77f7-3984-8aa0-ad78099693a7</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
               <connection>
                 <id>6580ec44-ce8d-3aaf-b7ba-ee4c4d67321b</id>
                 <name />
@@ -4205,16 +3843,16 @@
         <flowfileConcurrency>UNBOUNDED</flowfileConcurrency>
         <flowfileOutboundPolicy>STREAM_WHEN_AVAILABLE</flowfileOutboundPolicy>
         <outputPort>
-          <id>20b01ab3-3a8d-3573-b95d-a4a45494050f</id>
-          <name>To enrichment</name>
-          <position x="480.0" y="392.0" />
+          <id>21a9e277-2d80-359a-9c57-cb76d8962e6d</id>
+          <name>To data output</name>
+          <position x="-1120.0" y="592.0" />
           <comments />
           <scheduledState>RUNNING</scheduledState>
         </outputPort>
         <outputPort>
-          <id>21a9e277-2d80-359a-9c57-cb76d8962e6d</id>
-          <name>To data output</name>
-          <position x="-1120.0" y="592.0" />
+          <id>20b01ab3-3a8d-3573-b95d-a4a45494050f</id>
+          <name>To enrichment</name>
+          <position x="480.0" y="392.0" />
           <comments />
           <scheduledState>RUNNING</scheduledState>
         </outputPort>
@@ -4226,16 +3864,16 @@
           <flowfileConcurrency>UNBOUNDED</flowfileConcurrency>
           <flowfileOutboundPolicy>STREAM_WHEN_AVAILABLE</flowfileOutboundPolicy>
           <outputPort>
-            <id>27d5761b-0172-1000-0000-000059275dad</id>
-            <name>To enrichment</name>
-            <position x="-312.0" y="328.0" />
+            <id>27d5dab2-0172-1000-ffff-ffffab5c50be</id>
+            <name>To data output</name>
+            <position x="-632.0" y="328.0" />
             <comments />
             <scheduledState>STOPPED</scheduledState>
           </outputPort>
           <outputPort>
-            <id>27d5dab2-0172-1000-ffff-ffffab5c50be</id>
-            <name>To data output</name>
-            <position x="-632.0" y="328.0" />
+            <id>27d5761b-0172-1000-0000-000059275dad</id>
+            <name>To enrichment</name>
+            <position x="-312.0" y="328.0" />
             <comments />
             <scheduledState>STOPPED</scheduledState>
           </outputPort>
@@ -4311,16 +3949,16 @@
             </property>
           </processor>
           <outputPort>
-            <id>349b32fe-a821-1197-0000-00003a0b6fe5</id>
-            <name>To enrichment</name>
-            <position x="744.0" y="920.0" />
+            <id>bcb879d5-0175-1000-0000-000070879ad0</id>
+            <name>To data output</name>
+            <position x="-2480.0" y="336.0" />
             <comments />
             <scheduledState>RUNNING</scheduledState>
           </outputPort>
           <outputPort>
-            <id>bcb879d5-0175-1000-0000-000070879ad0</id>
-            <name>To data output</name>
-            <position x="-2480.0" y="336.0" />
+            <id>349b32fe-a821-1197-0000-00003a0b6fe5</id>
+            <name>To enrichment</name>
+            <position x="744.0" y="920.0" />
             <comments />
             <scheduledState>RUNNING</scheduledState>
           </outputPort>
@@ -4468,6 +4106,7 @@
                 <name>include-zero-record-flowfiles</name>
                 <value>true</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>bc91c66f-0175-1000-0000-00005c7f88ce</id>
@@ -4503,6 +4142,7 @@
                 <name>include-zero-record-flowfiles</name>
                 <value>true</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>bcabbf11-0175-1000-0000-000037f4e3d3</id>
@@ -4591,6 +4231,7 @@
                 <name>/timestamp</name>
                 <value>${field.value:toDate('yyyy-MM-dd HH:mm:ss,SSS'):format("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")}</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <inputPort>
               <id>bc6c2159-0175-1000-ffff-ffffb4de4d47</id>
@@ -4606,14 +4247,6 @@
               <comments />
               <scheduledState>RUNNING</scheduledState>
             </outputPort>
-            <funnel>
-              <id>bc90d189-0175-1000-0000-0000037bc986</id>
-              <position x="8.0" y="424.0" />
-            </funnel>
-            <funnel>
-              <id>bc925474-0175-1000-0000-00004e78071f</id>
-              <position x="1882.9999517774115" y="327.9999931568573" />
-            </funnel>
             <connection>
               <id>bc90c7ac-0175-1000-ffff-fffffa80b534</id>
               <name />
@@ -4674,66 +4307,6 @@
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
-            <connection>
-              <id>bc92a603-0175-1000-ffff-ffff9dadafd9</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>bc91c66f-0175-1000-0000-00005c7f88ce</sourceId>
-              <sourceGroupId>bc6be78f-0175-1000-ffff-ffffbcd0f569</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>bc925474-0175-1000-0000-00004e78071f</destinationId>
-              <destinationGroupId>bc6be78f-0175-1000-ffff-ffffbcd0f569</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>bcad0899-0175-1000-ffff-ffffa8a1a378</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>bc9ffeb0-0175-1000-0000-00000a88d684</sourceId>
-              <sourceGroupId>bc6be78f-0175-1000-ffff-ffffbcd0f569</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>bc90d189-0175-1000-0000-0000037bc986</destinationId>
-              <destinationGroupId>bc6be78f-0175-1000-ffff-ffffbcd0f569</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>bc90e481-0175-1000-ffff-ffffca3753fb</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>bc903708-0175-1000-0000-0000642abebf</sourceId>
-              <sourceGroupId>bc6be78f-0175-1000-ffff-ffffbcd0f569</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>bc90d189-0175-1000-0000-0000037bc986</destinationId>
-              <destinationGroupId>bc6be78f-0175-1000-ffff-ffffbcd0f569</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
             <connection>
               <id>bcad2e36-0175-1000-0000-00002b6e8fe7</id>
               <name />
@@ -4832,6 +4405,7 @@
                 <name>Line-by-Line Evaluation Mode</name>
                 <value>All</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>d3e43667-10ef-1528-b935-47c2f077f2c9</id>
@@ -4949,6 +4523,7 @@
                 <name>Line-by-Line Evaluation Mode</name>
                 <value>All</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>d64f3acd-54a6-1b39-b1af-cc0a26156d5b</id>
@@ -5068,6 +4643,7 @@
                 <name>pretty_print</name>
                 <value>false</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>896047e7-0175-1000-ffff-ffffc69204e4</id>
@@ -5111,6 +4687,7 @@
                 <name>source_file</name>
                 <value>/log/file/path</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               <autoTerminatedRelationship>original</autoTerminatedRelationship>
             </processor>
             <outputPort>
@@ -5120,34 +4697,6 @@
               <comments />
               <scheduledState>RUNNING</scheduledState>
             </outputPort>
-            <funnel>
-              <id>895faa7a-0175-1000-0000-000014ef9dd3</id>
-              <position x="278.84829417593915" y="332.4492766741185" />
-            </funnel>
-            <funnel>
-              <id>895f7db3-0175-1000-ffff-ffff8229d688</id>
-              <position x="-1446.1517058240609" y="301.4492766741185" />
-            </funnel>
-            <connection>
-              <id>895fbf8f-0175-1000-ffff-ffffa5d2d01e</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>6b9a3cb4-e697-1540-a5fb-ea71cfce8f41</sourceId>
-              <sourceGroupId>895eab20-0175-1000-0000-00007e13267d</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>895faa7a-0175-1000-0000-000014ef9dd3</destinationId>
-              <destinationGroupId>895eab20-0175-1000-0000-00007e13267d</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
             <connection>
               <id>bb8aafca-0175-1000-0000-000038f8e9fc</id>
               <name />
@@ -5168,26 +4717,6 @@
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
-            <connection>
-              <id>895f989f-0175-1000-ffff-ffffb8536433</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>71be315f-7e16-1cce-89f1-d5bd502f889f</sourceId>
-              <sourceGroupId>895eab20-0175-1000-0000-00007e13267d</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>895f7db3-0175-1000-ffff-ffff8229d688</destinationId>
-              <destinationGroupId>895eab20-0175-1000-0000-00007e13267d</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
             <connection>
               <id>895f18a7-0175-1000-ffff-ffffbc2237fd</id>
               <name />
@@ -5248,26 +4777,6 @@
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
-            <connection>
-              <id>bb8a3db4-0175-1000-ffff-ffffec520565</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>bb719fee-0175-1000-ffff-ffffb73dd31a</sourceId>
-              <sourceGroupId>895eab20-0175-1000-0000-00007e13267d</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>895f7db3-0175-1000-ffff-ffff8229d688</destinationId>
-              <destinationGroupId>895eab20-0175-1000-0000-00007e13267d</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
             <connection>
               <id>bb8a6c6c-0175-1000-0000-00000abdc8f9</id>
               <name />
@@ -5288,26 +4797,6 @@
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
-            <connection>
-              <id>bb8a959d-0175-1000-0000-00005213775d</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>896047e7-0175-1000-ffff-ffffc69204e4</sourceId>
-              <sourceGroupId>895eab20-0175-1000-0000-00007e13267d</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>895faa7a-0175-1000-0000-000014ef9dd3</destinationId>
-              <destinationGroupId>895eab20-0175-1000-0000-00007e13267d</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
             <connection>
               <id>8961779d-0175-1000-0000-00003ef237de</id>
               <name />
@@ -5439,6 +4928,7 @@
                 <name>pretty_print</name>
                 <value>false</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>fd6b6513-51f8-3a96-a764-13bd39ec7f84</id>
@@ -5474,6 +4964,7 @@
                 <name>event_type</name>
                 <value>/event_type</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               <autoTerminatedRelationship>original</autoTerminatedRelationship>
             </processor>
             <processor>
@@ -5522,6 +5013,7 @@
                 <name>/timestamp</name>
                 <value>${field.value:replaceFirst('\+(\d\d)(\d\d)','+$1:$2')}</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>46cdd7aa-91f0-307c-90aa-65747e558f25</id>
@@ -5598,14 +5090,6 @@
               <comments />
               <scheduledState>RUNNING</scheduledState>
             </outputPort>
-            <funnel>
-              <id>d8f19295-5666-31a8-b701-52214c4db51d</id>
-              <position x="-1500.995244929405" y="257.20806784146276" />
-            </funnel>
-            <funnel>
-              <id>9e3adb6e-2266-390c-995d-76bc3aa5c3d8</id>
-              <position x="283.72871497338747" y="273.4623850295515" />
-            </funnel>
             <processGroup>
               <id>8d1afcd0-0175-1000-ffff-ffffb3690a74</id>
               <name>TLS events</name>
@@ -5659,6 +5143,7 @@
                   <name>/tls/sni_domain</name>
                   <value>/tls/sni</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <processor>
                 <id>349b3279-a821-1197-aaa6-7e5472dccbef</id>
@@ -5706,6 +5191,7 @@
                   <name>/tls/sni_domain</name>
                   <value>${field.value:substringBeforeLast('.'):substringAfterLast('.'):append(${field.value:substringAfterLast('.'):prepend('.')})}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <processor>
                 <id>349b3291-a821-1197-0000-000032560c6a</id>
@@ -5766,23 +5252,19 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>349b328c-a821-1197-ffff-ffff84583945</id>
-                <position x="1169.5999060626996" y="490.80001181679165" />
-              </funnel>
               <connection>
-                <id>349b328d-a821-1197-ffff-ffffc861a589</id>
+                <id>9279996e-0175-1000-0000-000037fbed8b</id>
                 <name />
                 <bendPoints />
                 <labelIndex>1</labelIndex>
                 <zIndex>0</zIndex>
-                <sourceId>9279850b-0175-1000-0000-00001e74d182</sourceId>
+                <sourceId>92795a59-0175-1000-ffff-ffff89bc5f21</sourceId>
                 <sourceGroupId>8d1afcd0-0175-1000-ffff-ffffb3690a74</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>349b328c-a821-1197-ffff-ffff84583945</destinationId>
+                <sourceType>INPUT_PORT</sourceType>
+                <destinationId>9279850b-0175-1000-0000-00001e74d182</destinationId>
                 <destinationGroupId>8d1afcd0-0175-1000-ffff-ffffb3690a74</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
+                <destinationType>PROCESSOR</destinationType>
+                <relationship />
                 <maxWorkQueueSize>10000</maxWorkQueueSize>
                 <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
                 <flowFileExpiration>0 sec</flowFileExpiration>
@@ -5791,32 +5273,12 @@
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
               <connection>
-                <id>9279996e-0175-1000-0000-000037fbed8b</id>
+                <id>349b3297-a821-1197-0000-0000717807b6</id>
                 <name />
                 <bendPoints />
                 <labelIndex>1</labelIndex>
                 <zIndex>0</zIndex>
-                <sourceId>92795a59-0175-1000-ffff-ffff89bc5f21</sourceId>
-                <sourceGroupId>8d1afcd0-0175-1000-ffff-ffffb3690a74</sourceGroupId>
-                <sourceType>INPUT_PORT</sourceType>
-                <destinationId>9279850b-0175-1000-0000-00001e74d182</destinationId>
-                <destinationGroupId>8d1afcd0-0175-1000-ffff-ffffb3690a74</destinationGroupId>
-                <destinationType>PROCESSOR</destinationType>
-                <relationship />
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
-              <connection>
-                <id>349b3297-a821-1197-0000-0000717807b6</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>349b3279-a821-1197-aaa6-7e5472dccbef</sourceId>
+                <sourceId>349b3279-a821-1197-aaa6-7e5472dccbef</sourceId>
                 <sourceGroupId>8d1afcd0-0175-1000-ffff-ffffb3690a74</sourceGroupId>
                 <sourceType>PROCESSOR</sourceType>
                 <destinationId>349b3291-a821-1197-0000-000032560c6a</destinationId>
@@ -5870,26 +5332,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>349b328f-a821-1197-ffff-fffffdeaaa9e</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>349b3279-a821-1197-aaa6-7e5472dccbef</sourceId>
-                <sourceGroupId>8d1afcd0-0175-1000-ffff-ffffb3690a74</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>349b328c-a821-1197-ffff-ffff84583945</destinationId>
-                <destinationGroupId>8d1afcd0-0175-1000-ffff-ffffb3690a74</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>0 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
             </processGroup>
             <processGroup>
               <id>8d1ad21f-0175-1000-0000-00003c540411</id>
@@ -5944,6 +5386,7 @@
                   <name>/dns/rrname_domain_length</name>
                   <value>${field.value:substringBeforeLast('.'):substringAfterLast('.'):append(${field.value:substringAfterLast('.'):prepend('.')}):length():toNumber()}</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <processor>
                 <id>8d312ef9-0175-1000-ffff-fffff23bbb0c</id>
@@ -6010,6 +5453,7 @@
                   <name>type</name>
                   <value>/dns/type</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
                 <autoTerminatedRelationship>original</autoTerminatedRelationship>
               </processor>
               <processor>
@@ -6103,6 +5547,7 @@
                   <name>/dns/rrname_domain_length</name>
                   <value>/dns/rrname</value>
                 </property>
+                <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               </processor>
               <inputPort>
                 <id>8d212c22-0175-1000-ffff-fffffbc39157</id>
@@ -6118,14 +5563,6 @@
                 <comments />
                 <scheduledState>RUNNING</scheduledState>
               </outputPort>
-              <funnel>
-                <id>8d399854-0175-1000-ffff-ffff8272837e</id>
-                <position x="1736.0" y="528.0" />
-              </funnel>
-              <funnel>
-                <id>8d3298f0-0175-1000-ffff-ffffc9f211a7</id>
-                <position x="56.0" y="280.0" />
-              </funnel>
               <connection>
                 <id>8d3979b7-0175-1000-ffff-ffffe2efe898</id>
                 <name />
@@ -6186,26 +5623,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>8d32c0e2-0175-1000-ffff-ffffac9ca6d8</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>8d2262f6-0175-1000-0000-000029eaa6ef</sourceId>
-                <sourceGroupId>8d1ad21f-0175-1000-0000-00003c540411</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>8d3298f0-0175-1000-ffff-ffffc9f211a7</destinationId>
-                <destinationGroupId>8d1ad21f-0175-1000-0000-00003c540411</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>60 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
               <connection>
                 <id>8d3b1d93-0175-1000-ffff-ffffe953d6b9</id>
                 <name />
@@ -6248,26 +5665,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>8d39cd09-0175-1000-ffff-ffff864f5864</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>8d34409e-0175-1000-ffff-ffff99eb371d</sourceId>
-                <sourceGroupId>8d1ad21f-0175-1000-0000-00003c540411</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>8d399854-0175-1000-ffff-ffff8272837e</destinationId>
-                <destinationGroupId>8d1ad21f-0175-1000-0000-00003c540411</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>60 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
               <connection>
                 <id>8d3281c3-0175-1000-ffff-ffffed50fa50</id>
                 <name />
@@ -6288,26 +5685,6 @@
                 <partitioningAttribute />
                 <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
               </connection>
-              <connection>
-                <id>8d39f40b-0175-1000-0000-00006b7c017b</id>
-                <name />
-                <bendPoints />
-                <labelIndex>1</labelIndex>
-                <zIndex>0</zIndex>
-                <sourceId>8d37fe91-0175-1000-ffff-ffffb5c4de34</sourceId>
-                <sourceGroupId>8d1ad21f-0175-1000-0000-00003c540411</sourceGroupId>
-                <sourceType>PROCESSOR</sourceType>
-                <destinationId>8d399854-0175-1000-ffff-ffff8272837e</destinationId>
-                <destinationGroupId>8d1ad21f-0175-1000-0000-00003c540411</destinationGroupId>
-                <destinationType>FUNNEL</destinationType>
-                <relationship>failure</relationship>
-                <maxWorkQueueSize>10000</maxWorkQueueSize>
-                <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-                <flowFileExpiration>60 sec</flowFileExpiration>
-                <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-                <partitioningAttribute />
-                <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-              </connection>
               <connection>
                 <id>8d3485f4-0175-1000-0000-0000175959ff</id>
                 <name />
@@ -6410,38 +5787,18 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>8d1a6818-0175-1000-ffff-ffffeebd7e98</id>
+              <id>8d2364b0-0175-1000-ffff-ffffa2a4601f</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>46cdd7aa-91f0-307c-90aa-65747e558f25</sourceId>
+              <sourceId>8d1bef35-0175-1000-0000-0000746fa33d</sourceId>
               <sourceGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</sourceGroupId>
               <sourceType>PROCESSOR</sourceType>
-              <destinationId>fd6b6513-51f8-3a96-a764-13bd39ec7f84</destinationId>
-              <destinationGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</destinationGroupId>
-              <destinationType>PROCESSOR</destinationType>
-              <relationship>success</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>0 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>349b32e1-a821-1197-0000-00000d7cca30</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>349b32d8-a821-1197-0000-000025a75a3b</sourceId>
-              <sourceGroupId>8d1afcd0-0175-1000-ffff-ffffb3690a74</sourceGroupId>
-              <sourceType>OUTPUT_PORT</sourceType>
-              <destinationId>055308a4-d020-39a9-9da4-b165796ef717</destinationId>
-              <destinationGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</destinationGroupId>
-              <destinationType>OUTPUT_PORT</destinationType>
-              <relationship />
+              <destinationId>8d212c22-0175-1000-ffff-fffffbc39157</destinationId>
+              <destinationGroupId>8d1ad21f-0175-1000-0000-00003c540411</destinationGroupId>
+              <destinationType>INPUT_PORT</destinationType>
+              <relationship>dns</relationship>
               <maxWorkQueueSize>10000</maxWorkQueueSize>
               <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
               <flowFileExpiration>0 sec</flowFileExpiration>
@@ -6450,18 +5807,18 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>67789d5d-ebdc-390c-adc8-f2111f467ad4</id>
+              <id>8d1a6818-0175-1000-ffff-ffffeebd7e98</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>fd6b6513-51f8-3a96-a764-13bd39ec7f84</sourceId>
+              <sourceId>46cdd7aa-91f0-307c-90aa-65747e558f25</sourceId>
               <sourceGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</sourceGroupId>
               <sourceType>PROCESSOR</sourceType>
-              <destinationId>9e3adb6e-2266-390c-995d-76bc3aa5c3d8</destinationId>
+              <destinationId>fd6b6513-51f8-3a96-a764-13bd39ec7f84</destinationId>
               <destinationGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
+              <destinationType>PROCESSOR</destinationType>
+              <relationship>success</relationship>
               <maxWorkQueueSize>10000</maxWorkQueueSize>
               <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
               <flowFileExpiration>0 sec</flowFileExpiration>
@@ -6470,13 +5827,13 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>9266e0c5-0175-1000-0000-00006aafc0f8</id>
+              <id>349b32e1-a821-1197-0000-00000d7cca30</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>8d211b58-0175-1000-0000-000003eb5f3b</sourceId>
-              <sourceGroupId>8d1ad21f-0175-1000-0000-00003c540411</sourceGroupId>
+              <sourceId>349b32d8-a821-1197-0000-000025a75a3b</sourceId>
+              <sourceGroupId>8d1afcd0-0175-1000-ffff-ffffb3690a74</sourceGroupId>
               <sourceType>OUTPUT_PORT</sourceType>
               <destinationId>055308a4-d020-39a9-9da4-b165796ef717</destinationId>
               <destinationGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</destinationGroupId>
@@ -6490,58 +5847,18 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>d7ef534a-9fb6-3973-b2fa-2738705db47a</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>24e1d8ed-10f4-3b46-958c-f2fb676e3192</sourceId>
-              <sourceGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>d8f19295-5666-31a8-b701-52214c4db51d</destinationId>
-              <destinationGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>0 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>8d2364b0-0175-1000-ffff-ffffa2a4601f</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>8d1bef35-0175-1000-0000-0000746fa33d</sourceId>
-              <sourceGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>8d212c22-0175-1000-ffff-fffffbc39157</destinationId>
-              <destinationGroupId>8d1ad21f-0175-1000-0000-00003c540411</destinationGroupId>
-              <destinationType>INPUT_PORT</destinationType>
-              <relationship>dns</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>0 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>3e181820-b214-399d-a0df-474d15e2f146</id>
+              <id>8d1c1701-0175-1000-ffff-fffff7364622</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>1a038948-9e9a-3523-b899-990077bfd575</sourceId>
+              <sourceId>fd6b6513-51f8-3a96-a764-13bd39ec7f84</sourceId>
               <sourceGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</sourceGroupId>
               <sourceType>PROCESSOR</sourceType>
-              <destinationId>9e3adb6e-2266-390c-995d-76bc3aa5c3d8</destinationId>
+              <destinationId>8d1bef35-0175-1000-0000-0000746fa33d</destinationId>
               <destinationGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
+              <destinationType>PROCESSOR</destinationType>
+              <relationship>success</relationship>
               <maxWorkQueueSize>10000</maxWorkQueueSize>
               <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
               <flowFileExpiration>0 sec</flowFileExpiration>
@@ -6572,18 +5889,18 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>8d1c1701-0175-1000-ffff-fffff7364622</id>
+              <id>9266e0c5-0175-1000-0000-00006aafc0f8</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>fd6b6513-51f8-3a96-a764-13bd39ec7f84</sourceId>
-              <sourceGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>8d1bef35-0175-1000-0000-0000746fa33d</destinationId>
+              <sourceId>8d211b58-0175-1000-0000-000003eb5f3b</sourceId>
+              <sourceGroupId>8d1ad21f-0175-1000-0000-00003c540411</sourceGroupId>
+              <sourceType>OUTPUT_PORT</sourceType>
+              <destinationId>055308a4-d020-39a9-9da4-b165796ef717</destinationId>
               <destinationGroupId>bd12dc14-015e-3428-bfdf-b1219d2d6fdb</destinationGroupId>
-              <destinationType>PROCESSOR</destinationType>
-              <relationship>success</relationship>
+              <destinationType>OUTPUT_PORT</destinationType>
+              <relationship />
               <maxWorkQueueSize>10000</maxWorkQueueSize>
               <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
               <flowFileExpiration>0 sec</flowFileExpiration>
@@ -6698,6 +6015,7 @@
                 <name>/timestamp</name>
                 <value>${field.value:toDate('yyMMdd HH:mm:ss'):format("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")}</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>50813f6b-a5f6-1a98-8ae4-115134714332</id>
@@ -6745,6 +6063,7 @@
                 <name>/timestamp</name>
                 <value>${field.value:toDate('yyyyMMdd HH:mm:ss'):format("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")}</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>e4353681-23e9-15af-0000-000032ea35e3</id>
@@ -6847,6 +6166,7 @@
                 <name>include-zero-record-flowfiles</name>
                 <value>false</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>48723b8e-fae0-14e6-afdc-85c239646dc0</id>
@@ -6927,6 +6247,7 @@
                 <name>include-zero-record-flowfiles</name>
                 <value>false</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <inputPort>
               <id>7f683020-779c-1bc9-85da-5bad079d5d9d</id>
@@ -6942,30 +6263,22 @@
               <comments />
               <scheduledState>RUNNING</scheduledState>
             </outputPort>
-            <funnel>
-              <id>7113dbce-0176-1000-ffff-ffffbbfa695f</id>
-              <position x="-673.331668377643" y="376.49854987272295" />
-            </funnel>
-            <funnel>
-              <id>f1b33d4c-1b10-18ad-ab4a-4a3a1e744f4b</id>
-              <position x="1112.0" y="376.0" />
-            </funnel>
             <connection>
-              <id>631e37d8-ca81-1bfa-8f55-aac2a22873ad</id>
+              <id>14453eaa-7646-1485-0000-000070b97065</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>50813f6b-a5f6-1a98-8ae4-115134714332</sourceId>
+              <sourceId>14453e90-7646-1485-ffff-ffff81f3c683</sourceId>
               <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
               <sourceType>PROCESSOR</sourceType>
-              <destinationId>f1b33d4c-1b10-18ad-ab4a-4a3a1e744f4b</destinationId>
+              <destinationId>92693a34-99da-1004-adfb-bdf4aa7e1c30</destinationId>
               <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
+              <destinationType>PROCESSOR</destinationType>
+              <relationship>success</relationship>
               <maxWorkQueueSize>10000</maxWorkQueueSize>
               <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
+              <flowFileExpiration>0 sec</flowFileExpiration>
               <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
@@ -7011,21 +6324,21 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>711609c1-0176-1000-0000-000013fdee3b</id>
+              <id>cf95350a-de6c-1a4b-8183-8f9cfa11449a</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>e0bd3907-2d13-1407-b2dd-48591e65e59d</sourceId>
+              <sourceId>7f683020-779c-1bc9-85da-5bad079d5d9d</sourceId>
               <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>7113dbce-0176-1000-ffff-ffffbbfa695f</destinationId>
+              <sourceType>INPUT_PORT</sourceType>
+              <destinationId>f92d3f77-958a-1344-bd3b-7c93457e5c12</destinationId>
               <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
+              <destinationType>PROCESSOR</destinationType>
+              <relationship />
               <maxWorkQueueSize>10000</maxWorkQueueSize>
               <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
+              <flowFileExpiration>0 sec</flowFileExpiration>
               <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
@@ -7051,35 +6364,15 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>7fe931b3-82b3-1699-b49a-d380dd14a5b8</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>48723b8e-fae0-14e6-afdc-85c239646dc0</sourceId>
-              <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>bcbb33ba-112e-1f53-8982-d5ae9f0e701f</destinationId>
-              <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
-              <destinationType>OUTPUT_PORT</destinationType>
-              <relationship>success</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>0 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>a35e3744-5906-1ee9-abc4-205356ca01d1</id>
+              <id>3e21311d-dc5c-143f-b39e-d8fb8c9fd36d</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>f92d3f77-958a-1344-bd3b-7c93457e5c12</sourceId>
+              <sourceId>50813f6b-a5f6-1a98-8ae4-115134714332</sourceId>
               <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
               <sourceType>PROCESSOR</sourceType>
-              <destinationId>e4353681-23e9-15af-0000-000032ea35e3</destinationId>
+              <destinationId>48723b8e-fae0-14e6-afdc-85c239646dc0</destinationId>
               <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
               <destinationType>PROCESSOR</destinationType>
               <relationship>success</relationship>
@@ -7091,18 +6384,18 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>70e8f3cb-0176-1000-0000-00006d2cdbf5</id>
+              <id>14453a4b-7646-1485-ffff-fffffc8f5285</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>14453a41-7646-1485-b398-28f819de4a45</sourceId>
+              <sourceId>e4353681-23e9-15af-0000-000032ea35e3</sourceId>
               <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
               <sourceType>PROCESSOR</sourceType>
-              <destinationId>e0bd3907-2d13-1407-b2dd-48591e65e59d</destinationId>
+              <destinationId>14453a41-7646-1485-b398-28f819de4a45</destinationId>
               <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
               <destinationType>PROCESSOR</destinationType>
-              <relationship>success</relationship>
+              <relationship>unmatched</relationship>
               <maxWorkQueueSize>10000</maxWorkQueueSize>
               <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
               <flowFileExpiration>0 sec</flowFileExpiration>
@@ -7111,17 +6404,17 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>14453eaa-7646-1485-0000-000070b97065</id>
+              <id>7fe931b3-82b3-1699-b49a-d380dd14a5b8</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>14453e90-7646-1485-ffff-ffff81f3c683</sourceId>
+              <sourceId>48723b8e-fae0-14e6-afdc-85c239646dc0</sourceId>
               <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
               <sourceType>PROCESSOR</sourceType>
-              <destinationId>92693a34-99da-1004-adfb-bdf4aa7e1c30</destinationId>
+              <destinationId>bcbb33ba-112e-1f53-8982-d5ae9f0e701f</destinationId>
               <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
-              <destinationType>PROCESSOR</destinationType>
+              <destinationType>OUTPUT_PORT</destinationType>
               <relationship>success</relationship>
               <maxWorkQueueSize>10000</maxWorkQueueSize>
               <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
@@ -7131,35 +6424,15 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>cf95350a-de6c-1a4b-8183-8f9cfa11449a</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>7f683020-779c-1bc9-85da-5bad079d5d9d</sourceId>
-              <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
-              <sourceType>INPUT_PORT</sourceType>
-              <destinationId>f92d3f77-958a-1344-bd3b-7c93457e5c12</destinationId>
-              <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
-              <destinationType>PROCESSOR</destinationType>
-              <relationship />
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>0 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>3e21311d-dc5c-143f-b39e-d8fb8c9fd36d</id>
+              <id>a35e3744-5906-1ee9-abc4-205356ca01d1</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>50813f6b-a5f6-1a98-8ae4-115134714332</sourceId>
+              <sourceId>f92d3f77-958a-1344-bd3b-7c93457e5c12</sourceId>
               <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
               <sourceType>PROCESSOR</sourceType>
-              <destinationId>48723b8e-fae0-14e6-afdc-85c239646dc0</destinationId>
+              <destinationId>e4353681-23e9-15af-0000-000032ea35e3</destinationId>
               <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
               <destinationType>PROCESSOR</destinationType>
               <relationship>success</relationship>
@@ -7171,38 +6444,18 @@
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
             <connection>
-              <id>873a3c42-fe81-1ce1-8c70-7da1f2542c31</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>92693a34-99da-1004-adfb-bdf4aa7e1c30</sourceId>
-              <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>f1b33d4c-1b10-18ad-ab4a-4a3a1e744f4b</destinationId>
-              <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>14453a4b-7646-1485-ffff-fffffc8f5285</id>
+              <id>70e8f3cb-0176-1000-0000-00006d2cdbf5</id>
               <name />
               <bendPoints />
               <labelIndex>1</labelIndex>
               <zIndex>0</zIndex>
-              <sourceId>e4353681-23e9-15af-0000-000032ea35e3</sourceId>
+              <sourceId>14453a41-7646-1485-b398-28f819de4a45</sourceId>
               <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
               <sourceType>PROCESSOR</sourceType>
-              <destinationId>14453a41-7646-1485-b398-28f819de4a45</destinationId>
+              <destinationId>e0bd3907-2d13-1407-b2dd-48591e65e59d</destinationId>
               <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
               <destinationType>PROCESSOR</destinationType>
-              <relationship>unmatched</relationship>
+              <relationship>success</relationship>
               <maxWorkQueueSize>10000</maxWorkQueueSize>
               <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
               <flowFileExpiration>0 sec</flowFileExpiration>
@@ -7210,26 +6463,6 @@
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
-            <connection>
-              <id>71140678-0176-1000-0000-000060437da4</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>14453a41-7646-1485-b398-28f819de4a45</sourceId>
-              <sourceGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>7113dbce-0176-1000-ffff-ffffbbfa695f</destinationId>
-              <destinationGroupId>48bc31b5-dbc5-116d-adbe-fe0f10314ac2</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
           </processGroup>
           <processGroup>
             <id>5d04357e-423c-1ab5-a7a4-44565abfed7f</id>
@@ -7280,6 +6513,7 @@
                 <name>/timestamp</name>
                 <value>${field.value:toDate('dd/MMM/yyyy:HH:mm:ss.SSS'):format("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")}</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>e4c8356d-54ad-15b5-94fe-799d9465aa51</id>
@@ -7315,6 +6549,7 @@
                 <name>include-zero-record-flowfiles</name>
                 <value>true</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>f6e63fd3-6150-1d72-a58a-46b43bc5d5c2</id>
@@ -7350,6 +6585,7 @@
                 <name>include-zero-record-flowfiles</name>
                 <value>false</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>7fbd38e8-60a2-1503-8a6c-ffc6b156b3b0</id>
@@ -7410,14 +6646,6 @@
               <comments />
               <scheduledState>RUNNING</scheduledState>
             </outputPort>
-            <funnel>
-              <id>bb763b6c-302d-12a4-8eb2-b3b501d92244</id>
-              <position x="1882.9999517774115" y="327.9999931568573" />
-            </funnel>
-            <funnel>
-              <id>312d3490-461e-13ac-a3a2-603704c456e2</id>
-              <position x="8.0" y="424.0" />
-            </funnel>
             <connection>
               <id>960f3ac9-95dc-103d-a70a-ca3b070851a4</id>
               <name />
@@ -7458,46 +6686,6 @@
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
-            <connection>
-              <id>9451307c-96df-1302-8189-8e556060bb80</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>f6e63fd3-6150-1d72-a58a-46b43bc5d5c2</sourceId>
-              <sourceGroupId>5d04357e-423c-1ab5-a7a4-44565abfed7f</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>bb763b6c-302d-12a4-8eb2-b3b501d92244</destinationId>
-              <destinationGroupId>5d04357e-423c-1ab5-a7a4-44565abfed7f</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>0 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>fbd23518-c750-15f2-b8e0-9a0600eb3246</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>e4c8356d-54ad-15b5-94fe-799d9465aa51</sourceId>
-              <sourceGroupId>5d04357e-423c-1ab5-a7a4-44565abfed7f</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>312d3490-461e-13ac-a3a2-603704c456e2</destinationId>
-              <destinationGroupId>5d04357e-423c-1ab5-a7a4-44565abfed7f</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
             <connection>
               <id>b5d43cea-5555-10b0-b75f-b88a95e9c6aa</id>
               <name />
@@ -7518,26 +6706,6 @@
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
-            <connection>
-              <id>1285380e-3d8e-199c-a6b2-fec085b63cd4</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>c9763c4c-7186-1460-871a-b5fd00ca3241</sourceId>
-              <sourceGroupId>5d04357e-423c-1ab5-a7a4-44565abfed7f</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>312d3490-461e-13ac-a3a2-603704c456e2</destinationId>
-              <destinationGroupId>5d04357e-423c-1ab5-a7a4-44565abfed7f</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
             <connection>
               <id>484a3eab-4af3-11cd-abe2-d5ee6fc1a291</id>
               <name />
@@ -7980,6 +7148,7 @@
                 <name>/timestamp</name>
                 <value>${field.value:multiply(1000):format('yyyy-MM-dd HH:mm:ss.SSSZ'):replace(' ','T'):replaceFirst('\+(\d\d)(\d\d)','+$1:$2')}</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>3bf497f2-3aed-3465-b91c-72ef6e53f0ea</id>
@@ -8066,6 +7235,7 @@
                 <name>jolt-record-transform-cache-size</name>
                 <value>1</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
               <autoTerminatedRelationship>original</autoTerminatedRelationship>
             </processor>
             <inputPort>
@@ -8082,34 +7252,6 @@
               <comments />
               <scheduledState>RUNNING</scheduledState>
             </outputPort>
-            <funnel>
-              <id>c8c0a13d-0170-1000-ffff-ffff874141fa</id>
-              <position x="248.5321508445502" y="703.4412774751572" />
-            </funnel>
-            <funnel>
-              <id>06521038-335b-3139-839d-ab43a013ce03</id>
-              <position x="-1557.869726298236" y="758.8984861527665" />
-            </funnel>
-            <connection>
-              <id>3c739604-b69c-3e86-ba4c-a4739078837c</id>
-              <name />
-              <bendPoints />
-              <labelIndex>0</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>9027e415-c8cd-355e-af16-0c635f43832f</sourceId>
-              <sourceGroupId>83691174-683f-3c7c-8526-8fc00397aee1</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>c8c0a13d-0170-1000-ffff-ffff874141fa</destinationId>
-              <destinationGroupId>83691174-683f-3c7c-8526-8fc00397aee1</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>0 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
             <connection>
               <id>c8be8213-0170-1000-0000-0000695bc36c</id>
               <name />
@@ -8130,26 +7272,6 @@
               <partitioningAttribute />
               <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
             </connection>
-            <connection>
-              <id>ee8556df-9826-3d45-82de-5c1c876db435</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>3bf497f2-3aed-3465-b91c-72ef6e53f0ea</sourceId>
-              <sourceGroupId>83691174-683f-3c7c-8526-8fc00397aee1</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>06521038-335b-3139-839d-ab43a013ce03</destinationId>
-              <destinationGroupId>83691174-683f-3c7c-8526-8fc00397aee1</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>0 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
             <connection>
               <id>2d0f222e-d08e-31fd-b5e1-1ce178368e4c</id>
               <name />
@@ -8260,6 +7382,7 @@
                 <name>/timestamp</name>
                 <value>${field.value:toDate('yyyy-MM-dd HH:mm:ss,SSS'):format("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")}</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>dd3b361c-4e9c-158c-ba31-61006a0b21b7</id>
@@ -8336,6 +7459,7 @@
                 <name>include-zero-record-flowfiles</name>
                 <value>true</value>
               </property>
+              <autoTerminatedRelationship>failure</autoTerminatedRelationship>
             </processor>
             <processor>
               <id>38f03e95-db26-1287-be1a-4218f647596a</id>
@@ -8384,53 +7508,9 @@
               <id>f1e73393-065a-1450-9ad0-fd7cdb57853f</id>
               <name>Output</name>
               <position x="1120.0" y="808.0" />
-              <comments />
-              <scheduledState>RUNNING</scheduledState>
-            </outputPort>
-            <funnel>
-              <id>8f433b46-ddc7-163b-a48e-2f4436a68b1e</id>
-              <position x="8.0" y="424.0" />
-            </funnel>
-            <connection>
-              <id>e00437b9-7705-1d24-8df5-ab6739913b89</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>b09b367b-060f-1e74-9a96-ca5ba5f88858</sourceId>
-              <sourceGroupId>31b13b40-8e26-1798-9777-2272881c6031</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>8f433b46-ddc7-163b-a48e-2f4436a68b1e</destinationId>
-              <destinationGroupId>31b13b40-8e26-1798-9777-2272881c6031</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
-            <connection>
-              <id>75043a2e-2420-1bbd-aa6a-49903351258d</id>
-              <name />
-              <bendPoints />
-              <labelIndex>1</labelIndex>
-              <zIndex>0</zIndex>
-              <sourceId>4b1c38b7-8f98-1a81-96c9-17e3eccc45b2</sourceId>
-              <sourceGroupId>31b13b40-8e26-1798-9777-2272881c6031</sourceGroupId>
-              <sourceType>PROCESSOR</sourceType>
-              <destinationId>8f433b46-ddc7-163b-a48e-2f4436a68b1e</destinationId>
-              <destinationGroupId>31b13b40-8e26-1798-9777-2272881c6031</destinationGroupId>
-              <destinationType>FUNNEL</destinationType>
-              <relationship>failure</relationship>
-              <maxWorkQueueSize>10000</maxWorkQueueSize>
-              <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-              <flowFileExpiration>60 sec</flowFileExpiration>
-              <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-              <partitioningAttribute />
-              <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-            </connection>
+              <comments />
+              <scheduledState>RUNNING</scheduledState>
+            </outputPort>
             <connection>
               <id>4b353d86-8a69-1ca1-bc1c-8db0049f5886</id>
               <name />
@@ -9130,9 +8210,8 @@
               <property>
                 <name>generate-ff-custom-text</name>
                 <value>[{"stream": 0,"flow": {"bytes_toserver": 74,"bytes_toclient": 0,"start": "${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}","pkts_toserver": 1,"pkts_toclient": 0},"vlan": 665,"ip_dst_port": 54323,"in_iface": "ens1f3","payload": "","timestamp": "${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}","proto": "TCP","event_type": "alert","alert": {"category": "Not Suspicious Traffic","severity": 3,"action": "allowed","gid": 1,"signature_id": 29999991,"rev": 1,"signature": "SOC TEST1"},"payload_printable": "","ip_src_addr": "10.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}","ip_src_port": 43844,"ip_dst_addr": "10.0.0.${random():mod(254):plus(1)}","host":"nifi.soctools.geant.org","host_domain":"geant.org"},
-{"timestamp":"${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}","alert":{"action":"allowed","category":"Potentially Bad Traffic","gid":1,"metadata":{"affected_product":["Any"],"attack_target":["Client_Endpoint"],"created_at":["2019_07_26"],"deployment":["Perimeter"],"former_category":["DNS"],"signature_severity":["Minor"],"updated_at":["2019_09_28"]},"rev":3,"severity":2,"signature":"ET DNS Query for .cc TLD","signature_id":2027758},"app_proto":"dns","destination":{"ip":"10.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}","port":53},"dns":{"query":[{"id":37261,"rrname":"static.arduino.cc","rrtype":"A","tx_id":2,"type":"query"}]},"event_type":"alert","flow":{"bytes_toclient":1039,"bytes_toserver":343,"pkts_toclient":2,"pkts_toserver":3,"start":"${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}"},"flow_id":1889254052511234,"in_iface":"if1","payload":"kY0BAAABAAAAAAABBnN0YXRpYwdhcmR1aW5vAmNjAAABAAEAACkPoAAAgAAAAA==","payload_printable":".............static.arduino.cc.......)........","proto":"UDP","source":{"ip":"10.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}","port":64164},"stream":0,"tx_id":2},
-{"timestamp":"${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}","TLP":"AMBER","alert":{"action":"allowed","category":"Attempted Information Leak","gid":1,"metadata":{"created_at":["2014_10_15"],"former_category":["CURRENT_EVENTS"],"updated_at":["2014_10_15"]},"rev":6,"severity":2,"signature":"ET EXPLOIT SSL excessive fatal alerts (possible POODLE attack against server)","signature_id":2019418},"app_proto":"tls","destination":{"ip":"10.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}","port":37220},"event_type":"alert","flow":{"bytes_toclient":247,"bytes_toserver":298,"pkts_toclient":4,"pkts_toserver":4,"start":"${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}"},"flow_id":43047386649621,"payload":"FQMAAAICKA==","payload_printable":"......(","proto":"TCP","source":{"ip":"10.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}","port":443},"stream":1,"tls":{"ja3":{},"version":"SSLv3"},"tx_id":0}]
-</value>
+{"timestamp":"${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}","alert":{"action":"allowed","category":"Potentially Bad Traffic","gid":1,"metadata":{"affected_product":["Any"],"attack_target":["Client_Endpoint"],"created_at":["2019_07_26"],"deployment":["Perimeter"],"former_category":["DNS"],"signature_severity":["Minor"],"updated_at":["2019_09_28"]},"rev":3,"severity":2,"signature":"ET DNS Query for .cc TLD","signature_id":2027758},"app_proto":"dns","destination":{"ip":"10.10.10.${random():mod(254):plus(1)}","port":53},"dns":{"query":[{"id":37261,"rrname":"example.evil","rrtype":"A","tx_id":2,"type":"query"}]},"event_type":"alert","flow":{"bytes_toclient":1039,"bytes_toserver":343,"pkts_toclient":2,"pkts_toserver":3,"start":"${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}"},"flow_id":1889254052511234,"in_iface":"if1","payload":"kY0BAAABAAAAAAABBnN0YXRpYwdhcmR1aW5vAmNjAAABAAEAACkPoAAAgAAAAA==","payload_printable":".............example.evil.......)........","proto":"UDP","source":{"ip":"10.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}","port":64164},"stream":0,"tx_id":2},
+{"timestamp":"${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}","TLP":"AMBER","alert":{"action":"allowed","category":"Attempted Information Leak","gid":1,"metadata":{"created_at":["2014_10_15"],"former_category":["CURRENT_EVENTS"],"updated_at":["2014_10_15"]},"rev":6,"severity":2,"signature":"ET EXPLOIT SSL excessive fatal alerts (possible POODLE attack against server)","signature_id":2019418},"app_proto":"tls","destination":{"ip":"10.10.10.${random():mod(10):plus(1)}","port":37220},"event_type":"alert","flow":{"bytes_toclient":247,"bytes_toserver":298,"pkts_toclient":4,"pkts_toserver":4,"start":"${now():format('yyyy-MM-dd HH:mm:ss.SSS'):replaceFirst(' ','T')}"},"flow_id":43047386649621,"payload":"FQMAAAICKA==","payload_printable":"......(","proto":"TCP","source":{"ip":"10.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}.${random():mod(254):plus(1)}","port":443},"stream":1,"tls":{"ja3":{},"version":"SSLv3"},"tx_id":0}]</value>
               </property>
               <property>
                 <name>character-set</name>
@@ -9580,7 +8659,7 @@
             </property>
             <property>
               <name>Password</name>
-              <value>enc{c03f976a42d5917087e1c446fb6820f1c4fb8502ea2e946fd458c60b039ace3a5361abddad1c37049987c3ef5a9f1a72}</value>
+              <value>enc{e3c6c99d66e95dfa569c6dab15f7bd5cb2142d215044a4c556aba0a2bed19ac85c899bd8837e09bb49300f0823011b45}</value>
             </property>
             <property>
               <name>elasticsearch-http-connect-timeout</name>
@@ -9645,6 +8724,7 @@
               <name>Timestamp Format</name>
             </property>
             <autoTerminatedRelationship>success</autoTerminatedRelationship>
+            <autoTerminatedRelationship>failure</autoTerminatedRelationship>
           </processor>
           <inputPort>
             <id>e7d34e01-babe-3022-ad9b-a7620e7c0f38</id>
@@ -9653,10 +8733,6 @@
             <comments />
             <scheduledState>RUNNING</scheduledState>
           </inputPort>
-          <funnel>
-            <id>a8cf8491-c2a7-3986-b803-58aff43326de</id>
-            <position x="-709.0761208187066" y="911.6861746431973" />
-          </funnel>
           <connection>
             <id>3280c550-2117-37a6-8b5e-3bc1953fa17e</id>
             <name />
@@ -9680,26 +8756,6 @@
             <partitioningAttribute />
             <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
           </connection>
-          <connection>
-            <id>02a9e341-0590-34a8-9f0c-9d6992869e59</id>
-            <name />
-            <bendPoints />
-            <labelIndex>1</labelIndex>
-            <zIndex>0</zIndex>
-            <sourceId>8b48f28f-2379-3f0f-81fe-4e1b93e72666</sourceId>
-            <sourceGroupId>7ebf304b-4978-3adc-ac31-470fb76e5029</sourceGroupId>
-            <sourceType>PROCESSOR</sourceType>
-            <destinationId>a8cf8491-c2a7-3986-b803-58aff43326de</destinationId>
-            <destinationGroupId>7ebf304b-4978-3adc-ac31-470fb76e5029</destinationGroupId>
-            <destinationType>FUNNEL</destinationType>
-            <relationship>failure</relationship>
-            <maxWorkQueueSize>10000</maxWorkQueueSize>
-            <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-            <flowFileExpiration>1 min</flowFileExpiration>
-            <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-            <partitioningAttribute />
-            <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-          </connection>
           <connection>
             <id>5de8f98f-ce46-3565-b0ce-7f8ecf518c53</id>
             <name />
@@ -9715,7 +8771,7 @@
             <relationship />
             <maxWorkQueueSize>10000</maxWorkQueueSize>
             <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-            <flowFileExpiration>10 sec</flowFileExpiration>
+            <flowFileExpiration>60 sec</flowFileExpiration>
             <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
             <partitioningAttribute />
             <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
@@ -9897,7 +8953,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -9909,6 +8965,7 @@
             <name>File Filter</name>
             <value>.*</value>
           </property>
+          <autoTerminatedRelationship>failure</autoTerminatedRelationship>
           <autoTerminatedRelationship>original</autoTerminatedRelationship>
         </processor>
         <processor>
@@ -9929,7 +8986,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -9961,6 +9018,7 @@
             <name>Group</name>
           </property>
           <autoTerminatedRelationship>success</autoTerminatedRelationship>
+          <autoTerminatedRelationship>failure</autoTerminatedRelationship>
         </processor>
         <processor>
           <id>3c4d65a9-aa39-380f-b16b-2aea028a019b</id>
@@ -9980,7 +9038,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -10055,7 +9113,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -10130,7 +9188,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -10171,7 +9229,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -10204,6 +9262,7 @@
             <name>Line-by-Line Evaluation Mode</name>
             <value>All</value>
           </property>
+          <autoTerminatedRelationship>failure</autoTerminatedRelationship>
         </processor>
         <connection>
           <id>652026e5-0acd-3009-b45a-f68f3e37bef9</id>
@@ -10225,52 +9284,6 @@
           <partitioningAttribute />
           <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
         </connection>
-        <connection>
-          <id>b400d4e7-7106-3ea3-8b1a-0b9d2a8795b2</id>
-          <name />
-          <bendPoints>
-            <bendPoint x="787.0441617531399" y="276.7074043335799" />
-            <bendPoint x="788.0441617531399" y="291.7074043335799" />
-          </bendPoints>
-          <labelIndex>1</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>86fdf574-d86b-3f35-9aa0-3ada1867aff8</sourceId>
-          <sourceGroupId>a97a2cb2-e5b2-3c82-a365-ebe5139e2be6</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>86fdf574-d86b-3f35-9aa0-3ada1867aff8</destinationId>
-          <destinationGroupId>a97a2cb2-e5b2-3c82-a365-ebe5139e2be6</destinationGroupId>
-          <destinationType>PROCESSOR</destinationType>
-          <relationship>failure</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
-        <connection>
-          <id>5d7b82fa-10f8-3a32-9ffa-ebce53eb6070</id>
-          <name />
-          <bendPoints>
-            <bendPoint x="-414.74468712381326" y="221.65236588143148" />
-            <bendPoint x="-451.48125938943826" y="275.1232673706893" />
-          </bendPoints>
-          <labelIndex>1</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>857cd537-4aeb-31fb-9740-0513e6cc46fe</sourceId>
-          <sourceGroupId>a97a2cb2-e5b2-3c82-a365-ebe5139e2be6</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>857cd537-4aeb-31fb-9740-0513e6cc46fe</destinationId>
-          <destinationGroupId>a97a2cb2-e5b2-3c82-a365-ebe5139e2be6</destinationGroupId>
-          <destinationType>PROCESSOR</destinationType>
-          <relationship>failure</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
         <connection>
           <id>bfe27587-bb06-388c-a59a-8aad9830cda1</id>
           <name />
@@ -10351,29 +9364,6 @@
           <partitioningAttribute />
           <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
         </connection>
-        <connection>
-          <id>dea956ed-2b3b-39de-8cd8-a4d1f7a88aa2</id>
-          <name />
-          <bendPoints>
-            <bendPoint x="790.1869840187649" y="473.4228279175642" />
-            <bendPoint x="789.1869840187649" y="482.42282791756406" />
-          </bendPoints>
-          <labelIndex>1</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>937de5fc-7d4a-35af-a071-46f04d6ea4fa</sourceId>
-          <sourceGroupId>a97a2cb2-e5b2-3c82-a365-ebe5139e2be6</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>937de5fc-7d4a-35af-a071-46f04d6ea4fa</destinationId>
-          <destinationGroupId>a97a2cb2-e5b2-3c82-a365-ebe5139e2be6</destinationGroupId>
-          <destinationType>PROCESSOR</destinationType>
-          <relationship>failure</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
       </processGroup>
       <processGroup>
         <id>b997e46b-7905-33e8-8bbc-f4d51b0cc735</id>
@@ -10689,7 +9679,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -10721,6 +9711,7 @@
             <name>Line-by-Line Evaluation Mode</name>
             <value>All</value>
           </property>
+          <autoTerminatedRelationship>failure</autoTerminatedRelationship>
         </processor>
         <processor>
           <id>e1e2caef-8178-3c91-b3ca-99f05f619064</id>
@@ -10740,7 +9731,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -10793,7 +9784,7 @@
           </property>
           <property>
             <name>Remote URL</name>
-            <value>${misp_url}/attributes/restSearch/returnFormat:json/type:ip-src||ip-dst</value>
+            <value>${misp_url}/attributes/restSearch/returnFormat:json/type:ip-src||ip-dst/last:${last}</value>
           </property>
           <property>
             <name>SSL Context Service</name>
@@ -10913,7 +9904,9 @@
             <value>${misp_token}</value>
           </property>
           <autoTerminatedRelationship>Original</autoTerminatedRelationship>
+          <autoTerminatedRelationship>Failure</autoTerminatedRelationship>
           <autoTerminatedRelationship>Retry</autoTerminatedRelationship>
+          <autoTerminatedRelationship>No Retry</autoTerminatedRelationship>
         </processor>
         <processor>
           <id>671c4e42-604f-389d-9cee-27431ca36448</id>
@@ -10933,7 +9926,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -10954,6 +9947,7 @@
             <value>1 MB</value>
           </property>
           <autoTerminatedRelationship>success</autoTerminatedRelationship>
+          <autoTerminatedRelationship>failure</autoTerminatedRelationship>
         </processor>
         <processor>
           <id>c7cc4e24-7d9a-3a17-8af1-ca655f46595f</id>
@@ -10973,7 +9967,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -10994,6 +9988,7 @@
             <value>1 MB</value>
           </property>
           <autoTerminatedRelationship>success</autoTerminatedRelationship>
+          <autoTerminatedRelationship>failure</autoTerminatedRelationship>
         </processor>
         <processor>
           <id>81ec71a0-719a-3205-9360-6a535072f7c6</id>
@@ -11013,7 +10008,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11033,7 +10028,7 @@
           </property>
           <property>
             <name>last</name>
-            <value>${misp_ip_first_interval}</value>
+            <value>${misp_first_interval}</value>
           </property>
           <property>
             <name>timestamp</name>
@@ -11058,7 +10053,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11111,7 +10106,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11135,6 +10130,8 @@
             <name>misp_ip</name>
             <value>$.value</value>
           </property>
+          <autoTerminatedRelationship>failure</autoTerminatedRelationship>
+          <autoTerminatedRelationship>unmatched</autoTerminatedRelationship>
         </processor>
         <processor>
           <id>74d66e0e-0b65-36d2-96f1-4b836d2c4222</id>
@@ -11154,7 +10151,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11199,7 +10196,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11211,6 +10208,7 @@
             <name>Null Value Representation</name>
             <value>empty string</value>
           </property>
+          <autoTerminatedRelationship>failure</autoTerminatedRelationship>
           <autoTerminatedRelationship>original</autoTerminatedRelationship>
         </processor>
         <processor>
@@ -11231,7 +10229,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11255,11 +10253,9 @@
             <name>event_id</name>
             <value>$.event_id</value>
           </property>
+          <autoTerminatedRelationship>failure</autoTerminatedRelationship>
+          <autoTerminatedRelationship>unmatched</autoTerminatedRelationship>
         </processor>
-        <funnel>
-          <id>c490b6b5-0170-1000-0000-000035bc685d</id>
-          <position x="601.9534533822577" y="371.9240905653907" />
-        </funnel>
         <connection>
           <id>39f7b787-0995-3721-8d50-700838b7a256</id>
           <name />
@@ -11340,26 +10336,6 @@
           <partitioningAttribute />
           <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
         </connection>
-        <connection>
-          <id>58cc41df-404e-309b-9df6-2ea67e1fe2b7</id>
-          <name />
-          <bendPoints />
-          <labelIndex>1</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>283bea4b-2774-3f2d-aabe-cf96989e9997</sourceId>
-          <sourceGroupId>194a653f-0c92-3704-8bd4-ffa079643515</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>671c4e42-604f-389d-9cee-27431ca36448</destinationId>
-          <destinationGroupId>194a653f-0c92-3704-8bd4-ffa079643515</destinationGroupId>
-          <destinationType>PROCESSOR</destinationType>
-          <relationship>success</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
         <connection>
           <id>5e84f4ae-bf61-37d8-b115-0af74b89a6aa</id>
           <name />
@@ -11381,15 +10357,15 @@
           <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
         </connection>
         <connection>
-          <id>a9d8c7a2-6b55-3684-9954-92934d5a69e8</id>
+          <id>58cc41df-404e-309b-9df6-2ea67e1fe2b7</id>
           <name />
           <bendPoints />
           <labelIndex>1</labelIndex>
           <zIndex>0</zIndex>
-          <sourceId>74d66e0e-0b65-36d2-96f1-4b836d2c4222</sourceId>
+          <sourceId>283bea4b-2774-3f2d-aabe-cf96989e9997</sourceId>
           <sourceGroupId>194a653f-0c92-3704-8bd4-ffa079643515</sourceGroupId>
           <sourceType>PROCESSOR</sourceType>
-          <destinationId>192802be-4416-3abc-ba03-90934f2df860</destinationId>
+          <destinationId>671c4e42-604f-389d-9cee-27431ca36448</destinationId>
           <destinationGroupId>194a653f-0c92-3704-8bd4-ffa079643515</destinationGroupId>
           <destinationType>PROCESSOR</destinationType>
           <relationship>success</relationship>
@@ -11401,42 +10377,18 @@
           <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
         </connection>
         <connection>
-          <id>c2a99429-58ab-325b-b755-dffeb30b0fc1</id>
+          <id>a9d8c7a2-6b55-3684-9954-92934d5a69e8</id>
           <name />
           <bendPoints />
-          <labelIndex>0</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>192802be-4416-3abc-ba03-90934f2df860</sourceId>
-          <sourceGroupId>194a653f-0c92-3704-8bd4-ffa079643515</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>c490b6b5-0170-1000-0000-000035bc685d</destinationId>
-          <destinationGroupId>194a653f-0c92-3704-8bd4-ffa079643515</destinationGroupId>
-          <destinationType>FUNNEL</destinationType>
-          <relationship>No Retry</relationship>
-          <relationship>Failure</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
-        <connection>
-          <id>a146ab21-f626-3fa5-a736-fdeec786eaf8</id>
-          <name />
-          <bendPoints>
-            <bendPoint x="-312.47353014487453" y="970.3624699197178" />
-            <bendPoint x="-312.47353014487453" y="1020.3624699197178" />
-          </bendPoints>
           <labelIndex>1</labelIndex>
           <zIndex>0</zIndex>
-          <sourceId>c7cc4e24-7d9a-3a17-8af1-ca655f46595f</sourceId>
+          <sourceId>74d66e0e-0b65-36d2-96f1-4b836d2c4222</sourceId>
           <sourceGroupId>194a653f-0c92-3704-8bd4-ffa079643515</sourceGroupId>
           <sourceType>PROCESSOR</sourceType>
-          <destinationId>c7cc4e24-7d9a-3a17-8af1-ca655f46595f</destinationId>
+          <destinationId>192802be-4416-3abc-ba03-90934f2df860</destinationId>
           <destinationGroupId>194a653f-0c92-3704-8bd4-ffa079643515</destinationGroupId>
           <destinationType>PROCESSOR</destinationType>
-          <relationship>failure</relationship>
+          <relationship>success</relationship>
           <maxWorkQueueSize>10000</maxWorkQueueSize>
           <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
           <flowFileExpiration>0 sec</flowFileExpiration>
@@ -11484,76 +10436,6 @@
           <partitioningAttribute />
           <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
         </connection>
-        <connection>
-          <id>5b9b78c7-890c-3fe0-a1b1-b2dc5bbd944b</id>
-          <name />
-          <bendPoints>
-            <bendPoint x="306.30889441763816" y="583.7042207790005" />
-            <bendPoint x="306.30889441763816" y="633.7042207790005" />
-          </bendPoints>
-          <labelIndex>1</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>dbc236e3-8c68-3c6b-b1e9-d1fc8f57327d</sourceId>
-          <sourceGroupId>194a653f-0c92-3704-8bd4-ffa079643515</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>dbc236e3-8c68-3c6b-b1e9-d1fc8f57327d</destinationId>
-          <destinationGroupId>194a653f-0c92-3704-8bd4-ffa079643515</destinationGroupId>
-          <destinationType>PROCESSOR</destinationType>
-          <relationship>failure</relationship>
-          <relationship>unmatched</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
-        <connection>
-          <id>c98425f5-d4f3-36f7-b045-834923ca235a</id>
-          <name />
-          <bendPoints>
-            <bendPoint x="-911.4283280545671" y="539.9664353493931" />
-            <bendPoint x="-945.2909989530046" y="613.0546921853306" />
-          </bendPoints>
-          <labelIndex>1</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>ba1b7e7e-a03c-3ace-9182-7f43569537e2</sourceId>
-          <sourceGroupId>194a653f-0c92-3704-8bd4-ffa079643515</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>ba1b7e7e-a03c-3ace-9182-7f43569537e2</destinationId>
-          <destinationGroupId>194a653f-0c92-3704-8bd4-ffa079643515</destinationGroupId>
-          <destinationType>PROCESSOR</destinationType>
-          <relationship>failure</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
-        <connection>
-          <id>d19c9d34-8896-39ff-9d2d-f29651b24c18</id>
-          <name />
-          <bendPoints>
-            <bendPoint x="967.4604101497307" y="864.0677052542044" />
-            <bendPoint x="967.4604101497307" y="914.0677052542044" />
-          </bendPoints>
-          <labelIndex>1</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>671c4e42-604f-389d-9cee-27431ca36448</sourceId>
-          <sourceGroupId>194a653f-0c92-3704-8bd4-ffa079643515</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>671c4e42-604f-389d-9cee-27431ca36448</destinationId>
-          <destinationGroupId>194a653f-0c92-3704-8bd4-ffa079643515</destinationGroupId>
-          <destinationType>PROCESSOR</destinationType>
-          <relationship>failure</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
         <connection>
           <id>70fec2c7-4dd5-3dd1-92fa-59c3027bffb4</id>
           <name />
@@ -11617,53 +10499,6 @@
           <partitioningAttribute />
           <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
         </connection>
-        <connection>
-          <id>8d3dfbef-370e-374b-a6c6-89e4cdf6216b</id>
-          <name />
-          <bendPoints>
-            <bendPoint x="-320.5607955237681" y="759.2550630641567" />
-            <bendPoint x="-320.5607955237681" y="809.2550630641567" />
-          </bendPoints>
-          <labelIndex>1</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>d850fc04-df9a-36b7-b53f-8b397a1be69a</sourceId>
-          <sourceGroupId>194a653f-0c92-3704-8bd4-ffa079643515</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>d850fc04-df9a-36b7-b53f-8b397a1be69a</destinationId>
-          <destinationGroupId>194a653f-0c92-3704-8bd4-ffa079643515</destinationGroupId>
-          <destinationType>PROCESSOR</destinationType>
-          <relationship>failure</relationship>
-          <relationship>unmatched</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
-        <connection>
-          <id>536817e5-12a1-3a94-82ae-7638937a07e8</id>
-          <name />
-          <bendPoints>
-            <bendPoint x="969.4771541470864" y="627.6551663734834" />
-            <bendPoint x="969.4771541470864" y="677.6551663734834" />
-          </bendPoints>
-          <labelIndex>1</labelIndex>
-          <zIndex>0</zIndex>
-          <sourceId>283bea4b-2774-3f2d-aabe-cf96989e9997</sourceId>
-          <sourceGroupId>194a653f-0c92-3704-8bd4-ffa079643515</sourceGroupId>
-          <sourceType>PROCESSOR</sourceType>
-          <destinationId>283bea4b-2774-3f2d-aabe-cf96989e9997</destinationId>
-          <destinationGroupId>194a653f-0c92-3704-8bd4-ffa079643515</destinationGroupId>
-          <destinationType>PROCESSOR</destinationType>
-          <relationship>failure</relationship>
-          <maxWorkQueueSize>10000</maxWorkQueueSize>
-          <maxWorkQueueDataSize>1 GB</maxWorkQueueDataSize>
-          <flowFileExpiration>0 sec</flowFileExpiration>
-          <loadBalanceStrategy>DO_NOT_LOAD_BALANCE</loadBalanceStrategy>
-          <partitioningAttribute />
-          <loadBalanceCompression>DO_NOT_COMPRESS</loadBalanceCompression>
-        </connection>
       </processGroup>
       <processGroup>
         <id>c4a200ea-5317-332a-97a4-ff76f951ecde</id>
@@ -11690,7 +10525,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11886,7 +10721,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11925,7 +10760,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11957,7 +10792,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -11989,7 +10824,7 @@
           <yieldPeriod>1 sec</yieldPeriod>
           <bulletinLevel>WARN</bulletinLevel>
           <lossTolerant>false</lossTolerant>
-          <scheduledState>STOPPED</scheduledState>
+          <scheduledState>RUNNING</scheduledState>
           <schedulingStrategy>TIMER_DRIVEN</schedulingStrategy>
           <executionNode>ALL</executionNode>
           <runDurationNanos>0</runDurationNanos>
@@ -12318,7 +11153,7 @@
       </property>
       <property>
         <name>Truststore Password</name>
-        <value>enc{9d89bece21ad1ada6980d4d66e01948edea69bf4ca660094d01b6b80ec1d4d7b}</value>
+        <value>enc{2650a175fb2f75e2dcd038b4b506ac6368b7e025f6cb80fa6a82b187b0755443}</value>
       </property>
       <property>
         <name>Truststore Type</name>
@@ -12911,7 +11746,7 @@
     </controllerService>
     <variable name="misp_token" value="{{lookup('file','{{playbook_dir}}/secrets/tokens/misp')}}" />
     <variable name="maxmind_key" value="{{ maxmind_key }}" />
-    <variable name="misp_ip_first_interval" value="60d" />
+    <variable name="misp_first_interval" value="60d" />
     <variable name="elastic_username" value="{{ elastic_username }}" />
     <variable name="misp_url" value="{{ misp_url }}" />
     <variable name="elastic_url" value="https://{{ soctoolsproxy }}:9200" />
diff --git a/roles/nifi/templates/nifi.properties.j2 b/roles/nifi/templates/nifi.properties.j2
index 7a1137c..c2dafaf 100644
--- a/roles/nifi/templates/nifi.properties.j2
+++ b/roles/nifi/templates/nifi.properties.j2
@@ -166,8 +166,8 @@ nifi.security.ocsp.responder.certificate=
 
 # OpenId Connect SSO Properties #
 nifi.security.user.oidc.discovery.url=https://{{soctoolsproxy}}:12443/auth/realms/{{openid_realm}}/.well-known/openid-configuration
-nifi.security.user.oidc.connect.timeout=5 secs
-nifi.security.user.oidc.read.timeout=5 secs
+nifi.security.user.oidc.connect.timeout=10 secs
+nifi.security.user.oidc.read.timeout=10 secs
 nifi.security.user.oidc.client.id=soctools-nifi
 nifi.security.user.oidc.client.secret={{nifisecret.value}}
 nifi.security.user.oidc.preferred.jwsalgorithm=
diff --git a/startsoctools.yml b/startsoctools.yml
index 929573b..c9c4c6b 100644
--- a/startsoctools.yml
+++ b/startsoctools.yml
@@ -25,6 +25,11 @@
   roles:
     - keycloak
 
+- name: Reconfigure and start MISP
+  hosts: mispcontainers
+  roles:
+    - misp
+
 - name: Reconfigure and start NiFi
   hosts: nificontainers
   roles:
@@ -40,11 +45,6 @@
   roles:
     - odfekibana
 
-- name: Reconfigure and start MISP
-  hosts: mispcontainers
-  roles:
-    - misp
-
 - name: Install and run filebeat
   hosts: filebeat
   roles:
-- 
GitLab