Fixed RPi Serial Number

itam-data-analyzer.js

@@ -136,8 +136,6 @@ for (hd in hostdirs) {
       index_data[ host_data['ITAM']['ID'] ]['HW_BIOS_DATE'] = host_data['SOURCE']['DMIDECODE']['bios-release-date']
     }
 
-
-
     if (host_data['SOURCE'].hasOwnProperty('FACTER')) {
       if (!index_data[ host_data['ITAM']['ID'] ]['HW_SERIAL_NUMBER']) {
         index_data[ host_data['ITAM']['ID'] ]['HW_SERIAL_NUMBER'] = host_data['SOURCE']['FACTER']['uniqueid']
@@ -157,16 +155,15 @@ for (hd in hostdirs) {
       }
     }
 
+    if (host_data['SOURCE'].hasOwnProperty('RASPBERRY_SERIALNUMBER')) {
+      index_data[ host_data['ITAM']['ID'] ]['HW_SERIAL_NUMBER'] = host_data['SOURCE']['RASPBERRY_SERIALNUMBER']
+    }
 
     if (host_data['SOURCE'].hasOwnProperty('RASPBERRY_PI_MODEL')) {
       index_data[ host_data['ITAM']['ID'] ]['HW_MAKE']  = 'Raspberry Pi'
       index_data[ host_data['ITAM']['ID'] ]['HW_MODEL'] = host_data['SOURCE']['RASPBERRY_PI_MODEL']
     }
 
-    if (host_data['SOURCE'].hasOwnProperty('RASPBERRY_SERIALNUMBER')) {
-      index_data[ host_data['ITAM']['ID'] ]['HW_SERIAL_NUMBER']  = host_data['SOURCE']['HW_SERIAL_NUMBER']
-    }
-
     if (index_data[ host_data['ITAM']['ID'] ]['KERNEL'] == 'Linux') {
       if (host_data['SOURCE'].hasOwnProperty('ETC_PASSWD')) {
         if (host_data['SOURCE']['ETC_PASSWD'].hasOwnProperty('sqadmin')) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "skq-it-am",
-  "version": "0.0.10",
-  "version_date": "2021-06-26",
+  "version": "0.0.11",
+  "version_date": "2021-06-27",
   "description": "Sikuliaq IT Asset Manager",
   "copyright": "University of Alaska Fairbanks - College of Fisheries and Ocean Science - R/V Sikuliaq",
   "main": "index.js",

skqitam-client/index.js

@@ -299,7 +299,7 @@ switch (process['CONFIG']['LOCAL']['OS']['PLATFORM']) {
 
         cmd_rpi_hw = "cat /proc/cpuinfo | grep Serial | cut -d ' ' -f 2"
         try {
-          am_data['SOURCE']['RASPBERRY_SERIALNUMBER'] = childProcess.execSync(cmd_rpi_hw, { encoding: 'utf8' })
+          am_data['SOURCE']['RASPBERRY_SERIALNUMBER'] = String(childProcess.execSync(cmd_rpi_hw, { encoding: 'utf8' })).replace(/\n/, '')
         } catch (err) {
           console.log("WARNING: Could not run: " + cmd_rpi_hw + "\n" + err)
         }

skqitam-client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "skqitam-client",
-  "version": "0.0.10",
-  "version_date": "2021-06-26",
+  "version": "0.0.11",
+  "version_date": "2021-06-27",
   "description": "Sikuliaq IT Asset Manager Client Data Collector",
   "copyright": "University of Alaska Fairbanks - College of Fisheries and Ocean Science - R/V Sikuliaq",
   "main": "skqitam-client.js",

web/root/docs/versions.md

@@ -1,5 +1,6 @@
 ## Change Log
 
+- 0.0.11 2021-06-28 - Appendix D Software Report
 - 0.0.10 2021-06-26 - Unique ID Bug Fixes
 - 0.0.9  2021-06-24 - Legacy Mac Support
 - 0.0.8  2021-06-23 - Data Reporting and Charting

web/root/mkdocs.yml

@@ -5,7 +5,7 @@ copyright: <p class="small">Copyright &copy; 2021 <a target="_blank" href="https
 use_directory_urls: false
 
 extra:
-    version: 0.0.10 2021-06-26 (Beta)
+    version: 0.0.11 2021-06-27 (Beta)
 
 repo_url: https://github.alaska.edu/skq/skq-it-am.git
 repo_name: <span class="fab fa-git-square"></span>