Merge 36b2e47d0d into 6faf600d40

Similar to #1807

docker/elk/logstash/dist/http_output.conf

@@ -698,12 +698,15 @@ filter {
       remove_field => ["event_timestamp"]
     }
     mutate {
-      rename => {
+      split => ["source_ip", ":"]
-        "source_ip" => "src_ip"
+      rename => { "destination_ip" => "dest_ip" }
-        "destination_ip" => "dest_ip"
-      }
       add_field => { "dest_port" => "5060" }
     }
+    mutate {
+      add_field => { "src_ip" => "%{[source_ip][0]}" }
+      add_field => { "src_port" => "%{[source_ip][1]}" }
+      remove_field => ["source_ip"]
+    }
   }
 
 # Tanner

docker/elk/logstash/dist/logstash.conf

@@ -698,12 +698,15 @@ filter {
       remove_field => ["event_timestamp"]
     }
     mutate {
-      rename => {
+      split => ["source_ip", ":"]
-        "source_ip" => "src_ip"
+      rename => { "destination_ip" => "dest_ip" }
-        "destination_ip" => "dest_ip"
-      }
       add_field => { "dest_port" => "5060" }
     }
+    mutate {
+      add_field => { "src_ip" => "%{[source_ip][0]}" }
+      add_field => { "src_port" => "%{[source_ip][1]}" }
+      remove_field => ["source_ip"]
+    }
   }
 
 # Tanner

installer/install/tpot.yml

@@ -478,6 +478,21 @@
       tags:
         - "Ubuntu"
 
+    - name: Comment out Port(s) in sshd_config, can cause port conflicts on deploy (AlmaLinux, Debian, Fedora, openSUSE Tumbleweed, Raspbian, Rocky, Ubuntu)
+      ansible.builtin.replace:
+        path: /etc/ssh/sshd_config
+        regexp: "^(Port [0-9]+)"
+        replace: '# \1'
+      when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
+      tags:
+        - "AlmaLinux"
+        - "Debian"
+        - "Fedora"
+        - "openSUSE Tumbleweed"
+        - "Raspbian"
+        - "Rocky"
+        - "Ubuntu"
+
     - name: Change SSH Port to 64295 (AlmaLinux, Debian, Fedora, Raspbian, Rocky, Ubuntu)
       lineinfile:
         path: /etc/ssh/sshd_config

installer/remove/tpot.yml

@@ -215,6 +215,21 @@
         - "Rocky"
         - "Ubuntu"
 
+    - name: Revert Comment out Port(s) in sshd_config, can cause port conflicts on deploy (AlmaLinux, Debian, Fedora, openSUSE Tumbleweed, Raspbian, Rocky, Ubuntu)
+      ansible.builtin.replace:
+        path: /etc/ssh/sshd_config
+        regexp: "^# (Port [0-9]+)"
+        replace: '\1'
+      when: ansible_distribution in ["AlmaLinux", "Debian", "Fedora", "openSUSE Tumbleweed", "Raspbian", "Rocky", "Ubuntu"]
+      tags:
+        - "AlmaLinux"
+        - "Debian"
+        - "Fedora"
+        - "openSUSE Tumbleweed"
+        - "Raspbian"
+        - "Rocky"
+        - "Ubuntu"
+
     - name: Remove vm.max_map_count setting (All)
       lineinfile:
         path: /etc/sysctl.conf