change inventory naming scheme and updated all dependant scripts

README.md

@@ -8,8 +8,6 @@ If you plan to use this code in your work, we kindly request that you cite the f
 
 # **Introduction**
 
-{- TODO: is this text useful ? -} 
-
 The MITIK project proposal is to carry out non-intrusive passive measurements to analyze the mobility of users through contacts while they are moving. For that, the goal is to use probe request packets from off-the-shelf mobile devices with wireless communication (specifically Wi-Fi). To ensure GPDR compliance, a data anonymization/sanitization process is carried out so that probe requests are received by the _sniffers_ [4]. The system, as a whole, is composed of an architecture that comprises three phases, as shown in Figure 1.
 
 <div style="text-align:center">

config/broadcast.yml

@@ -6,4 +6,4 @@
 
   tasks:
     - name: say things to tty1
-      ansible.builtin.shell: echo {{ inventory_hostname }} {{ group_names[1] }} | sudo tee /dev/tty1 && /bin/true
+      ansible.builtin.shell: echo {{ inventory_hostname }} | sudo tee /dev/tty1 && /bin/true

config/inventory

@@ -4,15 +4,15 @@ ss2
 
 
 [ss1]
-; s6-whyred ansible_host=192.168.145.56
-; s1 ansible_host=192.168.1.184 ansible_ssh_user=user
-; s2 ansible_host=192.168.1.231
-; s3 ansible_host=192.168.1.239
-; s4 ansible_host=192.168.1.100
+; ss1-s6-whyred ansible_host=192.168.145.56
+; ss1-s1 ansible_host=192.168.1.184 ansible_ssh_user=user
+; ss1-s2 ansible_host=192.168.1.231
+; ss1-s3 ansible_host=192.168.1.239
+; ss1-s4 ansible_host=192.168.1.100
 
 [ss2]
-s6 ansible_host=192.168.1.244
-s5 ansible_host=192.168.1.100
+ss2-s6 ansible_host=192.168.1.244
+ss2-s5 ansible_host=192.168.1.100
 
 # rp4  ansible_host=192.168.1.248
 

config/test.yml

 - hosts:  all
   become: yes
   tasks:
+    
     - debug:
-        msg: "{{ ansible_interfaces | select('match', '^(wifi)[0-9]+')}}"
\ No newline at end of file
+        msg: >
+            {% if inventory_hostname is match('^ss[0-9]-s[0-9]$') %}
+              "../results/{{ ansible_date_time.date }}/{{ inventory_hostname[0:3] }}/{{ inventory_hostname[4:6] }}/"
+            {% else %}
+              "../results/{{ ansible_date_time.date }}/nogroup/{{ inventory_hostname }}/"
+            {% endif %}
\ No newline at end of file

docs/DOCUMENTATION.md

@@ -40,11 +40,12 @@ Enter the `config` folder. When running ansible from this folder, it will read c
 
 In order yo fill your inventory, you'll need to know your nodes' username and IP address. A static IP for each node is highly recommended.
 
-In the following example, we create a group of devices `ss1` with two nodes inside. They are locally nicknamed `s1` and `s2`, and they are reachable using their respective IP addresses. Username is set to be `user` for `s1`. Inline variables set here override variables defined globally.
+In the following example, we create a group of devices `ss1` with two nodes inside. They are locally nicknamed `ss1-s1` and `ss1-s2`, and they are reachable using their respective IP addresses. Inline variables set here override variables defined globally.  
+It is important to specify the super-sniffer inside the hostname, because else when tasks run you'll only see the number of the sniffer and not its group
 ```ini
 [ss1]
-s1 ansible_host=192.168.1.184
-s2 ansible_host=192.168.1.231
+ss1-s1 ansible_host=192.168.1.184
+ss1-s2 ansible_host=192.168.1.231
 ```
 ---
 The following adds members of the `ss1` and `ss2` groups to the `sniffers` group. Upon creating new groups, you might want to add them to the `sniffers`. This will let you run commands on all of its children at once.

docs/PLAYBOOKS.md

@@ -31,7 +31,7 @@ Multiple configuration scripts, here called microstasks, have been put into a si
 - `microtask_networkmanager_un_manager_setup.yml` (nodes)
     -  set up networkmanager to ignore wifi..8
 -  `microtask_hostname_update.yml` (nodes)
-    -  update device hostname to [group]-[inventory name]: ss1-s1
+    -  update device hostname to [inventory name]: ss1-s1
 - `microtask_hosts_update.yml` (nodes)
     - Add addresses of all other sniffers to each sniffer's hosts file
 - `microtask_getty_autologin_setup.yml` (nodes)