From aacad835c25a091137d93b74f38303bf12db910a Mon Sep 17 00:00:00 2001
From: Jesse Jaggars <jjaggars@redhat.com>
Date: Tue, 13 Nov 2018 23:11:47 +0100
Subject: [PATCH] adding specs for canonical facts

---
 uploader.json    | 25 +++++++++++++++++++++++++
 uploader.v2.json | 25 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/uploader.json b/uploader.json
index b1e37c3..8b59a85 100644
--- a/uploader.json
+++ b/uploader.json
@@ -1,5 +1,10 @@
 {
     "commands": [
+        {
+            "command": "/usr/sbin/dmidecode -s system-uuid",
+            "pattern": [],
+            "symbolic_name": "bios_uuid"
+        },
         {
             "command": "/sbin/blkid -c /dev/null",
             "pattern": [],
@@ -229,6 +234,11 @@
             "pattern": [],
             "symbolic_name": "hostname"
         },
+        {
+            "command": "/bin/hostname -I",
+            "pattern": [],
+            "symbolic_name": "ip_addresses"
+        },
         {
             "command": "/usr/sbin/httpd -V",
             "pattern": [],
@@ -726,6 +736,11 @@
             "pattern": [],
             "symbolic_name": "software_collections_list"
         },
+        {
+            "command": "/usr/bin/subscription-manager identity",
+            "pattern": [],
+            "symbolic_name": "subscription_manager_id"
+        },
         {
             "command": "/usr/bin/subscription-manager release --show",
             "pattern": [],
@@ -877,6 +892,11 @@
             "pattern": [],
             "symbolic_name": "machine_id2"
         },
+        {
+            "file": "/etc/machine-id",
+            "pattern": [],
+            "symbolic_name": "etc_machine_id"
+        },
         {
             "file": "/proc/1/cgroup",
             "pattern": [],
@@ -2348,6 +2368,11 @@
             "symbolic_name": "cpu_vulns",
             "pattern": []
         },
+        {
+            "glob": "/sys/class/net/*/address",
+            "symbolic_name": "mac_addresses",
+            "pattern": []
+        },
         {
             "glob": "/var/opt/amq-broker/*/etc/broker.xml",
             "symbolic_name": "amq_broker",
diff --git a/uploader.v2.json b/uploader.v2.json
index ce30182..4a7c490 100644
--- a/uploader.v2.json
+++ b/uploader.v2.json
@@ -1,5 +1,10 @@
 {
     "commands": [
+        {
+            "command": "/usr/sbin/dmidecode -s system-uuid",
+            "pattern": [],
+            "symbolic_name": "bios_uuid"
+        },
         {
             "command": "/sbin/blkid -c /dev/null",
             "pattern": [],
@@ -127,6 +132,11 @@
             "pattern": [],
             "symbolic_name": "dmidecode"
         },
+        {
+            "command": "/usr/sbin/dmidecode -s system-uuid",
+            "pattern": [],
+            "symbolic_name": "bios_uuid"
+        },
         {
             "command": "/usr/sbin/dmsetup info -C",
             "pattern": [],
@@ -229,6 +239,11 @@
             "pattern": [],
             "symbolic_name": "hostname"
         },
+        {
+            "command": "/bin/hostname -I",
+            "pattern": [],
+            "symbolic_name": "ip_addresses"
+        },
         {
             "command": "/usr/sbin/httpd -V",
             "pattern": [],
@@ -726,6 +741,11 @@
             "pattern": [],
             "symbolic_name": "software_collections_list"
         },
+        {
+            "command": "/usr/bin/subscription-manager identity",
+            "pattern": [],
+            "symbolic_name": "subscription_manager_id"
+        },
         {
             "command": "/usr/bin/subscription-manager release --show",
             "pattern": [],
@@ -2348,6 +2368,11 @@
             "symbolic_name": "cpu_vulns",
             "pattern": []
         },
+        {
+            "glob": "/sys/class/net/*/address",
+            "symbolic_name": "mac_addresses",
+            "pattern": []
+        },
         {
             "glob": "/var/opt/amq-broker/*/etc/broker.xml",
             "symbolic_name": "amq_broker",