diff --git a/octocatalog-diff/facts/db0.internal.staging.swh.network.yaml b/octocatalog-diff/facts/db0.internal.staging.swh.network.yaml
index 776cc5697f60eb9900a98867c601c7cf494cd242..1de823d1abeb7043602d365fc8ff932f29e3eb7e 100644
--- a/octocatalog-diff/facts/db0.internal.staging.swh.network.yaml
+++ b/octocatalog-diff/facts/db0.internal.staging.swh.network.yaml
@@ -2,17 +2,29 @@
 name: db0.internal.staging.swh.network
 values:
   agent_specified_environment: staging
-  apt_dist_updates: 3
+  apt_dist_updates: 7
   apt_has_dist_updates: true
-  apt_has_updates: false
+  apt_has_updates: true
   apt_package_dist_updates:
+  - pgbouncer
   - python3-certifi
   - python3-requests
   - python3-urllib3
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
   apt_package_security_dist_updates: []
-  apt_reboot_required: false
+  apt_package_security_updates: []
+  apt_package_updates:
+  - pgbouncer
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
+  apt_reboot_required: true
   apt_security_dist_updates: 0
-  apt_update_last_success: 1565516402
+  apt_security_updates: 0
+  apt_update_last_success: 1567083123
+  apt_updates: 4
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -84,8 +96,8 @@ values:
   kernelversion: 4.9.0
   load_averages:
     15m: 0.01
-    1m: 0.08
-    5m: 0.02
+    1m: 0.16
+    5m: 0.03
   location: sesi_rocquencourt_staging
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -98,22 +110,22 @@ values:
   manufacturer: QEMU
   memory:
     system:
-      available: 15.15 GiB
-      available_bytes: 16264749056
-      capacity: 3.37%
+      available: 15.10 GiB
+      available_bytes: 16214290432
+      capacity: 3.67%
       total: 15.68 GiB
       total_bytes: 16831205376
-      used: 540.21 MiB
-      used_bytes: 566456320
-  memoryfree: 15.15 GiB
-  memoryfree_mb: 15511.2734375
+      used: 588.34 MiB
+      used_bytes: 616914944
+  memoryfree: 15.10 GiB
+  memoryfree_mb: 15463.15234375
   memorysize: 15.68 GiB
   memorysize_mb: 16051.48828125
   mountpoints:
     "/":
-      available: 26.90 GiB
-      available_bytes: 28884451328
-      capacity: 14.51%
+      available: 26.60 GiB
+      available_bytes: 28559364096
+      capacity: 15.47%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -123,8 +135,8 @@ values:
       - data=ordered
       size: 31.47 GiB
       size_bytes: 33785901056
-      used: 4.56 GiB
-      used_bytes: 4901449728
+      used: 4.87 GiB
+      used_bytes: 5226536960
     "/dev/shm":
       available: 7.84 GiB
       available_bytes: 8415592448
@@ -141,7 +153,7 @@ values:
       used_bytes: 8192
     "/run":
       available: 1.56 GiB
-      available_bytes: 1680039936
+      available_bytes: 1680031744
       capacity: 0.18%
       device: tmpfs
       filesystem: tmpfs
@@ -154,8 +166,8 @@ values:
       - mode=755
       size: 1.57 GiB
       size_bytes: 1683124224
-      used: 2.94 MiB
-      used_bytes: 3084288
+      used: 2.95 MiB
+      used_bytes: 3092480
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -397,10 +409,10 @@ values:
     short: db0
     internal_fqdn: db0.internal.staging.swh.network
   system_uptime:
-    days: 4
-    hours: 109
-    seconds: 393399
-    uptime: 4 days
+    days: 22
+    hours: 545
+    seconds: 1963111
+    uptime: 22 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -409,15 +421,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 4 days
-  uptime_days: 4
-  uptime_hours: 109
-  uptime_seconds: 393399
+  uptime: 22 days
+  uptime_days: 22
+  uptime_hours: 545
+  uptime_seconds: 1963111
   uuid: 3D9DFE8D-9946-45CA-A63C-26BF638B6EBC
   vcsrepo_svn_ver: ''
   virtual: physical
   clientcert: db0.internal.staging.swh.network
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-11T09:40:23.397807553+00:00'
-expiration: '2019-08-11T10:10:23.398539863+00:00'
+timestamp: '2019-08-29T13:42:15.796250029+00:00'
+expiration: '2019-08-29T14:12:15.796931039+00:00'
diff --git a/octocatalog-diff/facts/deposit.internal.staging.swh.network.yaml b/octocatalog-diff/facts/deposit.internal.staging.swh.network.yaml
index 1ca88eff9f963ac78c3365bd52af650ee871aea7..6036d78e72363659a8f914c60f49634f50c2498e 100644
--- a/octocatalog-diff/facts/deposit.internal.staging.swh.network.yaml
+++ b/octocatalog-diff/facts/deposit.internal.staging.swh.network.yaml
@@ -3,25 +3,33 @@ name: deposit.internal.staging.swh.network
 values:
   agent_specified_environment: staging
   apache_version: 2.4.25
-  apt_dist_updates: 5
+  apt_dist_updates: 9
   apt_has_dist_updates: true
   apt_has_updates: true
   apt_package_dist_updates:
+  - pgbouncer
   - python3-certifi
   - python3-requests
   - python3-urllib3
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
   - filebeat
   - journalbeat
   apt_package_security_dist_updates: []
   apt_package_security_updates: []
   apt_package_updates:
+  - pgbouncer
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
   - filebeat
   - journalbeat
-  apt_reboot_required: false
+  apt_reboot_required: true
   apt_security_dist_updates: 0
   apt_security_updates: 0
-  apt_update_last_success: 1565516103
-  apt_updates: 2
+  apt_update_last_success: 1567154103
+  apt_updates: 6
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -92,9 +100,9 @@ values:
   kernelrelease: 4.9.0-9-amd64
   kernelversion: 4.9.0
   load_averages:
-    15m: 0.04
-    1m: 0.17
-    5m: 0.1
+    15m: 0.18
+    1m: 0.36
+    5m: 0.26
   location: sesi_rocquencourt_staging
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -107,22 +115,22 @@ values:
   manufacturer: QEMU
   memory:
     system:
-      available: 14.92 GiB
-      available_bytes: 16023240704
-      capacity: 4.80%
+      available: 14.98 GiB
+      available_bytes: 16081539072
+      capacity: 4.45%
       total: 15.68 GiB
       total_bytes: 16831221760
-      used: 770.55 MiB
-      used_bytes: 807981056
-  memoryfree: 14.92 GiB
-  memoryfree_mb: 15280.953125
+      used: 714.95 MiB
+      used_bytes: 749682688
+  memoryfree: 14.98 GiB
+  memoryfree_mb: 15336.55078125
   memorysize: 15.68 GiB
   memorysize_mb: 16051.50390625
   mountpoints:
     "/":
-      available: 28.13 GiB
-      available_bytes: 30206922752
-      capacity: 10.59%
+      available: 27.90 GiB
+      available_bytes: 29952528384
+      capacity: 11.35%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -132,8 +140,8 @@ values:
       - data=ordered
       size: 31.47 GiB
       size_bytes: 33785901056
-      used: 3.33 GiB
-      used_bytes: 3578978304
+      used: 3.57 GiB
+      used_bytes: 3833372672
     "/dev/shm":
       available: 7.84 GiB
       available_bytes: 8415600640
@@ -150,7 +158,7 @@ values:
       used_bytes: 8192
     "/run":
       available: 1.56 GiB
-      available_bytes: 1680113664
+      available_bytes: 1680097280
       capacity: 0.18%
       device: tmpfs
       filesystem: tmpfs
@@ -163,8 +171,8 @@ values:
       - mode=755
       size: 1.57 GiB
       size_bytes: 1683124224
-      used: 2.87 MiB
-      used_bytes: 3010560
+      used: 2.89 MiB
+      used_bytes: 3026944
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -406,10 +414,10 @@ values:
     short: deposit
     internal_fqdn: deposit.internal.staging.swh.network
   system_uptime:
-    days: 2
-    hours: 66
-    seconds: 239007
-    uptime: 2 days
+    days: 21
+    hours: 521
+    seconds: 1877242
+    uptime: 21 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -418,15 +426,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 2 days
-  uptime_days: 2
-  uptime_hours: 66
-  uptime_seconds: 239007
+  uptime: 21 days
+  uptime_days: 21
+  uptime_hours: 521
+  uptime_seconds: 1877242
   uuid: 5FA5531E-8C1F-49DE-B0CC-AF0B9002FFA1
   vcsrepo_svn_ver: ''
   virtual: physical
   clientcert: deposit.internal.staging.swh.network
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-11T09:40:23.521043190+00:00'
-expiration: '2019-08-11T10:10:23.521768974+00:00'
+timestamp: '2019-08-30T08:44:18.753191358+00:00'
+expiration: '2019-08-30T09:14:18.754017301+00:00'
diff --git a/octocatalog-diff/facts/gateway.internal.staging.swh.network.yaml b/octocatalog-diff/facts/gateway.internal.staging.swh.network.yaml
index 09130edd3d672161e69ad77e1ef41a9f264233c4..5a9d4a5a51499f61b3b6ef9c444b0c73b5f27c9b 100644
--- a/octocatalog-diff/facts/gateway.internal.staging.swh.network.yaml
+++ b/octocatalog-diff/facts/gateway.internal.staging.swh.network.yaml
@@ -4,8 +4,8 @@ values:
   agent_specified_environment: staging
   apt_has_dist_updates: false
   apt_has_updates: false
-  apt_reboot_required: false
-  apt_update_last_success: 1565516223
+  apt_reboot_required: true
+  apt_update_last_success: 1567085822
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -74,8 +74,8 @@ values:
   kernelversion: 4.9.0
   load_averages:
     15m: 0.02
-    1m: 0.3
-    5m: 0.07
+    1m: 0.27
+    5m: 0.08
   location: sesi_rocquencourt_staging
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -89,22 +89,22 @@ values:
   manufacturer: QEMU
   memory:
     system:
-      available: 807.07 MiB
-      available_bytes: 846270464
-      capacity: 19.00%
+      available: 788.09 MiB
+      available_bytes: 826372096
+      capacity: 20.90%
       total: 996.36 MiB
       total_bytes: 1044754432
-      used: 189.29 MiB
-      used_bytes: 198483968
-  memoryfree: 807.07 MiB
-  memoryfree_mb: 807.06640625
+      used: 208.27 MiB
+      used_bytes: 218382336
+  memoryfree: 788.09 MiB
+  memoryfree_mb: 788.08984375
   memorysize: 996.36 MiB
   memorysize_mb: 996.35546875
   mountpoints:
     "/":
-      available: 18.17 GiB
-      available_bytes: 19506937856
-      capacity: 7.56%
+      available: 18.04 GiB
+      available_bytes: 19372101632
+      capacity: 8.20%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -114,8 +114,8 @@ values:
       - data=ordered
       size: 19.65 GiB
       size_bytes: 21103177728
-      used: 1.49 GiB
-      used_bytes: 1596239872
+      used: 1.61 GiB
+      used_bytes: 1731076096
     "/dev/shm":
       available: 498.18 MiB
       available_bytes: 522375168
@@ -131,9 +131,9 @@ values:
       used: 0 bytes
       used_bytes: 0
     "/run":
-      available: 97.34 MiB
-      available_bytes: 102068224
-      capacity: 2.31%
+      available: 97.32 MiB
+      available_bytes: 102051840
+      capacity: 2.32%
       device: tmpfs
       filesystem: tmpfs
       options:
@@ -145,8 +145,8 @@ values:
       - mode=755
       size: 99.64 MiB
       size_bytes: 104476672
-      used: 2.30 MiB
-      used_bytes: 2408448
+      used: 2.31 MiB
+      used_bytes: 2424832
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -404,10 +404,10 @@ values:
     short: gateway
     internal_fqdn: gateway.internal.staging.swh.network
   system_uptime:
-    days: 5
-    hours: 141
-    seconds: 510249
-    uptime: 5 days
+    days: 24
+    hours: 577
+    seconds: 2079960
+    uptime: 24 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -416,15 +416,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 5 days
-  uptime_days: 5
-  uptime_hours: 141
-  uptime_seconds: 510249
+  uptime: 24 days
+  uptime_days: 24
+  uptime_hours: 577
+  uptime_seconds: 2079960
   uuid: D8E20B1C-15B1-4449-84AE-A96134974917
   vcsrepo_svn_ver: ''
   virtual: physical
   clientcert: gateway.internal.staging.swh.network
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-11T09:40:24.908016693+00:00'
-expiration: '2019-08-11T10:10:24.908751463+00:00'
+timestamp: '2019-08-29T13:42:16.455074546+00:00'
+expiration: '2019-08-29T14:12:16.455806296+00:00'
diff --git a/octocatalog-diff/facts/kafka01.euwest.azure.internal.softwareheritage.org.yaml b/octocatalog-diff/facts/kafka01.euwest.azure.internal.softwareheritage.org.yaml
index e9a15fffa647f223c41c54832ff74b73cfa5319b..dd7bcc645f466e8f04b3d2a3e94692844d75a65a 100644
--- a/octocatalog-diff/facts/kafka01.euwest.azure.internal.softwareheritage.org.yaml
+++ b/octocatalog-diff/facts/kafka01.euwest.azure.internal.softwareheritage.org.yaml
@@ -5,7 +5,7 @@ values:
   apt_has_dist_updates: false
   apt_has_updates: false
   apt_reboot_required: false
-  apt_update_last_success: 1566497717
+  apt_update_last_success: 1566575164
   architecture: amd64
   bios_release_date: 06/02/2017
   bios_vendor: American Megatrends Inc.
@@ -103,14 +103,19 @@ values:
   ipaddress_lo: 127.0.0.1
   is_pe: false
   is_virtual: true
+  java_default_home: "/usr/lib/jvm/java-8-openjdk-amd64"
+  java_libjvm_path: "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server"
+  java_major_version: '8'
+  java_patch_level: '222'
+  java_version: 1.8.0_222
   kernel: Linux
   kernelmajversion: '4.9'
   kernelrelease: 4.9.0-9-amd64
   kernelversion: 4.9.0
   load_averages:
-    15m: 0.29
-    1m: 0.53
-    5m: 0.56
+    15m: 0.46
+    1m: 0.31
+    5m: 0.39
   location: azure_euwest
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -123,22 +128,22 @@ values:
   manufacturer: Microsoft Corporation
   memory:
     system:
-      available: 3.59 GiB
-      available_bytes: 3851538432
-      capacity: 6.72%
+      available: 3.36 GiB
+      available_bytes: 3606638592
+      capacity: 12.65%
       total: 3.85 GiB
       total_bytes: 4128972800
-      used: 264.58 MiB
-      used_bytes: 277434368
-  memoryfree: 3.59 GiB
-  memoryfree_mb: 3673.11328125
+      used: 498.14 MiB
+      used_bytes: 522334208
+  memoryfree: 3.36 GiB
+  memoryfree_mb: 3439.55859375
   memorysize: 3.85 GiB
   memorysize_mb: 3937.6953125
   mountpoints:
     "/":
-      available: 28.28 GiB
-      available_bytes: 30365216768
-      capacity: 3.82%
+      available: 27.65 GiB
+      available_bytes: 29686779904
+      capacity: 5.97%
       device: "/dev/sda1"
       filesystem: ext4
       options:
@@ -148,8 +153,8 @@ values:
       - data=ordered
       size: 29.40 GiB
       size_bytes: 31571480576
-      used: 1.12 GiB
-      used_bytes: 1206263808
+      used: 1.76 GiB
+      used_bytes: 1884700672
     "/dev/shm":
       available: 1.92 GiB
       available_bytes: 2064486400
@@ -179,9 +184,9 @@ values:
       used: 35.99 MiB
       used_bytes: 37740544
     "/run":
-      available: 393.39 MiB
-      available_bytes: 412504064
-      capacity: 0.10%
+      available: 393.35 MiB
+      available_bytes: 412454912
+      capacity: 0.11%
       device: tmpfs
       filesystem: tmpfs
       options:
@@ -193,8 +198,8 @@ values:
       - mode=755
       size: 393.77 MiB
       size_bytes: 412897280
-      used: 384.00 KiB
-      used_bytes: 393216
+      used: 432.00 KiB
+      used_bytes: 442368
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -212,7 +217,7 @@ values:
       size_bytes: 5242880
       used: 0 bytes
       used_bytes: 0
-    "/run/user/0":
+    "/run/user/1001":
       available: 393.77 MiB
       available_bytes: 412897280
       capacity: 0%
@@ -225,10 +230,26 @@ values:
       - relatime
       - size=403220k
       - mode=700
+      - uid=1001
+      - gid=1001
       size: 393.77 MiB
       size_bytes: 412897280
       used: 0 bytes
       used_bytes: 0
+    "/srv/kafka":
+      available: 7.94 TiB
+      available_bytes: 8725568802816
+      capacity: 0.00%
+      device: "/dev/sdc1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.94 TiB
+      size_bytes: 8725665300480
+      used: 92.03 MiB
+      used_bytes: 96497664
     "/sys/fs/cgroup":
       available: 1.92 GiB
       available_bytes: 2064486400
@@ -248,6 +269,7 @@ values:
   mounts:
   - "/"
   - "/mnt/resource"
+  - "/srv/kafka"
   mtu_eth0: 1500
   mtu_lo: 65536
   mysql_server_id: 15388766
@@ -351,6 +373,13 @@ values:
       size: 8.00 GiB
       size_bytes: 8588820480
       uuid: 6068f525-780f-4877-9205-a048667eae7f
+    "/dev/sdc1":
+      filesystem: ext4
+      mount: "/srv/kafka"
+      partuuid: 5d4641f9-4f3b-42f2-ad0b-f8e9f0b7b1db
+      size: 8.00 TiB
+      size_bytes: 8796091956736
+      uuid: cb95c0f7-1c39-40f2-a937-7a3e766e58a6
   path: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
   physicalprocessorcount: 1
   processor0: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
@@ -426,9 +455,9 @@ values:
     internal_fqdn: kafka01.euwest.azure.internal.softwareheritage.org
   system_uptime:
     days: 0
-    hours: 0
-    seconds: 337
-    uptime: 0:05 hours
+    hours: 21
+    seconds: 79146
+    uptime: 21:59 hours
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -437,15 +466,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 0:05 hours
+  uptime: 21:59 hours
   uptime_days: 0
