Merge branch 'vagrant-update' into 'master'

Vagrant update

See merge request medina/security-monitoring!9

README.md

@@ -16,14 +16,17 @@ In addition to Wazuh, ClamAV is also installed on agent machines.
 
 ## Requirements
 
- * Vagrant 2.2.14
- * Ansible 2.9.16
+ * Vagrant `2.2.19`
+ * VirtualBox `6.1.32`
+ * Ansible `>=2.9.6`
  * (optional / integrations) `npm` / `npx` in order to run the simple HTTP server for the integrations
 
 ---
 
 ## Setting up the demo
 
+> Important: make sure you have installed the right versions of Vagrant and VirtualBox!
+
 1. Checkout Wazuh's tag `v4.1.5` into the current directory:
 
     ```
@@ -48,6 +51,8 @@ In addition to Wazuh, ClamAV is also installed on agent machines.
     $ make create provision
     ```
 
+    > Note: `create` command also adds `/etc/vbox/networks.conf` config required by Vagrant/VirtualBox.
+
 ---
 
 ## Using demo components
@@ -69,14 +74,15 @@ Clouditor starts automatically when Clouditor VM is provisioned.
 To see Clouditor's output, `ssh` to its machine and examine the log file:  
 
 ```
-$ make ssh-clouditor
-$ tail /var/log/clouditor.log
+$ make logs-clouditor
 ```
 
 To manually (re)start Clouditor (normally not needed), you can use the following command on the Clouditor VM (inside `/home/vagrant/clouditor`):
 
 ```
-$ make run
+$ make ssh-clouditor    # on host machine
+
+$ make run              # on VM
 ```
 
 ### Evidence Collector
@@ -84,8 +90,7 @@ $ make run
 To see Evidence Collector's output, `ssh` to its machine and open Docker logs:
 
 ```
-$ make ssh-evidence-collector
-$ docker logs -ft evidence-collector
+$ make logs-evidence-collector
 ```
 
 ### Wazuh

environments/full-setup/Vagrantfile

@@ -6,7 +6,6 @@ servers=[
     :hostname => "manager",
     :ip => "192.168.33.10",
     :box => "centos/stream8",
-    :forward_ports => [{:guest => 55000, :host => 55000}, {:guest => 9200, :host => 9200}],
     :ram => 2048,
     :cpu => 2
   },  
@@ -35,7 +34,6 @@ servers=[
     :hostname => "clouditor",
     :ip => "192.168.33.14",
     :box => "centos/stream8",
-    :forward_ports => [{:guest => 9090, :host => 9090}],
     :ram => 1024,
     :cpu => 1
   }
@@ -44,9 +42,6 @@ servers=[
 Vagrant.configure(2) do |config|
   servers.each do |machine|
       config.vm.define machine[:hostname] do |node|
-          # node.vm.provision "ansible" do |ansible|
-          #   ansible.playbook = "../../ansible/provision.yml"
-          # end
           node.vm.box = machine[:box]
           node.vm.hostname = machine[:hostname]
           node.vm.network "private_network", ip: machine[:ip]

environments/full-setup/full-setup.mk

@@ -3,6 +3,9 @@ SSH_PRIVATE_KEY = $(HOME)/.vagrant.d/insecure_private_key
 SSH_USER = vagrant
 
 create:
+	sudo mkdir -p /etc/vbox
+	sudo touch /etc/vbox/networks.conf
+	grep -Fxq "* 192.168.33.0/24" /etc/vbox/networks.conf || sudo sh -c 'echo "* 192.168.33.0/24\n" >> /etc/vbox/networks.conf' 
 	@$(VAGRANT_RUN) up
 
 delete:

environments/no-collector/no-collector.mk

@@ -3,6 +3,9 @@ SSH_PRIVATE_KEY = $(HOME)/.vagrant.d/insecure_private_key
 SSH_USER = vagrant
 
 create:
+	sudo mkdir -p /etc/vbox
+	sudo touch /etc/vbox/networks.conf
+	grep -Fxq "* 192.168.33.0/24" /etc/vbox/networks.conf || sudo sh -c 'echo "* 192.168.33.0/24\n" >> /etc/vbox/networks.conf' 
 	@$(VAGRANT_RUN) up
 
 delete: