v1.0.1 - Fixing Appendix D Reports

3 years ago · 43efeb09c9
34 changed files with 99 additions and 23 deletions
--- a/README.md
+++ b/README.md
@ -4,7 +4,7 @@
 - Copyright © 2021 [University of Alaska Fairbanks](https://www.uaf.edu) - [College of Fisheries and Ocean Science](https://www.uaf.edu/cfos/) - [R/V Sikuliaq](https://www.sikuliaq.alaska.edu)
 - Author: John Haverlack ([jehaverlack@alaska.edu](mailto:jehaverlack@alaska.edu))
 - Proposed Open Source License: [ISC License (ISC)](https://opensource.org/licenses/ISC)
- Status: 1.0.0 First Release 2021-07-16
+- Status: 1.0.1 2021-07-21 - Feature Additions: Appendix-D CSV Exports

 The Sikuliaq IT Asset Manager is a non-invasive tool that can be safely run on Windows, Mac, and Linux hosts to collect and report hardware and software information for IT Cybersecurity Auditing purposes.

--- a/index.js
+++ b/index.js
@ -240,7 +240,7 @@ app.use(function (req, res, next) {
 // Starting Express Web Service
 app.listen(process['CONFIG']['GLOBAL']['WEBUI_PORT'], function () {
  console.log ("Sikuliaq Cyber Asset Manager Server")
-  console.log ("  - Version: v" + process['CONFIG']['LOCAL']['PACKAGE']['version'] + ' ' + process['CONFIG']['LOCAL']['PACKAGE']['version_date']  + ' (Beta)')
+  console.log ("  - Version: v" + process['CONFIG']['LOCAL']['PACKAGE']['version'] + ' ' + process['CONFIG']['LOCAL']['PACKAGE']['version_date'])
  console.log ("  - Copyright (C) 2021 University of Alaska Fairbanks - College of Fisheries and Ocean Sciences - R/V Sikuliaq")
  console.log ("  - Author:  John Haverlack (jehaverlack@alaska.edu)\n")
  console.log ("Status: STARTED")
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "skq-it-am",
-  "version": "1.0.0",
-  "version_date": "2021-07-16",
+  "version": "1.0.1",
+  "version_date": "2021-07-21",
  "description": "Sikuliaq IT Asset Manager",
  "copyright": "University of Alaska Fairbanks - College of Fisheries and Ocean Science - R/V Sikuliaq",
  "main": "index.js",
--- a/skqitam-client/package.json
+++ b/skqitam-client/package.json
@ -1,7 +1,7 @@
 {
  "name": "skqitam-client",
-  "version": "1.0.0",
-  "version_date": "2021-07-16",
+  "version": "1.0.1",
+  "version_date": "2021-07-21",
  "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",
--- a/web/root/docs/assets.md
+++ b/web/root/docs/assets.md
@ -8,11 +8,11 @@
  <div class="col-sm-4">
    <div id="stats_summary"></div>
  </div>
-  <div class="col-sm-4">
+  <!-- <div class="col-sm-4">
    <h4><span class="fas fa-download"></span> Data Download</h4>
    <a href="api/data/proc/index-data.csv" class="btn btn-info">Device Inventory (CSV <span class="fas fa-file-csv"></span>)</a><br><br>
    <a href="api/data/proc/sw-index-data.csv" class="btn btn-info">Software Inventory (CSV <span class="fas fa-file-csv"></span>)</a>
-  </div>
+  </div> -->
 </div>

 ---
--- a/web/root/docs/stats.md
+++ b/web/root/docs/stats.md
@ -9,11 +9,11 @@
  <div class="col-sm-4">
    <div id="stats_summary"></div>
  </div>
-  <div class="col-sm-4">
+  <!-- <div class="col-sm-4">
    <h4><span class="fas fa-download"></span> Data Download</h4>
    <a href="api/data/proc/index-data.json" class="btn btn-info">Device Inventory (CSV <span class="fas fa-file-csv"></span>)</a><br><br>
    <a href="api/data/proc/sw-index-data.json" class="btn btn-info">Software Inventory (CSV <span class="fas fa-file-csv"></span>)</a>
-  </div>
+  </div> -->
 </div>

 ## System OS Versions
--- a/web/root/docs/versions.md
+++ b/web/root/docs/versions.md
@ -1,5 +1,6 @@
 ## Change Log

+- 1.0.1  2021-07-21 - Fixing Appendix-D Exports
 - 1.0.0  2021-07-16 - First Major Release / Published at [https://www.sikuliaq.alaska.edu/git/skq/skq-it-am.git](https://www.sikuliaq.alaska.edu/git/skq/skq-it-am.git)
 - 0.0.13 2021-07-14 - Asset List
 - 0.0.12 2021-06-30 - HW and SW Statistics Report
--- a/web/root/mkdocs.yml
+++ b/web/root/mkdocs.yml
@ -20,6 +20,7 @@ nav:
  # - Admin: /admin
  - Stats: stats.md
  - Assets: assets.md
+  - Data: data.md
  # - Setup:
  #   - Install: install.md
  #   - Optional Tool: optional.md
--- a/web/root/site/404.html
+++ b/web/root/site/404.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="/assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="/data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/assets.html
+++ b/web/root/site/assets.html
@ -79,6 +79,9 @@
                            <li class="navitem active">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
@ -110,7 +113,7 @@
                                </a>
                            </li>
                            <li class="nav-item">
-                                <a rel="next" href="contact.html" class="nav-link">
+                                <a rel="next" href="data.html" class="nav-link">
                                    Next <i class="fa fa-arrow-right"></i>
                                </a>
                            </li>
@ -136,11 +139,11 @@
  <div class="col-sm-4">
    <div id="stats_summary"></div>
  </div>
-  <div class="col-sm-4">
+  <!-- <div class="col-sm-4">
    <h4><span class="fas fa-download"></span> Data Download</h4>
    <a href="api/data/proc/index-data.csv" class="btn btn-info">Device Inventory (CSV <span class="fas fa-file-csv"></span>)</a><br><br>
    <a href="api/data/proc/sw-index-data.csv" class="btn btn-info">Software Inventory (CSV <span class="fas fa-file-csv"></span>)</a>
-  </div>
+  </div> -->
 </div></p>
 <hr />
 <div class="row">
--- a/web/root/site/bootstrap.html
+++ b/web/root/site/bootstrap.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/build.html
+++ b/web/root/site/build.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/cloning.html
+++ b/web/root/site/cloning.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/code.html
+++ b/web/root/site/code.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/contact.html
+++ b/web/root/site/contact.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown active">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
@ -105,7 +108,7 @@
                            </a>
                        </li>
                            <li class="nav-item">
-                                <a rel="prev" href="assets.html" class="nav-link">
+                                <a rel="prev" href="data.html" class="nav-link">
                                    <i class="fa fa-arrow-left"></i> Previous
                                </a>
                            </li>
--- a/web/root/site/editing.html
+++ b/web/root/site/editing.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/equations.html
+++ b/web/root/site/equations.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/footnotes.html
+++ b/web/root/site/footnotes.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/icons.html
+++ b/web/root/site/icons.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/index.html
+++ b/web/root/site/index.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/install.html
+++ b/web/root/site/install.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/license.html
+++ b/web/root/site/license.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown active">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/menu.html
+++ b/web/root/site/menu.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/optional.html
+++ b/web/root/site/optional.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/pdf.html
+++ b/web/root/site/pdf.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/search.html
+++ b/web/root/site/search.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/search/search_index.json
+++ b/web/root/site/search/search_index.json
--- a/web/root/site/sitemap.xml
+++ b/web/root/site/sitemap.xml
@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url>
     <loc>None</loc>
-     <lastmod>2021-07-16</lastmod>
+     <lastmod>2021-07-22</lastmod>
     <changefreq>daily</changefreq>
    </url><url>
     <loc>None</loc>
-     <lastmod>2021-07-16</lastmod>
+     <lastmod>2021-07-22</lastmod>
     <changefreq>daily</changefreq>
    </url><url>
     <loc>None</loc>
-     <lastmod>2021-07-16</lastmod>
+     <lastmod>2021-07-22</lastmod>
     <changefreq>daily</changefreq>
    </url><url>
     <loc>None</loc>
-     <lastmod>2021-07-16</lastmod>
+     <lastmod>2021-07-22</lastmod>
     <changefreq>daily</changefreq>
    </url><url>
     <loc>None</loc>
-     <lastmod>2021-07-16</lastmod>
+     <lastmod>2021-07-22</lastmod>
     <changefreq>daily</changefreq>
    </url><url>
     <loc>None</loc>
-     <lastmod>2021-07-16</lastmod>
+     <lastmod>2021-07-22</lastmod>
+     <changefreq>daily</changefreq>
+    </url><url>
+     <loc>None</loc>
+     <lastmod>2021-07-22</lastmod>
     <changefreq>daily</changefreq>
    </url>
 </urlset>
--- a/web/root/site/sitemap.xml.gz
+++ b/web/root/site/sitemap.xml.gz
--- a/web/root/site/stats.html
+++ b/web/root/site/stats.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
@ -138,11 +141,11 @@
  <div class="col-sm-4">
    <div id="stats_summary"></div>
  </div>
-  <div class="col-sm-4">
+  <!-- <div class="col-sm-4">
    <h4><span class="fas fa-download"></span> Data Download</h4>
    <a href="api/data/proc/index-data.json" class="btn btn-info">Device Inventory (CSV <span class="fas fa-file-csv"></span>)</a><br><br>
    <a href="api/data/proc/sw-index-data.json" class="btn btn-info">Software Inventory (CSV <span class="fas fa-file-csv"></span>)</a>
-  </div>
+  </div> -->
 </div></p>
 <h2 id="system-os-versions">System OS Versions</h2>
 <p><canvas id="stats_os_vers" width="600" height="200"></canvas></p>
--- a/web/root/site/swipe.html
+++ b/web/root/site/swipe.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/test.html
+++ b/web/root/site/test.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/version.html
+++ b/web/root/site/version.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
--- a/web/root/site/versions.html
+++ b/web/root/site/versions.html
@ -79,6 +79,9 @@
                            <li class="navitem">
                                <a href="assets.html" class="nav-link">Assets</a>
                            </li>
+                            <li class="navitem">
+                                <a href="data.html" class="nav-link">Data</a>
+                            </li>
                            <li class="dropdown active">
                                <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">About <b class="caret"></b></a>
                                <ul class="dropdown-menu">
@ -129,6 +132,7 @@

 <h2 id="change-log">Change Log</h2>
 <ul>
+<li>1.0.1  2021-07-21 - Fixing Appendix-D Exports</li>
 <li>1.0.0  2021-07-16 - First Major Release / Published at <a href="https://www.sikuliaq.alaska.edu/git/skq/skq-it-am.git">https://www.sikuliaq.alaska.edu/git/skq/skq-it-am.git</a></li>
 <li>0.0.13 2021-07-14 - Asset List</li>
 <li>0.0.12 2021-06-30 - HW and SW Statistics Report</li>