-  uptime_hours: 0
-  uptime_seconds: 337
+  uptime_hours: 21
+  uptime_seconds: 79146
   uuid: 24616019-5C09-0E4C-BADB-A432B5BC3CEA
   vcsrepo_svn_ver: ''
   virtual: hyperv
   clientcert: kafka01.euwest.azure.internal.softwareheritage.org
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-22T18:15:26.813369783+00:00'
-expiration: '2019-08-22T18:45:26.813845284+00:00'
+timestamp: '2019-08-23T16:08:54.842690414+00:00'
+expiration: '2019-08-23T16:38:54.843159617+00:00'
diff --git a/octocatalog-diff/facts/kafka02.euwest.azure.internal.softwareheritage.org.yaml b/octocatalog-diff/facts/kafka02.euwest.azure.internal.softwareheritage.org.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..09c2edd11f5420d31935b9a1f7aaafd86bd540f7
--- /dev/null
+++ b/octocatalog-diff/facts/kafka02.euwest.azure.internal.softwareheritage.org.yaml
@@ -0,0 +1,480 @@
+--- !ruby/object:Puppet::Node::Facts
+name: kafka02.euwest.azure.internal.softwareheritage.org
+values:
+  agent_specified_environment: production
+  apt_has_dist_updates: false
+  apt_has_updates: false
+  apt_reboot_required: false
+  apt_update_last_success: 1566575342
+  architecture: amd64
+  bios_release_date: 06/02/2017
+  bios_vendor: American Megatrends Inc.
+  bios_version: '090007'
+  blockdevice_fd0_size: 4096
+  blockdevice_sda_model: Virtual Disk
+  blockdevice_sda_size: 32212254720
+  blockdevice_sda_vendor: Msft
+  blockdevice_sdb_model: Virtual Disk
+  blockdevice_sdb_size: 8589934592
+  blockdevice_sdb_vendor: Msft
+  blockdevice_sdc_model: Virtual Disk
+  blockdevice_sdc_size: 8796093022208
+  blockdevice_sdc_vendor: Msft
+  blockdevice_sr0_model: Virtual CD/ROM
+  blockdevice_sr0_size: 1073741312
+  blockdevice_sr0_vendor: Msft
+  blockdevices: sdb,sr0,fd0,sdc,sda
+  boardmanufacturer: Microsoft Corporation
+  boardproductname: Virtual Machine
+  boardserialnumber: 0000-0009-4864-2357-3252-4008-60
+  chassisassettag: 7783-7084-3265-9085-8269-3286-77
+  chassistype: Desktop
+  cloud:
+    provider: azure
+  dhcp_servers:
+    eth0: 168.63.129.16
+    system: 168.63.129.16
+  disks:
+    fd0:
+      size: 4.00 KiB
+      size_bytes: 4096
+    sda:
+      model: Virtual Disk
+      size: 30.00 GiB
+      size_bytes: 32212254720
+      vendor: Msft
+    sdb:
+      model: Virtual Disk
+      size: 8.00 GiB
+      size_bytes: 8589934592
+      vendor: Msft
+    sdc:
+      model: Virtual Disk
+      size: 8.00 TiB
+      size_bytes: 8796093022208
+      vendor: Msft
+    sr0:
+      model: Virtual CD/ROM
+      size: 1.00 GiB
+      size_bytes: 1073741312
+      vendor: Msft
+  dmi:
+    bios:
+      release_date: 06/02/2017
+      vendor: American Megatrends Inc.
+      version: '090007'
+    board:
+      manufacturer: Microsoft Corporation
+      product: Virtual Machine
+      serial_number: 0000-0009-4864-2357-3252-4008-60
+    chassis:
+      asset_tag: 7783-7084-3265-9085-8269-3286-77
+      type: Desktop
+    manufacturer: Microsoft Corporation
+    product:
+      name: Virtual Machine
+      serial_number: 0000-0001-6767-9304-4520-4882-72
+      uuid: 632A4517-7DD4-504D-83A6-8BFA8899E6DC
+  domain: euwest.azure.internal.softwareheritage.org
+  facterversion: 3.10.0
+  filesystems: ext2,ext3,ext4
+  fips_enabled: false
+  fqdn: kafka02.euwest.azure.internal.softwareheritage.org
+  gid: root
+  hardwareisa: unknown
+  hardwaremodel: x86_64
+  hostname: kafka02
+  icinga2_puppet_hostcert: "/var/lib/puppet/ssl/certs/kafka02.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_hostprivkey: "/var/lib/puppet/ssl/private_keys/kafka02.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_localcacert: "/var/lib/puppet/ssl/certs/ca.pem"
+  id: root
+  identity:
+    gid: 0
+    group: root
+    privileged: true
+    uid: 0
+    user: root
+  interfaces: eth0,lo
+  ipaddress: 192.168.200.25
+  ipaddress6: fe80::20d:3aff:fe20:a6e8
+  ipaddress6_eth0: fe80::20d:3aff:fe20:a6e8
+  ipaddress6_lo: "::1"
+  ipaddress_eth0: 192.168.200.25
+  ipaddress_lo: 127.0.0.1
+  is_pe: false
+  is_virtual: true
+  java_default_home: "/usr/lib/jvm/java-8-openjdk-amd64"
+  java_libjvm_path: "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server"
+  java_major_version: '8'
+  java_patch_level: '222'
+  java_version: 1.8.0_222
+  kernel: Linux
+  kernelmajversion: '4.9'
+  kernelrelease: 4.9.0-9-amd64
+  kernelversion: 4.9.0
+  load_averages:
+    15m: 0.38
+    1m: 0.3
+    5m: 0.27
+  location: azure_euwest
+  lsbdistcodename: stretch
+  lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
+  lsbdistid: Debian
+  lsbdistrelease: '9.9'
+  lsbmajdistrelease: '9'
+  lsbminordistrelease: '9'
+  macaddress: 00:0d:3a:20:a6:e8
+  macaddress_eth0: 00:0d:3a:20:a6:e8
+  manufacturer: Microsoft Corporation
+  memory:
+    system:
+      available: 3.51 GiB
+      available_bytes: 3768242176
+      capacity: 8.74%
+      total: 3.85 GiB
+      total_bytes: 4128964608
+      used: 344.01 MiB
+      used_bytes: 360722432
+  memoryfree: 3.51 GiB
+  memoryfree_mb: 3593.67578125
+  memorysize: 3.85 GiB
+  memorysize_mb: 3937.6875
+  mountpoints:
+    "/":
+      available: 27.66 GiB
+      available_bytes: 29697052672
+      capacity: 5.94%
+      device: "/dev/sda1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - errors=remount-ro
+      - data=ordered
+      size: 29.40 GiB
+      size_bytes: 31571480576
+      used: 1.75 GiB
+      used_bytes: 1874427904
+    "/dev/shm":
+      available: 1.92 GiB
+      available_bytes: 2064482304
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      size: 1.92 GiB
+      size_bytes: 2064482304
+      used: 0 bytes
+      used_bytes: 0
+    "/mnt/resource":
+      available: 7.78 GiB
+      available_bytes: 8349155328
+      capacity: 0.45%
+      device: "/dev/sdb1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.81 GiB
+      size_bytes: 8386895872
+      used: 35.99 MiB
+      used_bytes: 37740544
+    "/run":
+      available: 393.35 MiB
+      available_bytes: 412454912
+      capacity: 0.11%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - noexec
+      - relatime
+      - size=403220k
+      - mode=755
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 432.00 KiB
+      used_bytes: 442368
+    "/run/lock":
+      available: 5.00 MiB
+      available_bytes: 5242880
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - noexec
+      - relatime
+      - size=5120k
+      size: 5.00 MiB
+      size_bytes: 5242880
+      used: 0 bytes
+      used_bytes: 0
+    "/run/user/1001":
+      available: 393.77 MiB
+      available_bytes: 412893184
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - relatime
+      - size=403216k
+      - mode=700
+      - uid=1001
+      - gid=1001
+      size: 393.77 MiB
+      size_bytes: 412893184
+      used: 0 bytes
+      used_bytes: 0
+    "/srv/kafka":
+      available: 7.94 TiB
+      available_bytes: 8725568802816
+      capacity: 0.00%
+      device: "/dev/sdc1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.94 TiB
+      size_bytes: 8725665300480
+      used: 92.03 MiB
+      used_bytes: 96497664
+    "/sys/fs/cgroup":
+      available: 1.92 GiB
+      available_bytes: 2064482304
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - ro
+      - nosuid
+      - nodev
+      - noexec
+      - mode=755
+      size: 1.92 GiB
+      size_bytes: 2064482304
+      used: 0 bytes
+      used_bytes: 0
+  mounts:
+  - "/"
+  - "/mnt/resource"
+  - "/srv/kafka"
+  mtu_eth0: 1500
+  mtu_lo: 65536
+  mysql_server_id: 15346280
+  netmask: 255.255.252.0
+  netmask6: 'ffff:ffff:ffff:ffff::'
+  netmask6_eth0: 'ffff:ffff:ffff:ffff::'
+  netmask6_lo: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+  netmask_eth0: 255.255.252.0
+  netmask_lo: 255.0.0.0
+  network: 192.168.200.0
+  network6: 'fe80::'
+  network6_eth0: 'fe80::'
+  network6_lo: "::1"
+  network_eth0: 192.168.200.0
+  network_lo: 127.0.0.0
+  networking:
+    dhcp: 168.63.129.16
+    domain: euwest.azure.internal.softwareheritage.org
+    fqdn: kafka02.euwest.azure.internal.softwareheritage.org
+    hostname: kafka02
+    interfaces:
+      eth0:
+        bindings:
+        - address: 192.168.200.25
+          netmask: 255.255.252.0
+          network: 192.168.200.0
+        bindings6:
+        - address: fe80::20d:3aff:fe20:a6e8
+          netmask: 'ffff:ffff:ffff:ffff::'
+          network: 'fe80::'
+        dhcp: 168.63.129.16
+        ip: 192.168.200.25
+        ip6: fe80::20d:3aff:fe20:a6e8
+        mac: 00:0d:3a:20:a6:e8
+        mtu: 1500
+        netmask: 255.255.252.0
+        netmask6: 'ffff:ffff:ffff:ffff::'
+        network: 192.168.200.0
+        network6: 'fe80::'
+      lo:
+        bindings:
+        - address: 127.0.0.1
+          netmask: 255.0.0.0
+          network: 127.0.0.0
+        bindings6:
+        - address: "::1"
+          netmask: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+          network: "::1"
+        ip: 127.0.0.1
+        ip6: "::1"
+        mtu: 65536
+        netmask: 255.0.0.0
+        netmask6: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+        network: 127.0.0.0
+        network6: "::1"
+    ip: 192.168.200.25
+    ip6: fe80::20d:3aff:fe20:a6e8
+    mac: 00:0d:3a:20:a6:e8
+    mtu: 1500
+    netmask: 255.255.252.0
+    netmask6: 'ffff:ffff:ffff:ffff::'
+    network: 192.168.200.0
+    network6: 'fe80::'
+    primary: eth0
+  operatingsystem: Debian
+  operatingsystemmajrelease: '9'
+  operatingsystemrelease: '9.9'
+  os:
+    architecture: amd64
+    distro:
+      codename: stretch
+      description: Debian GNU/Linux 9.9 (stretch)
+      id: Debian
+      release:
+        full: '9.9'
+        major: '9'
+        minor: '9'
+    family: Debian
+    hardware: x86_64
+    name: Debian
+    release:
+      full: '9.9'
+      major: '9'
+      minor: '9'
+    selinux:
+      enabled: false
+  osfamily: Debian
+  package_provider: apt
+  partitions:
+    "/dev/sda1":
+      filesystem: ext4
+      mount: "/"
+      partuuid: 8f00037d-01
+      size: 30.00 GiB
+      size_bytes: 32211206144
+      uuid: 1983b779-b2c8-404a-b8a4-1282baa9f8b1
+    "/dev/sdb1":
+      filesystem: ext4
+      mount: "/mnt/resource"
+      partuuid: 17452a63-01
+      size: 8.00 GiB
+      size_bytes: 8588820480
+      uuid: 40b7d884-a2fd-44a0-8a24-3a4eb0f01988
+    "/dev/sdc1":
+      filesystem: ext4
+      mount: "/srv/kafka"
+      partuuid: 1d462b0c-0880-47e8-b2ca-a11b0bbe194c
+      size: 8.00 TiB
+      size_bytes: 8796091956736
+      uuid: '038a7c13-10d8-4161-896d-2d6a10c588d6'
+  path: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+  physicalprocessorcount: 1
+  processor0: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processor1: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processorcount: 2
+  processors:
+    count: 2
+    isa: unknown
+    models:
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    physicalcount: 1
+  productname: Virtual Machine
+  public_ipaddresses: []
+  puppet_environmentpath: "/etc/puppet/code/environments"
+  puppet_server: pergamon.internal.softwareheritage.org
+  puppet_vardir: "/var/lib/puppet"
+  puppetversion: 4.8.2
+  root_home: "/root"
+  ruby:
+    platform: x86_64-linux-gnu
+    sitedir: "/usr/local/lib/site_ruby/2.3.0"
+    version: 2.3.3
+  rubyplatform: x86_64-linux-gnu
+  rubysitedir: "/usr/local/lib/site_ruby/2.3.0"
+  rubyversion: 2.3.3
+  selinux: false
+  serialnumber: 0000-0001-6767-9304-4520-4882-72
+  service_provider: systemd
+  ssh:
+    dsa:
+      fingerprints:
+        sha1: SSHFP 2 1 4b2199bbc09d8f6d9c28b416fbd64489c6ed08eb
+        sha256: SSHFP 2 2 0a4063e715996e845ecf7bf4e381f1604b4d6f541463d3f6eb278060c873bf91
+      key: AAAAB3NzaC1kc3MAAACBAJMgJOVofMA1gfsRxI2bbJL2SwkREE7UMrCPiUNzS1NVQq2G0PfDFqrJSKO3eYYiUSgNx/+JGpfmRngvqIAYo97NPiWsWoy8CoilaUMPwFPbdNsBWHeQJAQDZU6PUzIffbGU9ACx52zyJFQIdhCHgkNeIXjZiqIFQiAjJ0Vip31JAAAAFQDYiWxZDzkwJhVTbfuy2G6Xzp03mQAAAIA0vAkhI5InAfUWRfn7l4hMpGqpg76eIPVzlKVBLTrg7KxoxKcLBL3R+ZpUt9RoX2bVACy/3s9nDs9zn7uvrRaNUUwQbT5dchWfQJgpZ6mCG4OsnnDgI7KhN16PppeEkSVZzCyYvaLPij6jnoBs+ZqVDbpnaY8nvwK7WrdotpZbbwAAAIBAr8TrpOCKfQo7CX9C3Kh26IDusWMCLH/j8ozZjDYRlboAkVo3y5SSEJbLcJ2akp85MgD9CCc6Qq0qrNgVAKG/BW9ZTWK/HtjVi9ZRIIJ3AW7HkcLqovxB83Vm/rG+m9R4wod40OYOax6s2ADMinxqOKEfPhC3czwtKAklHeliAg==
+    ecdsa:
+      fingerprints:
+        sha1: SSHFP 3 1 73f6d3b09605800a5dac324737d059e31c440334
+        sha256: SSHFP 3 2 1f6388586dd79a80a91ff8da6955b3942c61964ba9d3c56e783477555bf24ca8
+      key: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNw6LzIFTCpM7/A6yc6E+o9/qhNtT7f1dxssRyM5VpTZu9plD9PO2MUQJGXf38raWl/mhnEaW8e58X64W+NM8mI=
+    ed25519:
+      fingerprints:
+        sha1: SSHFP 4 1 8bdc45d3633dea9060fea997b777c7ac4fd8907b
+        sha256: SSHFP 4 2 7517435dbd5c94897b37bf646c458443cb8edf3606e7e4b398caa0570a4b3440
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIA/cK4eOYJ1oiWUpy6s6JiNAgGnmOAkCPcijslf42AjT
+    rsa:
+      fingerprints:
+        sha1: SSHFP 1 1 35b171abc8e21aee72cbe6a3da774d47c158cee2
+        sha256: SSHFP 1 2 de9d6b9cf7e1774ae62c700c44cc8577751e94fa9924cfcf5a59d563bd7e6fb2
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDbW7O905ZraC2v2y89oND6Y4SURSxbTw7MyFXGGn96Z9g3E+0+eu1OYMhVX7rf2Uq6RJD1WsqxK8v2et+AdiYx/PIQ4UCTRLXJTTba0DPhQ5GN1uLuqfRBchFzyftqZajN95Si9hk3Fgz43PhPSkr1jTXyJsbn8rX6p5qSdDVuJ6yXLxzBpPP8urHW8XUciqYy/mdeceHRNUmkepPqS/gQHuNIW5cRiQZywUDzSNusujPZQElOKOyPUSudY17Ng/yTiT6YgmVcnNN8GmQA6pyRoIAO7ewZ4IUWApiu0krEzjemXbkuzExMbuqt9P1ldKFaRoF3No0S35q8HZyMbf9r
+  ssh_client_version_full: 7.4p1
+  ssh_server_version_full: 7.4p1
+  sshdsakey: AAAAB3NzaC1kc3MAAACBAJMgJOVofMA1gfsRxI2bbJL2SwkREE7UMrCPiUNzS1NVQq2G0PfDFqrJSKO3eYYiUSgNx/+JGpfmRngvqIAYo97NPiWsWoy8CoilaUMPwFPbdNsBWHeQJAQDZU6PUzIffbGU9ACx52zyJFQIdhCHgkNeIXjZiqIFQiAjJ0Vip31JAAAAFQDYiWxZDzkwJhVTbfuy2G6Xzp03mQAAAIA0vAkhI5InAfUWRfn7l4hMpGqpg76eIPVzlKVBLTrg7KxoxKcLBL3R+ZpUt9RoX2bVACy/3s9nDs9zn7uvrRaNUUwQbT5dchWfQJgpZ6mCG4OsnnDgI7KhN16PppeEkSVZzCyYvaLPij6jnoBs+ZqVDbpnaY8nvwK7WrdotpZbbwAAAIBAr8TrpOCKfQo7CX9C3Kh26IDusWMCLH/j8ozZjDYRlboAkVo3y5SSEJbLcJ2akp85MgD9CCc6Qq0qrNgVAKG/BW9ZTWK/HtjVi9ZRIIJ3AW7HkcLqovxB83Vm/rG+m9R4wod40OYOax6s2ADMinxqOKEfPhC3czwtKAklHeliAg==
+  sshecdsakey: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNw6LzIFTCpM7/A6yc6E+o9/qhNtT7f1dxssRyM5VpTZu9plD9PO2MUQJGXf38raWl/mhnEaW8e58X64W+NM8mI=
+  sshed25519key: AAAAC3NzaC1lZDI1NTE5AAAAIA/cK4eOYJ1oiWUpy6s6JiNAgGnmOAkCPcijslf42AjT
+  sshfp_dsa: |-
+    SSHFP 2 1 4b2199bbc09d8f6d9c28b416fbd64489c6ed08eb
+    SSHFP 2 2 0a4063e715996e845ecf7bf4e381f1604b4d6f541463d3f6eb278060c873bf91
+  sshfp_ecdsa: |-
+    SSHFP 3 1 73f6d3b09605800a5dac324737d059e31c440334
+    SSHFP 3 2 1f6388586dd79a80a91ff8da6955b3942c61964ba9d3c56e783477555bf24ca8
+  sshfp_ed25519: |-
+    SSHFP 4 1 8bdc45d3633dea9060fea997b777c7ac4fd8907b
+    SSHFP 4 2 7517435dbd5c94897b37bf646c458443cb8edf3606e7e4b398caa0570a4b3440
+  sshfp_rsa: |-
+    SSHFP 1 1 35b171abc8e21aee72cbe6a3da774d47c158cee2
+    SSHFP 1 2 de9d6b9cf7e1774ae62c700c44cc8577751e94fa9924cfcf5a59d563bd7e6fb2
+  sshrsakey: AAAAB3NzaC1yc2EAAAADAQABAAABAQDbW7O905ZraC2v2y89oND6Y4SURSxbTw7MyFXGGn96Z9g3E+0+eu1OYMhVX7rf2Uq6RJD1WsqxK8v2et+AdiYx/PIQ4UCTRLXJTTba0DPhQ5GN1uLuqfRBchFzyftqZajN95Si9hk3Fgz43PhPSkr1jTXyJsbn8rX6p5qSdDVuJ6yXLxzBpPP8urHW8XUciqYy/mdeceHRNUmkepPqS/gQHuNIW5cRiQZywUDzSNusujPZQElOKOyPUSudY17Ng/yTiT6YgmVcnNN8GmQA6pyRoIAO7ewZ4IUWApiu0krEzjemXbkuzExMbuqt9P1ldKFaRoF3No0S35q8HZyMbf9r
+  sudoversion: 1.8.19p1
+  swh_hostname:
+    fqdn: kafka02.euwest.azure.internal.softwareheritage.org
+    short: kafka02.euwest.azure
+    internal_fqdn: kafka02.euwest.azure.internal.softwareheritage.org
+  system_uptime:
+    days: 0
+    hours: 1
+    seconds: 7148
+    uptime: 1:59 hours
+  systemd: true
+  systemd_internal_services:
+    systemd-networkd-wait-online.service: disabled
+    systemd-networkd.service: disabled
+    systemd-resolved.service: disabled
+    systemd-timesyncd.service: enabled
+  systemd_version: '232'
+  timezone: UTC
+  uptime: 1:59 hours
+  uptime_days: 0
+  uptime_hours: 1
+  uptime_seconds: 7148
+  uuid: 632A4517-7DD4-504D-83A6-8BFA8899E6DC
+  vcsrepo_svn_ver: ''
+  virtual: hyperv
+  clientcert: kafka02.euwest.azure.internal.softwareheritage.org
+  clientversion: 4.8.2
+  clientnoop: false
+timestamp: '2019-08-23T16:08:48.599588720+00:00'
+expiration: '2019-08-23T16:38:48.600133522+00:00'
diff --git a/octocatalog-diff/facts/kafka03.euwest.azure.internal.softwareheritage.org.yaml b/octocatalog-diff/facts/kafka03.euwest.azure.internal.softwareheritage.org.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..120fdab1af2364d7a213e4f2641f12107e75372a
--- /dev/null
+++ b/octocatalog-diff/facts/kafka03.euwest.azure.internal.softwareheritage.org.yaml
@@ -0,0 +1,491 @@
+--- !ruby/object:Puppet::Node::Facts
+name: kafka03.euwest.azure.internal.softwareheritage.org
+values:
+  apt_has_dist_updates: false
+  apt_has_updates: false
+  apt_reboot_required: false
+  apt_update_last_success: -1
+  architecture: amd64
+  bios_release_date: 06/02/2017
+  bios_vendor: American Megatrends Inc.
+  bios_version: '090007'
+  blockdevice_fd0_size: 4096
+  blockdevice_sda_model: Virtual Disk
+  blockdevice_sda_size: 32212254720
+  blockdevice_sda_vendor: Msft
+  blockdevice_sdb_model: Virtual Disk
+  blockdevice_sdb_size: 8589934592
+  blockdevice_sdb_vendor: Msft
+  blockdevice_sdc_model: Virtual Disk
+  blockdevice_sdc_size: 8796093022208
+  blockdevice_sdc_vendor: Msft
+  blockdevice_sr0_model: Virtual CD/ROM
+  blockdevice_sr0_size: 643072
+  blockdevice_sr0_vendor: Msft
+  blockdevices: sdb,sr0,fd0,sdc,sda
+  boardmanufacturer: Microsoft Corporation
+  boardproductname: Virtual Machine
+  boardserialnumber: 0000-0009-8977-1509-2394-1809-05
+  chassisassettag: 7783-7084-3265-9085-8269-3286-77
+  chassistype: Desktop
+  cloud:
+    provider: azure
+  dhcp_servers:
+    eth0: 168.63.129.16
+    system: 168.63.129.16
+  disks:
+    fd0:
+      size: 4.00 KiB
+      size_bytes: 4096
+    sda:
+      model: Virtual Disk
+      size: 30.00 GiB
+      size_bytes: 32212254720
+      vendor: Msft
+    sdb:
+      model: Virtual Disk
+      size: 8.00 GiB
+      size_bytes: 8589934592
+      vendor: Msft
+    sdc:
+      model: Virtual Disk
+      size: 8.00 TiB
+      size_bytes: 8796093022208
+      vendor: Msft
+    sr0:
+      model: Virtual CD/ROM
+      size: 628.00 KiB
+      size_bytes: 643072
+      vendor: Msft
+  dmi:
+    bios:
+      release_date: 06/02/2017
+      vendor: American Megatrends Inc.
+      version: '090007'
+    board:
+      manufacturer: Microsoft Corporation
+      product: Virtual Machine
+      serial_number: 0000-0009-8977-1509-2394-1809-05
+    chassis:
+      asset_tag: 7783-7084-3265-9085-8269-3286-77
+      type: Desktop
+    manufacturer: Microsoft Corporation
+    product:
+      name: Virtual Machine
+      serial_number: 0000-0005-5980-0716-6878-8940-24
+      uuid: DB1DB04D-E8D7-C847-895B-BF6FAA2D8129
+  domain: euwest.azure.internal.softwareheritage.org
+  facterversion: 3.10.0
+  filesystems: ext2,ext3,ext4,udf
+  fips_enabled: false
+  fqdn: kafka03.euwest.azure.internal.softwareheritage.org
+  gid: root
+  hardwareisa: unknown
+  hardwaremodel: x86_64
+  hostname: kafka03
+  icinga2_puppet_hostcert: "/var/lib/puppet/ssl/certs/kafka03.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_hostprivkey: "/var/lib/puppet/ssl/private_keys/kafka03.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_localcacert: "/var/lib/puppet/ssl/certs/ca.pem"
+  id: root
+  identity:
+    gid: 0
+    group: root
+    privileged: true
+    uid: 0
+    user: root
+  interfaces: eth0,lo
+  ipaddress: 192.168.200.31
+  ipaddress6: fe80::20d:3aff:fe26:d6c3
+  ipaddress6_eth0: fe80::20d:3aff:fe26:d6c3
+  ipaddress6_lo: "::1"
+  ipaddress_eth0: 192.168.200.31
+  ipaddress_lo: 127.0.0.1
+  is_pe: false
+  is_virtual: true
+  kernel: Linux
+  kernelmajversion: '4.9'
+  kernelrelease: 4.9.0-9-amd64
+  kernelversion: 4.9.0
+  load_averages:
+    15m: 1.77
+    1m: 1.63
+    5m: 1.88
+  location: azure_euwest
+  lsbdistcodename: stretch
+  lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
+  lsbdistid: Debian
+  lsbdistrelease: '9.9'
+  lsbmajdistrelease: '9'
+  lsbminordistrelease: '9'
+  macaddress: 00:0d:3a:26:d6:c3
+  macaddress_eth0: 00:0d:3a:26:d6:c3
+  manufacturer: Microsoft Corporation
+  memory:
+    system:
+      available: 3.57 GiB
+      available_bytes: 3830345728
+      capacity: 7.23%
+      total: 3.85 GiB
+      total_bytes: 4128972800
+      used: 284.79 MiB
+      used_bytes: 298627072
+  memoryfree: 3.57 GiB
+  memoryfree_mb: 3652.90234375
+  memorysize: 3.85 GiB
+  memorysize_mb: 3937.6953125
+  mountpoints:
+    "/":
+      available: 28.38 GiB
+      available_bytes: 30471503872
+      capacity: 3.48%
+      device: "/dev/sda1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - errors=remount-ro
+      - data=ordered
+      size: 29.40 GiB
+      size_bytes: 31571480576
+      used: 1.02 GiB
+      used_bytes: 1099976704
+    "/dev/shm":
+      available: 1.92 GiB
+      available_bytes: 2064486400
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      size: 1.92 GiB
+      size_bytes: 2064486400
+      used: 0 bytes
+      used_bytes: 0
+    "/mnt/resource":
+      available: 7.78 GiB
+      available_bytes: 8349155328
+      capacity: 0.45%
+      device: "/dev/sdb1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.81 GiB
+      size_bytes: 8386895872
+      used: 35.99 MiB
+      used_bytes: 37740544
+    "/run":
+      available: 388.43 MiB
+      available_bytes: 407302144
+      capacity: 1.36%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - noexec
+      - relatime
+      - size=403220k
+      - mode=755
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 5.34 MiB
+      used_bytes: 5595136
+    "/run/lock":
+      available: 5.00 MiB
+      available_bytes: 5242880
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - noexec
+      - relatime
+      - size=5120k
+      size: 5.00 MiB
+      size_bytes: 5242880
+      used: 0 bytes
+      used_bytes: 0
+    "/run/user/0":
+      available: 393.77 MiB
+      available_bytes: 412897280
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - relatime
+      - size=403220k
+      - mode=700
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 0 bytes
+      used_bytes: 0
+    "/run/user/1000":
+      available: 393.77 MiB
+      available_bytes: 412897280
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - relatime
+      - size=403220k
+      - mode=700
+      - uid=1000
+      - gid=1000
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 0 bytes
+      used_bytes: 0
+    "/srv/kafka":
+      available: 7.94 TiB
+      available_bytes: 8725568802816
+      capacity: 0.00%
+      device: "/dev/sdc1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.94 TiB
+      size_bytes: 8725665300480
+      used: 92.03 MiB
+      used_bytes: 96497664
+    "/sys/fs/cgroup":
+      available: 1.92 GiB
+      available_bytes: 2064486400
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - ro
+      - nosuid
+      - nodev
+      - noexec
+      - mode=755
+      size: 1.92 GiB
+      size_bytes: 2064486400
+      used: 0 bytes
+      used_bytes: 0
+  mounts:
+  - "/"
+  - "/mnt/resource"
+  - "/srv/kafka"
+  mtu_eth0: 1500
+  mtu_lo: 65536
+  mysql_server_id: 15373891
+  netmask: 255.255.252.0
+  netmask6: 'ffff:ffff:ffff:ffff::'
+  netmask6_eth0: 'ffff:ffff:ffff:ffff::'
+  netmask6_lo: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+  netmask_eth0: 255.255.252.0
+  netmask_lo: 255.0.0.0
+  network: 192.168.200.0
+  network6: 'fe80::'
+  network6_eth0: 'fe80::'
+  network6_lo: "::1"
+  network_eth0: 192.168.200.0
+  network_lo: 127.0.0.0
+  networking:
+    dhcp: 168.63.129.16
+    domain: euwest.azure.internal.softwareheritage.org
+    fqdn: kafka03.euwest.azure.internal.softwareheritage.org
+    hostname: kafka03
+    interfaces:
+      eth0:
+        bindings:
+        - address: 192.168.200.31
+          netmask: 255.255.252.0
+          network: 192.168.200.0
+        bindings6:
+        - address: fe80::20d:3aff:fe26:d6c3
+          netmask: 'ffff:ffff:ffff:ffff::'
+          network: 'fe80::'
+        dhcp: 168.63.129.16
+        ip: 192.168.200.31
+        ip6: fe80::20d:3aff:fe26:d6c3
+        mac: 00:0d:3a:26:d6:c3
+        mtu: 1500
+        netmask: 255.255.252.0
+        netmask6: 'ffff:ffff:ffff:ffff::'
+        network: 192.168.200.0
+        network6: 'fe80::'
+      lo:
+        bindings:
+        - address: 127.0.0.1
+          netmask: 255.0.0.0
+          network: 127.0.0.0
+        bindings6:
+        - address: "::1"
+          netmask: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+          network: "::1"
+        ip: 127.0.0.1
+        ip6: "::1"
+        mtu: 65536
+        netmask: 255.0.0.0
+        netmask6: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+        network: 127.0.0.0
+        network6: "::1"
+    ip: 192.168.200.31
+    ip6: fe80::20d:3aff:fe26:d6c3
+    mac: 00:0d:3a:26:d6:c3
+    mtu: 1500
+    netmask: 255.255.252.0
+    netmask6: 'ffff:ffff:ffff:ffff::'
+    network: 192.168.200.0
+    network6: 'fe80::'
+    primary: eth0
+  operatingsystem: Debian
+  operatingsystemmajrelease: '9'
+  operatingsystemrelease: '9.9'
+  os:
+    architecture: amd64
+    distro:
+      codename: stretch
+      description: Debian GNU/Linux 9.9 (stretch)
+      id: Debian
+      release:
+        full: '9.9'
+        major: '9'
+        minor: '9'
+    family: Debian
+    hardware: x86_64
+    name: Debian
+    release:
+      full: '9.9'
+      major: '9'
+      minor: '9'
+    selinux:
+      enabled: false
+  osfamily: Debian
+  package_provider: apt
+  partitions:
+    "/dev/sda1":
+      filesystem: ext4
+      mount: "/"
+      partuuid: 8f00037d-01
+      size: 30.00 GiB
+      size_bytes: 32211206144
+      uuid: 1983b779-b2c8-404a-b8a4-1282baa9f8b1
+    "/dev/sdb1":
+      filesystem: ext4
+      mount: "/mnt/resource"
+      partuuid: 4db01ddb-01
+      size: 8.00 GiB
+      size_bytes: 8588820480
+      uuid: 04ae0d45-e988-4af6-9336-1e70de90fccd
+    "/dev/sdc1":
+      filesystem: ext4
+      mount: "/srv/kafka"
+      partuuid: 2072ed1f-549b-447c-ad80-088343e6b34c
+      size: 8.00 TiB
+      size_bytes: 8796091956736
+      uuid: 00d44749-7faf-4899-b26e-9a6207063607
+  path: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+  physicalprocessorcount: 1
+  processor0: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processor1: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processorcount: 2
+  processors:
+    count: 2
+    isa: unknown
+    models:
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    physicalcount: 1
+  productname: Virtual Machine
+  public_ipaddresses: []
+  puppet_environmentpath: "/etc/puppet/code/environments"
+  puppet_server: pergamon.internal.softwareheritage.org
+  puppet_vardir: "/var/cache/puppet"
+  puppetversion: 4.8.2
+  root_home: "/root"
+  ruby:
+    platform: x86_64-linux-gnu
+    sitedir: "/usr/local/lib/site_ruby/2.3.0"
+    version: 2.3.3
+  rubyplatform: x86_64-linux-gnu
+  rubysitedir: "/usr/local/lib/site_ruby/2.3.0"
+  rubyversion: 2.3.3
+  selinux: false
+  serialnumber: 0000-0005-5980-0716-6878-8940-24
+  service_provider: systemd
+  ssh:
+    dsa:
+      fingerprints:
+        sha1: SSHFP 2 1 72ad4cd677aa021df62c236a0589bf34d790250d
+        sha256: SSHFP 2 2 e1bdd05e0e589a3b72f1048513e6c744a98c99671b0edf83669b9384a6f9da30
+      key: AAAAB3NzaC1kc3MAAACBAPjmbdsTvxxkG69F/8hjezs5m6ISmsynMmJ8LwVaQK0Y7dCTcBGH+BejWObjs63BDpP+QY4NKEpneCVhR3wIU64JOweAM9Au9ShI4e1Swn8D/rZfO8Luq2x3q3zTyeGR94UHThQLxwpet8xl6vOQZxbCPXzn6WAfnjlxTM+2yQ9JAAAAFQDtlvYcNKS73yQTymuS24TLSnvZvwAAAIEArhiIKQbhJrNtxAIZu7+lqBvTZVGOXC4g/NjYh9+vI+7h+KRzZi3UIyqg4UHkvxIhwyrkypw8UUP95aVUsHMxz5xaDz4GmYfj7oB+SK284BMmcmBhwUpwh3UNC1DCUVrUPVYHQQCWQTMUg2bMQimYppn6j57v8a1C7dr4zmgcj+IAAACBAIsk0e/kQJCDZWwLE0NA6okkaPy9kI9BD/ZVgb01baBa8BuqDpH9gcBwbTXIjcaS3KMzKEjYbgZaDOJohzXFLYql/uEKixSp76rhxvGk1CVQtI4GwGKL1fmJNK2JhEn89CX+EezydN4bu+cTFT09p/MTsvbuw+7wk+l/mpujjWXA
+    ecdsa:
+      fingerprints:
+        sha1: SSHFP 3 1 9c526be66bce124d9b4297b51f39dcf39f7dc858
+        sha256: SSHFP 3 2 d071bdcf0624cafa582feaf1084cd70f21955189b0e44ee382a084e1c98149cc
+      key: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAtwyo8NwoKhcldNRjPRRmq9rfBuXk0X95hh6+neKDv2KSLJBx2ZxWIdBb+O5qolid6ETS+kdWv/vs96Ud0yw6Q=
+    ed25519:
+      fingerprints:
+        sha1: SSHFP 4 1 bec4a876fe9ad56832d3bd097cecb6705ca14880
+        sha256: SSHFP 4 2 c2225f9910ed675b6ebdf0e2f5e05ec74a022d3483dbf92b840af585177e89cb
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIFHGMfjufkfGybQscWlAFkx/xMJMsy4ZYBKHfPCOnUuu
+    rsa:
+      fingerprints:
+        sha1: SSHFP 1 1 4e7e25b5128a7149b83f59bcff92e22be2d5ea5a
+        sha256: SSHFP 1 2 049d83aedcb0c6c754cd713155c350c318be67fb3b5831d80c552e43d328273d
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDFzPw0g2s0mvFeIN9o9tZ+YaI3NUcqHXpKwSNoV7mKxS20PgMGBc065hAVMA0VRXLUhP9DdFcPjTDXZw2YH6E7XQenle6CHgoAZ47GD7dfJOdp5Y28w4RRefeZU6CWGpgrjjn8ZXIKkreg9UxpnwFb/wpZ4ry52QaVCU0VDNuahKoDVRBK8U0SbGQ1JGIB3hSW5E/VuwYqOEOl4xR5vZIaEt+sgHnYh3WJgt/66nOgU7uUqc7um4CiRp4SyVBfx76zBRA0gwwPFNq/407HvNgFEuDwLnv6rRHwEV2sdJkTRLX1K6J6lY4z20aXVvxCHJ38ilojrSa2KfGutDvOpVwL
+  ssh_client_version_full: 7.4p1
+  ssh_server_version_full: 7.4p1
+  sshdsakey: AAAAB3NzaC1kc3MAAACBAPjmbdsTvxxkG69F/8hjezs5m6ISmsynMmJ8LwVaQK0Y7dCTcBGH+BejWObjs63BDpP+QY4NKEpneCVhR3wIU64JOweAM9Au9ShI4e1Swn8D/rZfO8Luq2x3q3zTyeGR94UHThQLxwpet8xl6vOQZxbCPXzn6WAfnjlxTM+2yQ9JAAAAFQDtlvYcNKS73yQTymuS24TLSnvZvwAAAIEArhiIKQbhJrNtxAIZu7+lqBvTZVGOXC4g/NjYh9+vI+7h+KRzZi3UIyqg4UHkvxIhwyrkypw8UUP95aVUsHMxz5xaDz4GmYfj7oB+SK284BMmcmBhwUpwh3UNC1DCUVrUPVYHQQCWQTMUg2bMQimYppn6j57v8a1C7dr4zmgcj+IAAACBAIsk0e/kQJCDZWwLE0NA6okkaPy9kI9BD/ZVgb01baBa8BuqDpH9gcBwbTXIjcaS3KMzKEjYbgZaDOJohzXFLYql/uEKixSp76rhxvGk1CVQtI4GwGKL1fmJNK2JhEn89CX+EezydN4bu+cTFT09p/MTsvbuw+7wk+l/mpujjWXA
+  sshecdsakey: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBAtwyo8NwoKhcldNRjPRRmq9rfBuXk0X95hh6+neKDv2KSLJBx2ZxWIdBb+O5qolid6ETS+kdWv/vs96Ud0yw6Q=
+  sshed25519key: AAAAC3NzaC1lZDI1NTE5AAAAIFHGMfjufkfGybQscWlAFkx/xMJMsy4ZYBKHfPCOnUuu
+  sshfp_dsa: |-
+    SSHFP 2 1 72ad4cd677aa021df62c236a0589bf34d790250d
+    SSHFP 2 2 e1bdd05e0e589a3b72f1048513e6c744a98c99671b0edf83669b9384a6f9da30
+  sshfp_ecdsa: |-
+    SSHFP 3 1 9c526be66bce124d9b4297b51f39dcf39f7dc858
+    SSHFP 3 2 d071bdcf0624cafa582feaf1084cd70f21955189b0e44ee382a084e1c98149cc
+  sshfp_ed25519: |-
+    SSHFP 4 1 bec4a876fe9ad56832d3bd097cecb6705ca14880
+    SSHFP 4 2 c2225f9910ed675b6ebdf0e2f5e05ec74a022d3483dbf92b840af585177e89cb
+  sshfp_rsa: |-
+    SSHFP 1 1 4e7e25b5128a7149b83f59bcff92e22be2d5ea5a
+    SSHFP 1 2 049d83aedcb0c6c754cd713155c350c318be67fb3b5831d80c552e43d328273d
+  sshrsakey: AAAAB3NzaC1yc2EAAAADAQABAAABAQDFzPw0g2s0mvFeIN9o9tZ+YaI3NUcqHXpKwSNoV7mKxS20PgMGBc065hAVMA0VRXLUhP9DdFcPjTDXZw2YH6E7XQenle6CHgoAZ47GD7dfJOdp5Y28w4RRefeZU6CWGpgrjjn8ZXIKkreg9UxpnwFb/wpZ4ry52QaVCU0VDNuahKoDVRBK8U0SbGQ1JGIB3hSW5E/VuwYqOEOl4xR5vZIaEt+sgHnYh3WJgt/66nOgU7uUqc7um4CiRp4SyVBfx76zBRA0gwwPFNq/407HvNgFEuDwLnv6rRHwEV2sdJkTRLX1K6J6lY4z20aXVvxCHJ38ilojrSa2KfGutDvOpVwL
+  sudoversion: 1.8.19p1
+  swh_hostname:
+    fqdn: kafka03.euwest.azure.internal.softwareheritage.org
+    short: kafka03.euwest.azure
+    internal_fqdn: kafka03.euwest.azure.internal.softwareheritage.org
+  system_uptime:
+    days: 0
+    hours: 0
+    seconds: 2108
+    uptime: 0:35 hours
+  systemd: true
+  systemd_internal_services:
+    systemd-networkd-wait-online.service: disabled
+    systemd-networkd.service: disabled
+    systemd-resolved.service: disabled
+    systemd-timesyncd.service: enabled
+  systemd_version: '232'
+  timezone: UTC
+  uptime: 0:35 hours
+  uptime_days: 0
+  uptime_hours: 0
+  uptime_seconds: 2108
+  uuid: DB1DB04D-E8D7-C847-895B-BF6FAA2D8129
+  vcsrepo_svn_ver: ''
+  virtual: hyperv
+  clientcert: kafka03.euwest.azure.internal.softwareheritage.org
+  clientversion: 4.8.2
+  clientnoop: false
+timestamp: '2019-08-23T15:00:42.376212101+00:00'
+expiration: '2019-08-23T15:30:42.376774707+00:00'
diff --git a/octocatalog-diff/facts/kafka04.euwest.azure.internal.softwareheritage.org.yaml b/octocatalog-diff/facts/kafka04.euwest.azure.internal.softwareheritage.org.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..beab554e8b30ca0f4cfdccb4f231435d00b449a5
--- /dev/null
+++ b/octocatalog-diff/facts/kafka04.euwest.azure.internal.softwareheritage.org.yaml
@@ -0,0 +1,491 @@
+--- !ruby/object:Puppet::Node::Facts
+name: kafka04.euwest.azure.internal.softwareheritage.org
+values:
+  apt_has_dist_updates: false
+  apt_has_updates: false
+  apt_reboot_required: false
+  apt_update_last_success: -1
+  architecture: amd64
+  bios_release_date: 06/02/2017
+  bios_vendor: American Megatrends Inc.
+  bios_version: '090007'
+  blockdevice_fd0_size: 4096
+  blockdevice_sda_model: Virtual Disk
+  blockdevice_sda_size: 32212254720
+  blockdevice_sda_vendor: Msft
+  blockdevice_sdb_model: Virtual Disk
+  blockdevice_sdb_size: 8589934592
+  blockdevice_sdb_vendor: Msft
+  blockdevice_sdc_model: Virtual Disk
+  blockdevice_sdc_size: 8796093022208
+  blockdevice_sdc_vendor: Msft
+  blockdevice_sr0_model: Virtual CD/ROM
+  blockdevice_sr0_size: 643072
+  blockdevice_sr0_vendor: Msft
+  blockdevices: sdb,sr0,fd0,sdc,sda
+  boardmanufacturer: Microsoft Corporation
+  boardproductname: Virtual Machine
+  boardserialnumber: 0000-0013-2633-7629-5594-1553-18
+  chassisassettag: 7783-7084-3265-9085-8269-3286-77
+  chassistype: Desktop
+  cloud:
+    provider: azure
+  dhcp_servers:
+    eth0: 168.63.129.16
+    system: 168.63.129.16
+  disks:
+    fd0:
+      size: 4.00 KiB
+      size_bytes: 4096
+    sda:
+      model: Virtual Disk
+      size: 30.00 GiB
+      size_bytes: 32212254720
+      vendor: Msft
+    sdb:
+      model: Virtual Disk
+      size: 8.00 GiB
+      size_bytes: 8589934592
+      vendor: Msft
+    sdc:
+      model: Virtual Disk
+      size: 8.00 TiB
+      size_bytes: 8796093022208
+      vendor: Msft
+    sr0:
+      model: Virtual CD/ROM
+      size: 628.00 KiB
+      size_bytes: 643072
+      vendor: Msft
+  dmi:
+    bios:
+      release_date: 06/02/2017
+      vendor: American Megatrends Inc.
+      version: '090007'
+    board:
+      manufacturer: Microsoft Corporation
+      product: Virtual Machine
+      serial_number: 0000-0013-2633-7629-5594-1553-18
+    chassis:
+      asset_tag: 7783-7084-3265-9085-8269-3286-77
+      type: Desktop
+    manufacturer: Microsoft Corporation
+    product:
+      name: Virtual Machine
+      serial_number: 0000-0011-6829-9746-7924-8753-12
+      uuid: 4C5822A2-7343-3048-B810-FA77ED39DD36
+  domain: euwest.azure.internal.softwareheritage.org
+  facterversion: 3.10.0
+  filesystems: ext2,ext3,ext4,udf
+  fips_enabled: false
+  fqdn: kafka04.euwest.azure.internal.softwareheritage.org
+  gid: root
+  hardwareisa: unknown
+  hardwaremodel: x86_64
+  hostname: kafka04
+  icinga2_puppet_hostcert: "/var/lib/puppet/ssl/certs/kafka04.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_hostprivkey: "/var/lib/puppet/ssl/private_keys/kafka04.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_localcacert: "/var/lib/puppet/ssl/certs/ca.pem"
+  id: root
+  identity:
+    gid: 0
+    group: root
+    privileged: true
+    uid: 0
+    user: root
+  interfaces: eth0,lo
+  ipaddress: 192.168.200.33
+  ipaddress6: fe80::20d:3aff:fe26:d695
+  ipaddress6_eth0: fe80::20d:3aff:fe26:d695
+  ipaddress6_lo: "::1"
+  ipaddress_eth0: 192.168.200.33
+  ipaddress_lo: 127.0.0.1
+  is_pe: false
+  is_virtual: true
+  kernel: Linux
+  kernelmajversion: '4.9'
+  kernelrelease: 4.9.0-9-amd64
+  kernelversion: 4.9.0
+  load_averages:
+    15m: 1.78
+    1m: 1.85
+    5m: 1.92
+  location: azure_euwest
+  lsbdistcodename: stretch
+  lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
+  lsbdistid: Debian
+  lsbdistrelease: '9.9'
+  lsbmajdistrelease: '9'
+  lsbminordistrelease: '9'
+  macaddress: 00:0d:3a:26:d6:95
+  macaddress_eth0: 00:0d:3a:26:d6:95
+  manufacturer: Microsoft Corporation
+  memory:
+    system:
+      available: 3.57 GiB
+      available_bytes: 3832213504
+      capacity: 7.19%
+      total: 3.85 GiB
+      total_bytes: 4128972800
+      used: 283.01 MiB
+      used_bytes: 296759296
+  memoryfree: 3.57 GiB
+  memoryfree_mb: 3654.68359375
+  memorysize: 3.85 GiB
+  memorysize_mb: 3937.6953125
+  mountpoints:
+    "/":
+      available: 28.38 GiB
+      available_bytes: 30471507968
+      capacity: 3.48%
+      device: "/dev/sda1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - errors=remount-ro
+      - data=ordered
+      size: 29.40 GiB
+      size_bytes: 31571480576
+      used: 1.02 GiB
+      used_bytes: 1099972608
+    "/dev/shm":
+      available: 1.92 GiB
+      available_bytes: 2064486400
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      size: 1.92 GiB
+      size_bytes: 2064486400
+      used: 0 bytes
+      used_bytes: 0
+    "/mnt/resource":
+      available: 7.78 GiB
+      available_bytes: 8349155328
+      capacity: 0.45%
+      device: "/dev/sdb1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.81 GiB
+      size_bytes: 8386895872
+      used: 35.99 MiB
+      used_bytes: 37740544
+    "/run":
+      available: 388.43 MiB
+      available_bytes: 407302144
+      capacity: 1.36%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - noexec
+      - relatime
+      - size=403220k
+      - mode=755
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 5.34 MiB
+      used_bytes: 5595136
+    "/run/lock":
+      available: 5.00 MiB
+      available_bytes: 5242880
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - noexec
+      - relatime
+      - size=5120k
+      size: 5.00 MiB
+      size_bytes: 5242880
+      used: 0 bytes
+      used_bytes: 0
+    "/run/user/0":
+      available: 393.77 MiB
+      available_bytes: 412897280
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - relatime
+      - size=403220k
+      - mode=700
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 0 bytes
+      used_bytes: 0
+    "/run/user/1000":
+      available: 393.77 MiB
+      available_bytes: 412897280
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - relatime
+      - size=403220k
+      - mode=700
+      - uid=1000
+      - gid=1000
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 0 bytes
+      used_bytes: 0
+    "/srv/kafka":
+      available: 7.94 TiB
+      available_bytes: 8725568802816
+      capacity: 0.00%
+      device: "/dev/sdc1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.94 TiB
+      size_bytes: 8725665300480
+      used: 92.03 MiB
+      used_bytes: 96497664
+    "/sys/fs/cgroup":
+      available: 1.92 GiB
+      available_bytes: 2064486400
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - ro
+      - nosuid
+      - nodev
+      - noexec
+      - mode=755
+      size: 1.92 GiB
+      size_bytes: 2064486400
+      used: 0 bytes
+      used_bytes: 0
+  mounts:
+  - "/"
+  - "/mnt/resource"
+  - "/srv/kafka"
+  mtu_eth0: 1500
+  mtu_lo: 65536
+  mysql_server_id: 15373845
+  netmask: 255.255.252.0
+  netmask6: 'ffff:ffff:ffff:ffff::'
+  netmask6_eth0: 'ffff:ffff:ffff:ffff::'
+  netmask6_lo: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+  netmask_eth0: 255.255.252.0
+  netmask_lo: 255.0.0.0
+  network: 192.168.200.0
+  network6: 'fe80::'
+  network6_eth0: 'fe80::'
+  network6_lo: "::1"
+  network_eth0: 192.168.200.0
+  network_lo: 127.0.0.0
+  networking:
+    dhcp: 168.63.129.16
+    domain: euwest.azure.internal.softwareheritage.org
+    fqdn: kafka04.euwest.azure.internal.softwareheritage.org
+    hostname: kafka04
+    interfaces:
+      eth0:
+        bindings:
+        - address: 192.168.200.33
+          netmask: 255.255.252.0
+          network: 192.168.200.0
+        bindings6:
+        - address: fe80::20d:3aff:fe26:d695
+          netmask: 'ffff:ffff:ffff:ffff::'
+          network: 'fe80::'
+        dhcp: 168.63.129.16
+        ip: 192.168.200.33
+        ip6: fe80::20d:3aff:fe26:d695
+        mac: 00:0d:3a:26:d6:95
+        mtu: 1500
+        netmask: 255.255.252.0
+        netmask6: 'ffff:ffff:ffff:ffff::'
+        network: 192.168.200.0
+        network6: 'fe80::'
+      lo:
+        bindings:
+        - address: 127.0.0.1
+          netmask: 255.0.0.0
+          network: 127.0.0.0
+        bindings6:
+        - address: "::1"
+          netmask: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+          network: "::1"
+        ip: 127.0.0.1
+        ip6: "::1"
+        mtu: 65536
+        netmask: 255.0.0.0
+        netmask6: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+        network: 127.0.0.0
+        network6: "::1"
+    ip: 192.168.200.33
+    ip6: fe80::20d:3aff:fe26:d695
+    mac: 00:0d:3a:26:d6:95
+    mtu: 1500
+    netmask: 255.255.252.0
+    netmask6: 'ffff:ffff:ffff:ffff::'
+    network: 192.168.200.0
+    network6: 'fe80::'
+    primary: eth0
+  operatingsystem: Debian
+  operatingsystemmajrelease: '9'
+  operatingsystemrelease: '9.9'
+  os:
+    architecture: amd64
+    distro:
+      codename: stretch
+      description: Debian GNU/Linux 9.9 (stretch)
+      id: Debian
+      release:
+        full: '9.9'
+        major: '9'
+        minor: '9'
+    family: Debian
+    hardware: x86_64
+    name: Debian
+    release:
+      full: '9.9'
+      major: '9'
+      minor: '9'
+    selinux:
+      enabled: false
+  osfamily: Debian
+  package_provider: apt
+  partitions:
+    "/dev/sda1":
+      filesystem: ext4
+      mount: "/"
+      partuuid: 8f00037d-01
+      size: 30.00 GiB
+      size_bytes: 32211206144
+      uuid: 1983b779-b2c8-404a-b8a4-1282baa9f8b1
+    "/dev/sdb1":
+      filesystem: ext4
+      mount: "/mnt/resource"
+      partuuid: a222584c-01
+      size: 8.00 GiB
+      size_bytes: 8588820480
+      uuid: 212b09f9-2353-4b43-aa3e-1225185619e9
+    "/dev/sdc1":
+      filesystem: ext4
+      mount: "/srv/kafka"
+      partuuid: '03486319-5d55-4329-8b11-2bc257742f60'
+      size: 8.00 TiB
+      size_bytes: 8796091956736
+      uuid: 50c65288-48f9-477b-8a29-76587fd743cb
+  path: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+  physicalprocessorcount: 1
+  processor0: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processor1: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processorcount: 2
+  processors:
+    count: 2
+    isa: unknown
+    models:
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    physicalcount: 1
+  productname: Virtual Machine
+  public_ipaddresses: []
+  puppet_environmentpath: "/etc/puppet/code/environments"
+  puppet_server: pergamon.internal.softwareheritage.org
+  puppet_vardir: "/var/cache/puppet"
+  puppetversion: 4.8.2
+  root_home: "/root"
+  ruby:
+    platform: x86_64-linux-gnu
+    sitedir: "/usr/local/lib/site_ruby/2.3.0"
+    version: 2.3.3
+  rubyplatform: x86_64-linux-gnu
+  rubysitedir: "/usr/local/lib/site_ruby/2.3.0"
+  rubyversion: 2.3.3
+  selinux: false
+  serialnumber: 0000-0011-6829-9746-7924-8753-12
+  service_provider: systemd
+  ssh:
+    dsa:
+      fingerprints:
+        sha1: SSHFP 2 1 ae3a51eb290ec543291a09130061857121635cfd
+        sha256: SSHFP 2 2 913f6d0859657ae7f91b4afbd23cee68a3a656e851c750ac50618d0b87f3b546
+      key: AAAAB3NzaC1kc3MAAACBAKJFAIoRyp8nx2rzWRhv2cOx4Ornssd6NiwMA6R8JN9QBXWQ73wwt2R4SYE1YvfSTVtKap0NRueLALDNOJhhEdxRjbKE1NJBCpYgBJVHIHKWQUXLYhMK0VUXgA0zcXaTNXtnjJVU4doL4y472TFT+13XcAn1tuQsfokk0Pd8xQZhAAAAFQC1Wa3rygK4758SjLa4nRbaXj94VwAAAIBEUzlR3gFCoHz+2WtECNAfW4/gg/Xy7cK3/5NSAyl2RZczc+ffTeBeyyDFjoCeDIMP2RwqwbmvdGKtZuerM1boBF2q278yKFXQxwCWipWywwI5wxW+gvX+9CHmytBKma29YAw48pflS+Vkkd/T492/9f6jxm8q01s9ThPAs8VaqAAAAIBL4ofMg+BbV+fZWDdVW52aVPl4LdS4uf9ZS4b/3yrTFT6G7nO7j1CWoBRTwcYnIc9xPVXhxkV0/DqqFJt7tJObZrzeD+7FmE8YgRkLB1EGsfEFZIC2NUE+eCjJmSIS4DMCCRqWnltr0uKsl+bht2kr6UaniX54PXEkITgheHR3pw==
+    ecdsa:
+      fingerprints:
+        sha1: SSHFP 3 1 d354d18752d921269e8fafb0eeab8e449bd2781c
+        sha256: SSHFP 3 2 710475e4293952219a899b1fa2806e1f1eccb99db1b0e0063c9b8898ce3404fd
+      key: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKJLlPybWx7SVqpA445txHh4V2pYzL/oiSHXf+nAOGFzyOb21w6CZpjgjB8SzwkX5Cev+5NgkKucdapJWgGYP2Y=
+    ed25519:
+      fingerprints:
+        sha1: SSHFP 4 1 24b2c5ca1f3c86c1de4a50d58cf7af599c9ffc70
+        sha256: SSHFP 4 2 0c9ccf567b3ee801dc8673ae2066e9c43ebedab1413fa58d76b61aa5434c4894
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIDV4lzefm4rHQqr7n1bVq0E91+z4/b92cqrAh0rM5Fkc
+    rsa:
+      fingerprints:
+        sha1: SSHFP 1 1 5c58a7b7097fe9f9285709a212f51b74042ce896
+        sha256: SSHFP 1 2 ac3c7fe720b273ff8329e4bcb66365c86c2751f79527cb27f97c52bfdc675056
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDFK0V6GMx+Pz+9t6kopEXiCDziUEYdr9l1pQi2rV0P1y7XwuLIR8I8dK1l7shAHo8CsXl6RfqaeDocLs/qlmP7O5GPmKgDsqBTOQEcyz8qes1Mrg8bT+lA/YB0r9OZw7wFEitTqNVhr29DiRo6sePXlKGpLIy+Wg4Pi2h6f4RP0M8ArzSGN9kd/KbyFARO/d5hUkDhy9uuKelqwNDvVew0JUKwmgSnys95ltvdsJgF2y0bSRDX0iSmoyS5zakolRuFoQJUDZzG/Cf+iUxiHA/D/9hFUekrph/aXWOmClsBHEKepzamANIFjhgcZaFTIdMfKK7Zm1TnRPmlMMQppW2B
+  ssh_client_version_full: 7.4p1
+  ssh_server_version_full: 7.4p1
+  sshdsakey: AAAAB3NzaC1kc3MAAACBAKJFAIoRyp8nx2rzWRhv2cOx4Ornssd6NiwMA6R8JN9QBXWQ73wwt2R4SYE1YvfSTVtKap0NRueLALDNOJhhEdxRjbKE1NJBCpYgBJVHIHKWQUXLYhMK0VUXgA0zcXaTNXtnjJVU4doL4y472TFT+13XcAn1tuQsfokk0Pd8xQZhAAAAFQC1Wa3rygK4758SjLa4nRbaXj94VwAAAIBEUzlR3gFCoHz+2WtECNAfW4/gg/Xy7cK3/5NSAyl2RZczc+ffTeBeyyDFjoCeDIMP2RwqwbmvdGKtZuerM1boBF2q278yKFXQxwCWipWywwI5wxW+gvX+9CHmytBKma29YAw48pflS+Vkkd/T492/9f6jxm8q01s9ThPAs8VaqAAAAIBL4ofMg+BbV+fZWDdVW52aVPl4LdS4uf9ZS4b/3yrTFT6G7nO7j1CWoBRTwcYnIc9xPVXhxkV0/DqqFJt7tJObZrzeD+7FmE8YgRkLB1EGsfEFZIC2NUE+eCjJmSIS4DMCCRqWnltr0uKsl+bht2kr6UaniX54PXEkITgheHR3pw==
+  sshecdsakey: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKJLlPybWx7SVqpA445txHh4V2pYzL/oiSHXf+nAOGFzyOb21w6CZpjgjB8SzwkX5Cev+5NgkKucdapJWgGYP2Y=
+  sshed25519key: AAAAC3NzaC1lZDI1NTE5AAAAIDV4lzefm4rHQqr7n1bVq0E91+z4/b92cqrAh0rM5Fkc
+  sshfp_dsa: |-
+    SSHFP 2 1 ae3a51eb290ec543291a09130061857121635cfd
+    SSHFP 2 2 913f6d0859657ae7f91b4afbd23cee68a3a656e851c750ac50618d0b87f3b546
+  sshfp_ecdsa: |-
+    SSHFP 3 1 d354d18752d921269e8fafb0eeab8e449bd2781c
+    SSHFP 3 2 710475e4293952219a899b1fa2806e1f1eccb99db1b0e0063c9b8898ce3404fd
+  sshfp_ed25519: |-
+    SSHFP 4 1 24b2c5ca1f3c86c1de4a50d58cf7af599c9ffc70
+    SSHFP 4 2 0c9ccf567b3ee801dc8673ae2066e9c43ebedab1413fa58d76b61aa5434c4894
+  sshfp_rsa: |-
+    SSHFP 1 1 5c58a7b7097fe9f9285709a212f51b74042ce896
+    SSHFP 1 2 ac3c7fe720b273ff8329e4bcb66365c86c2751f79527cb27f97c52bfdc675056
+  sshrsakey: AAAAB3NzaC1yc2EAAAADAQABAAABAQDFK0V6GMx+Pz+9t6kopEXiCDziUEYdr9l1pQi2rV0P1y7XwuLIR8I8dK1l7shAHo8CsXl6RfqaeDocLs/qlmP7O5GPmKgDsqBTOQEcyz8qes1Mrg8bT+lA/YB0r9OZw7wFEitTqNVhr29DiRo6sePXlKGpLIy+Wg4Pi2h6f4RP0M8ArzSGN9kd/KbyFARO/d5hUkDhy9uuKelqwNDvVew0JUKwmgSnys95ltvdsJgF2y0bSRDX0iSmoyS5zakolRuFoQJUDZzG/Cf+iUxiHA/D/9hFUekrph/aXWOmClsBHEKepzamANIFjhgcZaFTIdMfKK7Zm1TnRPmlMMQppW2B
+  sudoversion: 1.8.19p1
+  swh_hostname:
+    fqdn: kafka04.euwest.azure.internal.softwareheritage.org
+    short: kafka04.euwest.azure
+    internal_fqdn: kafka04.euwest.azure.internal.softwareheritage.org
+  system_uptime:
+    days: 0
+    hours: 0
+    seconds: 2091
+    uptime: 0:34 hours
+  systemd: true
+  systemd_internal_services:
+    systemd-networkd-wait-online.service: disabled
+    systemd-networkd.service: disabled
+    systemd-resolved.service: disabled
+    systemd-timesyncd.service: enabled
+  systemd_version: '232'
+  timezone: UTC
+  uptime: 0:34 hours
+  uptime_days: 0
+  uptime_hours: 0
+  uptime_seconds: 2091
+  uuid: 4C5822A2-7343-3048-B810-FA77ED39DD36
+  vcsrepo_svn_ver: ''
+  virtual: hyperv
+  clientcert: kafka04.euwest.azure.internal.softwareheritage.org
+  clientversion: 4.8.2
+  clientnoop: false
+timestamp: '2019-08-23T15:00:31.835137738+00:00'
+expiration: '2019-08-23T15:30:31.835547838+00:00'
diff --git a/octocatalog-diff/facts/kafka05.euwest.azure.internal.softwareheritage.org.yaml b/octocatalog-diff/facts/kafka05.euwest.azure.internal.softwareheritage.org.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..32197fc477db7381b2fbd48aaf1dea3f756b2381
--- /dev/null
+++ b/octocatalog-diff/facts/kafka05.euwest.azure.internal.softwareheritage.org.yaml
@@ -0,0 +1,491 @@
+--- !ruby/object:Puppet::Node::Facts
+name: kafka05.euwest.azure.internal.softwareheritage.org
+values:
+  apt_has_dist_updates: false
+  apt_has_updates: false
+  apt_reboot_required: false
+  apt_update_last_success: -1
+  architecture: amd64
+  bios_release_date: 06/02/2017
+  bios_vendor: American Megatrends Inc.
+  bios_version: '090007'
+  blockdevice_fd0_size: 4096
+  blockdevice_sda_model: Virtual Disk
+  blockdevice_sda_size: 32212254720
+  blockdevice_sda_vendor: Msft
+  blockdevice_sdb_model: Virtual Disk
+  blockdevice_sdb_size: 8589934592
+  blockdevice_sdb_vendor: Msft
+  blockdevice_sdc_model: Virtual Disk
+  blockdevice_sdc_size: 8796093022208
+  blockdevice_sdc_vendor: Msft
+  blockdevice_sr0_model: Virtual CD/ROM
+  blockdevice_sr0_size: 643072
+  blockdevice_sr0_vendor: Msft
+  blockdevices: sdb,sr0,fd0,sdc,sda
+  boardmanufacturer: Microsoft Corporation
+  boardproductname: Virtual Machine
+  boardserialnumber: 0000-0013-6311-1127-3682-2019-93
+  chassisassettag: 7783-7084-3265-9085-8269-3286-77
+  chassistype: Desktop
+  cloud:
+    provider: azure
+  dhcp_servers:
+    eth0: 168.63.129.16
+    system: 168.63.129.16
+  disks:
+    fd0:
+      size: 4.00 KiB
+      size_bytes: 4096
+    sda:
+      model: Virtual Disk
+      size: 30.00 GiB
+      size_bytes: 32212254720
+      vendor: Msft
+    sdb:
+      model: Virtual Disk
+      size: 8.00 GiB
+      size_bytes: 8589934592
+      vendor: Msft
+    sdc:
+      model: Virtual Disk
+      size: 8.00 TiB
+      size_bytes: 8796093022208
+      vendor: Msft
+    sr0:
+      model: Virtual CD/ROM
+      size: 628.00 KiB
+      size_bytes: 643072
+      vendor: Msft
+  dmi:
+    bios:
+      release_date: 06/02/2017
+      vendor: American Megatrends Inc.
+      version: '090007'
+    board:
+      manufacturer: Microsoft Corporation
+      product: Virtual Machine
+      serial_number: 0000-0013-6311-1127-3682-2019-93
+    chassis:
+      asset_tag: 7783-7084-3265-9085-8269-3286-77
+      type: Desktop
+    manufacturer: Microsoft Corporation
+    product:
+      name: Virtual Machine
+      serial_number: 0000-0001-2706-4875-4616-8127-06
+      uuid: 4F40A211-3A65-A244-BD2B-6F7B91A66D89
+  domain: euwest.azure.internal.softwareheritage.org
+  facterversion: 3.10.0
+  filesystems: ext2,ext3,ext4,udf
+  fips_enabled: false
+  fqdn: kafka05.euwest.azure.internal.softwareheritage.org
+  gid: root
+  hardwareisa: unknown
+  hardwaremodel: x86_64
+  hostname: kafka05
+  icinga2_puppet_hostcert: "/var/lib/puppet/ssl/certs/kafka05.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_hostprivkey: "/var/lib/puppet/ssl/private_keys/kafka05.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_localcacert: "/var/lib/puppet/ssl/certs/ca.pem"
+  id: root
+  identity:
+    gid: 0
+    group: root
+    privileged: true
+    uid: 0
+    user: root
+  interfaces: eth0,lo
+  ipaddress: 192.168.200.34
+  ipaddress6: fe80::20d:3aff:fe26:d56c
+  ipaddress6_eth0: fe80::20d:3aff:fe26:d56c
+  ipaddress6_lo: "::1"
+  ipaddress_eth0: 192.168.200.34
+  ipaddress_lo: 127.0.0.1
+  is_pe: false
+  is_virtual: true
+  kernel: Linux
+  kernelmajversion: '4.9'
+  kernelrelease: 4.9.0-9-amd64
+  kernelversion: 4.9.0
+  load_averages:
+    15m: 1.76
+    1m: 1.45
+    5m: 1.85
+  location: azure_euwest
+  lsbdistcodename: stretch
+  lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
+  lsbdistid: Debian
+  lsbdistrelease: '9.9'
+  lsbmajdistrelease: '9'
+  lsbminordistrelease: '9'
+  macaddress: 00:0d:3a:26:d5:6c
+  macaddress_eth0: 00:0d:3a:26:d5:6c
+  manufacturer: Microsoft Corporation
+  memory:
+    system:
+      available: 3.57 GiB
+      available_bytes: 3830087680
+      capacity: 7.24%
+      total: 3.85 GiB
+      total_bytes: 4128972800
+      used: 285.04 MiB
+      used_bytes: 298885120
+  memoryfree: 3.57 GiB
+  memoryfree_mb: 3652.65625
+  memorysize: 3.85 GiB
+  memorysize_mb: 3937.6953125
+  mountpoints:
+    "/":
+      available: 28.38 GiB
+      available_bytes: 30471507968
+      capacity: 3.48%
+      device: "/dev/sda1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - errors=remount-ro
+      - data=ordered
+      size: 29.40 GiB
+      size_bytes: 31571480576
+      used: 1.02 GiB
+      used_bytes: 1099972608
+    "/dev/shm":
+      available: 1.92 GiB
+      available_bytes: 2064486400
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      size: 1.92 GiB
+      size_bytes: 2064486400
+      used: 0 bytes
+      used_bytes: 0
+    "/mnt/resource":
+      available: 7.78 GiB
+      available_bytes: 8349155328
+      capacity: 0.45%
+      device: "/dev/sdb1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.81 GiB
+      size_bytes: 8386895872
+      used: 35.99 MiB
+      used_bytes: 37740544
+    "/run":
+      available: 388.43 MiB
+      available_bytes: 407302144
+      capacity: 1.36%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - noexec
+      - relatime
+      - size=403220k
+      - mode=755
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 5.34 MiB
+      used_bytes: 5595136
+    "/run/lock":
+      available: 5.00 MiB
+      available_bytes: 5242880
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - noexec
+      - relatime
+      - size=5120k
+      size: 5.00 MiB
+      size_bytes: 5242880
+      used: 0 bytes
+      used_bytes: 0
+    "/run/user/0":
+      available: 393.77 MiB
+      available_bytes: 412897280
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - relatime
+      - size=403220k
+      - mode=700
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 0 bytes
+      used_bytes: 0
+    "/run/user/1000":
+      available: 393.77 MiB
+      available_bytes: 412897280
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - relatime
+      - size=403220k
+      - mode=700
+      - uid=1000
+      - gid=1000
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 0 bytes
+      used_bytes: 0
+    "/srv/kafka":
+      available: 7.94 TiB
+      available_bytes: 8725568802816
+      capacity: 0.00%
+      device: "/dev/sdc1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.94 TiB
+      size_bytes: 8725665300480
+      used: 92.03 MiB
+      used_bytes: 96497664
+    "/sys/fs/cgroup":
+      available: 1.92 GiB
+      available_bytes: 2064486400
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - ro
+      - nosuid
+      - nodev
+      - noexec
+      - mode=755
+      size: 1.92 GiB
+      size_bytes: 2064486400
+      used: 0 bytes
+      used_bytes: 0
+  mounts:
+  - "/"
+  - "/mnt/resource"
+  - "/srv/kafka"
+  mtu_eth0: 1500
+  mtu_lo: 65536
+  mysql_server_id: 15373740
+  netmask: 255.255.252.0
+  netmask6: 'ffff:ffff:ffff:ffff::'
+  netmask6_eth0: 'ffff:ffff:ffff:ffff::'
+  netmask6_lo: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+  netmask_eth0: 255.255.252.0
+  netmask_lo: 255.0.0.0
+  network: 192.168.200.0
+  network6: 'fe80::'
+  network6_eth0: 'fe80::'
+  network6_lo: "::1"
+  network_eth0: 192.168.200.0
+  network_lo: 127.0.0.0
+  networking:
+    dhcp: 168.63.129.16
+    domain: euwest.azure.internal.softwareheritage.org
+    fqdn: kafka05.euwest.azure.internal.softwareheritage.org
+    hostname: kafka05
+    interfaces:
+      eth0:
+        bindings:
+        - address: 192.168.200.34
+          netmask: 255.255.252.0
+          network: 192.168.200.0
+        bindings6:
+        - address: fe80::20d:3aff:fe26:d56c
+          netmask: 'ffff:ffff:ffff:ffff::'
+          network: 'fe80::'
+        dhcp: 168.63.129.16
+        ip: 192.168.200.34
+        ip6: fe80::20d:3aff:fe26:d56c
+        mac: 00:0d:3a:26:d5:6c
+        mtu: 1500
+        netmask: 255.255.252.0
+        netmask6: 'ffff:ffff:ffff:ffff::'
+        network: 192.168.200.0
+        network6: 'fe80::'
+      lo:
+        bindings:
+        - address: 127.0.0.1
+          netmask: 255.0.0.0
+          network: 127.0.0.0
+        bindings6:
+        - address: "::1"
+          netmask: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+          network: "::1"
+        ip: 127.0.0.1
+        ip6: "::1"
+        mtu: 65536
+        netmask: 255.0.0.0
+        netmask6: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+        network: 127.0.0.0
+        network6: "::1"
+    ip: 192.168.200.34
+    ip6: fe80::20d:3aff:fe26:d56c
+    mac: 00:0d:3a:26:d5:6c
+    mtu: 1500
+    netmask: 255.255.252.0
+    netmask6: 'ffff:ffff:ffff:ffff::'
+    network: 192.168.200.0
+    network6: 'fe80::'
+    primary: eth0
+  operatingsystem: Debian
+  operatingsystemmajrelease: '9'
+  operatingsystemrelease: '9.9'
+  os:
+    architecture: amd64
+    distro:
+      codename: stretch
+      description: Debian GNU/Linux 9.9 (stretch)
+      id: Debian
+      release:
+        full: '9.9'
+        major: '9'
+        minor: '9'
+    family: Debian
+    hardware: x86_64
+    name: Debian
+    release:
+      full: '9.9'
+      major: '9'
+      minor: '9'
+    selinux:
+      enabled: false
+  osfamily: Debian
+  package_provider: apt
+  partitions:
+    "/dev/sda1":
+      filesystem: ext4
+      mount: "/"
+      partuuid: 8f00037d-01
+      size: 30.00 GiB
+      size_bytes: 32211206144
+      uuid: 1983b779-b2c8-404a-b8a4-1282baa9f8b1
+    "/dev/sdb1":
+      filesystem: ext4
+      mount: "/mnt/resource"
+      partuuid: 11a2404f-01
+      size: 8.00 GiB
+      size_bytes: 8588820480
+      uuid: c4820c15-2c83-45a6-9287-7f82ba01302e
+    "/dev/sdc1":
+      filesystem: ext4
+      mount: "/srv/kafka"
+      partuuid: 62c21459-b7e5-46ea-950c-a2cb071aefa6
+      size: 8.00 TiB
+      size_bytes: 8796091956736
+      uuid: da5acf3e-f9fe-4508-9328-67ef9a90868d
+  path: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+  physicalprocessorcount: 1
+  processor0: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processor1: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processorcount: 2
+  processors:
+    count: 2
+    isa: unknown
+    models:
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    physicalcount: 1
+  productname: Virtual Machine
+  public_ipaddresses: []
+  puppet_environmentpath: "/etc/puppet/code/environments"
+  puppet_server: pergamon.internal.softwareheritage.org
+  puppet_vardir: "/var/cache/puppet"
+  puppetversion: 4.8.2
+  root_home: "/root"
+  ruby:
+    platform: x86_64-linux-gnu
+    sitedir: "/usr/local/lib/site_ruby/2.3.0"
+    version: 2.3.3
+  rubyplatform: x86_64-linux-gnu
+  rubysitedir: "/usr/local/lib/site_ruby/2.3.0"
+  rubyversion: 2.3.3
+  selinux: false
+  serialnumber: 0000-0001-2706-4875-4616-8127-06
+  service_provider: systemd
+  ssh:
+    dsa:
+      fingerprints:
+        sha1: SSHFP 2 1 4db077e79a9d29aa96df5e591452643b3e55766b
+        sha256: SSHFP 2 2 0bc1d462e11ff769f6fc2f4367a81af0ae101ebdafa6a9d03cfcfabad7edbcc7
+      key: AAAAB3NzaC1kc3MAAACBALiPEK0+QmjXCwO40LX992+UjKuNbGXtyFyxac/RdSEOm1fuiAvwxAuEFw4OLF8UPu+cLUKIvI+FGuX0Me3GkWh2BN6PrAXprMiR/nqukcQ+7mQOrfjT6c+t9QfgTudJB0dNA3wXbs8jtTl8cTAFtwz32Iy9af0uTk5REC6yAmPbAAAAFQDrqt7zoQGurrEp30V+afLV4s5Y9QAAAIBuEaX//ZOTz+BZQ5YKrpfDc11P2xop+SE/KjlfXXUJfY96swAC0kRBkyExHm4z2RvZiFHPzkSzEfGI+eeoqEVop7A+W1pMbS2FRzVaFdJqM5tJX6NqxcyHyV6UX3HOPaz+GiX4qbs5Z3Z9ghropA2XuuWkGYy0+ij3yVhZjIkanwAAAIA1/QD/xCI1hMlyZZ7LCcwnsjxqmMjFZKjXlQJRs8SgiLcN6Y6UKhGN3GsM/TKpw/yspV6S9Tsdau6BQug5K7Ns9OkTzwm19SKQ7q0WT/Ifi3r0eY0WsLuDgi/L2BfvE5GxrtEFUqRivl1c3TWh5gm+c3gB++ZpsYBHeL9Uj220wg==
+    ecdsa:
+      fingerprints:
+        sha1: SSHFP 3 1 0c7370027d67300776e7f9c2353650e73ed44f69
+        sha256: SSHFP 3 2 3f98717deb2a4b079e132869c8d391cd3aae5c41ab04795760de8fad11a06291
+      key: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMzdTaBJpsgP9khF44DCc+Z4QIMsYoJ04vwlnuWO/ZZolIkRYUqdiq2cvVan2cXnyU5rWGGnYS1ZhuoTNSabqLI=
+    ed25519:
+      fingerprints:
+        sha1: SSHFP 4 1 4d1518a02011e2fd98cff57eb790e4d5bac09ceb
+        sha256: SSHFP 4 2 dadcfaf35782e4c6e01dc899eadf7e8d5e319916884ebc16d8fea9ab9bc14bfa
+      key: AAAAC3NzaC1lZDI1NTE5AAAAIMKHWxLZqhgsnSUTftLfEnyTwbSLJWKJ8G3RR/+40zj3
+    rsa:
+      fingerprints:
+        sha1: SSHFP 1 1 73bf5c769cfb50cf642274a95c153c456807dc9a
+        sha256: SSHFP 1 2 83e81b74a4927afcafd3d705337f93c1022d7c00769b439f732842998806decb
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDVpgkdctdZAqSPTi5ZpBPk+EXB+v/sZa1nBhiCqSic8YyHu+TnhuirxKp3jiz70viLp0/jutFNMxCpogPHouO7/4nMt4sJ8fLY00S/zNONyycK6fzuDVosZvBRxoaOH1F3Btdu2xqFab3UY8daQuDT0KUHFTij17MsX/6s0TKD0ZLGGOlVj6A6Cw55Cse9W5z3k2Ineq4aeiMtBrZbHWnb5MkhAVlTmbHdtfBZ+pBV+DnwCvmXPLQCvoN0voiNLr3bZbP5vMRTuNg0vxLyghZSNJvPDhoyG4xBa6xmOt9NQLUlWyC4JQ1KEwDWSFUPBkp3lXcM0llZM+TtWwSrJM5X
+  ssh_client_version_full: 7.4p1
+  ssh_server_version_full: 7.4p1
+  sshdsakey: AAAAB3NzaC1kc3MAAACBALiPEK0+QmjXCwO40LX992+UjKuNbGXtyFyxac/RdSEOm1fuiAvwxAuEFw4OLF8UPu+cLUKIvI+FGuX0Me3GkWh2BN6PrAXprMiR/nqukcQ+7mQOrfjT6c+t9QfgTudJB0dNA3wXbs8jtTl8cTAFtwz32Iy9af0uTk5REC6yAmPbAAAAFQDrqt7zoQGurrEp30V+afLV4s5Y9QAAAIBuEaX//ZOTz+BZQ5YKrpfDc11P2xop+SE/KjlfXXUJfY96swAC0kRBkyExHm4z2RvZiFHPzkSzEfGI+eeoqEVop7A+W1pMbS2FRzVaFdJqM5tJX6NqxcyHyV6UX3HOPaz+GiX4qbs5Z3Z9ghropA2XuuWkGYy0+ij3yVhZjIkanwAAAIA1/QD/xCI1hMlyZZ7LCcwnsjxqmMjFZKjXlQJRs8SgiLcN6Y6UKhGN3GsM/TKpw/yspV6S9Tsdau6BQug5K7Ns9OkTzwm19SKQ7q0WT/Ifi3r0eY0WsLuDgi/L2BfvE5GxrtEFUqRivl1c3TWh5gm+c3gB++ZpsYBHeL9Uj220wg==
+  sshecdsakey: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMzdTaBJpsgP9khF44DCc+Z4QIMsYoJ04vwlnuWO/ZZolIkRYUqdiq2cvVan2cXnyU5rWGGnYS1ZhuoTNSabqLI=
+  sshed25519key: AAAAC3NzaC1lZDI1NTE5AAAAIMKHWxLZqhgsnSUTftLfEnyTwbSLJWKJ8G3RR/+40zj3
+  sshfp_dsa: |-
+    SSHFP 2 1 4db077e79a9d29aa96df5e591452643b3e55766b
+    SSHFP 2 2 0bc1d462e11ff769f6fc2f4367a81af0ae101ebdafa6a9d03cfcfabad7edbcc7
+  sshfp_ecdsa: |-
+    SSHFP 3 1 0c7370027d67300776e7f9c2353650e73ed44f69
+    SSHFP 3 2 3f98717deb2a4b079e132869c8d391cd3aae5c41ab04795760de8fad11a06291
+  sshfp_ed25519: |-
+    SSHFP 4 1 4d1518a02011e2fd98cff57eb790e4d5bac09ceb
+    SSHFP 4 2 dadcfaf35782e4c6e01dc899eadf7e8d5e319916884ebc16d8fea9ab9bc14bfa
+  sshfp_rsa: |-
+    SSHFP 1 1 73bf5c769cfb50cf642274a95c153c456807dc9a
+    SSHFP 1 2 83e81b74a4927afcafd3d705337f93c1022d7c00769b439f732842998806decb
+  sshrsakey: AAAAB3NzaC1yc2EAAAADAQABAAABAQDVpgkdctdZAqSPTi5ZpBPk+EXB+v/sZa1nBhiCqSic8YyHu+TnhuirxKp3jiz70viLp0/jutFNMxCpogPHouO7/4nMt4sJ8fLY00S/zNONyycK6fzuDVosZvBRxoaOH1F3Btdu2xqFab3UY8daQuDT0KUHFTij17MsX/6s0TKD0ZLGGOlVj6A6Cw55Cse9W5z3k2Ineq4aeiMtBrZbHWnb5MkhAVlTmbHdtfBZ+pBV+DnwCvmXPLQCvoN0voiNLr3bZbP5vMRTuNg0vxLyghZSNJvPDhoyG4xBa6xmOt9NQLUlWyC4JQ1KEwDWSFUPBkp3lXcM0llZM+TtWwSrJM5X
+  sudoversion: 1.8.19p1
+  swh_hostname:
+    fqdn: kafka05.euwest.azure.internal.softwareheritage.org
+    short: kafka05.euwest.azure
+    internal_fqdn: kafka05.euwest.azure.internal.softwareheritage.org
+  system_uptime:
+    days: 0
+    hours: 0
+    seconds: 2113
+    uptime: 0:35 hours
+  systemd: true
+  systemd_internal_services:
+    systemd-networkd-wait-online.service: disabled
+    systemd-networkd.service: disabled
+    systemd-resolved.service: disabled
+    systemd-timesyncd.service: enabled
+  systemd_version: '232'
+  timezone: UTC
+  uptime: 0:35 hours
+  uptime_days: 0
+  uptime_hours: 0
+  uptime_seconds: 2113
+  uuid: 4F40A211-3A65-A244-BD2B-6F7B91A66D89
+  vcsrepo_svn_ver: ''
+  virtual: hyperv
+  clientcert: kafka05.euwest.azure.internal.softwareheritage.org
+  clientversion: 4.8.2
+  clientnoop: false
+timestamp: '2019-08-23T15:00:52.373015376+00:00'
+expiration: '2019-08-23T15:30:52.373497878+00:00'
diff --git a/octocatalog-diff/facts/kafka06.euwest.azure.internal.softwareheritage.org.yaml b/octocatalog-diff/facts/kafka06.euwest.azure.internal.softwareheritage.org.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..39fbc266ffdcf93738ec7dcc23055cb9e667c8e3
--- /dev/null
+++ b/octocatalog-diff/facts/kafka06.euwest.azure.internal.softwareheritage.org.yaml
@@ -0,0 +1,491 @@
+--- !ruby/object:Puppet::Node::Facts
+name: kafka06.euwest.azure.internal.softwareheritage.org
+values:
+  apt_has_dist_updates: false
+  apt_has_updates: false
+  apt_reboot_required: false
+  apt_update_last_success: -1
+  architecture: amd64
+  bios_release_date: 06/02/2017
+  bios_vendor: American Megatrends Inc.
+  bios_version: '090007'
+  blockdevice_fd0_size: 4096
+  blockdevice_sda_model: Virtual Disk
+  blockdevice_sda_size: 32212254720
+  blockdevice_sda_vendor: Msft
+  blockdevice_sdb_model: Virtual Disk
+  blockdevice_sdb_size: 8589934592
+  blockdevice_sdb_vendor: Msft
+  blockdevice_sdc_model: Virtual Disk
+  blockdevice_sdc_size: 8796093022208
+  blockdevice_sdc_vendor: Msft
+  blockdevice_sr0_model: Virtual CD/ROM
+  blockdevice_sr0_size: 643072
+  blockdevice_sr0_vendor: Msft
+  blockdevices: sdb,sr0,fd0,sdc,sda
+  boardmanufacturer: Microsoft Corporation
+  boardproductname: Virtual Machine
+  boardserialnumber: 0000-0013-2929-9859-5031-6559-54
+  chassisassettag: 7783-7084-3265-9085-8269-3286-77
+  chassistype: Desktop
+  cloud:
+    provider: azure
+  dhcp_servers:
+    eth0: 168.63.129.16
+    system: 168.63.129.16
+  disks:
+    fd0:
+      size: 4.00 KiB
+      size_bytes: 4096
+    sda:
+      model: Virtual Disk
+      size: 30.00 GiB
+      size_bytes: 32212254720
+      vendor: Msft
+    sdb:
+      model: Virtual Disk
+      size: 8.00 GiB
+      size_bytes: 8589934592
+      vendor: Msft
+    sdc:
+      model: Virtual Disk
+      size: 8.00 TiB
+      size_bytes: 8796093022208
+      vendor: Msft
+    sr0:
+      model: Virtual CD/ROM
+      size: 628.00 KiB
+      size_bytes: 643072
+      vendor: Msft
+  dmi:
+    bios:
+      release_date: 06/02/2017
+      vendor: American Megatrends Inc.
+      version: '090007'
+    board:
+      manufacturer: Microsoft Corporation
+      product: Virtual Machine
+      serial_number: 0000-0013-2929-9859-5031-6559-54
+    chassis:
+      asset_tag: 7783-7084-3265-9085-8269-3286-77
+      type: Desktop
+    manufacturer: Microsoft Corporation
+    product:
+      name: Virtual Machine
+      serial_number: 0000-0007-8540-9064-9115-5750-73
+      uuid: D555FF6C-4026-2143-B87A-37CAF8A0E612
+  domain: euwest.azure.internal.softwareheritage.org
+  facterversion: 3.10.0
+  filesystems: ext2,ext3,ext4,udf
+  fips_enabled: false
+  fqdn: kafka06.euwest.azure.internal.softwareheritage.org
+  gid: root
+  hardwareisa: unknown
+  hardwaremodel: x86_64
+  hostname: kafka06
+  icinga2_puppet_hostcert: "/var/lib/puppet/ssl/certs/kafka06.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_hostprivkey: "/var/lib/puppet/ssl/private_keys/kafka06.euwest.azure.internal.softwareheritage.org.pem"
+  icinga2_puppet_localcacert: "/var/lib/puppet/ssl/certs/ca.pem"
+  id: root
+  identity:
+    gid: 0
+    group: root
+    privileged: true
+    uid: 0
+    user: root
+  interfaces: eth0,lo
+  ipaddress: 192.168.200.30
+  ipaddress6: fe80::20d:3aff:fe26:db80
+  ipaddress6_eth0: fe80::20d:3aff:fe26:db80
+  ipaddress6_lo: "::1"
+  ipaddress_eth0: 192.168.200.30
+  ipaddress_lo: 127.0.0.1
+  is_pe: false
+  is_virtual: true
+  kernel: Linux
+  kernelmajversion: '4.9'
+  kernelrelease: 4.9.0-9-amd64
+  kernelversion: 4.9.0
+  load_averages:
+    15m: 1.71
+    1m: 1.25
+    5m: 1.71
+  location: azure_euwest
+  lsbdistcodename: stretch
+  lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
+  lsbdistid: Debian
+  lsbdistrelease: '9.9'
+  lsbmajdistrelease: '9'
+  lsbminordistrelease: '9'
+  macaddress: 00:0d:3a:26:db:80
+  macaddress_eth0: 00:0d:3a:26:db:80
+  manufacturer: Microsoft Corporation
+  memory:
+    system:
+      available: 3.57 GiB
+      available_bytes: 3832393728
+      capacity: 7.18%
+      total: 3.85 GiB
+      total_bytes: 4128968704
+      used: 282.84 MiB
+      used_bytes: 296574976
+  memoryfree: 3.57 GiB
+  memoryfree_mb: 3654.85546875
+  memorysize: 3.85 GiB
+  memorysize_mb: 3937.69140625
+  mountpoints:
+    "/":
+      available: 28.38 GiB
+      available_bytes: 30471503872
+      capacity: 3.48%
+      device: "/dev/sda1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - errors=remount-ro
+      - data=ordered
+      size: 29.40 GiB
+      size_bytes: 31571480576
+      used: 1.02 GiB
+      used_bytes: 1099976704
+    "/dev/shm":
+      available: 1.92 GiB
+      available_bytes: 2064482304
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      size: 1.92 GiB
+      size_bytes: 2064482304
+      used: 0 bytes
+      used_bytes: 0
+    "/mnt/resource":
+      available: 7.78 GiB
+      available_bytes: 8349155328
+      capacity: 0.45%
+      device: "/dev/sdb1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.81 GiB
+      size_bytes: 8386895872
+      used: 35.99 MiB
+      used_bytes: 37740544
+    "/run":
+      available: 388.43 MiB
+      available_bytes: 407302144
+      capacity: 1.36%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - noexec
+      - relatime
+      - size=403220k
+      - mode=755
+      size: 393.77 MiB
+      size_bytes: 412897280
+      used: 5.34 MiB
+      used_bytes: 5595136
+    "/run/lock":
+      available: 5.00 MiB
+      available_bytes: 5242880
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - noexec
+      - relatime
+      - size=5120k
+      size: 5.00 MiB
+      size_bytes: 5242880
+      used: 0 bytes
+      used_bytes: 0
+    "/run/user/0":
+      available: 393.77 MiB
+      available_bytes: 412893184
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - relatime
+      - size=403216k
+      - mode=700
+      size: 393.77 MiB
+      size_bytes: 412893184
+      used: 0 bytes
+      used_bytes: 0
+    "/run/user/1000":
+      available: 393.77 MiB
+      available_bytes: 412893184
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - rw
+      - nosuid
+      - nodev
+      - relatime
+      - size=403216k
+      - mode=700
+      - uid=1000
+      - gid=1000
+      size: 393.77 MiB
+      size_bytes: 412893184
+      used: 0 bytes
+      used_bytes: 0
+    "/srv/kafka":
+      available: 7.94 TiB
+      available_bytes: 8725568802816
+      capacity: 0.00%
+      device: "/dev/sdc1"
+      filesystem: ext4
+      options:
+      - rw
+      - relatime
+      - data=ordered
+      size: 7.94 TiB
+      size_bytes: 8725665300480
+      used: 92.03 MiB
+      used_bytes: 96497664
+    "/sys/fs/cgroup":
+      available: 1.92 GiB
+      available_bytes: 2064482304
+      capacity: 0%
+      device: tmpfs
+      filesystem: tmpfs
+      options:
+      - ro
+      - nosuid
+      - nodev
+      - noexec
+      - mode=755
+      size: 1.92 GiB
+      size_bytes: 2064482304
+      used: 0 bytes
+      used_bytes: 0
+  mounts:
+  - "/"
+  - "/mnt/resource"
+  - "/srv/kafka"
+  mtu_eth0: 1500
+  mtu_lo: 65536
+  mysql_server_id: 15374144
+  netmask: 255.255.252.0
+  netmask6: 'ffff:ffff:ffff:ffff::'
+  netmask6_eth0: 'ffff:ffff:ffff:ffff::'
+  netmask6_lo: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+  netmask_eth0: 255.255.252.0
+  netmask_lo: 255.0.0.0
+  network: 192.168.200.0
+  network6: 'fe80::'
+  network6_eth0: 'fe80::'
+  network6_lo: "::1"
+  network_eth0: 192.168.200.0
+  network_lo: 127.0.0.0
+  networking:
+    dhcp: 168.63.129.16
+    domain: euwest.azure.internal.softwareheritage.org
+    fqdn: kafka06.euwest.azure.internal.softwareheritage.org
+    hostname: kafka06
+    interfaces:
+      eth0:
+        bindings:
+        - address: 192.168.200.30
+          netmask: 255.255.252.0
+          network: 192.168.200.0
+        bindings6:
+        - address: fe80::20d:3aff:fe26:db80
+          netmask: 'ffff:ffff:ffff:ffff::'
+          network: 'fe80::'
+        dhcp: 168.63.129.16
+        ip: 192.168.200.30
+        ip6: fe80::20d:3aff:fe26:db80
+        mac: 00:0d:3a:26:db:80
+        mtu: 1500
+        netmask: 255.255.252.0
+        netmask6: 'ffff:ffff:ffff:ffff::'
+        network: 192.168.200.0
+        network6: 'fe80::'
+      lo:
+        bindings:
+        - address: 127.0.0.1
+          netmask: 255.0.0.0
+          network: 127.0.0.0
+        bindings6:
+        - address: "::1"
+          netmask: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+          network: "::1"
+        ip: 127.0.0.1
+        ip6: "::1"
+        mtu: 65536
+        netmask: 255.0.0.0
+        netmask6: ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+        network: 127.0.0.0
+        network6: "::1"
+    ip: 192.168.200.30
+    ip6: fe80::20d:3aff:fe26:db80
+    mac: 00:0d:3a:26:db:80
+    mtu: 1500
+    netmask: 255.255.252.0
+    netmask6: 'ffff:ffff:ffff:ffff::'
+    network: 192.168.200.0
+    network6: 'fe80::'
+    primary: eth0
+  operatingsystem: Debian
+  operatingsystemmajrelease: '9'
+  operatingsystemrelease: '9.9'
+  os:
+    architecture: amd64
+    distro:
+      codename: stretch
+      description: Debian GNU/Linux 9.9 (stretch)
+      id: Debian
+      release:
+        full: '9.9'
+        major: '9'
+        minor: '9'
+    family: Debian
+    hardware: x86_64
+    name: Debian
+    release:
+      full: '9.9'
+      major: '9'
+      minor: '9'
+    selinux:
+      enabled: false
+  osfamily: Debian
+  package_provider: apt
+  partitions:
+    "/dev/sda1":
+      filesystem: ext4
+      mount: "/"
+      partuuid: 8f00037d-01
+      size: 30.00 GiB
+      size_bytes: 32211206144
+      uuid: 1983b779-b2c8-404a-b8a4-1282baa9f8b1
+    "/dev/sdb1":
+      filesystem: ext4
+      mount: "/mnt/resource"
+      partuuid: 6cff55d5-01
+      size: 8.00 GiB
+      size_bytes: 8588820480
+      uuid: 9565d5b0-c4fe-42aa-bdd4-776b78823da2
+    "/dev/sdc1":
+      filesystem: ext4
+      mount: "/srv/kafka"
+      partuuid: 3a285516-26b9-4775-b02c-a89bf1b963ca
+      size: 8.00 TiB
+      size_bytes: 8796091956736
+      uuid: 3205da7e-937c-46e3-b91a-88ea049f99c4
+  path: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+  physicalprocessorcount: 1
+  processor0: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processor1: Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+  processorcount: 2
+  processors:
+    count: 2
+    isa: unknown
+    models:
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    - Intel(R) Xeon(R) CPU E5-2673 v4 @ 2.30GHz
+    physicalcount: 1
+  productname: Virtual Machine
+  public_ipaddresses: []
+  puppet_environmentpath: "/etc/puppet/code/environments"
+  puppet_server: pergamon.internal.softwareheritage.org
+  puppet_vardir: "/var/cache/puppet"
+  puppetversion: 4.8.2
+  root_home: "/root"
+  ruby:
+    platform: x86_64-linux-gnu
+    sitedir: "/usr/local/lib/site_ruby/2.3.0"
+    version: 2.3.3
+  rubyplatform: x86_64-linux-gnu
+  rubysitedir: "/usr/local/lib/site_ruby/2.3.0"
+  rubyversion: 2.3.3
+  selinux: false
+  serialnumber: 0000-0007-8540-9064-9115-5750-73
+  service_provider: systemd
+  ssh:
+    dsa:
+      fingerprints:
+        sha1: SSHFP 2 1 c34283849bcb957648bdcd5e627151db7b3eaa71
+        sha256: SSHFP 2 2 ef5a0ed76c39151b9d56b5eaca73b84f46fec159f6d2ea56a6d1457de679c651
+      key: AAAAB3NzaC1kc3MAAACBANpEOPHxzz0fGw0GOLn5MhR4HX2NQK/JeYUoBKBriY7a3ODwuMNZVatbol01Z5yUJsQPqHSJ4PbpiDOO8SCOv7Bjt4KWvCAvPJ9NoUu50fRbHq/Su5FdMeSieAny2j+LsOcWkKZTyYG9eQQtkTRPwp2PNhuQDlh1l4dwtXR9W5AFAAAAFQC/UPep3T+ZeN5VmZC5Bs8OyDlnCQAAAIB4C+AroQ+7ZBG/NeGcevlR7ZPaihj3NkxgBfmdSi/k/pokfrifpnul+PHOt8W6jkm1gZIQxiHro6/L4C4MHqLEsKK0Rrrakkbj4+IoEaKeFgIIegqs3H1HY0mnLH0VUVWmOAzE5HFoJJv3M+mwMVdsqpL8LsvvAf+RvXr7ojwg9wAAAIEAsj30CQtrYd39idZABf46E142Oek6fwdgTGEy8Y4804Cpis5xBTygd7tRO/st2zdK0m4vjejIPqzZ8MlxFAMgx0IR+6/4yp5olW6KUTFRtQfNuF3t4/VI7a4vKsShO4qIRYrjnPyeg1CasuoIqBmmIjJa+WEjHRoWR7hLBrdZC5I=
+    ecdsa:
+      fingerprints:
+        sha1: SSHFP 3 1 99a42508f430343a0458c9e4e7dffd4fe5402847
+        sha256: SSHFP 3 2 3509239393cc70094811adb5939a1f0ae55258ed3fa97addc4afb2adeb57f119
+      key: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDLkTnPa2rvR8iiW6aSMYsyzfkvXlhI0ytnb4EOUhXw3ggNTc98eSePCRx2GLRSs9gwh877dKgNuYo8cDcwdY/M=
+    ed25519:
+      fingerprints:
+        sha1: SSHFP 4 1 ca38f2c75a1db53c92ea2fb31e553fc8dfe14482
+        sha256: SSHFP 4 2 9328616dbc08c9f4843bc04eca2d10c8dca748891c97495c559c7184b23e653a
+      key: AAAAC3NzaC1lZDI1NTE5AAAAICWx6wNKVJCGxekB+uY/HJoMO5AIMW64o4/xM+C+ehDd
+    rsa:
+      fingerprints:
+        sha1: SSHFP 1 1 32c6786d665aad97d2fa62993123d68cf02437cf
+        sha256: SSHFP 1 2 8443dc7139a2ef78dae84322354a81fe1e51b4d0e10f99d974a3d84584c146f4
+      key: AAAAB3NzaC1yc2EAAAADAQABAAABAQDKc2vgruHMDMTA6nVxqDsIeYzr8rEkFx7Q1FZjndbrLmZ/JyunUHiHiv61Y7W/333kecwFS9nBj8UiAqDLtKlC++zozecjsV4tSlPAXXgPeO4DALFAi93bRHpzvVtF1QCUb3k9bvZ/aa0Q+elAv0YUmR0zBWt9qBgGo9ISvh6hnmTygFRh51F5GI74HVQjs4UfRQB33YGfiNIMW4Us2V4ahlRFb1AFymajdO4AqDSFror+/mXguP9VrvRWK/B7r2+R85QkvWFq+PZXHeTqj0nAKLW1guM9L8fc96IV1xpK3yrc0xTfGuzhDGuWu4J04XQI9EnQTWEWIMyIZG/6vMyx
+  ssh_client_version_full: 7.4p1
+  ssh_server_version_full: 7.4p1
+  sshdsakey: AAAAB3NzaC1kc3MAAACBANpEOPHxzz0fGw0GOLn5MhR4HX2NQK/JeYUoBKBriY7a3ODwuMNZVatbol01Z5yUJsQPqHSJ4PbpiDOO8SCOv7Bjt4KWvCAvPJ9NoUu50fRbHq/Su5FdMeSieAny2j+LsOcWkKZTyYG9eQQtkTRPwp2PNhuQDlh1l4dwtXR9W5AFAAAAFQC/UPep3T+ZeN5VmZC5Bs8OyDlnCQAAAIB4C+AroQ+7ZBG/NeGcevlR7ZPaihj3NkxgBfmdSi/k/pokfrifpnul+PHOt8W6jkm1gZIQxiHro6/L4C4MHqLEsKK0Rrrakkbj4+IoEaKeFgIIegqs3H1HY0mnLH0VUVWmOAzE5HFoJJv3M+mwMVdsqpL8LsvvAf+RvXr7ojwg9wAAAIEAsj30CQtrYd39idZABf46E142Oek6fwdgTGEy8Y4804Cpis5xBTygd7tRO/st2zdK0m4vjejIPqzZ8MlxFAMgx0IR+6/4yp5olW6KUTFRtQfNuF3t4/VI7a4vKsShO4qIRYrjnPyeg1CasuoIqBmmIjJa+WEjHRoWR7hLBrdZC5I=
+  sshecdsakey: AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDLkTnPa2rvR8iiW6aSMYsyzfkvXlhI0ytnb4EOUhXw3ggNTc98eSePCRx2GLRSs9gwh877dKgNuYo8cDcwdY/M=
+  sshed25519key: AAAAC3NzaC1lZDI1NTE5AAAAICWx6wNKVJCGxekB+uY/HJoMO5AIMW64o4/xM+C+ehDd
+  sshfp_dsa: |-
+    SSHFP 2 1 c34283849bcb957648bdcd5e627151db7b3eaa71
+    SSHFP 2 2 ef5a0ed76c39151b9d56b5eaca73b84f46fec159f6d2ea56a6d1457de679c651
+  sshfp_ecdsa: |-
+    SSHFP 3 1 99a42508f430343a0458c9e4e7dffd4fe5402847
+    SSHFP 3 2 3509239393cc70094811adb5939a1f0ae55258ed3fa97addc4afb2adeb57f119
+  sshfp_ed25519: |-
+    SSHFP 4 1 ca38f2c75a1db53c92ea2fb31e553fc8dfe14482
+    SSHFP 4 2 9328616dbc08c9f4843bc04eca2d10c8dca748891c97495c559c7184b23e653a
+  sshfp_rsa: |-
+    SSHFP 1 1 32c6786d665aad97d2fa62993123d68cf02437cf
+    SSHFP 1 2 8443dc7139a2ef78dae84322354a81fe1e51b4d0e10f99d974a3d84584c146f4
+  sshrsakey: AAAAB3NzaC1yc2EAAAADAQABAAABAQDKc2vgruHMDMTA6nVxqDsIeYzr8rEkFx7Q1FZjndbrLmZ/JyunUHiHiv61Y7W/333kecwFS9nBj8UiAqDLtKlC++zozecjsV4tSlPAXXgPeO4DALFAi93bRHpzvVtF1QCUb3k9bvZ/aa0Q+elAv0YUmR0zBWt9qBgGo9ISvh6hnmTygFRh51F5GI74HVQjs4UfRQB33YGfiNIMW4Us2V4ahlRFb1AFymajdO4AqDSFror+/mXguP9VrvRWK/B7r2+R85QkvWFq+PZXHeTqj0nAKLW1guM9L8fc96IV1xpK3yrc0xTfGuzhDGuWu4J04XQI9EnQTWEWIMyIZG/6vMyx
+  sudoversion: 1.8.19p1
+  swh_hostname:
+    fqdn: kafka06.euwest.azure.internal.softwareheritage.org
+    short: kafka06.euwest.azure
+    internal_fqdn: kafka06.euwest.azure.internal.softwareheritage.org
+  system_uptime:
+    days: 0
+    hours: 0
+    seconds: 2133
+    uptime: 0:35 hours
+  systemd: true
+  systemd_internal_services:
+    systemd-networkd-wait-online.service: disabled
+    systemd-networkd.service: disabled
+    systemd-resolved.service: disabled
+    systemd-timesyncd.service: enabled
+  systemd_version: '232'
+  timezone: UTC
+  uptime: 0:35 hours
+  uptime_days: 0
+  uptime_hours: 0
+  uptime_seconds: 2133
+  uuid: D555FF6C-4026-2143-B87A-37CAF8A0E612
+  vcsrepo_svn_ver: ''
+  virtual: hyperv
+  clientcert: kafka06.euwest.azure.internal.softwareheritage.org
+  clientversion: 4.8.2
+  clientnoop: false
+timestamp: '2019-08-23T15:01:12.941654511+00:00'
+expiration: '2019-08-23T15:31:12.942116204+00:00'
diff --git a/octocatalog-diff/facts/moma.softwareheritage.org.yaml b/octocatalog-diff/facts/moma.softwareheritage.org.yaml
index 3f1c87b933315006a555ea8ca42fe86c93fb00f4..52261a5f38fe9901bd4531edfef471a9d789e449 100644
--- a/octocatalog-diff/facts/moma.softwareheritage.org.yaml
+++ b/octocatalog-diff/facts/moma.softwareheritage.org.yaml
@@ -3,38 +3,10 @@ name: moma.softwareheritage.org
 values:
   agent_specified_environment: production
   apache_version: 2.4.25
-  apt_dist_updates: 16
-  apt_has_dist_updates: true
-  apt_has_updates: true
-  apt_package_dist_updates:
-  - python3-kafka
-  - python3-mimeparse
-  - python3-aiohttp-utils
-  - python3-wrapt
-  - python3-deprecated
-  - python3-django-js-reverse
-  - python3-pyblake2
-  - python3-swh.core
-  - python3-swh.model
-  - python3-swh.scheduler
-  - python3-swh.indexer
-  - python3-swh.indexer.storage
-  - python3-swh.journal
-  - python3-swh.vault
-  - python3-swh.web
-  - filebeat
-  apt_package_security_dist_updates: []
-  apt_package_security_updates: []
-  apt_package_updates:
-  - python3-django-js-reverse
-  - python3-swh.scheduler
-  - python3-swh.web
-  - filebeat
+  apt_has_dist_updates: false
+  apt_has_updates: false
   apt_reboot_required: true
-  apt_security_dist_updates: 0
-  apt_security_updates: 0
-  apt_update_last_success: 1565357326
-  apt_updates: 4
+  apt_update_last_success: 1567083546
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -104,9 +76,9 @@ values:
   kernelrelease: 4.9.0-9-amd64
   kernelversion: 4.9.0
   load_averages:
-    15m: 0.19
-    1m: 0.34
-    5m: 0.25
+    15m: 2.95
+    1m: 4.42
+    5m: 3.13
   location: sesi_rocquencourt
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -128,22 +100,22 @@ values:
       used: 0 bytes
       used_bytes: 0
     system:
-      available: 10.20 GiB
-      available_bytes: 10946859008
-      capacity: 34.96%
+      available: 10.12 GiB
+      available_bytes: 10867494912
+      capacity: 35.43%
       total: 15.68 GiB
       total_bytes: 16831193088
-      used: 5.48 GiB
-      used_bytes: 5884334080
-  memoryfree: 10.20 GiB
-  memoryfree_mb: 10439.73828125
+      used: 5.55 GiB
+      used_bytes: 5963698176
+  memoryfree: 10.12 GiB
+  memoryfree_mb: 10364.05078125
   memorysize: 15.68 GiB
   memorysize_mb: 16051.4765625
   mountpoints:
     "/":
-      available: 11.61 GiB
-      available_bytes: 12467240960
-      capacity: 40.64%
+      available: 11.30 GiB
+      available_bytes: 12138385408
+      capacity: 42.21%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -154,8 +126,8 @@ values:
       - data=ordered
       size: 19.56 GiB
       size_bytes: 21002579968
-      used: 7.95 GiB
-      used_bytes: 8535339008
+      used: 8.26 GiB
+      used_bytes: 8864194560
     "/dev/shm":
       available: 7.84 GiB
       available_bytes: 8415596544
@@ -172,8 +144,8 @@ values:
       used_bytes: 0
     "/run":
       available: 1.57 GiB
-      available_bytes: 1682534400
-      capacity: 0.03%
+      available_bytes: 1682530304
+      capacity: 0.04%
       device: tmpfs
       filesystem: tmpfs
       options:
@@ -185,8 +157,8 @@ values:
       - mode=755
       size: 1.57 GiB
       size_bytes: 1683120128
-      used: 572.00 KiB
-      used_bytes: 585728
+      used: 576.00 KiB
+      used_bytes: 589824
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -204,7 +176,7 @@ values:
       size_bytes: 5242880
       used: 0 bytes
       used_bytes: 0
-    "/run/user/1003":
+    "/run/user/0":
       available: 1.57 GiB
       available_bytes: 1683116032
       capacity: 0%
@@ -217,13 +189,11 @@ values:
       - relatime
       - size=1643668k
       - mode=700
-      - uid=1003
-      - gid=1003
       size: 1.57 GiB
       size_bytes: 1683116032
       used: 0 bytes
       used_bytes: 0
-    "/run/user/1015":
+    "/run/user/1003":
       available: 1.57 GiB
       available_bytes: 1683116032
       capacity: 0%
@@ -236,8 +206,8 @@ values:
       - relatime
       - size=1643668k
       - mode=700
-      - uid=1015
-      - gid=1015
+      - uid=1003
+      - gid=1003
       size: 1.57 GiB
       size_bytes: 1683116032
       used: 0 bytes
@@ -468,10 +438,10 @@ values:
     short: moma
     internal_fqdn: moma.internal.softwareheritage.org
   system_uptime:
-    days: 50
-    hours: 1222
-    seconds: 4402527
-    uptime: 50 days
+    days: 70
+    hours: 1703
+    seconds: 6131254
+    uptime: 70 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -480,15 +450,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 50 days
-  uptime_days: 50
-  uptime_hours: 1222
-  uptime_seconds: 4402527
+  uptime: 70 days
+  uptime_days: 70
+  uptime_hours: 1703
+  uptime_seconds: 6131254
   uuid: F9773017-6BF5-4AEC-8531-F37668CD7203
   vcsrepo_svn_ver: ''
   virtual: kvm
   clientcert: moma.softwareheritage.org
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-09T13:31:52.283844509+00:00'
-expiration: '2019-08-09T14:01:52.285487691+00:00'
+timestamp: '2019-08-29T13:43:59.339504252+00:00'
+expiration: '2019-08-29T14:13:59.341244199+00:00'
diff --git a/octocatalog-diff/facts/pergamon.softwareheritage.org.yaml b/octocatalog-diff/facts/pergamon.softwareheritage.org.yaml
index 6658d22a92385fd1e6954e175384c9f1d1bb3436..839f49d1abe53df0f2ce34dc9e4dbc73e0339b73 100644
--- a/octocatalog-diff/facts/pergamon.softwareheritage.org.yaml
+++ b/octocatalog-diff/facts/pergamon.softwareheritage.org.yaml
@@ -12,10 +12,10 @@ values:
   apt_package_security_updates: []
   apt_package_updates:
   - grafana
-  apt_reboot_required: true
+  apt_reboot_required: false
   apt_security_dist_updates: 0
   apt_security_updates: 0
-  apt_update_last_success: 1566557943
+  apt_update_last_success: 1566827942
   apt_updates: 1
   architecture: amd64
   bios_release_date: 04/01/2014
@@ -28,9 +28,9 @@ values:
   blockdevice_vda_vendor: '0x1af4'
   blockdevice_vdb_size: 4294967296
   blockdevice_vdb_vendor: '0x1af4'
-  blockdevice_vdd_size: 171798691840
-  blockdevice_vdd_vendor: '0x1af4'
-  blockdevices: vdd,vdb,sr0,vda
+  blockdevice_vdc_size: 171798691840
+  blockdevice_vdc_vendor: '0x1af4'
+  blockdevices: vdb,sr0,vdc,vda
   chassistype: Other
   dhcp_servers:
     eth1: 192.168.100.1
@@ -48,7 +48,7 @@ values:
       size: 4.00 GiB
       size_bytes: 4294967296
       vendor: '0x1af4'
-    vdd:
+    vdc:
       size: 160.00 GiB
       size_bytes: 171798691840
       vendor: '0x1af4'
@@ -65,7 +65,7 @@ values:
       uuid: AA664C56-FC2F-45A2-98D5-476F11EEA5BB
   domain: softwareheritage.org
   facterversion: 3.10.0
-  filesystems: btrfs,ext2,ext3,ext4,hfs,hfsplus,jfs,minix,msdos,ntfs,qnx4,ufs,vfat,xfs
+  filesystems: ext2,ext3,ext4
   fips_enabled: false
   fqdn: pergamon.softwareheritage.org
   gid: root
@@ -103,9 +103,9 @@ values:
   kernelrelease: 4.9.0-9-amd64
   kernelversion: 4.9.0
   load_averages:
-    15m: 0.41
-    1m: 0.52
-    5m: 0.66
+    15m: 0.4
+    1m: 0.27
+    5m: 0.54
   location: sesi_rocquencourt
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -119,30 +119,30 @@ values:
   manufacturer: QEMU
   memory:
     swap:
-      available: 3.65 GiB
-      available_bytes: 3920920576
-      capacity: 8.66%
+      available: 4.00 GiB
+      available_bytes: 4292866048
+      capacity: 0%
       total: 4.00 GiB
       total_bytes: 4292866048
-      used: 354.71 MiB
-      used_bytes: 371945472
+      used: 0 bytes
+      used_bytes: 0
     system:
-      available: 5.80 GiB
-      available_bytes: 6228410368
-      capacity: 25.64%
+      available: 5.16 GiB
+      available_bytes: 5544460288
+      capacity: 33.80%
       total: 7.80 GiB
-      total_bytes: 8375488512
-      used: 2.00 GiB
-      used_bytes: 2147078144
-  memoryfree: 5.80 GiB
-  memoryfree_mb: 5939.875
+      total_bytes: 8375484416
+      used: 2.64 GiB
+      used_bytes: 2831024128
+  memoryfree: 5.16 GiB
+  memoryfree_mb: 5287.609375
   memorysize: 7.80 GiB
-  memorysize_mb: 7987.48828125
+  memorysize_mb: 7987.484375
   mountpoints:
     "/":
-      available: 33.44 GiB
-      available_bytes: 35905736704
-      capacity: 31.88%
+      available: 33.65 GiB
+      available_bytes: 36131520512
+      capacity: 31.45%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -152,8 +152,8 @@ values:
       - data=ordered
       size: 49.09 GiB
       size_bytes: 52709421056
-      used: 15.65 GiB
-      used_bytes: 16803684352
+      used: 15.44 GiB
+      used_bytes: 16577900544
     "/dev/shm":
       available: 3.90 GiB
       available_bytes: 4187738112
@@ -169,9 +169,9 @@ values:
       used: 4.00 KiB
       used_bytes: 4096
     "/run":
-      available: 797.79 MiB
-      available_bytes: 836542464
-      capacity: 0.12%
+      available: 797.89 MiB
+      available_bytes: 836653056
+      capacity: 0.11%
       device: tmpfs
       filesystem: tmpfs
       options:
@@ -183,8 +183,8 @@ values:
       - mode=755
       size: 798.75 MiB
       size_bytes: 837550080
-      used: 984.00 KiB
-      used_bytes: 1007616
+      used: 876.00 KiB
+      used_bytes: 897024
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -202,7 +202,7 @@ values:
       size_bytes: 5242880
       used: 0 bytes
       used_bytes: 0
-    "/run/user/1001":
+    "/run/user/0":
       available: 798.75 MiB
       available_bytes: 837545984
       capacity: 0%
@@ -215,8 +215,6 @@ values:
       - relatime
       - size=817916k
       - mode=700
-      - uid=1001
-      - gid=1001
       size: 798.75 MiB
       size_bytes: 837545984
       used: 0 bytes
@@ -240,25 +238,6 @@ values:
       size_bytes: 837545984
       used: 0 bytes
       used_bytes: 0
-    "/run/user/1017":
-      available: 798.75 MiB
-      available_bytes: 837545984
-      capacity: 0%
-      device: tmpfs
-      filesystem: tmpfs
-      options:
-      - rw
-      - nosuid
-      - nodev
-      - relatime
-      - size=817916k
-      - mode=700
-      - uid=1017
-      - gid=1017
-      size: 798.75 MiB
-      size_bytes: 837545984
-      used: 0 bytes
-      used_bytes: 0
     "/sys/fs/cgroup":
       available: 3.90 GiB
       available_bytes: 4187742208
@@ -276,10 +255,10 @@ values:
       used: 0 bytes
       used_bytes: 0
     "/var/lib/prometheus":
-      available: 59.24 GiB
-      available_bytes: 63608352768
-      capacity: 62.14%
-      device: "/dev/vdd1"
+      available: 57.94 GiB
+      available_bytes: 62216765440
+      capacity: 62.97%
+      device: "/dev/vdc1"
       filesystem: ext4
       options:
       - rw
@@ -288,8 +267,8 @@ values:
       - data=ordered
       size: 156.49 GiB
       size_bytes: 168026722304
-      used: 97.25 GiB
-      used_bytes: 104418369536
+      used: 98.54 GiB
+      used_bytes: 105809956864
   mounts:
   - "/"
   - "/var/lib/prometheus"
@@ -416,7 +395,7 @@ values:
       size: 4.00 GiB
       size_bytes: 4292870144
       uuid: 93910aea-ce19-458a-8e50-abd3f06589e1
-    "/dev/vdd1":
+    "/dev/vdc1":
       filesystem: ext4
       mount: "/var/lib/prometheus"
       partuuid: 858d8e2c-c05f-45ab-ad9a-f6df36367738
@@ -497,8 +476,8 @@ values:
     SSHFP 1 2 a280ca8bdb71751daf5e9a21b473b79ca38e0a29122029859889711e162dcf98
   sshrsakey: AAAAB3NzaC1yc2EAAAADAQABAAABAQCUVA+gg4Hyy2q7qiZ3Y3kvZmzAbtcG/HGKBb5CMOO65sPLZfw9WGChi829NoAKzHNR9CPX+AyLokZ5W4khLcQ3JbK9vr+iXxBIzIeE/DOuyXkQegOPFNyG7XoFb7v7e2IX1Lmgprm6obUszo403CD6/w1IsN9/I7nozPd8jxtWVdfYRRFqwZrEJfkkSDrR1QJJ6VI9xcDVssybKNzSGDUzaVfPnp9uLiD9rE9UwE5aHvwXoqXfr+hR8QMWWaEtlZVroWd7ZM6smgshWRJEOMIz7cK1zSG+Dj1SX+kZqWEPG9xiNO5ug8G/Zu+vkVQcmzLLgdOJEJuEgeoYzG32bG/v
   sudoversion: 1.8.19p1
-  swapfree: 3.65 GiB
-  swapfree_mb: 3739.28125
+  swapfree: 4.00 GiB
+  swapfree_mb: 4093.99609375
   swapsize: 4.00 GiB
   swapsize_mb: 4093.99609375
   swh_hostname:
@@ -506,10 +485,10 @@ values:
     short: pergamon
     internal_fqdn: pergamon.internal.softwareheritage.org
   system_uptime:
-    days: 50
-    hours: 1222
-    seconds: 4402698
-    uptime: 50 days
+    days: 0
+    hours: 3
+    seconds: 14100
+    uptime: 3:55 hours
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -518,15 +497,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 50 days
-  uptime_days: 50
-  uptime_hours: 1222
-  uptime_seconds: 4402698
+  uptime: 3:55 hours
+  uptime_days: 0
+  uptime_hours: 3
+  uptime_seconds: 14100
   uuid: AA664C56-FC2F-45A2-98D5-476F11EEA5BB
   vcsrepo_svn_ver: ''
   virtual: kvm
   clientcert: pergamon.softwareheritage.org
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-23T11:54:35.323150839+00:00'
-expiration: '2019-08-23T12:24:35.323623787+00:00'
+timestamp: '2019-08-26T14:05:13.242428634+00:00'
+expiration: '2019-08-26T14:35:13.242882426+00:00'
diff --git a/octocatalog-diff/facts/scheduler0.internal.staging.swh.network.yaml b/octocatalog-diff/facts/scheduler0.internal.staging.swh.network.yaml
index 336e0ac7afcd88634c766cc4d7d88ab9d7ae6fed..f172bf3d7ac275548cf6e817697895bb6a2490bd 100644
--- a/octocatalog-diff/facts/scheduler0.internal.staging.swh.network.yaml
+++ b/octocatalog-diff/facts/scheduler0.internal.staging.swh.network.yaml
@@ -2,10 +2,30 @@
 name: scheduler0.internal.staging.swh.network
 values:
   agent_specified_environment: staging
-  apt_has_dist_updates: false
-  apt_has_updates: false
-  apt_reboot_required: false
-  apt_update_last_success: 1565515983
+  apt_dist_updates: 6
+  apt_has_dist_updates: true
+  apt_has_updates: true
+  apt_package_dist_updates:
+  - python3-swh.core
+  - python3-swh.storage.schemata
+  - python3-swh.model
+  - python3-swh.storage
+  - python3-swh.lister
+  - python3-swh.loader.npm
+  apt_package_security_dist_updates: []
+  apt_package_security_updates: []
+  apt_package_updates:
+  - python3-swh.core
+  - python3-swh.storage.schemata
+  - python3-swh.model
+  - python3-swh.storage
+  - python3-swh.lister
+  - python3-swh.loader.npm
+  apt_reboot_required: true
+  apt_security_dist_updates: 0
+  apt_security_updates: 0
+  apt_update_last_success: 1567085583
+  apt_updates: 6
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -77,9 +97,9 @@ values:
   kernelrelease: 4.9.0-9-amd64
   kernelversion: 4.9.0
   load_averages:
-    15m: 0.14
-    1m: 0.41
-    5m: 0.34
+    15m: 0.03
+    1m: 0.32
+    5m: 0.13
   location: sesi_rocquencourt_staging
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -92,22 +112,22 @@ values:
   manufacturer: QEMU
   memory:
     system:
-      available: 14.66 GiB
-      available_bytes: 15741575168
-      capacity: 6.47%
+      available: 14.63 GiB
+      available_bytes: 15707336704
+      capacity: 6.68%
       total: 15.68 GiB
       total_bytes: 16831205376
-      used: 1.01 GiB
-      used_bytes: 1089630208
-  memoryfree: 14.66 GiB
-  memoryfree_mb: 15012.3359375
+      used: 1.05 GiB
+      used_bytes: 1123868672
+  memoryfree: 14.63 GiB
+  memoryfree_mb: 14979.68359375
   memorysize: 15.68 GiB
   memorysize_mb: 16051.48828125
   mountpoints:
     "/":
-      available: 28.50 GiB
-      available_bytes: 30600208384
-      capacity: 9.43%
+      available: 28.22 GiB
+      available_bytes: 30300667904
+      capacity: 10.32%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -117,8 +137,8 @@ values:
       - data=ordered
       size: 31.47 GiB
       size_bytes: 33785901056
-      used: 2.97 GiB
-      used_bytes: 3185692672
+      used: 3.25 GiB
+      used_bytes: 3485233152
     "/dev/shm":
       available: 7.84 GiB
       available_bytes: 8415596544
@@ -135,7 +155,7 @@ values:
       used_bytes: 4096
     "/run":
       available: 1.56 GiB
-      available_bytes: 1680150528
+      available_bytes: 1680142336
       capacity: 0.18%
       device: tmpfs
       filesystem: tmpfs
@@ -149,7 +169,7 @@ values:
       size: 1.57 GiB
       size_bytes: 1683124224
       used: 2.84 MiB
-      used_bytes: 2973696
+      used_bytes: 2981888
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -394,10 +414,10 @@ values:
     short: scheduler0
     internal_fqdn: scheduler0.internal.staging.swh.network
   system_uptime:
-    days: 3
-    hours: 90
-    seconds: 324507
-    uptime: 3 days
+    days: 21
+    hours: 526
+    seconds: 1894220
+    uptime: 21 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -406,15 +426,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 3 days
-  uptime_days: 3
-  uptime_hours: 90
-  uptime_seconds: 324507
+  uptime: 21 days
+  uptime_days: 21
+  uptime_hours: 526
+  uptime_seconds: 1894220
   uuid: A918F8C6-BEEC-4772-A81F-421117193927
   vcsrepo_svn_ver: 1.9.5
   virtual: physical
   clientcert: scheduler0.internal.staging.swh.network
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-11T09:40:23.960080392+00:00'
-expiration: '2019-08-11T10:10:23.960785411+00:00'
+timestamp: '2019-08-29T13:42:17.202231722+00:00'
+expiration: '2019-08-29T14:12:17.202935108+00:00'
diff --git a/octocatalog-diff/facts/storage0.internal.staging.swh.network.yaml b/octocatalog-diff/facts/storage0.internal.staging.swh.network.yaml
index 52b5752979fd15a1c74927c128d11a0bf509e6ee..40d379a888aafd64ecaa693413817686583cecff 100644
--- a/octocatalog-diff/facts/storage0.internal.staging.swh.network.yaml
+++ b/octocatalog-diff/facts/storage0.internal.staging.swh.network.yaml
@@ -2,17 +2,10 @@
 name: storage0.internal.staging.swh.network
 values:
   agent_specified_environment: staging
-  apt_dist_updates: 16
+  apt_dist_updates: 14
   apt_has_dist_updates: true
   apt_has_updates: true
   apt_package_dist_updates:
-  - libpq-dev
-  - libpq5
-  - postgresql-plpython3-9.6
-  - postgresql-contrib-9.6
-  - postgresql-client-9.6
-  - postgresql-9.6
-  - postgresql-doc-9.6
   - python-setuptools
   - python-pkg-resources
   - python3-setuptools
@@ -21,31 +14,15 @@ values:
   - python3-idna
   - python3-requests
   - python3-urllib3
+  - python3-swh.core
+  - python3-swh.storage.schemata
   - python3-swh.model
-  apt_package_security_dist_updates:
-  - libpq-dev
-  - libpq5
-  - postgresql-plpython3-9.6
-  - postgresql-contrib-9.6
-  - postgresql-client-9.6
-  - postgresql-9.6
-  - postgresql-doc-9.6
-  apt_package_security_updates:
-  - libpq-dev
-  - libpq5
-  - postgresql-plpython3-9.6
-  - postgresql-contrib-9.6
-  - postgresql-client-9.6
-  - postgresql-9.6
-  - postgresql-doc-9.6
+  - python3-swh.storage
+  - python3-swh.lister
+  - python3-swh.loader.npm
+  apt_package_security_dist_updates: []
+  apt_package_security_updates: []
   apt_package_updates:
-  - libpq-dev
-  - libpq5
-  - postgresql-plpython3-9.6
-  - postgresql-contrib-9.6
-  - postgresql-client-9.6
-  - postgresql-9.6
-  - postgresql-doc-9.6
   - python-setuptools
   - python-pkg-resources
   - python3-setuptools
@@ -54,12 +31,17 @@ values:
   - python3-idna
   - python3-requests
   - python3-urllib3
+  - python3-swh.core
+  - python3-swh.storage.schemata
   - python3-swh.model
-  apt_reboot_required: false
-  apt_security_dist_updates: 7
-  apt_security_updates: 7
-  apt_update_last_success: 1565317982
-  apt_updates: 16
+  - python3-swh.storage
+  - python3-swh.lister
+  - python3-swh.loader.npm
+  apt_reboot_required: true
+  apt_security_dist_updates: 0
+  apt_security_updates: 0
+  apt_update_last_success: 1567085583
+  apt_updates: 14
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -131,9 +113,9 @@ values:
   kernelrelease: 4.9.0-9-amd64
   kernelversion: 4.9.0
   load_averages:
-    15m: 0.09
-    1m: 0.21
-    5m: 0.13
+    15m: 0.01
+    1m: 0.08
+    5m: 0.06
   location: sesi_rocquencourt_staging
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -146,22 +128,22 @@ values:
   manufacturer: QEMU
   memory:
     system:
-      available: 5.79 GiB
-      available_bytes: 6213881856
-      capacity: 25.81%
+      available: 5.90 GiB
+      available_bytes: 6331957248
+      capacity: 24.40%
       total: 7.80 GiB
       total_bytes: 8375525376
-      used: 2.01 GiB
-      used_bytes: 2161643520
-  memoryfree: 5.79 GiB
-  memoryfree_mb: 5926.01953125
+      used: 1.90 GiB
+      used_bytes: 2043568128
+  memoryfree: 5.90 GiB
+  memoryfree_mb: 6038.625
   memorysize: 7.80 GiB
   memorysize_mb: 7987.5234375
   mountpoints:
     "/":
-      available: 21.10 GiB
-      available_bytes: 22660947968
-      capacity: 32.93%
+      available: 19.14 GiB
+      available_bytes: 20550438912
+      capacity: 39.17%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -171,8 +153,8 @@ values:
       - data=ordered
       size: 31.47 GiB
       size_bytes: 33785901056
-      used: 10.36 GiB
-      used_bytes: 11124953088
+      used: 12.33 GiB
+      used_bytes: 13235462144
     "/dev/shm":
       available: 3.90 GiB
       available_bytes: 4187758592
@@ -188,8 +170,8 @@ values:
       used: 4.00 KiB
       used_bytes: 4096
     "/run":
-      available: 796.14 MiB
-      available_bytes: 834809856
+      available: 796.12 MiB
+      available_bytes: 834793472
       capacity: 0.33%
       device: tmpfs
       filesystem: tmpfs
@@ -202,8 +184,8 @@ values:
       - mode=755
       size: 798.75 MiB
       size_bytes: 837554176
-      used: 2.62 MiB
-      used_bytes: 2744320
+      used: 2.63 MiB
+      used_bytes: 2760704
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -430,10 +412,10 @@ values:
     short: storage0
     internal_fqdn: storage0.internal.staging.swh.network
   system_uptime:
-    days: 6
-    hours: 153
-    seconds: 552995
-    uptime: 6 days
+    days: 26
+    hours: 643
+    seconds: 2318302
+    uptime: 26 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -442,15 +424,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 6 days
-  uptime_days: 6
-  uptime_hours: 153
-  uptime_seconds: 552995
+  uptime: 26 days
+  uptime_days: 26
+  uptime_hours: 643
+  uptime_seconds: 2318302
   uuid: BA47C5E6-6D74-493C-A291-9CA8284C133D
   vcsrepo_svn_ver: 1.9.5
   virtual: physical
   clientcert: storage0.internal.staging.swh.network
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-09T03:27:19.644503961+00:00'
-expiration: '2019-08-09T03:57:19.645321947+00:00'
+timestamp: '2019-08-29T13:49:06.158223650+00:00'
+expiration: '2019-08-29T14:19:06.158981061+00:00'
diff --git a/octocatalog-diff/facts/vault.internal.staging.swh.network.yaml b/octocatalog-diff/facts/vault.internal.staging.swh.network.yaml
index 2b55c9b2b566470cafa24595205e601bf83777fe..3fdf8e3d3bd84cd57ec9c263cf0f4959d57e4694 100644
--- a/octocatalog-diff/facts/vault.internal.staging.swh.network.yaml
+++ b/octocatalog-diff/facts/vault.internal.staging.swh.network.yaml
@@ -2,17 +2,27 @@
 name: vault.internal.staging.swh.network
 values:
   agent_specified_environment: staging
-  apt_dist_updates: 3
+  apt_dist_updates: 6
   apt_has_dist_updates: true
-  apt_has_updates: false
+  apt_has_updates: true
   apt_package_dist_updates:
   - python3-certifi
   - python3-requests
   - python3-urllib3
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
   apt_package_security_dist_updates: []
-  apt_reboot_required: false
+  apt_package_security_updates: []
+  apt_package_updates:
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
+  apt_reboot_required: true
   apt_security_dist_updates: 0
-  apt_update_last_success: 1565515202
+  apt_security_updates: 0
+  apt_update_last_success: 1567086122
+  apt_updates: 3
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -93,22 +103,22 @@ values:
   manufacturer: QEMU
   memory:
     system:
-      available: 15.20 GiB
-      available_bytes: 16323477504
-      capacity: 3.02%
+      available: 15.19 GiB
+      available_bytes: 16308609024
+      capacity: 3.10%
       total: 15.68 GiB
       total_bytes: 16831205376
-      used: 484.21 MiB
-      used_bytes: 507727872
-  memoryfree: 15.20 GiB
-  memoryfree_mb: 15567.28125
+      used: 498.39 MiB
+      used_bytes: 522596352
+  memoryfree: 15.19 GiB
+  memoryfree_mb: 15553.1015625
   memorysize: 15.68 GiB
   memorysize_mb: 16051.48828125
   mountpoints:
     "/":
-      available: 29.59 GiB
-      available_bytes: 31775170560
-      capacity: 5.95%
+      available: 29.44 GiB
+      available_bytes: 31607513088
+      capacity: 6.45%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -118,8 +128,8 @@ values:
       - data=ordered
       size: 31.47 GiB
       size_bytes: 33785901056
-      used: 1.87 GiB
-      used_bytes: 2010730496
+      used: 2.03 GiB
+      used_bytes: 2178387968
     "/dev/shm":
       available: 7.84 GiB
       available_bytes: 8415600640
@@ -136,8 +146,8 @@ values:
       used_bytes: 0
     "/run":
       available: 1.56 GiB
-      available_bytes: 1680183296
-      capacity: 0.17%
+      available_bytes: 1680175104
+      capacity: 0.18%
       device: tmpfs
       filesystem: tmpfs
       options:
@@ -149,8 +159,8 @@ values:
       - mode=755
       size: 1.57 GiB
       size_bytes: 1683124224
-      used: 2.80 MiB
-      used_bytes: 2940928
+      used: 2.81 MiB
+      used_bytes: 2949120
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -393,10 +403,10 @@ values:
     short: vault
     internal_fqdn: vault.internal.staging.swh.network
   system_uptime:
-    days: 2
-    hours: 63
-    seconds: 230092
-    uptime: 2 days
+    days: 20
+    hours: 499
+    seconds: 1799804
+    uptime: 20 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -405,15 +415,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 2 days
-  uptime_days: 2
-  uptime_hours: 63
-  uptime_seconds: 230092
+  uptime: 20 days
+  uptime_days: 20
+  uptime_hours: 499
+  uptime_seconds: 1799804
   uuid: 4670AEBE-9C62-4E11-8336-D738A2F7A73F
   vcsrepo_svn_ver: ''
   virtual: physical
   clientcert: vault.internal.staging.swh.network
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-11T09:40:22.534957367+00:00'
-expiration: '2019-08-11T10:10:22.535673672+00:00'
+timestamp: '2019-08-29T13:42:14.518044122+00:00'
+expiration: '2019-08-29T14:12:14.518833491+00:00'
diff --git a/octocatalog-diff/facts/webapp.internal.staging.swh.network.yaml b/octocatalog-diff/facts/webapp.internal.staging.swh.network.yaml
index dc48c7e0cbde6eb9b31e01e75abec8e60f2c55ea..6139741291366b369e3ef3bc3a80ecb20773ba18 100644
--- a/octocatalog-diff/facts/webapp.internal.staging.swh.network.yaml
+++ b/octocatalog-diff/facts/webapp.internal.staging.swh.network.yaml
@@ -3,24 +3,30 @@ name: webapp.internal.staging.swh.network
 values:
   agent_specified_environment: staging
   apache_version: 2.4.25
-  apt_dist_updates: 3
+  apt_dist_updates: 6
   apt_has_dist_updates: true
   apt_has_updates: true
   apt_package_dist_updates:
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
   - python3-swh.web
   - filebeat
   - journalbeat
   apt_package_security_dist_updates: []
   apt_package_security_updates: []
   apt_package_updates:
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
   - python3-swh.web
   - filebeat
   - journalbeat
-  apt_reboot_required: false
+  apt_reboot_required: true
   apt_security_dist_updates: 0
   apt_security_updates: 0
-  apt_update_last_success: 1565516102
-  apt_updates: 3
+  apt_update_last_success: 1567085703
+  apt_updates: 6
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -87,8 +93,8 @@ values:
   kernelversion: 4.9.0
   load_averages:
     15m: 0.01
-    1m: 0.16
-    5m: 0.08
+    1m: 0.21
+    5m: 0.06
   location: sesi_rocquencourt_staging
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -101,22 +107,22 @@ values:
   manufacturer: QEMU
   memory:
     system:
-      available: 14.01 GiB
-      available_bytes: 15048048640
-      capacity: 10.59%
+      available: 14.00 GiB
+      available_bytes: 15036018688
+      capacity: 10.67%
       total: 15.68 GiB
       total_bytes: 16831221760
-      used: 1.66 GiB
-      used_bytes: 1783173120
-  memoryfree: 14.01 GiB
-  memoryfree_mb: 14350.9375
+      used: 1.67 GiB
+      used_bytes: 1795203072
+  memoryfree: 14.00 GiB
+  memoryfree_mb: 14339.46484375
   memorysize: 15.68 GiB
   memorysize_mb: 16051.50390625
   mountpoints:
     "/":
-      available: 28.49 GiB
-      available_bytes: 30586740736
-      capacity: 9.47%
+      available: 28.26 GiB
+      available_bytes: 30341181440
+      capacity: 10.20%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -126,8 +132,8 @@ values:
       - data=ordered
       size: 31.47 GiB
       size_bytes: 33785901056
-      used: 2.98 GiB
-      used_bytes: 3199160320
+      used: 3.21 GiB
+      used_bytes: 3444719616
     "/dev/shm":
       available: 7.84 GiB
       available_bytes: 8415608832
@@ -144,7 +150,7 @@ values:
       used_bytes: 0
     "/run":
       available: 1.56 GiB
-      available_bytes: 1680175104
+      available_bytes: 1680166912
       capacity: 0.18%
       device: tmpfs
       filesystem: tmpfs
@@ -157,8 +163,8 @@ values:
       - mode=755
       size: 1.57 GiB
       size_bytes: 1683124224
-      used: 2.81 MiB
-      used_bytes: 2949120
+      used: 2.82 MiB
+      used_bytes: 2957312
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -400,10 +406,10 @@ values:
     short: webapp
     internal_fqdn: webapp.internal.staging.swh.network
   system_uptime:
-    days: 3
-    hours: 76
-    seconds: 275771
-    uptime: 3 days
+    days: 21
+    hours: 512
+    seconds: 1845482
+    uptime: 21 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -412,15 +418,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 3 days
-  uptime_days: 3
-  uptime_hours: 76
-  uptime_seconds: 275771
+  uptime: 21 days
+  uptime_days: 21
+  uptime_hours: 512
+  uptime_seconds: 1845482
   uuid: A43344AE-3925-4A0F-AFE6-9982634A66F7
   vcsrepo_svn_ver: ''
   virtual: physical
   clientcert: webapp.internal.staging.swh.network
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-11T09:40:24.597919347+00:00'
-expiration: '2019-08-11T10:10:24.598656400+00:00'
+timestamp: '2019-08-29T13:42:15.513054511+00:00'
+expiration: '2019-08-29T14:12:15.513791718+00:00'
diff --git a/octocatalog-diff/facts/worker0.internal.staging.swh.network.yaml b/octocatalog-diff/facts/worker0.internal.staging.swh.network.yaml
index 52c27246fe55ec5a9e4ef2d69b1b1b259c15347f..2821be72686d8167a26e13680b3f27071b53ed33 100644
--- a/octocatalog-diff/facts/worker0.internal.staging.swh.network.yaml
+++ b/octocatalog-diff/facts/worker0.internal.staging.swh.network.yaml
@@ -2,10 +2,24 @@
 name: worker0.internal.staging.swh.network
 values:
   agent_specified_environment: staging
-  apt_has_dist_updates: false
-  apt_has_updates: false
-  apt_reboot_required: false
-  apt_update_last_success: 1565515202
+  apt_dist_updates: 3
+  apt_has_dist_updates: true
+  apt_has_updates: true
+  apt_package_dist_updates:
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
+  apt_package_security_dist_updates: []
+  apt_package_security_updates: []
+  apt_package_updates:
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
+  apt_reboot_required: true
+  apt_security_dist_updates: 0
+  apt_security_updates: 0
+  apt_update_last_success: 1567084802
+  apt_updates: 3
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -71,9 +85,9 @@ values:
   kernelrelease: 4.9.0-9-amd64
   kernelversion: 4.9.0
   load_averages:
-    15m: 0.02
-    1m: 0.29
-    5m: 0.09
+    15m: 0.01
+    1m: 0.15
+    5m: 0.03
   location: sesi_rocquencourt_staging
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -86,22 +100,22 @@ values:
   manufacturer: QEMU
   memory:
     system:
-      available: 14.64 GiB
-      available_bytes: 15723704320
-      capacity: 6.58%
+      available: 14.75 GiB
+      available_bytes: 15839547392
+      capacity: 5.89%
       total: 15.68 GiB
       total_bytes: 16831205376
-      used: 1.03 GiB
-      used_bytes: 1107501056
-  memoryfree: 14.64 GiB
-  memoryfree_mb: 14995.29296875
+      used: 945.72 MiB
+      used_bytes: 991657984
+  memoryfree: 14.75 GiB
+  memoryfree_mb: 15105.76953125
   memorysize: 15.68 GiB
   memorysize_mb: 16051.48828125
   mountpoints:
     "/":
-      available: 29.99 GiB
-      available_bytes: 32197013504
-      capacity: 4.70%
+      available: 29.80 GiB
+      available_bytes: 32002043904
+      capacity: 5.28%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -111,11 +125,11 @@ values:
       - data=ordered
       size: 31.47 GiB
       size_bytes: 33785901056
-      used: 1.48 GiB
-      used_bytes: 1588887552
+      used: 1.66 GiB
+      used_bytes: 1783857152
     "/dev/shm":
       available: 7.84 GiB
-      available_bytes: 8415170560
+      available_bytes: 8415129600
       capacity: 0.01%
       device: tmpfs
       filesystem: tmpfs
@@ -125,12 +139,12 @@ values:
       - nodev
       size: 7.84 GiB
       size_bytes: 8415600640
-      used: 420.00 KiB
-      used_bytes: 430080
+      used: 460.00 KiB
+      used_bytes: 471040
     "/run":
       available: 1.56 GiB
-      available_bytes: 1680183296
-      capacity: 0.17%
+      available_bytes: 1680166912
+      capacity: 0.18%
       device: tmpfs
       filesystem: tmpfs
       options:
@@ -142,8 +156,8 @@ values:
       - mode=755
       size: 1.57 GiB
       size_bytes: 1683124224
-      used: 2.80 MiB
-      used_bytes: 2940928
+      used: 2.82 MiB
+      used_bytes: 2957312
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -366,10 +380,10 @@ values:
     short: worker0
     internal_fqdn: worker0.internal.staging.swh.network
   system_uptime:
-    days: 3
-    hours: 89
-    seconds: 323696
-    uptime: 3 days
+    days: 21
+    hours: 525
+    seconds: 1893408
+    uptime: 21 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -378,15 +392,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 3 days
-  uptime_days: 3
-  uptime_hours: 89
-  uptime_seconds: 323696
+  uptime: 21 days
+  uptime_days: 21
+  uptime_hours: 525
+  uptime_seconds: 1893408
   uuid: 7DF01691-DA81-4308-B3FC-31B157A6E72C
   vcsrepo_svn_ver: ''
   virtual: physical
   clientcert: worker0.internal.staging.swh.network
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-11T09:40:22.699378323+00:00'
-expiration: '2019-08-11T10:10:22.700120580+00:00'
+timestamp: '2019-08-29T13:42:15.619474989+00:00'
+expiration: '2019-08-29T14:12:15.620307175+00:00'
diff --git a/octocatalog-diff/facts/worker1.internal.staging.swh.network.yaml b/octocatalog-diff/facts/worker1.internal.staging.swh.network.yaml
index f002fa38dc16428b820ee28c571e3968f6b501f9..f2516d8417645d18a3fdd5551f27bb4ba42658e0 100644
--- a/octocatalog-diff/facts/worker1.internal.staging.swh.network.yaml
+++ b/octocatalog-diff/facts/worker1.internal.staging.swh.network.yaml
@@ -2,10 +2,24 @@
 name: worker1.internal.staging.swh.network
 values:
   agent_specified_environment: staging
-  apt_has_dist_updates: false
-  apt_has_updates: false
-  apt_reboot_required: false
-  apt_update_last_success: 1565515502
+  apt_dist_updates: 3
+  apt_has_dist_updates: true
+  apt_has_updates: true
+  apt_package_dist_updates:
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
+  apt_package_security_dist_updates: []
+  apt_package_security_updates: []
+  apt_package_updates:
+  - python3-swh.core
+  - python3-swh.model
+  - python3-swh.storage
+  apt_reboot_required: true
+  apt_security_dist_updates: 0
+  apt_security_updates: 0
+  apt_update_last_success: 1567084802
+  apt_updates: 3
   architecture: amd64
   bios_release_date: 04/01/2014
   bios_vendor: SeaBIOS
@@ -72,8 +86,8 @@ values:
   kernelversion: 4.9.0
   load_averages:
     15m: 0.01
-    1m: 0.15
-    5m: 0.05
+    1m: 0.08
+    5m: 0.02
   location: sesi_rocquencourt_staging
   lsbdistcodename: stretch
   lsbdistdescription: Debian GNU/Linux 9.9 (stretch)
@@ -86,22 +100,22 @@ values:
   manufacturer: QEMU
   memory:
     system:
-      available: 14.89 GiB
-      available_bytes: 15989501952
-      capacity: 5.00%
+      available: 14.75 GiB
+      available_bytes: 15837454336
+      capacity: 5.90%
       total: 15.68 GiB
       total_bytes: 16831205376
-      used: 802.71 MiB
-      used_bytes: 841703424
-  memoryfree: 14.89 GiB
-  memoryfree_mb: 15248.77734375
+      used: 947.71 MiB
+      used_bytes: 993751040
+  memoryfree: 14.75 GiB
+  memoryfree_mb: 15103.7734375
   memorysize: 15.68 GiB
   memorysize_mb: 16051.48828125
   mountpoints:
     "/":
-      available: 29.99 GiB
-      available_bytes: 32206012416
-      capacity: 4.68%
+      available: 29.81 GiB
+      available_bytes: 32010457088
+      capacity: 5.25%
       device: "/dev/vda1"
       filesystem: ext4
       options:
@@ -111,11 +125,11 @@ values:
       - data=ordered
       size: 31.47 GiB
       size_bytes: 33785901056
-      used: 1.47 GiB
-      used_bytes: 1579888640
+      used: 1.65 GiB
+      used_bytes: 1775443968
     "/dev/shm":
       available: 7.84 GiB
-      available_bytes: 8415170560
+      available_bytes: 8415129600
       capacity: 0.01%
       device: tmpfs
       filesystem: tmpfs
@@ -125,11 +139,11 @@ values:
       - nodev
       size: 7.84 GiB
       size_bytes: 8415600640
-      used: 420.00 KiB
-      used_bytes: 430080
+      used: 460.00 KiB
+      used_bytes: 471040
     "/run":
       available: 1.56 GiB
-      available_bytes: 1680162816
+      available_bytes: 1680146432
       capacity: 0.18%
       device: tmpfs
       filesystem: tmpfs
@@ -142,8 +156,8 @@ values:
       - mode=755
       size: 1.57 GiB
       size_bytes: 1683124224
-      used: 2.82 MiB
-      used_bytes: 2961408
+      used: 2.84 MiB
+      used_bytes: 2977792
     "/run/lock":
       available: 5.00 MiB
       available_bytes: 5242880
@@ -385,10 +399,10 @@ values:
     short: worker1
     internal_fqdn: worker1.internal.staging.swh.network
   system_uptime:
-    days: 3
-    hours: 89
-    seconds: 320984
-    uptime: 3 days
+    days: 21
+    hours: 525
+    seconds: 1890696
+    uptime: 21 days
   systemd: true
   systemd_internal_services:
     systemd-networkd-wait-online.service: disabled
@@ -397,15 +411,15 @@ values:
     systemd-timesyncd.service: enabled
   systemd_version: '232'
   timezone: UTC
-  uptime: 3 days
-  uptime_days: 3
-  uptime_hours: 89
-  uptime_seconds: 320984
+  uptime: 21 days
+  uptime_days: 21
+  uptime_hours: 525
+  uptime_seconds: 1890696
   uuid: AE3A8CCE-925E-4968-BC0D-32283A635CD4
   vcsrepo_svn_ver: ''
   virtual: physical
   clientcert: worker1.internal.staging.swh.network
   clientversion: 4.8.2
   clientnoop: false
-timestamp: '2019-08-11T09:40:22.579844724+00:00'
-expiration: '2019-08-11T10:10:22.580661110+00:00'
+timestamp: '2019-08-29T13:42:14.672006006+00:00'
+expiration: '2019-08-29T14:12:14.672790341+00:00'