From ffc5c5a91ea0ddad863833ec9ec07745663a69b8 Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Mon, 3 May 2021 08:10:27 -0700
Subject: [PATCH 01/51] Add package-lock.json to .gitignore (#708)

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index fe0513dee2..20f75d9f03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,7 @@ cypress/downloads
 
 # Fleet local development DB backups
 backup.sql.gz
+
+# Common mistake for new developers to run npm install and then end up
+# committing a package-lock.json. Fleet app uses Yarn with yarn.lock.
+package-lock.json

From b8aec634139e4ef2ca900c50ee1265034d017542 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Mon, 3 May 2021 18:58:23 -0400
Subject: [PATCH 02/51] Host details page styling (#710)

* Host details page restyled to match Figma
* Page uses flexboxes
* Text match Figma
---
 assets/images/icon-chevron-down-9x6@2x.png    | Bin 0 -> 408 bytes
 .../hosts/HostDetailsPage/HostDetailsPage.jsx |  55 ++++++++++--------
 .../pages/hosts/HostDetailsPage/_styles.scss  |  50 ++++++++++++----
 3 files changed, 71 insertions(+), 34 deletions(-)
 create mode 100644 assets/images/icon-chevron-down-9x6@2x.png

diff --git a/assets/images/icon-chevron-down-9x6@2x.png b/assets/images/icon-chevron-down-9x6@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..46c0151dfe773ed186915a143068ba7b8b261fa7
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0WC>HK~#7F?Uv6`
zgHRC0cLVB`QqqDQm<oc2sEG%$0<i<VU^EA@13O3ymXecB65$h&L*_wd_WhaU@_sjV
zSiX;CcOOI^kH>Rlm>e;?!2<#Dw)`C}7N=j*JSPTP@wB~MRVL1*CI)1QB3=`n48o-}
z-^xIb_&;3UlMv%iFuTS(5#sI>%gbyY<|M?Z0=?p(m9BV=b_Mo{Zy|5IT|()NNrGto
z-H2bf64x@Y`N5KzhAzcx#65s&zB@q&TSRQ&Y|SHpK9z7Y^OMPDNQP*?!}O}inR%>)
zwYJ|b+GF_g7Q_HPlyFmt+bPDRiP0XYO;la+tb`+!$aPH^uj1@ANQm*M#&u0todwxE
zNPA5bcp@Rzr(wrLyBnnW4u43BluEv{T}&R&!TAFkjF}8CSsNk%0000<MNUMnLSTX;
C6R1J}

literal 0
HcmV?d00001

diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
index 948b20846e..98a989fcf1 100644
--- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
@@ -3,6 +3,7 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import classnames from "classnames";
 
+import { Link } from "react-router";
 import ReactTooltip from "react-tooltip";
 import { noop, pick } from "lodash";
 
@@ -29,6 +30,8 @@ import {
 import helpers from "./helpers";
 import SelectQueryModal from "./SelectQueryModal";
 
+import BackChevron from "../../../../assets/images/icon-chevron-down-9x6@2x.png";
+
 const baseClass = "host-details";
 
 export class HostDetailsPage extends Component {
@@ -192,7 +195,7 @@ export class HostDetailsPage extends Component {
             You can’t <br /> query an <br /> offline host.
           </span>
         </ReactTooltip>
-        <Button onClick={toggleDeleteHostModal()} variant="inverse">
+        <Button onClick={toggleDeleteHostModal()} variant="active">
           Delete
         </Button>
       </div>
@@ -219,7 +222,7 @@ export class HostDetailsPage extends Component {
     });
 
     return (
-      <div className="section labels">
+      <div className="section labels col-25">
         <p className="section__header">Labels</p>
         {labels.length === 0 ? (
           <p className="info__item">No labels are associated with this host.</p>
@@ -344,6 +347,12 @@ export class HostDetailsPage extends Component {
       Object.keys(object).forEach((key) => {
         if (object[key] === "") {
           object[key] = "--";
+        } else if (
+          key === "logger_tls_period" ||
+          key === "config_tls_refresh" ||
+          key === "distributed_interval"
+        ) {
+          object[key] = `${object[key]} sec`;
         }
       });
     });
@@ -356,6 +365,12 @@ export class HostDetailsPage extends Component {
 
     return (
       <div className={`${baseClass} body-wrap`}>
+        <div>
+          <Link to="/hosts/manage">
+            <img src={BackChevron} alt="back chevron" id="back-chevron" />
+            Back to Hosts
+          </Link>
+        </div>
         <div className="section title">
           <div className="title__inner">
             <div className="hostname-container">
@@ -395,22 +410,20 @@ export class HostDetailsPage extends Component {
           </div>
           {renderActionButtons()}
         </div>
-        <div className="section about">
+        <div className="section about col-50">
           <p className="section__header">About this host</p>
           <div className="info">
             <div className="info__item info__item--about">
               <div className="info__block">
-                <span className="info__header">Last seen</span>
-                <span className="info__header">Enrolled</span>
-                <span className="info__header">Uptime</span>
-              </div>
-              <div className="info__block">
-                <span className="info__data">
-                  {humanHostLastSeen(aboutData.seen_time)}
-                </span>
+                <span className="info__header">Created at</span>
                 <span className="info__data">
                   {humanHostEnrolled(aboutData.last_enrolled_at)}
                 </span>
+                <span className="info__header">Updated at</span>
+                <span className="info__data">
+                  {humanHostLastSeen(aboutData.seen_time)}
+                </span>
+                <span className="info__header">Uptime</span>
                 <span className="info__data">
                   {humanHostUptime(aboutData.uptime)}
                 </span>
@@ -419,33 +432,27 @@ export class HostDetailsPage extends Component {
             <div className="info__item info__item--about">
               <div className="info__block">
                 <span className="info__header">Hardware model</span>
-                <span className="info__header">Serial number</span>
-                <span className="info__header">IP address</span>
-              </div>
-              <div className="info__block">
                 <span className="info__data">{aboutData.hardware_model}</span>
+                <span className="info__header">Serial number</span>
                 <span className="info__data">{aboutData.hardware_serial}</span>
+                <span className="info__header">IPv4</span>
                 <span className="info__data">{aboutData.primary_ip}</span>
               </div>
             </div>
           </div>
         </div>
-        <div className="section osquery">
-          <p className="section__header">Osquery configuration</p>
-          <div className="info">
-            <div className="info__item info__item--title">
-              <span className="info__header">Config refresh</span>
+        <div className="section osquery col-25">
+          <p className="section__header">Agent Options</p>
+          <div className="info__item info__item--about">
+            <div className="info__block">
+              <span className="info__header">Config TLS refresh</span>
               <span className="info__data">
                 {osqueryData.config_tls_refresh}
               </span>
-            </div>
-            <div className="info__item info__item--title">
               <span className="info__header">Logger TLS period</span>
               <span className="info__data">
                 {osqueryData.logger_tls_period}
               </span>
-            </div>
-            <div className="info__item info__item--title">
               <span className="info__header">Distributed interval</span>
               <span className="info__data">
                 {osqueryData.distributed_interval}
diff --git a/frontend/pages/hosts/HostDetailsPage/_styles.scss b/frontend/pages/hosts/HostDetailsPage/_styles.scss
index 126722c77e..f56ed3adba 100644
--- a/frontend/pages/hosts/HostDetailsPage/_styles.scss
+++ b/frontend/pages/hosts/HostDetailsPage/_styles.scss
@@ -1,17 +1,34 @@
+a {
+  font-size: $x-small;
+  color: $core-vibrant-blue;
+  font-weight: $bold;
+  text-decoration: none;
+}
+
 .host-details {
   display: flex;
-  flex-direction: column;
+  flex-wrap: wrap;
+  flex-grow: 1;
+  align-content: flex-start;
   padding-bottom: 50px;
   min-width: 0;
+  background-color: $ui-off-white;
+  gap: $pad-large;
 
   .section {
+    flex: 100%;
     display: flex;
     flex-direction: column;
-    margin: $pad-xxlarge 0 0;
+    background-color: $core-white;
+    border-radius: 16px;
+    border: 1px solid $ui-fleet-blue-15;
+    padding: $pad-xxlarge;
+    box-shadow: 0px 3px 0px rgba(226, 228, 234, 0.4);
 
     &__header {
-      margin: 0 0 $pad-medium;
       font-size: $medium;
+      font-weight: bold;
+      margin: 0 0 $pad-medium 0;
     }
 
     .info {
@@ -94,7 +111,8 @@
     }
   }
 
-  .about {
+  .about,
+  .osquery {
     .info {
       &__item {
         &--about {
@@ -107,18 +125,25 @@
         display: flex;
         flex-direction: column;
         margin-right: $pad-xxlarge;
+      }
+      &__data {
+        margin-bottom: $pad-medium;
 
-        span {
-          margin-bottom: $pad-medium;
-
-          &:last-child {
-            margin-bottom: 0;
-          }
+        &:last-child {
+          margin-bottom: 0;
         }
       }
     }
   }
 
+  .col-50 {
+    flex: 2;
+  }
+
+  .col-25 {
+    flex: 1;
+  }
+
   .status {
     color: $core-fleet-black;
     text-transform: capitalize;
@@ -224,4 +249,9 @@
       white-space: nowrap;
     }
   }
+
+  #back-chevron {
+    width: 12px;
+    margin-right: 10px;
+  }
 }

From dbe0cdeb446377c67d67911872ba52b687f8fe8d Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Mon, 3 May 2021 19:53:04 -0500
Subject: [PATCH 03/51] call for contributors

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 37e044d4d0..ced3e6e7be 100644
--- a/README.md
+++ b/README.md
@@ -47,6 +47,10 @@ Documentation for Fleet can be found [here on GitHub](./docs/README.md).
 
 Please join us in the #fleet channel on [osquery Slack](https://osquery.slack.com/join/shared_invite/zt-h29zm0gk-s2DBtGUTW4CFel0f0IjTEw#/).
 
+#### Contributing
+
+Contributions are welcome, whether you answer questions on Slack/GitHub/StackOverflow/Twitter, improve the documentation or website, write a tutorial, give a talk, start a local osquery meetup, troubleshoot reported issues, or [submit a patch](https://github.com/fleetdm/fleet/blob/master/CONTRIBUTING.md).  The Fleet code of conduct is [on GitHub](https://github.com/fleetdm/fleet/blob/master/CODE_OF_CONDUCT.md).
+
 #### Community projects
 
 Below are some projects created by Fleet community members. Please submit a pull request if you'd like your project featured.

From 3b81cb88e9581aae97225fa14f85ab1b30e110da Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Tue, 4 May 2021 11:09:23 -0700
Subject: [PATCH 04/51] Update documentation on size of Fleet deployments
 (#718)

Better represents the growth of Fleet deployment size.
---
 docs/1-Using-Fleet/FAQ.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/1-Using-Fleet/FAQ.md b/docs/1-Using-Fleet/FAQ.md
index 35c6ffed14..bfc6db9efb 100644
--- a/docs/1-Using-Fleet/FAQ.md
+++ b/docs/1-Using-Fleet/FAQ.md
@@ -1,4 +1,5 @@
 # Using Fleet FAQ
+
 - [Has anyone stress tested Fleet? How many clients can the Fleet server handle?](#has-anyone-stress-tested-fleet-how-many-clients-can-the-fleet-server-handle)
 - [How often do labels refresh? Is the refresh frequency configurable?](#how-often-do-labels-refresh-is-the-refresh-frequency-configurable)
 - [How do I revoke the authorization tokens for a user?](#how-do-i-revoke-the-authorization-tokens-for-a-user)
@@ -10,9 +11,9 @@
 
 ## Has anyone stress tested Fleet? How many clients can the Fleet server handle?
 
-Fleet has been stress tested to 150,000 online hosts and 400,000 total enrolled hosts. There are numerous production deployments in the thousands, in the tens of thousands of hosts range, and there are production deployments in the high tens of thousands of hosts range. 
+Fleet has been stress tested to 150,000 online hosts and 400,000 total enrolled hosts. Production deployments exist with over 100,000 hosts and numerous production deployments manage tens of thousands of hosts.
 
-It’s standard deployment practice to have multiple Fleet servers behind a load balancer. However, typically the MySQL database is the bottleneck and an individual Fleet server can handle tens of thousands of hosts.
+It’s standard deployment practice to have multiple Fleet servers behind a load balancer. However, typically the MySQL database is the performance bottleneck and a single Fleet server can handle tens of thousands of hosts.
 
 ## How often do labels refresh? Is the refresh frequency configurable?
 
@@ -30,7 +31,6 @@ Fleet can live query the `osquery_schedule` table. Performing this live query al
 
 Fleet provides standard interfaces for monitoring and alerting. See the [Monitoring Fleet](./5-Monitoring-Fleet.md) documentation for details.
 
-
 ## Why is the “Add User” button disabled?
 
 The “Add User” button is disabled if SMTP (email) has not been configured for the Fleet server. Currently, there is no way to add new users without email capabilities.
@@ -51,7 +51,7 @@ It is possible to configure osqueryd to log query results outside of Fleet. For
 
 ### What are my options for storing the osquery logs?
 
-Folks typically use Fleet to ship logs to data aggregation systems like Splunk, the ELK stack, and Graylog. 
+Folks typically use Fleet to ship logs to data aggregation systems like Splunk, the ELK stack, and Graylog.
 
 The [logger configuration options](https://github.com/fleetdm/fleet/blob/master/docs/2-Deployment/2-Configuration.md#osquery_status_log_plugin) allow you to select the log output plugin. Using the log outputs you can route the logs to your chosen aggregation system.
 
@@ -67,4 +67,4 @@ Expecting results, but not seeing anything in the logs?
 
 ## Why aren’t my live queries being logged?
 
-Live query results are never logged to the filesystem of the Fleet server. See [Where are my query results?](#where-are-my-query-results).
\ No newline at end of file
+Live query results are never logged to the filesystem of the Fleet server. See [Where are my query results?](#where-are-my-query-results).

From 9fb9da31f5462fa7dda4819a114bbdbc0252c347 Mon Sep 17 00:00:00 2001
From: noahtalerman <47070608+noahtalerman@users.noreply.github.com>
Date: Tue, 4 May 2021 15:50:18 -0400
Subject: [PATCH 05/51] Bring Orbit docs into Fleet docs and add FAQ section
 (#717)

- Add new `2-Orbit-osquery/` directory to the top-level `docs/` directory.
- Rename `2-Deployment/` -> `3-Deployment/` to accommodate new Orbit directory.
- Rename `3-Contribution/` ->  `4-Contribution/` to accommodate new Orbit directory.
- Add FAQ section to Orbit documentation.
---
 CHANGELOG.md                                  |   2 +-
 docs/1-Using-Fleet/2-fleetctl-CLI.md          |   6 +-
 docs/1-Using-Fleet/3-REST-API.md              |   2 +-
 docs/1-Using-Fleet/4-Osquery-logs.md          |  14 +-
 .../6-Security-best-practices.md              |   2 +-
 docs/1-Using-Fleet/7-Updating-Fleet.md        |   2 +-
 docs/1-Using-Fleet/FAQ.md                     |   8 +-
 docs/2-Orbit-osquery/README.md                | 152 ++++++++++++++++++
 .../1-Installation.md                         |   0
 .../2-Configuration.md                        |   0
 .../3-Adding-hosts.md                         |   0
 .../4-Example-deployment-scenarios.md         |   0
 .../4-fleetctl-agent-updates.md               |   0
 docs/{2-Deployment => 3-Deployment}/FAQ.md    |   0
 docs/{2-Deployment => 3-Deployment}/README.md |   0
 .../1-Building-Fleet.md                       |   0
 .../2-Testing.md                              |   0
 .../3-Migrations.md                           |   0
 .../4-Committing-Changes.md                   |   0
 .../5-Releasing-Fleet.md                      |   0
 .../{3-Contribution => 4-Contribution}/FAQ.md |   0
 .../README.md                                 |   0
 docs/README.md                                |  11 +-
 frontend/README.md                            |   2 +-
 .../hosts/AddHostModal/AddHostModal.jsx       |   2 +-
 tools/backup_db/README.md                     |   2 +-
 website/config/routes.js                      |   2 +-
 27 files changed, 181 insertions(+), 26 deletions(-)
 create mode 100644 docs/2-Orbit-osquery/README.md
 rename docs/{2-Deployment => 3-Deployment}/1-Installation.md (100%)
 rename docs/{2-Deployment => 3-Deployment}/2-Configuration.md (100%)
 rename docs/{2-Deployment => 3-Deployment}/3-Adding-hosts.md (100%)
 rename docs/{2-Deployment => 3-Deployment}/4-Example-deployment-scenarios.md (100%)
 rename docs/{2-Deployment => 3-Deployment}/4-fleetctl-agent-updates.md (100%)
 rename docs/{2-Deployment => 3-Deployment}/FAQ.md (100%)
 rename docs/{2-Deployment => 3-Deployment}/README.md (100%)
 rename docs/{3-Contribution => 4-Contribution}/1-Building-Fleet.md (100%)
 rename docs/{3-Contribution => 4-Contribution}/2-Testing.md (100%)
 rename docs/{3-Contribution => 4-Contribution}/3-Migrations.md (100%)
 rename docs/{3-Contribution => 4-Contribution}/4-Committing-Changes.md (100%)
 rename docs/{3-Contribution => 4-Contribution}/5-Releasing-Fleet.md (100%)
 rename docs/{3-Contribution => 4-Contribution}/FAQ.md (100%)
 rename docs/{3-Contribution => 4-Contribution}/README.md (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 241644d9f7..e156fd7e7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 * Improve Fleet performance by batch updating host seen time instead of updating synchronously. This improvement reduces MySQL CPU usage by ~33% with 4,000 simulated hosts and MySQL running in Docker.
 
-* Add support for software inventory, introducing a list of installed software items on each host's respective _Host details_ page. This feature is flagged off by default (for now). Check out [the feature flag documentation for instructions on how to turn this feature on](https://github.com/fleetdm/fleet/blob/master/docs/2-Deployment/2-Configuration.md#software-inventory).
+* Add support for software inventory, introducing a list of installed software items on each host's respective _Host details_ page. This feature is flagged off by default (for now). Check out [the feature flag documentation for instructions on how to turn this feature on](https://github.com/fleetdm/fleet/blob/master/docs/3-Deployment/2-Configuration.md#software-inventory).
 
 * Add Windows support for `fleetctl` agent autoupdates. The `fleetctl updates` command provides the ability to self-manage an agent update server. Available for Fleet Basic customers.
 
diff --git a/docs/1-Using-Fleet/2-fleetctl-CLI.md b/docs/1-Using-Fleet/2-fleetctl-CLI.md
index 755f1c218f..cf85636d6c 100644
--- a/docs/1-Using-Fleet/2-fleetctl-CLI.md
+++ b/docs/1-Using-Fleet/2-fleetctl-CLI.md
@@ -34,7 +34,7 @@ This guide illustrates:
 
 ### Running Fleet
 
-For the sake of this tutorial, I will be using the local development Docker Compose infrastructure to run Fleet locally. This is documented in some detail in the [developer documentation](../3-Contribution/1-Building-Fleet.md#development-infrastructure), but the following are the minimal set of commands that you can run from the root of the repository (assuming that you have a working Go/JavaScript toolchain installed along with Docker Compose):
+For the sake of this tutorial, I will be using the local development Docker Compose infrastructure to run Fleet locally. This is documented in some detail in the [developer documentation](../4-Contribution/1-Building-Fleet.md#development-infrastructure), but the following are the minimal set of commands that you can run from the root of the repository (assuming that you have a working Go/JavaScript toolchain installed along with Docker Compose):
 
 ```
 docker-compose up -d
@@ -80,7 +80,7 @@ It's possible to specify the password via the `--password` flag or the `$PASSWOR
 
 ### Connecting a host
 
-For the sake of this tutorial, I'm going to be using Kolide's osquery launcher to start osquery locally and connect it to Fleet. To learn more about connecting osquery to Fleet, see the [Adding Hosts to Fleet](../2-Deployment/3-Adding-hosts.md) documentation.
+For the sake of this tutorial, I'm going to be using Kolide's osquery launcher to start osquery locally and connect it to Fleet. To learn more about connecting osquery to Fleet, see the [Adding Hosts to Fleet](../3-Deployment/3-Adding-hosts.md) documentation.
 
 To get your osquery enroll secret, run the following:
 
@@ -577,7 +577,7 @@ spec:
 
 Fleet supports osquery's file carving functionality as of Fleet 3.3.0. This allows the Fleet server to request files (and sets of files) from osquery agents, returning the full contents to Fleet.
 
-File carving data can be either stored in Fleet's database or to an external S3 bucket. For information on how to configure the latter, consult the [configuration docs](https://github.com/fleetdm/fleet/blob/master/docs/2-Deployment/2-Configuration.md#s3-file-carving-backend).
+File carving data can be either stored in Fleet's database or to an external S3 bucket. For information on how to configure the latter, consult the [configuration docs](https://github.com/fleetdm/fleet/blob/master/docs/3-Deployment/2-Configuration.md#s3-file-carving-backend).
 
 ### Configuration
 
diff --git a/docs/1-Using-Fleet/3-REST-API.md b/docs/1-Using-Fleet/3-REST-API.md
index 7822b9aba7..f4962fe1cd 100644
--- a/docs/1-Using-Fleet/3-REST-API.md
+++ b/docs/1-Using-Fleet/3-REST-API.md
@@ -589,7 +589,7 @@ None.
 
 Returns the information of the specified host. 
 
-The endpoint returns the host's installed `software` if the software inventory feature flag is turned on. This feature flag is turned off by default. [Check out the feature flag documentation](../2-Deployment/2-Configuration.md#feature-flags) for instructions on how to turn on the software inventory feature.
+The endpoint returns the host's installed `software` if the software inventory feature flag is turned on. This feature flag is turned off by default. [Check out the feature flag documentation](../3-Deployment/2-Configuration.md#feature-flags) for instructions on how to turn on the software inventory feature.
 
 `GET /api/v1/fleet/hosts/{id}`
 
diff --git a/docs/1-Using-Fleet/4-Osquery-logs.md b/docs/1-Using-Fleet/4-Osquery-logs.md
index d51b300fef..2550b1a4ee 100644
--- a/docs/1-Using-Fleet/4-Osquery-logs.md
+++ b/docs/1-Using-Fleet/4-Osquery-logs.md
@@ -22,21 +22,21 @@ Fleet supports the following logging plugins for osquery logs:
 - [PubSub](#pubsub) - Logs are written to Google Cloud PubSub topics.
 - [Stdout](#stdout) - Logs are written to stdout.
 
-To set the osquery logging plugins, use the `--osquery_result_log_plugin` and `--osquery_status_log_plugin` flags (or [equivalents for environment variables or configuration files](../2-Deployment/2-Configuration.md#options)).
+To set the osquery logging plugins, use the `--osquery_result_log_plugin` and `--osquery_status_log_plugin` flags (or [equivalents for environment variables or configuration files](../3-Deployment/2-Configuration.md#options)).
 
 ### Filesystem
 
 The default logging plugin.
 
 - Plugin name: `filesystem`
-- Flag namespace: [filesystem](../2-Deployment/2-Configuration.md#filesystem)
+- Flag namespace: [filesystem](../3-Deployment/2-Configuration.md#filesystem)
 
 With the filesystem plugin, osquery result and/or status logs are written to the local filesystem on the Fleet server. This is typically used with a log forwarding agent on the Fleet server that will push the logs into a logging pipeline. Note that if multiple load-balanced Fleet servers are used, the logs will be load-balanced across those servers (not duplicated).
 
 ### Firehose
 
 - Plugin name: `firehose`
-- Flag namespace: [firehose](../2-Deployment/2-Configuration.md#firehose)
+- Flag namespace: [firehose](../3-Deployment/2-Configuration.md#firehose)
 
 With the Firehose plugin, osquery result and/or status logs are written to [AWS Firehose](https://aws.amazon.com/kinesis/data-firehose/) streams. This is a very good method for aggregating osquery logs into AWS S3 storage.
 
@@ -45,7 +45,7 @@ Note that Firehose logging has limits [discussed in the documentation](https://d
 ### Kinesis
 
 - Plugin name: `kinesis`
-- Flag namespace: [kinesis](../2-Deployment/2-Configuration.md#kinesis)
+- Flag namespace: [kinesis](../3-Deployment/2-Configuration.md#kinesis)
 
 With the Kinesis plugin, osquery result and/or status logs are written to
 [AWS Kinesis](https://aws.amazon.com/kinesis/data-streams) streams.
@@ -58,7 +58,7 @@ output in the Fleet logs and those logs _will not_ be sent to Kinesis.
 ### Lambda
 
 - Plugin name: `lambda`
-- Flag namespace: [lambda](../2-Deployment/2-Configuration.md#lambda)
+- Flag namespace: [lambda](../3-Deployment/2-Configuration.md#lambda)
 
 With the Lambda plugin, osquery result and/or status logs are written to
 [AWS Lambda](https://aws.amazon.com/lambda/) functions.
@@ -73,7 +73,7 @@ output in the Fleet logs and those logs _will not_ be sent to Lambda.
 ### PubSub
 
 - Plugin name: `pubsub`
-- Flag namespace: [pubsub](../2-Deployment/2-Configuration.md#pubsub)
+- Flag namespace: [pubsub](../3-Deployment/2-Configuration.md#pubsub)
 
 With the PubSub plugin, osquery result and/or status logs are written to [PubSub](https://cloud.google.com/pubsub/) topics.
 
@@ -82,7 +82,7 @@ Note that messages over 10MB will be dropped, with a notification sent to the fl
 ### Stdout
 
 - Plugin name: `stdout`
-- Flag namespace: [stdout](../2-Deployment/2-Configuration.md#stdout)
+- Flag namespace: [stdout](../3-Deployment/2-Configuration.md#stdout)
 
 With the stdout plugin, osquery result and/or status logs are written to stdout
 on the Fleet server. This is typically used for debugging or with a log
diff --git a/docs/1-Using-Fleet/6-Security-best-practices.md b/docs/1-Using-Fleet/6-Security-best-practices.md
index f3a54d0345..f3ff1acf19 100644
--- a/docs/1-Using-Fleet/6-Security-best-practices.md
+++ b/docs/1-Using-Fleet/6-Security-best-practices.md
@@ -27,7 +27,7 @@ Fleet supports SAML auth which means that it can be configured such that it neve
 
 Passwords are never stored in plaintext in the database. We store a `bcrypt`ed hash of the password along with a randomly generated salt. The `bcrypt` iteration count and salt key size are admin-configurable.
 ### Authentication tokens
-The size and expiration time of session tokens is admin-configurable.  See [https://github.com/fleetdm/fleet/blob/master/docs/2-Deployment/2-Configuration.md#session_duration](../2-Deployment/2-Configuration.md#session_duration).
+The size and expiration time of session tokens is admin-configurable.  See [https://github.com/fleetdm/fleet/blob/master/docs/3-Deployment/2-Configuration.md#session_duration](../3-Deployment/2-Configuration.md#session_duration).
 
 It is possible to revoke all session tokens for a user by forcing a password reset.
 
diff --git a/docs/1-Using-Fleet/7-Updating-Fleet.md b/docs/1-Using-Fleet/7-Updating-Fleet.md
index 842693b552..1bdee324e5 100644
--- a/docs/1-Using-Fleet/7-Updating-Fleet.md
+++ b/docs/1-Using-Fleet/7-Updating-Fleet.md
@@ -7,7 +7,7 @@
 
 ## Overview
 
-This guide explains how to update and run new versions of Fleet. For initial installation instructions, see [Installing Fleet](../2-Deployment/1-Installation.md).
+This guide explains how to update and run new versions of Fleet. For initial installation instructions, see [Installing Fleet](../3-Deployment/1-Installation.md).
 
 There are two steps to perform a typical Fleet update. If any other steps are required, they will be noted in the release notes.
 
diff --git a/docs/1-Using-Fleet/FAQ.md b/docs/1-Using-Fleet/FAQ.md
index bfc6db9efb..5b4d09dfd2 100644
--- a/docs/1-Using-Fleet/FAQ.md
+++ b/docs/1-Using-Fleet/FAQ.md
@@ -17,7 +17,7 @@ It’s standard deployment practice to have multiple Fleet servers behind a load
 
 ## How often do labels refresh? Is the refresh frequency configurable?
 
-The update frequency for labels is configurable with the [—osquery_label_update_interval](https://github.com/fleetdm/fleet/blob/master/docs/2-Deployment/2-Configuration.md#osquery_label_update_interval) flag (default 1 hour).
+The update frequency for labels is configurable with the [—osquery_label_update_interval](https://github.com/fleetdm/fleet/blob/master/docs/3-Deployment/2-Configuration.md#osquery_label_update_interval) flag (default 1 hour).
 
 ## How do I revoke the authorization tokens for a user?
 
@@ -45,7 +45,7 @@ Live query results (executed in the web UI or `fleetctl query`) are pushed direc
 
 ### Scheduled Queries
 
-Scheduled query results (queries that are scheduled to run in Packs) are typically sent to the Fleet server, and will be available on the filesystem of the server at the path configurable by [`--osquery_result_log_file`](../2-Deployment/2-Configuration.md#osquery_result_log_file). This defaults to `/tmp/osquery_result`.
+Scheduled query results (queries that are scheduled to run in Packs) are typically sent to the Fleet server, and will be available on the filesystem of the server at the path configurable by [`--osquery_result_log_file`](../3-Deployment/2-Configuration.md#osquery_result_log_file). This defaults to `/tmp/osquery_result`.
 
 It is possible to configure osqueryd to log query results outside of Fleet. For results to go to Fleet, the `--logger_plugin` flag must be set to `tls`.
 
@@ -53,7 +53,7 @@ It is possible to configure osqueryd to log query results outside of Fleet. For
 
 Folks typically use Fleet to ship logs to data aggregation systems like Splunk, the ELK stack, and Graylog.
 
-The [logger configuration options](https://github.com/fleetdm/fleet/blob/master/docs/2-Deployment/2-Configuration.md#osquery_status_log_plugin) allow you to select the log output plugin. Using the log outputs you can route the logs to your chosen aggregation system.
+The [logger configuration options](https://github.com/fleetdm/fleet/blob/master/docs/3-Deployment/2-Configuration.md#osquery_status_log_plugin) allow you to select the log output plugin. Using the log outputs you can route the logs to your chosen aggregation system.
 
 ### Troubleshooting
 
@@ -63,7 +63,7 @@ Expecting results, but not seeing anything in the logs?
 - Check whether the query is scheduled in differential mode. If so, new results will only be logged when the result set changes.
 - Ensure that the query is scheduled to run on the intended platforms, and that the tables queried are supported by those platforms.
 - Use live query to `SELECT * FROM osquery_schedule` to check whether the query has been scheduled on the host.
-- Look at the status logs provided by osquery. In a standard configuration these are available on the filesystem of the Fleet server at the path configurable by [`--filesystem_status_log_file`](../2-Deployment/2-Configuration.md#filesystem_status_log_file). This defaults to `/tmp/osquery_status`. The host will output a status log each time it executes the query.
+- Look at the status logs provided by osquery. In a standard configuration these are available on the filesystem of the Fleet server at the path configurable by [`--filesystem_status_log_file`](../3-Deployment/2-Configuration.md#filesystem_status_log_file). This defaults to `/tmp/osquery_status`. The host will output a status log each time it executes the query.
 
 ## Why aren’t my live queries being logged?
 
diff --git a/docs/2-Orbit-osquery/README.md b/docs/2-Orbit-osquery/README.md
new file mode 100644
index 0000000000..bc094ae52c
--- /dev/null
+++ b/docs/2-Orbit-osquery/README.md
@@ -0,0 +1,152 @@
+# Orbit osquery
+
+Orbit is an [osquery](https://github.com/osquery/osquery) runtime and autoupdater. With Orbit, it's easy to deploy osquery, manage configurations, and stay up to date. Orbit eases the deployment of osquery connected with a [Fleet server](https://github.com/fleetdm/fleet), and is a (near) drop-in replacement for osquery in a variety of deployment scenarios.
+
+Orbit is the recommended agent for Fleet.  But Orbit can be used with or without Fleet, and Fleet can be used with or without Orbit.
+
+## Usage
+
+General information and flag documentation can be accessed by running `orbit --help`.
+
+### Permissions
+
+Orbit generally expects root permissions to be able to create and access it's working files. 
+
+To get root level permissions:
+
+#### macOS/Linux
+
+Prefix `orbit` commands with `sudo` (`sudo orbit ...`) or run in a root shell.
+
+#### Windows
+
+Run Powershell or cmd.exe with "Run as administrator" and start `orbit` commands from that shell.
+
+### Osquery shell
+
+Run an `osqueryi` shell with `orbit osqueryi` or `orbit shell`.
+
+### Connect to a Fleet server
+
+Use the `--fleet-url` and `--enroll-secret` flags to connect to a Fleet server.
+
+For example:
+
+``` sh
+orbit --fleet-url=https://localhost:8080 --enroll-secret=the_secret_value 
+```
+
+Use `--fleet_certificate` to provide a path to a certificate bundle when necessary for osquery to verify the authenticity of the Fleet server (typically when using a Windows client or self-signed certificates):
+
+``` sh
+orbit --fleet-url=https://localhost:8080 --enroll-secret=the_secret_value --fleet-certificate=cert.pem 
+```
+
+Add the `--insecure` flag for connections using otherwise invalid certificates:
+
+``` sh
+orbit --fleet-url=https://localhost:8080 --enroll-secret=the_secret_value --insecure 
+```
+
+### Osquery flags
+
+Orbit can be used as near drop-in replacement for `osqueryd`, enhancing standard osquery with autoupdate capabilities. Orbit passes through any options after `--` directly to the `osqueryd` instance.
+
+For example, the following would be a typical drop-in usage of Orbit:
+
+``` sh
+orbit -- --flagfile=flags.txt
+```
+
+## Packaging
+
+Orbit, like standalone osquery, is typically deployed via OS-specific packages. Tooling is provided with this repository to generate installation packages.
+
+### Packaging support
+
+- **macOS** - `.pkg` package generation with (optional) [Notarization](https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution) and codesigning - Persistence via `launchd`.
+
+- **Linux** - `.deb` (Debian, Ubuntu, etc.) & `.rpm` (RHEL, CentOS, etc.) package generation - Persistence via `systemd`.
+
+- **Windows** (coming soon) - `.msi` package generation - Persistence via Services.
+
+### Building packages
+
+Before building packages, clone or download this repository and [install Go](https://golang.org/doc/install).
+
+Use `go run ./cmd/package` from this directory to run the packaging tools.
+
+The only required parameter is `--type`, use one of `deb`, `rpm`, or `pkg` (`msi` coming soon).
+
+Configure osquery to connect to a Fleet (or other TLS) server with the `--fleet-url` and `--enroll-secret` flags.
+
+A minimal invocation for communicating with Fleet:
+
+``` sh
+go run ./cmd/package --type deb --fleet-url=fleet.example.com --enroll-secret=notsosecret
+```
+
+This will build a `.deb` package configured to communicate with a Fleet server at `fleet.example.com` using the enroll secret `notsosecret`.
+
+When the Fleet server uses a self-signed (or otherwise invalid) TLS certificate, package with the `--insecure` or `--fleet-certificate` options.
+
+See `go run ./cmd/package` for the full range of packaging options.
+
+#### Update channels
+
+Orbit uses the concept of "update channels" to determine the version of Orbit, osquery, and any extensions (extension support coming soon) to run. This concept is modeled from the common versioning convention for Docker containers.
+
+Configure update channels for Orbit and osqueryd with the `--orbit-channel` and `--osqueryd-channel` flags when packaging.
+
+| Channel                              | Versions |
+| ------------------------------------ | ------   |
+| `4`                                  | 4.x.x    |
+| `4.6`                                | 4.6.x    |
+| `4.6.0`                              | 4.6.0    |
+
+Additionally `stable` and `edge` are special channel names. `stable` will always return the version Fleet deems to be stable, while `edge` will provide newer releases for beta testing.
+
+#### macOS signing & Notarization
+
+Orbit's packager can automate the codesigning and Notarization steps to allow the resulting package to generate packages that appear "trusted" when install on macOS hosts. Signing & notarization are supported only on macOS hosts.
+
+For signing, a "Developer ID Installer" certificate must be available on the build machine ([generation instructions](https://help.apple.com/xcode/mac/current/#/dev154b28f09)). Use `security find-identity -v` to verify the existence of this certificate and make note of the identifier provided in the left column.
+
+For Notarization, valid App Store Connect credentials must be available on the build machine. Set these in the environment variables `AC_USERNAME` and `AC_PASSWORD`. It is common to configure this via [app-specific passwords](https://support.apple.com/en-ca/HT204397).
+
+Build a signed and notarized macOS package with an invocation like the following:
+
+``` sh
+AC_USERNAME=zach@fleetdm.com AC_PASSWORD=llpk-sije-kjlz-jdzw go run ./cmd/package --type=pkg --fleet-url=fleet.example.com --enroll-secret=63SBzTT+2UyW --sign-identity 3D7260BF99539C6E80A94835A8921A988F4E6498 --notarize
+```
+
+This process may take several minutes to complete as the Notarization process completes on Apple's servers.
+
+After successful notarization, the generated "ticket" is automatically stapled to the package. 
+
+## FAQs
+
+### How does Orbit compare with Kolide Launcher?
+
+Orbit is inspired by the success of [Kolide Launcher](https://github.com/kolide/launcher), and approaches a similar problem domain with new strategies informed by the challenges encountered in real world deployments. Orbit does not share any code with Launcher.
+
+- Both Orbit and Launcher use [The Update Framework](https://theupdateframework.com/) specification for managing updates. Orbit utilizes the official [go-tuf](https://github.com/theupdateframework/go-tuf) library, while Launcher has it's own implementation of the specification.
+- Orbit can be deployed as a (near) drop-in replacement for osquery, supporting full customization of the osquery flags. Launcher heavily manages the osquery flags making deployment outside of Fleet or Kolide's SaaS difficult.
+- Orbit prefers the battle-tested plugins of osquery. Orbit uses the built-in logging, configuration, and live query plugins, while Launcher uses custom implementations.
+- Orbit prefers the built-in osquery remote APIs. Launcher utilizes a custom gRPC API that has led to issues with character encoding, load balancers/proxies, and request size limits.
+- Orbit encourages use of the osquery performance Watchdog, while Launcher disables the Watchdog.
+
+Additionally, Orbit aims to tackle problems out of scope for Launcher:
+
+- Configure updates via release channels, providing more granular control over agent versioning.
+- Support for deploying and updating osquery extensions (🔜).
+- Manage osquery versions and startup flags from a remote (Fleet) server (🔜).
+- Further control of osquery performance via cgroups (🔜).
+
+### Is Orbit Free?
+
+Yes! Orbit is licensed under an MIT license and all uses are encouraged.
+
+### How does orbit update osquery? And how do the stable and edge channels get triggered to update osquery on a self hosted Fleet instance?
+
+Orbit uses a configurable update server. We expect that many folks will just use the update server we manage (similar to what Kolide does with Launcher's update server). We are also offering [tooling for self-managing an update server](https://github.com/fleetdm/fleet/blob/master/docs/3-Deployment/4-fleetctl-agent-updates.md) as part of Fleet Basic (the subscription offering).
diff --git a/docs/2-Deployment/1-Installation.md b/docs/3-Deployment/1-Installation.md
similarity index 100%
rename from docs/2-Deployment/1-Installation.md
rename to docs/3-Deployment/1-Installation.md
diff --git a/docs/2-Deployment/2-Configuration.md b/docs/3-Deployment/2-Configuration.md
similarity index 100%
rename from docs/2-Deployment/2-Configuration.md
rename to docs/3-Deployment/2-Configuration.md
diff --git a/docs/2-Deployment/3-Adding-hosts.md b/docs/3-Deployment/3-Adding-hosts.md
similarity index 100%
rename from docs/2-Deployment/3-Adding-hosts.md
rename to docs/3-Deployment/3-Adding-hosts.md
diff --git a/docs/2-Deployment/4-Example-deployment-scenarios.md b/docs/3-Deployment/4-Example-deployment-scenarios.md
similarity index 100%
rename from docs/2-Deployment/4-Example-deployment-scenarios.md
rename to docs/3-Deployment/4-Example-deployment-scenarios.md
diff --git a/docs/2-Deployment/4-fleetctl-agent-updates.md b/docs/3-Deployment/4-fleetctl-agent-updates.md
similarity index 100%
rename from docs/2-Deployment/4-fleetctl-agent-updates.md
rename to docs/3-Deployment/4-fleetctl-agent-updates.md
diff --git a/docs/2-Deployment/FAQ.md b/docs/3-Deployment/FAQ.md
similarity index 100%
rename from docs/2-Deployment/FAQ.md
rename to docs/3-Deployment/FAQ.md
diff --git a/docs/2-Deployment/README.md b/docs/3-Deployment/README.md
similarity index 100%
rename from docs/2-Deployment/README.md
rename to docs/3-Deployment/README.md
diff --git a/docs/3-Contribution/1-Building-Fleet.md b/docs/4-Contribution/1-Building-Fleet.md
similarity index 100%
rename from docs/3-Contribution/1-Building-Fleet.md
rename to docs/4-Contribution/1-Building-Fleet.md
diff --git a/docs/3-Contribution/2-Testing.md b/docs/4-Contribution/2-Testing.md
similarity index 100%
rename from docs/3-Contribution/2-Testing.md
rename to docs/4-Contribution/2-Testing.md
diff --git a/docs/3-Contribution/3-Migrations.md b/docs/4-Contribution/3-Migrations.md
similarity index 100%
rename from docs/3-Contribution/3-Migrations.md
rename to docs/4-Contribution/3-Migrations.md
diff --git a/docs/3-Contribution/4-Committing-Changes.md b/docs/4-Contribution/4-Committing-Changes.md
similarity index 100%
rename from docs/3-Contribution/4-Committing-Changes.md
rename to docs/4-Contribution/4-Committing-Changes.md
diff --git a/docs/3-Contribution/5-Releasing-Fleet.md b/docs/4-Contribution/5-Releasing-Fleet.md
similarity index 100%
rename from docs/3-Contribution/5-Releasing-Fleet.md
rename to docs/4-Contribution/5-Releasing-Fleet.md
diff --git a/docs/3-Contribution/FAQ.md b/docs/4-Contribution/FAQ.md
similarity index 100%
rename from docs/3-Contribution/FAQ.md
rename to docs/4-Contribution/FAQ.md
diff --git a/docs/3-Contribution/README.md b/docs/4-Contribution/README.md
similarity index 100%
rename from docs/3-Contribution/README.md
rename to docs/4-Contribution/README.md
diff --git a/docs/README.md b/docs/README.md
index 68b906da59..6e152ad0d5 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -3,12 +3,15 @@
 Welcome to the documentation for the Fleet osquery fleet manager.
 
 ### [Using Fleet](./1-Using-Fleet/README.md)
-Resources for using the Fleet UI, fleetctl CLI, and Fleet REST API
+Resources for using the Fleet UI, fleetctl CLI, and Fleet REST API.
 
-### [Deployment](./2-Deployment/README.md)
-Resources for installing Fleet's infrastructure dependencies, configuring Fleet, deploying osquery to hosts, and viewing example deployment scenarios
+### [Orbit osquery](./2-Orbit-osquery/README.md)
+Resources for using Orbit for osquery: the recommended agent for Fleet.
 
-### [Contribution](./3-Contribution/README.md)
+### [Deployment](./3-Deployment/README.md)
+Resources for installing Fleet's infrastructure dependencies, configuring Fleet, deploying osquery to hosts, and viewing example deployment scenarios.
+
+### [Contribution](./4-Contribution/README.md)
 If you're interested in interacting with the Fleet source code, you'll find information on modifying and building the code here.
 
 ---
diff --git a/frontend/README.md b/frontend/README.md
index 819ba2439e..44fee0a772 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -5,7 +5,7 @@ The Fleet front-end is a Single Page Application using React and Redux.
 ## Running the Fleet web app
 
 For details instruction on building and serving the Fleet web application
-consult the [Development Documentation](https://github.com/fleetdm/fleet/tree/master/docs/2-Deployment)
+consult the [Development Documentation](https://github.com/fleetdm/fleet/tree/master/docs/3-Deployment)
 
 ## Directory Structure
 
diff --git a/frontend/components/hosts/AddHostModal/AddHostModal.jsx b/frontend/components/hosts/AddHostModal/AddHostModal.jsx
index de315aec4e..62998673a7 100644
--- a/frontend/components/hosts/AddHostModal/AddHostModal.jsx
+++ b/frontend/components/hosts/AddHostModal/AddHostModal.jsx
@@ -121,7 +121,7 @@ class AddHostModal extends Component {
           <div className={`${baseClass}__documentation-link`}>
             <h4>
               <a
-                href="https://github.com/fleetdm/fleet/blob/master/docs/2-Deployment/3-Adding-hosts.md"
+                href="https://github.com/fleetdm/fleet/blob/master/docs/3-Deployment/3-Adding-hosts.md"
                 target="_blank"
                 rel="noopener noreferrer"
               >
diff --git a/tools/backup_db/README.md b/tools/backup_db/README.md
index 928c706e72..3a6dc69d93 100644
--- a/tools/backup_db/README.md
+++ b/tools/backup_db/README.md
@@ -1,3 +1,3 @@
 These scripts are for backing up and restore the Docker development MySQL database.
 
-Usage is documented [here](../../docs/3-Contribution/2-Testing.md#database-backuprestore).
+Usage is documented [here](../../docs/4-Contribution/2-Testing.md#database-backuprestore).
diff --git a/website/config/routes.js b/website/config/routes.js
index be89883e3d..3da29d5e5e 100644
--- a/website/config/routes.js
+++ b/website/config/routes.js
@@ -36,7 +36,7 @@ module.exports.routes = {
   'GET /pricing':    { action:   'view-pricing' },
   '/try-fleet': '/get-started',
   '/documentation': 'https://github.com/fleetdm/fleet/tree/master/docs',
-  '/contribute': 'https://github.com/fleetdm/fleet/tree/master/docs/3-Contribution',
+  '/contribute': 'https://github.com/fleetdm/fleet/tree/master/docs/4-Contribution',
   '/hall-of-fame': 'https://github.com/fleetdm/fleet/pulse',
 
 

From 7c88de8f499afbe683ae7e17ea3588dcdba7ef5e Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Wed, 5 May 2021 10:39:11 -0500
Subject: [PATCH 06/51] better experience for infrequent npm users

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ced3e6e7be..b95e51a7af 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ Fleet is the most widely used open source osquery manager.  Deploying osquery wi
 
 ```bash
 # Install the Fleet command-line tool
-npm install -g fleetctl
+sudo npm install -g fleetctl
 # Run a local demo of the Fleet server
 sudo fleetctl preview
 ```

From ea051952009519ddb8ba1538de50a90958b14566 Mon Sep 17 00:00:00 2001
From: noahtalerman <47070608+noahtalerman@users.noreply.github.com>
Date: Wed, 5 May 2021 18:00:05 -0400
Subject: [PATCH 07/51] Add questions to FAQ and add documentation section to
 CONTRIBUTING.md (#726)

- Add section on contributing to Fleet documentation. This section covers the use of relative links and best practices for anchor links
- Add 3 questions and their respective answers to the FAQ section in the `1-Using-Fleet` docs
---
 CONTRIBUTING.md           | 20 ++++++++++++++++++++
 docs/1-Using-Fleet/FAQ.md | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fe194fc8d6..64b8de7bde 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,3 +33,23 @@ To open your browser's **network requests**, press Control Shift J (Windows, Lin
 
 Sensitive security-related issues should be reported to
 [security@fleetdm.com](mailto:security@fleetdm.com) before a public issue is made.
+
+## Contributing to documentation
+
+Fleet currently uses GitHub as the central location for documentation.
+
+### Markdown links
+
+Due to the structure of the Fleet documentation and GitHub's unique markdown files, there are several practices we'd like to call out if you're documentation changes include links to other locations within the Fleet docs. 
+
+#### Relative links
+
+When including a link to a different file in the Fleet documentation please use relative links when possible. 
+
+For example, let's say you're working on changes in the Contribution docs and you'd like to add a link to the REST API docs. The relative link would look something like `../1-Using-Fleet/3-REST-API.md`.
+
+#### Special characters in anchor links
+
+There are certain characters GitHub doesn't support in the use of anchor links in markdown files. The general rule we've found is to only use a-z or A-Z characters in anchor links. All other characters should be removed.
+
+For example, consider the section title *How do I connect to the Mailhog simulated server?*. The valid GitHub anchor link for this section is #how-do-i-connect-to-the-mailhog-simulated-server. Notice the *?* character is removed.
diff --git a/docs/1-Using-Fleet/FAQ.md b/docs/1-Using-Fleet/FAQ.md
index 5b4d09dfd2..125c1228bf 100644
--- a/docs/1-Using-Fleet/FAQ.md
+++ b/docs/1-Using-Fleet/FAQ.md
@@ -1,13 +1,16 @@
 # Using Fleet FAQ
 
 - [Has anyone stress tested Fleet? How many clients can the Fleet server handle?](#has-anyone-stress-tested-fleet-how-many-clients-can-the-fleet-server-handle)
+- [Can I target my hosts using their enroll secrets?](#can-I-target-my-hosts-using-their-enroll-secrets)
 - [How often do labels refresh? Is the refresh frequency configurable?](#how-often-do-labels-refresh-is-the-refresh-frequency-configurable)
 - [How do I revoke the authorization tokens for a user?](#how-do-i-revoke-the-authorization-tokens-for-a-user)
 - [How do I monitor the performance of my queries?](#how-do-i-monitor-the-performance-of-my-queries)
 - [How do I monitor a Fleet server?](#how-do-i-monitor-a-fleet-server)
 - [Why is the “Add User” button disabled?](#why-is-the-add-user-button-disabled)
+- [Can I disable password-based authentication in the Fleet UI?](#can-i-disable-password-based-authentication-in-the-fleet-ui)
 - [Where are my query results?](#where-are-my-query-results)
 - [Why aren’t my live queries being logged?](#why-arent-my-live-queries-being-logged)
+- [Can I use the Fleet API to fetch results from a scheduled query pack?](#can-i-use-the-fleet-api-to-fetch-results-from-a-scheduled-query-pack)
 
 ## Has anyone stress tested Fleet? How many clients can the Fleet server handle?
 
@@ -15,6 +18,14 @@ Fleet has been stress tested to 150,000 online hosts and 400,000 total enrolled
 
 It’s standard deployment practice to have multiple Fleet servers behind a load balancer. However, typically the MySQL database is the performance bottleneck and a single Fleet server can handle tens of thousands of hosts.
 
+## Can I target my hosts using their enroll secrets?
+
+No, currently, there’s no way to retrieve the name of the enroll secret with a query. This means that there's no way to create a label using your hosts' enroll secrets and then use this label as a target for queries or query packs. 
+
+Typically folks will use some other unique identifier to create labels that distinguish each type of device. As a workaround, [Fleet's manual labels](./2-fleetctl-CLI.md#host-labels) provide a way to create groups of hosts without a query. These manual labels can then be used as targets for queries or query packs.
+
+In the coming months, Fleet will introduce the [Teams feature](https://github.com/fleetdm/fleet/issues/288) to Fleet Basic customers. Teams will allow users to group hosts into teams using their enroll secret. These teams can then be targeted with specific queries, query packs, and configuration.
+
 ## How often do labels refresh? Is the refresh frequency configurable?
 
 The update frequency for labels is configurable with the [—osquery_label_update_interval](https://github.com/fleetdm/fleet/blob/master/docs/3-Deployment/2-Configuration.md#osquery_label_update_interval) flag (default 1 hour).
@@ -37,6 +48,15 @@ The “Add User” button is disabled if SMTP (email) has not been configured fo
 
 One way to hack around this is to use a simulated mailserver like [Mailhog](https://github.com/mailhog/MailHog). You can retrieve the email that was “sent” in the Mailhog UI, and provide users with the invite URL manually.
 
+## Can I disable password-based authentication in the Fleet UI?
+
+Some folks like to enforce users with SAML SSO enabled to login only via the SSO and not via password.
+
+There is no option in the Fleet UI for disabling password-based authentication.
+However, users that have SSO enabled in Fleet will not be able to log in via password-based authentication.
+
+If a user has SSO enabled, the Login page in the Fleet UI does displays the “Username” and “Password” fields but on attempted password-based login, this user will receive an “Authentication failed” message.
+
 ## Where are my query results?
 
 ### Live Queries
@@ -68,3 +88,19 @@ Expecting results, but not seeing anything in the logs?
 ## Why aren’t my live queries being logged?
 
 Live query results are never logged to the filesystem of the Fleet server. See [Where are my query results?](#where-are-my-query-results).
+
+## Can I use the Fleet API to fetch results from a scheduled query pack?
+
+You cannot. Scheduled query results are logged to whatever logging plugin you have configured and are not stored in the Fleet DB.
+
+However, the Fleet API exposes a significant amount of host information via the [`api/v1/fleet/hosts`](./3-REST-API.md#list-hosts) and the [`api/v1/fleet/hosts/{id}`](./3-REST-API.md#get-host) API endpoints. The `api/v1/fleet/hosts` [can even be configured to return additional host information](https://github.com/fleetdm/fleet/blob/9fb9da31f5462fa7dda4819a114bbdbc0252c347/docs/1-Using-Fleet/2-fleetctl-CLI.md#fleet-configuration-options).
+
+As an example, let's say you want to retrieve a host's OS version, installed software, and kernel version:
+
+Each host’s OS version is available using the `api/v1/fleet/hosts` API endpoint. [Check out the API documentation for this endpoint](./3-REST-API.md#list-hosts).
+
+The ability to view each host’s installed software was released behind a feature flag in Fleet 3.11.0 and called Software inventory. [Check out the feature flag documentation for instructions on turning on Software inventory in Fleet](../3-Deployment/2-Configuration.md#feature-flags).
+
+Once the Software inventory feature is turned on, a list of a specific host’s installed software is available using the `api/v1/fleet/hosts/{id}` endpoint. [Check out the documentation for this endpoint](./3-REST-API.md#get-host).
+
+It’s possible in Fleet to retrieve each host’s kernel version, using the Fleet API, through `additional_queries`. The Fleet configuration options yaml file includes an `additional_queries` property that allows you to append custom query results to the host details returned by the `api/v1/fleet/hosts`  endpoint. [Check out an example configuration file with the additional_queries field](./2-fleetctl-CLI.md#fleet-configuration-options).
\ No newline at end of file

From 26c841bcd5e8650ebf63a278b0a7a9dc8f72bbce Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Wed, 5 May 2021 21:27:58 -0500
Subject: [PATCH 08/51] update calendly links & dedupe quickstart for now
 (#728)

* update calendly link

* update other calendly link

* consolidate /get-started

* Update routes.js

* demux to /get-started

* lint fix

* lint fix
---
 website/config/routes.js            | 19 +++++++------------
 website/views/layouts/layout.ejs    |  4 ++--
 website/views/pages/get-started.ejs |  2 +-
 website/views/pages/homepage.ejs    |  2 +-
 website/views/pages/pricing.ejs     |  2 +-
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/website/config/routes.js b/website/config/routes.js
index 3da29d5e5e..a0c5b6e87e 100644
--- a/website/config/routes.js
+++ b/website/config/routes.js
@@ -17,24 +17,15 @@ module.exports.routes = {
 
   '/blog':           'https://medium.com/fleetdm',
 
-  '/pricing':        (req, res)=>{
-    // FUTURE: pricing page explaining commercial support and EE, w/ our subscription terms
-    res.redirect('mailto:todo@example.com?subject=Pricing question&body=Please do not send this email!\n\nWe are a very young company and still working on our processes.  For now, if you have a pricing question or would like to know Fleet\'s latest pricing and support tiers, please create an issue at https://github.com/fleetdm/fleet/issues.  Thank you!');
-  },
-
   '/legal/terms': 'https://docs.google.com/document/d/1OM6YDVIs7bP8wg6iA3VG13X086r64tWDqBSRudG4a0Y/edit',
 
-  '/security':       (req, res)=>{
-    // FUTURE: make a page- check out how Sails does it, and also https://about.gitlab.com/security/
-    res.redirect('mailto:todo@example.com?subject=Security vulnerability&body=Please do not send this email!\n\nWe are a very young company and still working on our processes.  For now, if you have a security vulnerability to report, please send a DM to mikermcneil or Zach Wasserman in the "osquery" Slack workspace.  Thank you for letting us know!');
-  },
+  '/security': 'https://github.com/fleetdm/fleet/security/policy',
 
   '/company/about':          '/blog', // FUTURE: brief "about" page explaining the origins of the company
   '/company/stewardship':    'https://github.com/fleetdm/fleet', // FUTURE: page about how we approach open source and our commitments to the community
   'GET /company/contact':    { action:   'view-contact' },
-  'GET /get-started':    { action:   'view-get-started' },
+  'GET /get-started': 'https://github.com/fleetdm/fleet/blob/master/README.md', // « FUTURE: When ready, bring back { action:   'view-get-started' }
   'GET /pricing':    { action:   'view-pricing' },
-  '/try-fleet': '/get-started',
   '/documentation': 'https://github.com/fleetdm/fleet/tree/master/docs',
   '/contribute': 'https://github.com/fleetdm/fleet/tree/master/docs/4-Contribution',
   '/hall-of-fame': 'https://github.com/fleetdm/fleet/pulse',
@@ -62,13 +53,17 @@ module.exports.routes = {
   //  ╔╦╗╦╔═╗╔═╗  ╦═╗╔═╗╔╦╗╦╦═╗╔═╗╔═╗╔╦╗╔═╗   ┬   ╔╦╗╔═╗╦ ╦╔╗╔╦  ╔═╗╔═╗╔╦╗╔═╗
   //  ║║║║╚═╗║    ╠╦╝║╣  ║║║╠╦╝║╣ ║   ║ ╚═╗  ┌┼─   ║║║ ║║║║║║║║  ║ ║╠═╣ ║║╚═╗
   //  ╩ ╩╩╚═╝╚═╝  ╩╚═╚═╝═╩╝╩╩╚═╚═╝╚═╝ ╩ ╚═╝  └┘   ═╩╝╚═╝╚╩╝╝╚╝╩═╝╚═╝╩ ╩═╩╝╚═╝
-  // '/logout':                  '/api/v1/account/logout',
+
+  // Convenience
   '/company':                    '/company/about',
   '/support':                    '/company/contact',
   '/contact':                    '/company/contact',
   '/legal':                      '/legal/terms',
   '/terms':                      '/legal/terms',
+  // '/logout':                  '/api/v1/account/logout',
 
+  // Legacy (to avoid breaking links)
+  '/try-fleet':                  '/get-started',
 
   //  ╦ ╦╔═╗╔╗ ╦ ╦╔═╗╔═╗╦╔═╔═╗
   //  ║║║║╣ ╠╩╗╠═╣║ ║║ ║╠╩╗╚═╗
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index dbe7c70c92..a6e9da0944 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -81,7 +81,7 @@
             <div class="pt-2">
               <div class="d-flex flex-column mb-4">
                 <span style="font-weight: 700;" class="py-2 px-3">Get started</span>
-                <a class="mobile-menu-item py-2 px-3" target="_blank" href="/try-fleet" data-text="Try Fleet">Try Fleet</a>
+                <a class="mobile-menu-item py-2 px-3" target="_blank" href="/get-started" data-text="Try Fleet">Try Fleet</a>
                 <a class="mobile-menu-item py-2 px-3" target="_blank" href="/documentation" data-text="Documentation">Documentation</a>
                 <a class="mobile-menu-item py-2 px-3" target="_blank" href="/contribute" data-text="Contribute">Contribute</a>
                 <a class="mobile-menu-item py-2 px-3" target="_blank" href="/hall-of-fame" data-text="Hall of fame">Hall of fame</a>
@@ -102,7 +102,7 @@
               Get started
             </button>
             <div style="border-radius: 8px;" class="dropdown-menu dropdown-container p-2" aria-labelledby="dropdownMenuButton">
-              <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" href="/try-fleet" data-text="Try Fleet">Try Fleet</a>
+              <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" href="/get-started" data-text="Try Fleet">Try Fleet</a>
               <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" target="_blank" href="/documentation" data-text="Documentation">Documentation</a>
               <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" target="_blank" href="/contribute" data-text="Contribute">Contribute</a>
               <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" target="_blank" href="/hall-of-fame" data-text="Hall of fame">Hall of fame</a>
diff --git a/website/views/pages/get-started.ejs b/website/views/pages/get-started.ejs
index 4931641a73..e8e3269d01 100644
--- a/website/views/pages/get-started.ejs
+++ b/website/views/pages/get-started.ejs
@@ -90,7 +90,7 @@
                   </a>
                   <a
                     target="_blank"
-                    href="https://calendly.com/fleetdm/chat?month=2021-04"
+                    href="https://calendly.com/fleetdm/demo"
                     style="max-width: 250px"
                     class="btn btn-block btn-lg btn-schedule my-1 ml-2"
                     id="arrow"
diff --git a/website/views/pages/homepage.ejs b/website/views/pages/homepage.ejs
index 933d11ef64..80423fbeb3 100644
--- a/website/views/pages/homepage.ejs
+++ b/website/views/pages/homepage.ejs
@@ -22,7 +22,7 @@
               <img title="Other Linux distros, like Debian" alt="linux logo" src="/images/os-linux-32x36@2x.png" style="width: 32px;" class="d-block mx-auto h-100"/>
             </div>
           </div>
-          <a target="_blank" href="https://github.com/fleetdm/fleet/blob/master/README.md" class="btn btn-block btn-lg btn-primary mb-5">Get started with Fleet</a>
+          <a target="_blank" href="/get-started" class="btn btn-block btn-lg btn-primary mb-5">Get started with Fleet</a>
         </div>
       </div>
     </div>
diff --git a/website/views/pages/pricing.ejs b/website/views/pages/pricing.ejs
index a521575268..41099c9064 100644
--- a/website/views/pages/pricing.ejs
+++ b/website/views/pages/pricing.ejs
@@ -1073,7 +1073,7 @@
           </button>
           <a
             target="_blank"
-            href="https://calendly.com/fleetdm/chat?month=2021-04"
+            href="https://calendly.com/fleetdm/demo"
             style="max-width: 250px"
             class="btn btn-block btn-lg btn-white my-3 mx-2"
             id="arrow"

From f5d58a738cd54641bf6a20c4866dcd2c5317b5e2 Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Wed, 5 May 2021 22:07:15 -0500
Subject: [PATCH 09/51] Set up fleetdm.com/apply to list of openings (#729)

---
 website/config/routes.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/website/config/routes.js b/website/config/routes.js
index a0c5b6e87e..98907fa605 100644
--- a/website/config/routes.js
+++ b/website/config/routes.js
@@ -24,6 +24,7 @@ module.exports.routes = {
   '/company/about':          '/blog', // FUTURE: brief "about" page explaining the origins of the company
   '/company/stewardship':    'https://github.com/fleetdm/fleet', // FUTURE: page about how we approach open source and our commitments to the community
   'GET /company/contact':    { action:   'view-contact' },
+  'GET /apply': 'https://fleet-device-management.breezy.hr',
   'GET /get-started': 'https://github.com/fleetdm/fleet/blob/master/README.md', // « FUTURE: When ready, bring back { action:   'view-get-started' }
   'GET /pricing':    { action:   'view-pricing' },
   '/documentation': 'https://github.com/fleetdm/fleet/tree/master/docs',

From c67d9bc8ebccd11025a75797e62b98f6c0299387 Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Thu, 6 May 2021 13:46:52 -0500
Subject: [PATCH 10/51] Send contact form messages to Slack (#733)

* bring back action to handle contact form

* deliver contact form messages to Slack.
---
 .../deliver-contact-form-message.js           | 24 +++----------------
 website/config/custom.js                      |  3 ++-
 website/config/routes.js                      |  2 +-
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/website/api/controllers/deliver-contact-form-message.js b/website/api/controllers/deliver-contact-form-message.js
index 7668439757..4e04aed81c 100644
--- a/website/api/controllers/deliver-contact-form-message.js
+++ b/website/api/controllers/deliver-contact-form-message.js
@@ -50,27 +50,9 @@ module.exports = {
 
   fn: async function({emailAddress, topic, fullName, message}) {
 
-    if (!sails.config.custom.internalEmailAddress) {
-      throw new Error(
-`Cannot deliver incoming message from contact form because there is no internal
-email address (\`sails.config.custom.internalEmailAddress\`) configured for this
-app.  To enable contact form emails, you'll need to add this missing setting to
-your custom config -- usually in \`config/custom.js\`, \`config/staging.js\`,
-\`config/production.js\`, or via system environment variables.`
-      );
-    }
-
-    await sails.helpers.sendTemplateEmail.with({
-      to: sails.config.custom.internalEmailAddress,
-      subject: 'New contact form message',
-      template: 'internal/email-contact-form',
-      layout: false,
-      templateData: {
-        contactName: fullName,
-        contactEmail: emailAddress,
-        topic,
-        message,
-      }
+    await sails.helpers.http.post(sails.config.custom.slackWebhookUrlForContactForm, {
+      text: `New contact form message: (Remember: we have to email back; can't just reply to this thread.) cc @sales `+
+      `Name: ${fullName}, Email: ${emailAddress}, Topic: ${topic}, Message: ${message}`
     });
 
   }
diff --git a/website/config/custom.js b/website/config/custom.js
index 44de0294c5..fa8de14f08 100644
--- a/website/config/custom.js
+++ b/website/config/custom.js
@@ -98,8 +98,9 @@ module.exports.custom = {
   /***************************************************************************
   *                                                                          *
   * Any other custom config this Sails app should use during development.    *
+  * (and possibly in ALL environments, if not overridden in config/env/)     *
   *                                                                          *
   ***************************************************************************/
-  // …
+  //…
 
 };
diff --git a/website/config/routes.js b/website/config/routes.js
index 98907fa605..8173d80c06 100644
--- a/website/config/routes.js
+++ b/website/config/routes.js
@@ -85,6 +85,6 @@ module.exports.routes = {
   // 'POST  /api/v1/entrance/signup':                       { action: 'entrance/signup' },
   // 'POST  /api/v1/entrance/send-password-recovery-email': { action: 'entrance/send-password-recovery-email' },
   // 'POST  /api/v1/entrance/update-password-and-login':    { action: 'entrance/update-password-and-login' },
-  // 'POST  /api/v1/deliver-contact-form-message':          { action: 'deliver-contact-form-message' },
+  'POST  /api/v1/deliver-contact-form-message':          { action: 'deliver-contact-form-message' },
 
 };

From b0af4287942557d27499392f86c916f395ca032a Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Fri, 7 May 2021 06:48:00 +0900
Subject: [PATCH 11/51] Added osquery link to testimonial (#730)

* Added osquery link to testimonial

* Update homepage.ejs

Changed inline-block style to d-inline-block class.
---
 website/views/pages/homepage.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/views/pages/homepage.ejs b/website/views/pages/homepage.ejs
index 80423fbeb3..11dfd62d8a 100644
--- a/website/views/pages/homepage.ejs
+++ b/website/views/pages/homepage.ejs
@@ -51,8 +51,8 @@
     <div style="max-width: 800px" class="pb-5 mx-auto">
       <div style="max-width: 800px; text-align: center;" class="position-relative mx-auto">
         <p>"Fleet is hands down the best osquery platform out there. Zach and I created Fleet as a natural extension to our original vision for osquery and this has manifested in the ease-of-use, flexibility, and adoption it has today. Look to Fleet for the future of open-source endpoint monitoring."</p>
-        <p style="color: #676A7A" class="mb-4">- Mike Arpaia, Co-creator of osquery</p>
-        <img alt="osquery logo" src="/images/logo-osquery-89x24@2x.png" style="height: 40px; width: 137px;" class="mb-3 mx-auto"/>
+        <p style="color: #676A7A" class="mb-4">- Mike Arpaia, Co-creator of <a style="color:#676A7A;" target="_blank" href="https://osquery.io/">osquery</a></p>
+        <a target="_blank" href="https://osquery.io/"><img alt="osquery logo" src="/images/logo-osquery-89x24@2x.png" style="height: 40px; width: 137px;" class="d-inline-block mb-3 mx-auto"/></a>
       </div>
     </div>
   </div>

From f788254e61c4e3a9539e9693f573b0669ec5f7f8 Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Thu, 6 May 2021 21:05:09 -0700
Subject: [PATCH 12/51] Implement storage of scheduled query statistics (#735)

Track all data from the osquery_schedule table on a per-host basis. This
data is now returned when retrieving host details in the API.
---
 server/datastore/datastore.go                 |   1 +
 server/datastore/datastore_hosts.go           | 119 ++++++++++++
 .../datastore/datastore_scheduled_queries.go  |   8 +-
 server/datastore/mysql/hosts.go               | 128 ++++++++++++-
 .../20210506095025_AddScheduledQueryStats.go  |  40 ++++
 server/datastore/mysql/scheduled_queries.go   |   2 +-
 server/kolide/hosts.go                        |   3 +
 server/kolide/packs.go                        |   6 +
 server/kolide/scheduled_queries.go            |  23 +++
 server/service/service_osquery.go             |  74 ++++++++
 server/service/service_osquery_test.go        | 172 ++++++++++++++++++
 server/test/new_objects.go                    |   9 +-
 12 files changed, 578 insertions(+), 7 deletions(-)
 create mode 100644 server/datastore/mysql/migrations/tables/20210506095025_AddScheduledQueryStats.go

diff --git a/server/datastore/datastore.go b/server/datastore/datastore.go
index af0bd4beca..b7470e7a79 100644
--- a/server/datastore/datastore.go
+++ b/server/datastore/datastore.go
@@ -44,6 +44,7 @@ var TestFunctions = [...]func(*testing.T, kolide.Datastore){
 	testListHostsInLabel,
 	testListUniqueHostsInLabels,
 	testSaveHosts,
+	testSaveHostPackStats,
 	testDeleteHost,
 	testListHosts,
 	testListHostsFilterAdditional,
diff --git a/server/datastore/datastore_hosts.go b/server/datastore/datastore_hosts.go
index 7d3c8ff5b8..a00579ec98 100644
--- a/server/datastore/datastore_hosts.go
+++ b/server/datastore/datastore_hosts.go
@@ -92,6 +92,125 @@ func testSaveHosts(t *testing.T, ds kolide.Datastore) {
 	assert.Nil(t, host)
 }
 
+func testSaveHostPackStats(t *testing.T, ds kolide.Datastore) {
+	host, err := ds.NewHost(&kolide.Host{
+		DetailUpdateTime: time.Now(),
+		LabelUpdateTime:  time.Now(),
+		SeenTime:         time.Now(),
+		NodeKey:          "1",
+		UUID:             "1",
+		HostName:         "foo.local",
+		PrimaryIP:        "192.168.1.1",
+		PrimaryMac:       "30-65-EC-6F-C4-58",
+	})
+	require.NoError(t, err)
+	require.NotNil(t, host)
+
+	// Pack and query must exist for stats to save successfully
+	pack1 := test.NewPack(t, ds, "test1")
+	query1 := test.NewQuery(t, ds, "time", "select * from time", 0, true)
+	squery1 := test.NewScheduledQuery(t, ds, pack1.ID, query1.ID, 30, true, true, "time-scheduled")
+	stats1 := []kolide.ScheduledQueryStats{
+		{
+			ScheduledQueryName: squery1.Name,
+			ScheduledQueryID:   squery1.ID,
+			QueryName:          query1.Name,
+			PackName:           pack1.Name,
+			PackID:             pack1.ID,
+			AverageMemory:      8000,
+			Denylisted:         false,
+			Executions:         164,
+			Interval:           30,
+			LastExecuted:       time.Unix(1620325191, 0).UTC(),
+			OutputSize:         1337,
+			SystemTime:         150,
+			UserTime:           180,
+			WallTime:           0,
+		},
+	}
+
+	pack2 := test.NewPack(t, ds, "test2")
+	squery2 := test.NewScheduledQuery(t, ds, pack2.ID, query1.ID, 30, true, true, "time-scheduled")
+	query2 := test.NewQuery(t, ds, "processes", "select * from processes", 0, true)
+	squery3 := test.NewScheduledQuery(t, ds, pack2.ID, query2.ID, 30, true, true, "processes")
+	stats2 := []kolide.ScheduledQueryStats{
+		{
+			ScheduledQueryName: squery2.Name,
+			ScheduledQueryID:   squery2.ID,
+			QueryName:          query1.Name,
+			PackName:           pack2.Name,
+			PackID:             pack2.ID,
+			AverageMemory:      431,
+			Denylisted:         true,
+			Executions:         1,
+			Interval:           30,
+			LastExecuted:       time.Unix(980943843, 0).UTC(),
+			OutputSize:         134,
+			SystemTime:         1656,
+			UserTime:           18453,
+			WallTime:           10,
+		},
+		{
+			ScheduledQueryName: squery3.Name,
+			ScheduledQueryID:   squery3.ID,
+			QueryName:          query2.Name,
+			PackName:           pack2.Name,
+			PackID:             pack2.ID,
+			AverageMemory:      8000,
+			Denylisted:         false,
+			Executions:         164,
+			Interval:           30,
+			LastExecuted:       time.Unix(1620325191, 0).UTC(),
+			OutputSize:         1337,
+			SystemTime:         150,
+			UserTime:           180,
+			WallTime:           0,
+		},
+	}
+
+	host.PackStats = []kolide.PackStats{
+		{
+			PackName: "test1",
+			// Append an additional entry to be sure that receiving stats for a
+			// now-deleted query doesn't break saving. This extra entry should
+			// not be returned on loading the host.
+			QueryStats: append(stats1, kolide.ScheduledQueryStats{PackName: "foo", ScheduledQueryName: "bar"}),
+		},
+		{
+			PackName:   "test2",
+			QueryStats: stats2,
+		},
+	}
+
+	require.NoError(t, ds.SaveHost(host))
+
+	host, err = ds.Host(host.ID)
+	require.NoError(t, err)
+
+	require.Len(t, host.PackStats, 2)
+	sort.Slice(host.PackStats, func(i, j int) bool {
+		return host.PackStats[i].PackName < host.PackStats[j].PackName
+	})
+	assert.Equal(t, host.PackStats[0].PackName, "test1")
+	assert.ElementsMatch(t, host.PackStats[0].QueryStats, stats1)
+	assert.Equal(t, host.PackStats[1].PackName, "test2")
+	assert.ElementsMatch(t, host.PackStats[1].QueryStats, stats2)
+
+	// Set to nil should not overwrite
+	host.PackStats = nil
+	require.NoError(t, ds.SaveHost(host))
+	host, err = ds.Host(host.ID)
+	require.NoError(t, err)
+	require.Len(t, host.PackStats, 2)
+
+	// Set to empty should make it empty
+	host.PackStats = []kolide.PackStats{}
+	require.NoError(t, ds.SaveHost(host))
+	host, err = ds.Host(host.ID)
+	require.NoError(t, err)
+	require.Len(t, host.PackStats, 0)
+}
+
 func testDeleteHost(t *testing.T, ds kolide.Datastore) {
 	host, err := ds.NewHost(&kolide.Host{
 		DetailUpdateTime: time.Now(),
diff --git a/server/datastore/datastore_scheduled_queries.go b/server/datastore/datastore_scheduled_queries.go
index caf586c2e0..3525930f4c 100644
--- a/server/datastore/datastore_scheduled_queries.go
+++ b/server/datastore/datastore_scheduled_queries.go
@@ -84,9 +84,11 @@ func testNewScheduledQuery(t *testing.T, ds kolide.Datastore) {
 	query, err := ds.NewScheduledQuery(&kolide.ScheduledQuery{
 		PackID:  p1.ID,
 		QueryID: q1.ID,
+		Name:    "foo-scheduled",
 	})
 	require.Nil(t, err)
-	assert.Equal(t, "foo", query.Name)
+	assert.Equal(t, "foo", query.QueryName)
+	assert.Equal(t, "foo-scheduled", query.Name)
 	assert.Equal(t, "select * from time;", query.Query)
 }
 
@@ -94,7 +96,7 @@ func testScheduledQuery(t *testing.T, ds kolide.Datastore) {
 	u1 := test.NewUser(t, ds, "Admin", "admin", "admin@kolide.co", true)
 	q1 := test.NewQuery(t, ds, "foo", "select * from time;", u1.ID, true)
 	p1 := test.NewPack(t, ds, "baz")
-	sq1 := test.NewScheduledQuery(t, ds, p1.ID, q1.ID, 60, false, false)
+	sq1 := test.NewScheduledQuery(t, ds, p1.ID, q1.ID, 60, false, false, "")
 
 	query, err := ds.ScheduledQuery(sq1.ID)
 	require.Nil(t, err)
@@ -118,7 +120,7 @@ func testDeleteScheduledQuery(t *testing.T, ds kolide.Datastore) {
 	u1 := test.NewUser(t, ds, "Admin", "admin", "admin@kolide.co", true)
 	q1 := test.NewQuery(t, ds, "foo", "select * from time;", u1.ID, true)
 	p1 := test.NewPack(t, ds, "baz")
-	sq1 := test.NewScheduledQuery(t, ds, p1.ID, q1.ID, 60, false, false)
+	sq1 := test.NewScheduledQuery(t, ds, p1.ID, q1.ID, 60, false, false, "")
 
 	query, err := ds.ScheduledQuery(sq1.ID)
 	require.Nil(t, err)
diff --git a/server/datastore/mysql/hosts.go b/server/datastore/mysql/hosts.go
index e23ee4cb79..0392761dfa 100644
--- a/server/datastore/mysql/hosts.go
+++ b/server/datastore/mysql/hosts.go
@@ -3,6 +3,7 @@ package mysql
 import (
 	"database/sql"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/cenkalti/backoff/v4"
@@ -129,6 +130,124 @@ func (d *Datastore) SaveHost(host *kolide.Host) error {
 		return errors.Wrapf(err, "save host with id %d", host.ID)
 	}
 
+	// Save host pack stats only if it is non-nil. Empty stats should be
+	// represented by an empty slice.
+	if host.PackStats != nil {
+		if err := d.saveHostPackStats(host); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (d *Datastore) saveHostPackStats(host *kolide.Host) error {
+	if err := d.withRetryTxx(func(tx *sqlx.Tx) error {
+		sql := `
+			DELETE FROM scheduled_query_stats
+			WHERE host_id = ?
+		`
+		if _, err := tx.Exec(sql, host.ID); err != nil {
+			return errors.Wrap(err, "delete old stats")
+		}
+
+		// Bulk insert software entries
+		var args []interface{}
+		queryCount := 0
+		for _, pack := range host.PackStats {
+			for _, query := range pack.QueryStats {
+				queryCount++
+
+				args = append(args,
+					query.PackName,
+					query.ScheduledQueryName,
+					host.ID,
+					query.AverageMemory,
+					query.Denylisted,
+					query.Executions,
+					query.Interval,
+					query.LastExecuted,
+					query.OutputSize,
+					query.SystemTime,
+					query.UserTime,
+					query.WallTime,
+				)
+			}
+		}
+
+		if queryCount == 0 {
+			return nil
+		}
+
+		values := strings.TrimSuffix(strings.Repeat("((SELECT sq.id FROM scheduled_queries sq JOIN packs p ON (sq.pack_id = p.id) WHERE p.name = ? AND sq.name = ?),?,?,?,?,?,?,?,?,?,?),", queryCount), ",")
+		sql = fmt.Sprintf(`
+			INSERT IGNORE INTO scheduled_query_stats (
+				scheduled_query_id,
+				host_id,
+				average_memory,
+				denylisted,
+				executions,
+				schedule_interval,
+				last_executed,
+				output_size,
+				system_time,
+				user_time,
+				wall_time
+			)
+			VALUES %s
+		`, values)
+		if _, err := tx.Exec(sql, args...); err != nil {
+			return errors.Wrap(err, "insert pack stats")
+		}
+
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "save pack stats")
+	}
+	return nil
+}
+
+func (d *Datastore) loadHostPackStats(host *kolide.Host) error {
+	sql := `
+SELECT
+	sqs.scheduled_query_id,
+	sqs.average_memory,
+	sqs.denylisted,
+	sqs.executions,
+	sqs.schedule_interval,
+	sqs.last_executed,
+	sqs.output_size,
+	sqs.system_time,
+	sqs.user_time,
+	sqs.wall_time,
+	sq.name AS scheduled_query_name,
+	sq.id AS scheduled_query_id,
+	sq.query_name AS query_name,
+	p.name AS pack_name,
+	p.id as pack_id
+FROM scheduled_query_stats sqs
+	JOIN scheduled_queries sq ON (sqs.scheduled_query_id = sq.id)
+	JOIN packs p ON (sq.pack_id = p.id)  
+WHERE host_id = ?
+`
+	var stats []kolide.ScheduledQueryStats
+	if err := d.db.Select(&stats, sql, host.ID); err != nil {
+		return errors.Wrap(err, "load pack stats")
+	}
+
+	packs := map[uint]kolide.PackStats{}
+	for _, query := range stats {
+		pack := packs[query.PackID]
+		pack.PackName = query.PackName
+		pack.PackID = query.PackID
+		pack.QueryStats = append(pack.QueryStats, query)
+		packs[pack.PackID] = pack
+	}
+
+	for _, pack := range packs {
+		host.PackStats = append(host.PackStats, pack)
+	}
+
 	return nil
 }
 
@@ -148,7 +267,10 @@ func (d *Datastore) Host(id uint) (*kolide.Host, error) {
 	host := &kolide.Host{}
 	err := d.db.Get(host, sqlStatement, id)
 	if err != nil {
-		return nil, errors.Wrap(err, "getting host by id")
+		return nil, errors.Wrap(err, "get host by id")
+	}
+	if err := d.loadHostPackStats(host); err != nil {
+		return nil, err
 	}
 
 	return host, nil
@@ -605,5 +727,9 @@ func (d *Datastore) HostByIdentifier(identifier string) (*kolide.Host, error) {
 		return nil, errors.Wrap(err, "get host by identifier")
 	}
 
+	if err := d.loadHostPackStats(host); err != nil {
+		return nil, err
+	}
+
 	return host, nil
 }
diff --git a/server/datastore/mysql/migrations/tables/20210506095025_AddScheduledQueryStats.go b/server/datastore/mysql/migrations/tables/20210506095025_AddScheduledQueryStats.go
new file mode 100644
index 0000000000..119aa7f9d3
--- /dev/null
+++ b/server/datastore/mysql/migrations/tables/20210506095025_AddScheduledQueryStats.go
@@ -0,0 +1,40 @@
+package tables
+
+import (
+	"database/sql"
+
+	"github.com/pkg/errors"
+)
+
+func init() {
+	MigrationClient.AddMigration(Up_20210506095025, Down_20210506095025)
+}
+
+func Up_20210506095025(tx *sql.Tx) error {
+	sql := `
+		CREATE TABLE scheduled_query_stats (
+			host_id int unsigned NOT NULL,
+			scheduled_query_id int unsigned NOT NULL,
+			average_memory int,
+			denylisted tinyint(1),
+			executions int,
+			schedule_interval int,
+			last_executed timestamp,
+			output_size int,
+			system_time int,
+			user_time int,
+			wall_time int,
+			PRIMARY KEY (host_id, scheduled_query_id),
+			FOREIGN KEY (host_id) REFERENCES hosts (id),
+			FOREIGN KEY (scheduled_query_id) REFERENCES scheduled_queries (id)
+		)
+	`
+	if _, err := tx.Exec(sql); err != nil {
+		return errors.Wrap(err, "create scheduled_query_stats")
+	}
+	return nil
+}
+
+func Down_20210506095025(tx *sql.Tx) error {
+	return nil
+}
diff --git a/server/datastore/mysql/scheduled_queries.go b/server/datastore/mysql/scheduled_queries.go
index 151c862ecd..0bdbaee3fb 100644
--- a/server/datastore/mysql/scheduled_queries.go
+++ b/server/datastore/mysql/scheduled_queries.go
@@ -87,7 +87,7 @@ func (d *Datastore) NewScheduledQuery(sq *kolide.ScheduledQuery, opts ...kolide.
 	}
 
 	sq.Query = metadata[0].Query
-	sq.Name = metadata[0].Name
+	sq.QueryName = metadata[0].Name
 
 	return sq, nil
 }
diff --git a/server/kolide/hosts.go b/server/kolide/hosts.go
index 2ac1498d23..6877b2469d 100644
--- a/server/kolide/hosts.go
+++ b/server/kolide/hosts.go
@@ -145,6 +145,9 @@ type Host struct {
 	LoggerTLSPeriod           uint                `json:"logger_tls_period" db:"logger_tls_period"`
 	Additional                *json.RawMessage    `json:"additional,omitempty" db:"additional"`
 	EnrollSecretName          string              `json:"enroll_secret_name" db:"enroll_secret_name"`
+
+	// Loaded via JOIN in DB
+	PackStats []PackStats `json:"pack_stats"`
 }
 
 // HostDetail provides the full host metadata along with associated labels and
diff --git a/server/kolide/packs.go b/server/kolide/packs.go
index 88475eee7d..c614fb4928 100644
--- a/server/kolide/packs.go
+++ b/server/kolide/packs.go
@@ -176,3 +176,9 @@ type PackTarget struct {
 	PackID uint
 	Target
 }
+
+type PackStats struct {
+	PackID     uint                  `json:"pack_id,omitempty"`
+	PackName   string                `json:"pack_name,omitempty"`
+	QueryStats []ScheduledQueryStats `json:"query_stats"`
+}
diff --git a/server/kolide/scheduled_queries.go b/server/kolide/scheduled_queries.go
index e20dd9af0b..c2f8084128 100644
--- a/server/kolide/scheduled_queries.go
+++ b/server/kolide/scheduled_queries.go
@@ -2,6 +2,7 @@ package kolide
 
 import (
 	"context"
+	"time"
 
 	"gopkg.in/guregu/null.v3"
 )
@@ -51,3 +52,25 @@ type ScheduledQueryPayload struct {
 	Shard    *null.Int `json:"shard"`
 	Denylist *bool     `json:"denylist"`
 }
+
+type ScheduledQueryStats struct {
+	ScheduledQueryName string `json:"scheduled_query_name,omitempty" db:"scheduled_query_name"`
+	ScheduledQueryID   uint   `json:"scheduled_query_id,omitempty" db:"scheduled_query_id"`
+
+	QueryName string `json:"query_name,omitempty" db:"query_name"`
+
+	PackName string `json:"pack_name,omitempty" db:"pack_name"`
+	PackID   uint   `json:"pack_id,omitempty" db:"pack_id"`
+
+	// From osquery directly
+	AverageMemory int  `json:"average_memory" db:"average_memory"`
+	Denylisted    bool `json:"denylisted" db:"denylisted"`
+	Executions    int  `json:"executions" db:"executions"`
+	// Note schedule_interval is used for DB since "interval" is a reserved word in MySQL
+	Interval     int       `json:"interval" db:"schedule_interval"`
+	LastExecuted time.Time `json:"last_executed" db:"last_executed"`
+	OutputSize   int       `json:"output_size" db:"output_size"`
+	SystemTime   int       `json:"system_time" db:"system_time"`
+	UserTime     int       `json:"user_time" db:"user_time"`
+	WallTime     int       `json:"wall_time" db:"wall_time"`
+}
diff --git a/server/service/service_osquery.go b/server/service/service_osquery.go
index 8cc1aee194..5b9893570c 100644
--- a/server/service/service_osquery.go
+++ b/server/service/service_osquery.go
@@ -747,6 +747,80 @@ FROM python_packages;
 		Platforms:  []string{"windows"},
 		IngestFunc: ingestSoftware,
 	},
+	"scheduled_query_stats": {
+		Query: `
+			SELECT *,
+				(SELECT value from osquery_flags where name = 'pack_delimiter') AS delimiter
+			FROM osquery_schedule
+`,
+		IngestFunc: func(logger log.Logger, host *kolide.Host, rows []map[string]string) error {
+			packs := map[string][]kolide.ScheduledQueryStats{}
+
+			for _, row := range rows {
+				providedName := row["name"]
+				if providedName == "" {
+					level.Debug(logger).Log(
+						"msg", "host reported scheduled query with empty name",
+						"host", host.HostName,
+					)
+					continue
+				}
+				delimiter := row["delimiter"]
+				if delimiter == "" {
+					level.Debug(logger).Log(
+						"msg", "host reported scheduled query with empty delimiter",
+						"host", host.HostName,
+					)
+					continue
+				}
+
+				// Split with a limit of 2 in case query name includes the
+				// delimiter. Not much we can do if pack name includes the
+				// delimiter.
+				trimmedName := strings.TrimPrefix(providedName, "pack"+delimiter)
+				parts := strings.SplitN(trimmedName, delimiter, 2)
+				if len(parts) != 2 {
+					level.Debug(logger).Log(
+						"msg", "could not split pack and query names",
+						"host", host.HostName,
+						"name", providedName,
+						"delimiter", delimiter,
+					)
+					continue
+				}
+				packName, scheduledName := parts[0], parts[1]
+
+				stats := kolide.ScheduledQueryStats{
+					ScheduledQueryName: scheduledName,
+					PackName:           packName,
+					AverageMemory:      cast.ToInt(row["average_memory"]),
+					Denylisted:         cast.ToBool(row["denylisted"]),
+					Executions:         cast.ToInt(row["executions"]),
+					Interval:           cast.ToInt(row["interval"]),
+					// Cast to int first to allow cast.ToTime to interpret the unix timestamp.
+					LastExecuted: time.Unix(cast.ToInt64(row["last_executed"]), 0).UTC(),
+					OutputSize:   cast.ToInt(row["output_size"]),
+					SystemTime:   cast.ToInt(row["system_time"]),
+					UserTime:     cast.ToInt(row["user_time"]),
+					WallTime:     cast.ToInt(row["wall_time"]),
+				}
+				packs[packName] = append(packs[packName], stats)
+			}
+
+			host.PackStats = []kolide.PackStats{}
+			for packName, stats := range packs {
+				host.PackStats = append(
+					host.PackStats,
+					kolide.PackStats{
+						PackName:   packName,
+						QueryStats: stats,
+					},
+				)
+			}
+
+			return nil
+		},
+	},
 }
 
 func ingestSoftware(logger log.Logger, host *kolide.Host, rows []map[string]string) error {
diff --git a/server/service/service_osquery_test.go b/server/service/service_osquery_test.go
index 072b83b42b..23103676d7 100644
--- a/server/service/service_osquery_test.go
+++ b/server/service/service_osquery_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -971,6 +972,177 @@ func TestDetailQueryNetworkInterfaces(t *testing.T) {
 	assert.Equal(t, "00:00:00:00:00:00", host.PrimaryMac)
 }
 
+func TestDetailQueryScheduledQueryStats(t *testing.T) {
+	host := kolide.Host{}
+
+	ingest := detailQueries["scheduled_query_stats"].IngestFunc
+
+	assert.NoError(t, ingest(log.NewNopLogger(), &host, nil))
+	assert.Len(t, host.PackStats, 0)
+
+	resJSON := `
+[
+  {
+    "average_memory":"33",
+    "delimiter":"/",
+    "denylisted":"0",
+    "executions":"1",
+    "interval":"33",
+    "last_executed":"1620325191",
+    "name":"pack/pack-2/time",
+    "output_size":"",
+    "query":"SELECT * FROM time",
+    "system_time":"100",
+    "user_time":"60",
+    "wall_time":"180"
+  },
+  {
+    "average_memory":"8000",
+    "delimiter":"/",
+    "denylisted":"0",
+    "executions":"164",
+    "interval":"30",
+    "last_executed":"1620325191",
+    "name":"pack/test/osquery info",
+    "output_size":"1337",
+    "query":"SELECT * FROM osquery_info",
+    "system_time":"150",
+    "user_time":"180",
+    "wall_time":"0"
+  },
+  {
+    "average_memory":"50400",
+    "delimiter":"/",
+    "denylisted":"1",
+    "executions":"188",
+    "interval":"30",
+    "last_executed":"1620325203",
+    "name":"pack/test/processes?",
+    "output_size":"",
+    "query":"SELECT * FROM processes",
+    "system_time":"140",
+    "user_time":"190",
+    "wall_time":"1"
+  },
+  {
+    "average_memory":"0",
+    "delimiter":"/",
+    "denylisted":"0",
+    "executions":"1",
+    "interval":"3600",
+    "last_executed":"1620323381",
+    "name":"pack/test/processes?-1",
+    "output_size":"",
+    "query":"SELECT * FROM processes",
+    "system_time":"0",
+    "user_time":"0",
+    "wall_time":"0"
+  },
+  {
+    "average_memory":"0",
+    "delimiter":"/",
+    "denylisted":"0",
+    "executions":"105",
+    "interval":"47",
+    "last_executed":"1620325190",
+    "name":"pack/test/time",
+    "output_size":"",
+    "query":"SELECT * FROM time",
+    "system_time":"70",
+    "user_time":"50",
+    "wall_time":"1"
+  }
+]
+`
+
+	var rows []map[string]string
+	require.NoError(t, json.Unmarshal([]byte(resJSON), &rows))
+
+	assert.NoError(t, ingest(log.NewNopLogger(), &host, rows))
+	assert.Len(t, host.PackStats, 2)
+	sort.Slice(host.PackStats, func(i, j int) bool {
+		return host.PackStats[i].PackName < host.PackStats[j].PackName
+	})
+	assert.Equal(t, host.PackStats[0].PackName, "pack-2")
+	assert.ElementsMatch(t, host.PackStats[0].QueryStats,
+		[]kolide.ScheduledQueryStats{
+			{
+				ScheduledQueryName: "time",
+				PackName:           "pack-2",
+				AverageMemory:      33,
+				Denylisted:         false,
+				Executions:         1,
+				Interval:           33,
+				LastExecuted:       time.Unix(1620325191, 0).UTC(),
+				OutputSize:         0,
+				SystemTime:         100,
+				UserTime:           60,
+				WallTime:           180,
+			},
+		},
+	)
+	assert.Equal(t, host.PackStats[1].PackName, "test")
+	assert.ElementsMatch(t, host.PackStats[1].QueryStats,
+		[]kolide.ScheduledQueryStats{
+			{
+				ScheduledQueryName: "osquery info",
+				PackName:           "test",
+				AverageMemory:      8000,
+				Denylisted:         false,
+				Executions:         164,
+				Interval:           30,
+				LastExecuted:       time.Unix(1620325191, 0).UTC(),
+				OutputSize:         1337,
+				SystemTime:         150,
+				UserTime:           180,
+				WallTime:           0,
+			},
+			{
+				ScheduledQueryName: "processes?",
+				PackName:           "test",
+				AverageMemory:      50400,
+				Denylisted:         true,
+				Executions:         188,
+				Interval:           30,
+				LastExecuted:       time.Unix(1620325203, 0).UTC(),
+				OutputSize:         0,
+				SystemTime:         140,
+				UserTime:           190,
+				WallTime:           1,
+			},
+			{
+				ScheduledQueryName: "processes?-1",
+				PackName:           "test",
+				AverageMemory:      0,
+				Denylisted:         false,
+				Executions:         1,
+				Interval:           3600,
+				LastExecuted:       time.Unix(1620323381, 0).UTC(),
+				OutputSize:         0,
+				SystemTime:         0,
+				UserTime:           0,
+				WallTime:           0,
+			},
+			{
+				ScheduledQueryName: "time",
+				PackName:           "test",
+				AverageMemory:      0,
+				Denylisted:         false,
+				Executions:         105,
+				Interval:           47,
+				LastExecuted:       time.Unix(1620325190, 0).UTC(),
+				OutputSize:         0,
+				SystemTime:         70,
+				UserTime:           50,
+				WallTime:           1,
+			},
+		},
+	)
+
+	assert.NoError(t, ingest(log.NewNopLogger(), &host, nil))
+	assert.Len(t, host.PackStats, 0)
+}
+
 func TestNewDistributedQueryCampaign(t *testing.T) {
 	ds := &mock.Store{
 		AppConfigStore: mock.AppConfigStore{
diff --git a/server/test/new_objects.go b/server/test/new_objects.go
index 44124ecc1a..c78ac7220d 100644
--- a/server/test/new_objects.go
+++ b/server/test/new_objects.go
@@ -9,10 +9,14 @@ import (
 )
 
 func NewQuery(t *testing.T, ds kolide.Datastore, name, q string, authorID uint, saved bool) *kolide.Query {
+	authorPtr := &authorID
+	if authorID == 0 {
+		authorPtr = nil
+	}
 	query, err := ds.NewQuery(&kolide.Query{
 		Name:     name,
 		Query:    q,
-		AuthorID: &authorID,
+		AuthorID: authorPtr,
 		Saved:    saved,
 	})
 	require.Nil(t, err)
@@ -122,8 +126,9 @@ func NewUser(t *testing.T, ds kolide.Datastore, name, username, email string, ad
 	return u
 }
 
-func NewScheduledQuery(t *testing.T, ds kolide.Datastore, pid, qid, interval uint, snapshot, removed bool) *kolide.ScheduledQuery {
+func NewScheduledQuery(t *testing.T, ds kolide.Datastore, pid, qid, interval uint, snapshot, removed bool, name string) *kolide.ScheduledQuery {
 	sq, err := ds.NewScheduledQuery(&kolide.ScheduledQuery{
+		Name:     name,
 		PackID:   pid,
 		QueryID:  qid,
 		Interval: interval,

From eaf576fda2165c88f14214e01baa347094e786e8 Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Fri, 7 May 2021 21:22:03 +0900
Subject: [PATCH 13/51] query-library-get-system-uptime (#736)

---
 handbook/queries/README.md            |  1 +
 handbook/queries/get-system-uptime.md | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 handbook/queries/get-system-uptime.md

diff --git a/handbook/queries/README.md b/handbook/queries/README.md
index 5ee5c5b46d..31682612b9 100644
--- a/handbook/queries/README.md
+++ b/handbook/queries/README.md
@@ -27,6 +27,7 @@ Fleet's standard query library includes a growing collection of useful queries f
 - [Get OS version](./get-os-version.md) (macOS, Linux, Windows, FreeBSD)
 - [Get mounts](./get-mounts.md) (macOS, Linux)
 - [Get startup items](./get-startup-items.md) (macOS, Linux, Windows, FreeBSD)
+- [Get system uptime](./get-system-uptime.md) (macOS, Linux, Windows, FreeBSD)
 
 ### Contributors
 
diff --git a/handbook/queries/get-system-uptime.md b/handbook/queries/get-system-uptime.md
new file mode 100644
index 0000000000..ccc42b24c0
--- /dev/null
+++ b/handbook/queries/get-system-uptime.md
@@ -0,0 +1,16 @@
+# Get system uptime
+
+Shows the system uptime.
+
+### Support
+macOS, Linux, Windows, FreeBSD
+
+### Query
+```sql
+SELECT * FROM uptime;
+```
+### Purpose
+Informational
+
+### Remediation
+N/A
\ No newline at end of file

From 5af0d6b8708ab637a1a5e3016a5726353878de9e Mon Sep 17 00:00:00 2001
From: gillespi314 <73313222+gillespi314@users.noreply.github.com>
Date: Fri, 7 May 2021 13:54:29 -0500
Subject: [PATCH 14/51] Update website styling (#715)

* Update website styling

* Convert ellipse margin from rem to px

* Adjust padding to match neighboring card element

* Fix linting errors

* Remove unneeded div
---
 .../assets/styles/bootstrap-overrides.less    |  21 +-
 website/assets/styles/layout.less             |  40 ++++
 website/assets/styles/pages/get-started.less  |  28 +--
 website/assets/styles/pages/homepage.less     |   3 -
 website/assets/styles/pages/pricing.less      |  30 +--
 website/views/layouts/layout.ejs              |  14 +-
 website/views/pages/get-started.ejs           |   2 +-
 website/views/pages/homepage.ejs              | 126 ++++++------
 website/views/pages/pricing.ejs               | 179 +++++++-----------
 9 files changed, 225 insertions(+), 218 deletions(-)

diff --git a/website/assets/styles/bootstrap-overrides.less b/website/assets/styles/bootstrap-overrides.less
index 5ff72e033f..f5c0f36a76 100644
--- a/website/assets/styles/bootstrap-overrides.less
+++ b/website/assets/styles/bootstrap-overrides.less
@@ -51,7 +51,6 @@ footer {
   line-height: 24px;
 }
 
-
 .btn {
   font-family: @header-font;
   font-weight: 700;
@@ -79,25 +78,25 @@ footer {
   }
 
   &.btn-primary {
-    background-color: #EF7182;
-    border-color: #EF7182;
+    background-color: #ff5c83;
+    border-color: #ff5c83;
     &:hover {
-      background-color: darken(#EF7182, 10%);
-      border-color: darken(#EF7182, 10%);
+      background-color: darken(#ff5c83, 10%);
+      border-color: darken(#ff5c83, 10%);
     }
   }
   &.btn-info {
-    background-color: #6B6CFA;
-    border-color: #6B6CFA;
+    background-color: #6b6cfa;
+    border-color: #6b6cfa;
     &:hover {
-      background-color: darken(#6B6CFA, 10%);
-      border-color: darken(#6B6CFA, 10%);
+      background-color: darken(#6b6cfa, 10%);
+      border-color: darken(#6b6cfa, 10%);
     }
   }
 }
 
 .card {
-  box-shadow: 0px 4px 10px rgba(0, 0, 0, 0.1);
+  box-shadow: 0px 6px 20px rgba(0, 0, 0, 0.05);
 }
 
 .dropdown:hover > .dropdown-menu {
@@ -108,7 +107,7 @@ footer {
 }
 
 .dropdown-menu {
-  left: 16px !important;//lesshint-disable-line importantRule
+  left: 16px !important; //lesshint-disable-line importantRule
   min-width: 0;
   margin: 0;
 }
diff --git a/website/assets/styles/layout.less b/website/assets/styles/layout.less
index d013930be7..005aa1cc77 100644
--- a/website/assets/styles/layout.less
+++ b/website/assets/styles/layout.less
@@ -80,6 +80,24 @@ html, body {
     background-color: #f1f0ff;
     font-weight: @bold;
   }
+  .menu-link {
+    color: #192147;
+    font-weight: @bold;
+    svg {
+      path {
+        fill: #192147;
+      }
+    }
+  }
+  .menu-link:hover {
+    color: #6a67fe;
+
+    svg {
+      path {
+        fill: #6a67fe;
+      }
+    }
+  }
 }
 
 [purpose='page-header'].header {
@@ -141,6 +159,24 @@ html, body {
     background-color: #f1f0ff;
     font-weight: @bold;
   }
+  .menu-link {
+    color: #192147;
+    font-weight: @bold;
+    svg {
+      path {
+        fill: #192147;
+      }
+    }
+  }
+  .menu-link:hover {
+    color: #6a67fe;
+
+    svg {
+      path {
+        fill: #6a67fe;
+      }
+    }
+  }
 }
 
 [purpose='page-footer'] {
@@ -177,6 +213,10 @@ body.detected-mobile {
   // …
 }
 
+.dropdown:hover > .btn.btn-link {
+  color: #6a67fe;
+}
+
 @media (max-width: 1199px) {
   [purpose='page-wrap'] {
     padding-bottom: 230px;
diff --git a/website/assets/styles/pages/get-started.less b/website/assets/styles/pages/get-started.less
index d52f62c6dd..73bb9fcdea 100644
--- a/website/assets/styles/pages/get-started.less
+++ b/website/assets/styles/pages/get-started.less
@@ -9,7 +9,7 @@
     color: #6a67fe;
   }
   #primary-button {
-      color: #fff;
+    color: #fff;
   }
   #learn-more {
     background: #f9fafc;
@@ -33,6 +33,7 @@
       border-color: #f9fafc;
     }
   }
+
   #arrow {
     padding-right: 45px;
     cursor: pointer;
@@ -41,11 +42,11 @@
     color: #192147;
     font-weight: bold;
     user-select: none;
-    transition: 0.2s linear;
-    -o-transition: 0.2s linear;
-    -ms-transition: 0.2s linear;
-    -moz-transition: 0.2s linear;
-    -webkit-transition: 0.2s linear;
+    transition: 0.2s ease-in-out;
+    -o-transition: 0.2s ease-in-out;
+    -ms-transition: 0.2s ease-in-out;
+    -moz-transition: 0.2s ease-in-out;
+    -webkit-transition: 0.2s ease-in-out;
   }
 
   #arrow:before {
@@ -54,16 +55,21 @@
     position: absolute;
     top: 12px;
     left: 80%; // <--- here
+    transition: 0.2s ease-in-out;
+    -o-transition: 0.2s ease-in-out;
+    -ms-transition: 0.2s ease-in-out;
+    -moz-transition: 0.2s ease-in-out;
+    -webkit-transition: 0.2s ease-in-out;
     /*   opacity: 0; */
   }
 
   #arrow:hover:before {
     left: 82%; // <--- here
-    transition: 0.2s linear;
-    -o-transition: 0.2s linear;
-    -ms-transition: 0.2s linear;
-    -moz-transition: 0.2s linear;
-    -webkit-transition: 0.2s linear;
+    transition: 0.2s ease-in-out;
+    -o-transition: 0.2s ease-in-out;
+    -ms-transition: 0.2s ease-in-out;
+    -moz-transition: 0.2s ease-in-out;
+    -webkit-transition: 0.2s ease-in-out;
     /*   opacity:1; */
   }
 }
diff --git a/website/assets/styles/pages/homepage.less b/website/assets/styles/pages/homepage.less
index e7bad929d3..91867093cf 100644
--- a/website/assets/styles/pages/homepage.less
+++ b/website/assets/styles/pages/homepage.less
@@ -27,9 +27,6 @@
   .quote-mark {
     font-family: @header-font;
   }
-  .footer-fade {
-    background: linear-gradient(360deg, #201E43 0%, #353D62 100%);
-  }
   .log-destinations-container {
     display: flex;
     flex-wrap: wrap;
diff --git a/website/assets/styles/pages/pricing.less b/website/assets/styles/pages/pricing.less
index d58de5e90e..6adfce6e85 100644
--- a/website/assets/styles/pages/pricing.less
+++ b/website/assets/styles/pages/pricing.less
@@ -21,11 +21,6 @@
       border-color: #fff;
     }
   }
-  .card-body {
-    box-shadow: 0px 6px 20px rgba(0, 0, 0, 0.05);
-    border: 1px solid #e2e4ea;
-    border-radius: 0.75rem;
-  }
 
   #arrow {
     padding-right: 45px;
@@ -35,11 +30,11 @@
     color: #192147;
     font-weight: bold;
     user-select: none;
-    transition: 0.2s linear;
-    -o-transition: 0.2s linear;
-    -ms-transition: 0.2s linear;
-    -moz-transition: 0.2s linear;
-    -webkit-transition: 0.2s linear;
+    transition: 0.2s ease-in-out;
+    -o-transition: 0.2s ease-in-out;
+    -ms-transition: 0.2s ease-in-out;
+    -moz-transition: 0.2s ease-in-out;
+    -webkit-transition: 0.2s ease-in-out;
   }
 
   #arrow:before {
@@ -48,16 +43,21 @@
     position: absolute;
     top: 12px;
     left: 80%; // <--- here
+    transition: 0.2s ease-in-out;
+    -o-transition: 0.2s ease-in-out;
+    -ms-transition: 0.2s ease-in-out;
+    -moz-transition: 0.2s ease-in-out;
+    -webkit-transition: 0.2s ease-in-out;
     /*   opacity: 0; */
   }
 
   #arrow:hover:before {
     left: 82%; // <--- here
-    transition: 0.2s linear;
-    -o-transition: 0.2s linear;
-    -ms-transition: 0.2s linear;
-    -moz-transition: 0.2s linear;
-    -webkit-transition: 0.2s linear;
+    transition: 0.2s ease-in-out;
+    -o-transition: 0.2s ease-in-out;
+    -ms-transition: 0.2s ease-in-out;
+    -moz-transition: 0.2s ease-in-out;
+    -webkit-transition: 0.2s ease-in-out;
     /*   opacity:1; */
   }
 }
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index a6e9da0944..7a05335eb1 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -86,11 +86,13 @@
                 <a class="mobile-menu-item py-2 px-3" target="_blank" href="/contribute" data-text="Contribute">Contribute</a>
                 <a class="mobile-menu-item py-2 px-3" target="_blank" href="/hall-of-fame" data-text="Hall of fame">Hall of fame</a>
               </div>
-              <a href="/pricing" class="header-link d-flex align-items-center px-3 py-2 mb-4 text-decoration-none" style=" text-decoration: none; color: #192147; font-weight: 700;">Pricing</a>
-              <a href="/blog" class="header-link d-flex align-items-center px-3 py-2 mb-4 text-decoration-none" style=" text-decoration: none; color: #192147; font-weight: 700;">Blog</a>
-              <!-- <a href="/company/contact" class="header-link d-flex align-items-center px-3 py-2 mb-4 text-decoration-none" style=" text-decoration: none; color: #192147; font-weight: 700;">Contact</a> -->
-              <a target="_blank" href="https://github.com/fleetdm/fleet" class="header-link d-flex align-items-center px-3 py-2" style=" text-decoration: none; color: #192147; font-weight: 700;">
-                <img alt="A blue octocat icon representing the GitHub brand." src="/images/github-mark-blue-24x24@2x.png" style="width: 24px; font-weight: 700;" />
+              <a href="/pricing" class="menu-link d-flex align-items-center px-3 py-2 mb-4 text-decoration-none" style=" text-decoration: none; font-weight: 700;">Pricing</a>
+              <a href="/blog" class="menu-link d-flex align-items-center px-3 py-2 mb-4 text-decoration-none" style=" text-decoration: none; font-weight: 700;">Blog</a>
+              <!-- <a href="/company/contact" class="menu-link d-flex align-items-center px-3 py-2 mb-4 text-decoration-none" style=" text-decoration: none; color: #192147; font-weight: 700;">Contact</a> -->
+              <a target="_blank" href="https://github.com/fleetdm/fleet" class="menu-link d-flex align-items-center px-3 py-2" style=" text-decoration: none; font-weight: 700;">
+                <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+                  <path fill-rule="evenodd" clip-rule="evenodd" d="M11.9633 0.5C5.3578 0.5 0 5.8578 0 12.4633C0 17.7477 3.44954 22.2248 8.14679 23.8394C8.73394 23.9128 8.95413 23.5459 8.95413 23.2523C8.95413 22.9587 8.95413 22.2248 8.95413 21.1972C5.65138 21.9312 4.91743 19.5826 4.91743 19.5826C4.40367 18.1881 3.59633 17.8211 3.59633 17.8211C2.49541 17.0872 3.66972 17.0872 3.66972 17.0872C4.84404 17.1606 5.50459 18.3349 5.50459 18.3349C6.6055 20.1697 8.29358 19.656 8.95413 19.3624C9.02752 18.555 9.3945 18.0413 9.68807 17.7477C7.04587 17.4541 4.25688 16.4266 4.25688 11.8028C4.25688 10.4817 4.69725 9.45413 5.50459 8.57339C5.43119 8.35321 4.99083 7.1055 5.65138 5.49083C5.65138 5.49083 6.6789 5.19725 8.95413 6.73853C9.90826 6.44495 10.9358 6.37156 11.9633 6.37156C12.9908 6.37156 14.0183 6.51835 14.9725 6.73853C17.2477 5.19725 18.2752 5.49083 18.2752 5.49083C18.9358 7.1055 18.4954 8.35321 18.422 8.64679C19.156 9.45413 19.6697 10.555 19.6697 11.8761C19.6697 16.5 16.8807 17.4541 14.2385 17.7477C14.6789 18.1147 15.0459 18.8486 15.0459 19.9495C15.0459 21.5642 15.0459 22.8119 15.0459 23.2523C15.0459 23.5459 15.2661 23.9128 15.8532 23.8394C20.6239 22.2248 24 17.7477 24 12.4633C23.9266 5.8578 18.5688 0.5 11.9633 0.5Z" fill="#192147"/>
+                </svg>
                 <span class="ml-2">GitHub</span>
               </a>
             </div>
@@ -98,7 +100,7 @@
         </div>
         <div class="d-none d-lg-flex">
           <div class="dropdown px-3 py-2 mr-4">
-            <button style="font-size: 16px; text-decoration: none;" class="header-btn btn btn-link p-0 m-0" type="button" id="dropdownMenuButton">
+            <button style="font-size: 16px; text-decoration: none;" class="header-btn btn btn-link p-0 m-0 dropdown-label" type="button" id="dropdownMenuButton">
               Get started
             </button>
             <div style="border-radius: 8px;" class="dropdown-menu dropdown-container p-2" aria-labelledby="dropdownMenuButton">
diff --git a/website/views/pages/get-started.ejs b/website/views/pages/get-started.ejs
index e8e3269d01..6ca5e76182 100644
--- a/website/views/pages/get-started.ejs
+++ b/website/views/pages/get-started.ejs
@@ -1,5 +1,5 @@
 <div id="get-started">
-  <div class="footer-fade pb-5">
+  <div class="pb-5">
     <div
       style="max-width: 1260px"
       class="container-fluid pt-5 px-4 px-sm-5 mx-auto"
diff --git a/website/views/pages/homepage.ejs b/website/views/pages/homepage.ejs
index 11dfd62d8a..bba3dea08e 100644
--- a/website/views/pages/homepage.ejs
+++ b/website/views/pages/homepage.ejs
@@ -134,71 +134,69 @@
       </div>
     </div>
   </div>
-  <div class="footer-fade pb-5">
-    <div style="max-width: 1260px;" class="container-fluid pt-5 px-4 px-sm-5 mx-auto">
-      <% /*
-      <div style="max-width: 800px; color: #fff;" class="py-5 mx-auto">
-        <h2 class="text-center mb-4">FAQ</h2>
-        <div class="mb-5">
-          <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
-            <p id="faq__question1" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer1" aria-controls="faq__answer1">
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit?
-              <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
-            </p>
-            <p id="faq__answer1" class="collapse" aria-labelledby="faq__question1">
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-            </p>
-          </div>
-          <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
-            <p id="faq__question2" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer2" aria-controls="faq__answer2">
-              Mauris viverra tempus nisl, sed varius leo volutpat sit amet?
-              <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
-            </p>
-            <p id="faq__answer2" class="collapse" aria-labelledby="faq__question2">
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-            </p>
-          </div>
-          <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
-            <p id="faq__question3" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer3" aria-controls="faq__answer3">
-              Mauris viverra tempus nisl, sed varius leo volutpat sit amet?
-              <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
-            </p>
-            <p id="faq__answer3" class="collapse" aria-labelledby="faq__question3">
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-            </p>
-          </div>
-          <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
-            <p id="faq__question4" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer4" aria-controls="faq__answer4">
-              Mauris viverra tempus nisl, sed varius leo volutpat sit amet?
-              <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
-            </p>
-            <p id="faq__answer4" class="collapse" aria-labelledby="faq__question4">
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-            </p>
-          </div>
-          <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
-            <p id="faq__question5" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer5" aria-controls="faq__answer5">
-              Mauris viverra tempus nisl, sed varius leo volutpat sit amet?
-              <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
-            </p>
-            <p id="faq__answer5" class="collapse" aria-labelledby="faq__question5">
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-            </p>
-          </div>
-          <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
-            <p id="faq__question6" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer6" aria-controls="faq__answer6">
-              Lorem ipsum dolor sit amet, consectetur adipiscing elit?
-              <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
-            </p>
-            <p id="faq__answer6" class="collapse" aria-labelledby="faq__question6">
-              Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
-            </p>
-          </div>
+  <div style="max-width: 1260px;" class="container-fluid pt-5 px-4 px-sm-5 mx-auto">
+    <% /*
+    <div style="max-width: 800px; color: #fff;" class="py-5 mx-auto">
+      <h2 class="text-center mb-4">FAQ</h2>
+      <div class="mb-5">
+        <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
+          <p id="faq__question1" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer1" aria-controls="faq__answer1">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit?
+            <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
+          </p>
+          <p id="faq__answer1" class="collapse" aria-labelledby="faq__question1">
+            Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+          </p>
         </div>
-        <h2 class="text-center pt-3 mb-4">Still got questions? Get in touch.</h2>
-        <button style="max-width: 242px;" class="btn btn-block btn-lg btn-info my-3 mb-4 mx-auto" @click="clickChatButton()">Contact us</button>
-      </div> */ %>
-    </div>
+        <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
+          <p id="faq__question2" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer2" aria-controls="faq__answer2">
+            Mauris viverra tempus nisl, sed varius leo volutpat sit amet?
+            <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
+          </p>
+          <p id="faq__answer2" class="collapse" aria-labelledby="faq__question2">
+            Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+          </p>
+        </div>
+        <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
+          <p id="faq__question3" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer3" aria-controls="faq__answer3">
+            Mauris viverra tempus nisl, sed varius leo volutpat sit amet?
+            <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
+          </p>
+          <p id="faq__answer3" class="collapse" aria-labelledby="faq__question3">
+            Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+          </p>
+        </div>
+        <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
+          <p id="faq__question4" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer4" aria-controls="faq__answer4">
+            Mauris viverra tempus nisl, sed varius leo volutpat sit amet?
+            <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
+          </p>
+          <p id="faq__answer4" class="collapse" aria-labelledby="faq__question4">
+            Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+          </p>
+        </div>
+        <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
+          <p id="faq__question5" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer5" aria-controls="faq__answer5">
+            Mauris viverra tempus nisl, sed varius leo volutpat sit amet?
+            <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
+          </p>
+          <p id="faq__answer5" class="collapse" aria-labelledby="faq__question5">
+            Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+          </p>
+        </div>
+        <div style="border-bottom: 1px solid rgba(255,255,255,0.2); padding-right: 20px;" class="position-relative">
+          <p id="faq__question6" style="cursor: pointer;" class="pt-3 mb-3" data-toggle="collapse" data-target="#faq__answer6" aria-controls="faq__answer6">
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit?
+            <span style="color: #6A67FE; right: 0; top: 24px;" class="position-absolute fa fa-angle-down"></span>
+          </p>
+          <p id="faq__answer6" class="collapse" aria-labelledby="faq__question6">
+            Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+          </p>
+        </div>
+      </div>
+      <h2 class="text-center pt-3 mb-4">Still got questions? Get in touch.</h2>
+      <button style="max-width: 242px;" class="btn btn-block btn-lg btn-info my-3 mb-4 mx-auto" @click="clickChatButton()">Contact us</button>
+    </div> */ %>
   </div>
 </div>
 
diff --git a/website/views/pages/pricing.ejs b/website/views/pages/pricing.ejs
index 41099c9064..aafe49483f 100644
--- a/website/views/pages/pricing.ejs
+++ b/website/views/pages/pricing.ejs
@@ -1,5 +1,5 @@
 <div id="pricing">
-  <div class="footer-fade pb-5">
+  <div class="pb-5">
     <div
       style="max-width: 1260px"
       class="container-fluid pt-5 px-4 px-sm-5 mx-auto"
@@ -19,7 +19,7 @@
                       Core
                     </p>
                     <h2 style="color: #6b6cfa">FREE</h2>
-                    <p class="mb-0">/host/month</p>
+                    <p style="padding-bottom: 28px" class="mb-0">/host/month</p>
                   </div>
                   <a
                     href="/get-started"
@@ -163,9 +163,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Community GitHub</p>
                     </div>
@@ -188,9 +187,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Community Slack</p>
                     </div>
@@ -213,9 +211,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Telephone support</p>
                     </div>
@@ -232,9 +229,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Email support</p>
                     </div>
@@ -251,9 +247,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Dedicated Slack channel</p>
                     </div>
@@ -279,9 +274,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Device management & inventory dashboard
@@ -306,9 +300,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Realtime device inventory</p>
                     </div>
@@ -331,9 +324,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">REST API & CLI tool</p>
                     </div>
@@ -356,9 +348,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Search devices by IP, serial, hostname, UUID
@@ -383,9 +374,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Software inventory*†</p>
                     </div>
@@ -408,9 +398,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Integration users with API-only access*†
@@ -435,9 +424,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Human-to-device mapping*†</p>
                     </div>
@@ -460,9 +448,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Target and configure specific groups of systems*†
@@ -481,9 +468,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Aggregate insights for groups of systems*†
@@ -509,9 +495,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Shareable device health reports</p>
                     </div>
@@ -534,9 +519,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Scope transparency*</p>
                     </div>
@@ -559,9 +543,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Multiple teams*</p>
                     </div>
@@ -587,9 +570,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Single sign on (SSO, SAML)</p>
                     </div>
@@ -612,9 +594,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Role-based access control*</p>
                     </div>
@@ -638,9 +619,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Audit queries and other activity*</p>
                     </div>
@@ -663,9 +643,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Programmable vulnerability management*†
@@ -690,9 +669,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Query performance monitoring*</p>
                     </div>
@@ -715,9 +693,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Standard query library*†</p>
                     </div>
@@ -740,9 +717,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Detect and surface issues with devices*†
@@ -767,9 +743,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Self-remediation*†</p>
                     </div>
@@ -793,9 +768,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Flexible log destinations (AWS Kinesis, Lambda, GCP)
@@ -820,9 +794,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">StreamAlert integration*†</p>
                     </div>
@@ -852,9 +825,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Self-managed</p>
                     </div>
@@ -877,9 +849,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Deployment tools (Helm, Terraform)
@@ -904,9 +875,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Compatible with custom osquery extensions
@@ -931,9 +901,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Configure osquery startup flags*</p>
                     </div>
@@ -956,9 +925,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Programmable vulnerability management*
@@ -983,9 +951,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Osquery agent autoupdates†</p>
                     </div>
@@ -1008,9 +975,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">Self-hosted agent autoupdates†</p>
                     </div>
@@ -1027,9 +993,8 @@
                     <div class="col-6 col-md-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
-                        src="/images/ellipse-6x8@2x.png"
-                        class="mt-2"
-                        style="width: 6.4px; height: 8px"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
                         Mass deploy custom osquery extensions*

From 56a9e2cf20f9a73234f780c8f989dc056b3d1443 Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Fri, 7 May 2021 12:47:52 -0700
Subject: [PATCH 15/51] Add description to returned query stats (#742)

Gets the description from the associated query.
---
 server/datastore/mysql/hosts.go    | 6 ++++--
 server/kolide/scheduled_queries.go | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/datastore/mysql/hosts.go b/server/datastore/mysql/hosts.go
index 0392761dfa..234be740ee 100644
--- a/server/datastore/mysql/hosts.go
+++ b/server/datastore/mysql/hosts.go
@@ -224,10 +224,12 @@ SELECT
 	sq.id AS scheduled_query_id,
 	sq.query_name AS query_name,
 	p.name AS pack_name,
-	p.id as pack_id
+	p.id as pack_id,
+	q.description
 FROM scheduled_query_stats sqs
 	JOIN scheduled_queries sq ON (sqs.scheduled_query_id = sq.id)
-	JOIN packs p ON (sq.pack_id = p.id)  
+	JOIN packs p ON (sq.pack_id = p.id)
+	JOIN queries q ON (sq.query_name = q.name)
 WHERE host_id = ?
 `
 	var stats []kolide.ScheduledQueryStats
diff --git a/server/kolide/scheduled_queries.go b/server/kolide/scheduled_queries.go
index c2f8084128..15829095e6 100644
--- a/server/kolide/scheduled_queries.go
+++ b/server/kolide/scheduled_queries.go
@@ -57,7 +57,8 @@ type ScheduledQueryStats struct {
 	ScheduledQueryName string `json:"scheduled_query_name,omitempty" db:"scheduled_query_name"`
 	ScheduledQueryID   uint   `json:"scheduled_query_id,omitempty" db:"scheduled_query_id"`
 
-	QueryName string `json:"query_name,omitempty" db:"query_name"`
+	QueryName   string `json:"query_name,omitempty" db:"query_name"`
+	Description string `json:"description,omitempty" db:"description"`
 
 	PackName string `json:"pack_name,omitempty" db:"pack_name"`
 	PackID   uint   `json:"pack_id,omitempty" db:"pack_id"`

From 02973ec4a25e3e6814a4b396f6e48a24073bbbc7 Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Sat, 8 May 2021 06:19:55 +0900
Subject: [PATCH 16/51] website-add-jobs-link (#737)

* website-add-jobs-link

Add jobs link to the footer.
Also fixed up some padding issues in the footer at tablet and mobile breakpoints.

* Update layout.less
---
 website/assets/styles/layout.less |  8 ++++----
 website/views/layouts/layout.ejs  | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/website/assets/styles/layout.less b/website/assets/styles/layout.less
index 005aa1cc77..664062834b 100644
--- a/website/assets/styles/layout.less
+++ b/website/assets/styles/layout.less
@@ -219,19 +219,19 @@ body.detected-mobile {
 
 @media (max-width: 1199px) {
   [purpose='page-wrap'] {
-    padding-bottom: 230px;
+    padding-bottom: 260px;
     [purpose='page-footer'] {
-      height: 230px;
+      height: 260px;
     }
   }
 }
 
 @media (max-width: 767px) {
   [purpose='page-wrap'] {
-    padding-bottom: 360px;
+    padding-bottom: 380px;
     [purpose='page-footer'] {
       padding-top: 44px;
-      height: 360px;
+      height: 380px;
     }
   }
 }
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index 7a05335eb1..e5069d7bc7 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -149,16 +149,17 @@
             </div>
           </div>
           <div class="row flex-row-reverse">
-            <div style="font-family: 'Lato', sans-serif; font-size: 13px;" class="col-md text-center text-md-right pt-0 pt-md-3 pt-xl-0 mb-1 mb-md-0">
+            <div style="font-family: 'Lato', sans-serif; font-size: 13px;" class="col-md text-center text-xl-right pt-0 pb-3 pt-xl-0 mb-1 mb-md-0">
               <a href="https://github.com/fleetdm/fleet/tree/master/docs" style="color: #fff; text-decoration: underline;" class="mr-1">Documentation</a>
-              <a target="_blank" href="https://github.com/fleetdm/fleet" style="color: #fff; text-decoration: underline;">Contribute</a>
+              <a target="_blank" href="https://github.com/fleetdm/fleet" style="color: #fff; text-decoration: underline;" class="mr-1">Contribute</a>
+              <a target="_blank" href="https://fleetdm.com/apply" style="color: #fff; text-decoration: underline;">Jobs at Fleet</a>
             </div>
-            <div class="col-md-8 col-lg-9">
+            <div class="col-xl-9">
               <div style="font-family: 'Lato', sans-serif; font-size: 13px;" class="row">
-                <div class="col-xl-4 text-center text-md-left">
+                <div class="col-xl-4 text-center text-xl-left">
                   &copy; 2021 Fleet Device Management Inc.
                 </div>
-                <div class="col-xl-8 text-center text-md-left text-xl-center px-xl-0">
+                <div class="col-xl-8 text-center text-xl-left px-xl-0">
                   All trademarks, service marks, and company names are the property of their respective owners.
                 </div>
               </div>

From d4147e916dce496dcd3e714348f9618bbb8a7742 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Fri, 7 May 2021 18:18:52 -0400
Subject: [PATCH 17/51] Host details page: packs accordion (#724)

* Pack queries accordion
* Connects to query_stats API
* No packs edge case

Co-authored-by: Sarah Gillespie <sarahgillespi314@gmail.com>
---
 .../icon-accordion-collapse-16x16@2x.png      | Bin 0 -> 565 bytes
 assets/images/icon-chevron-purple-9x6@2x.png  | Bin 0 -> 982 bytes
 assets/images/icon-chevron-white-9x6@2x.png   | Bin 0 -> 224 bytes
 frontend/interfaces/query.ts                  |   4 ++
 frontend/kolide/helpers.ts                    |  11 +++
 .../hosts/HostDetailsPage/HostDetailsPage.jsx |  66 +++++++++++++----
 .../PackQueriesListRow/PackQueriesListRow.jsx |  35 +++++++++
 .../PackQueriesListRow/_styles.scss           |  29 ++++++++
 .../PackQueriesListRow/index.js               |   1 +
 .../pages/hosts/HostDetailsPage/_styles.scss  |  68 +++++++++++++++++-
 package.json                                  |   1 +
 yarn.lock                                     |   5 ++
 12 files changed, 205 insertions(+), 15 deletions(-)
 create mode 100644 assets/images/icon-accordion-collapse-16x16@2x.png
 create mode 100644 assets/images/icon-chevron-purple-9x6@2x.png
 create mode 100644 assets/images/icon-chevron-white-9x6@2x.png
 create mode 100644 frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/PackQueriesListRow.jsx
 create mode 100644 frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/_styles.scss
 create mode 100644 frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/index.js

diff --git a/assets/images/icon-accordion-collapse-16x16@2x.png b/assets/images/icon-accordion-collapse-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1234f114dd7db53cc8ada783220076e8d1d456f7
GIT binary patch
literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0m?~4K~#7F?U%7m
z!cY{3|8r3cPCkGGi;m)`o9HGaFz5&_CJ-myKzIRDCUMg^>L5>`n~r@08F&CD5D7ir
zQ$(R4V8PzSFCnG3h5zg6X_`aukU#D0g+fay2GRgWu>c5U>;JPIdMi~bk=pRFPYMNI
z>$Gsr-~#>-X0ldRQL-#*d<jVSdy60S*KGuY9ga|3B$VvQl?NCuY`2?kCMcihsA7JF
z0i13(t`zr7OrSz4tq2@s={-<N7XStY5LGaYae*cHB(e(R^5kx<3r4F6U-+&-CQI1Z
z1lHGq><Pgyz63HlFgDP-Te03+AOaG!vpc#jYknktC2({+K71aDnFS7$g!sYmnlzrb
z`9va-oLyoj0SQkeN5iH2$2|du$=M~Q3QP*G*WrHVkx=u5_nAjxqQL(C=-U0=aQL8v
z9P=`%X{QQ!uj=-O@$&rh`EpFo=_9|rx@7nk7%c6yaIeI;TQv?k%Q*~#{J)O10M%d$
zCR+<QRhWWcD~Fs17(zxhRjDjL=~|Q#I9!%F(QU$TTNU-jMsVoS%+2gQ1=ck+!flEN
zQwc8j=R(;Vc~i)!MvhZdM6m_V3^g5Gm455p@^3x>($&YBry(*g00000NkvXXu0mjf
D-E-`O

literal 0
HcmV?d00001

diff --git a/assets/images/icon-chevron-purple-9x6@2x.png b/assets/images/icon-chevron-purple-9x6@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..32f1662b7ec160934ef2582a529f7606a905894c
GIT binary patch
literal 982
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg
z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg(UKbBnda-upao=eFt9QT
zF)#yJj6lf1D8&FW4aj2fVw8rngBUfSYM2-p+A|qgplYIkGzd%pVvrsP&AfmSVd4TN
zxN3z3%m_9}+rE9xX+Vmzz$3Dlfk8|agc&`9R6YPri_8p(D2ed(u}aR*)k{ptPfFFR
z$SnZrVz8;O0y1+`OA-|-a&z*EttxDlz$&bOY>=?Nk^)#sNw%$0gl~X?bAC~(f~lT~
zo`I4bmx6+VO;JjkRgjAtR6CGotCUevQedU8UtV6WS8lAAUzDzIXlZGwZ(yWvWTXpJ
zp<7&;SCUwvn^&w1F$89gOKNd)QD#9&W`3Rm$lS!F{L&IzB_)tWZ~$><NoE?tro3XP
zw}2kh2g&Fg>KW+6%?4_<0f}1q7iFdbZ3dZdXJ`Xfi6REI$3`DyIg(=_J_U;cy=up0
zqYn=@J1(C?>XE=e4)=6%42j@;8{`{y$UtD8XZN1xUCI?K>mTrbVcEtl^2*I$VV=Vc
zkrvhprag_}A2i<7tWP@Tvti3NPtVfKw2MCbe*XUD%dn@Cbq`Zq<NtLGySOgAPhT!8
zxR2@7?h>(eF|YF4N<8PA{9Ew$W>Vpov{i*l8|3*eT=oq(*6#7*;iNJbPBSy1Lq}G1
zt+bEV&M}|UtTOFng7n7hP4b5=85dr6TsrUI91ey@tHQL8Dr*NHl~ne8ti{))X6nP}
zr~Tkiio<sYlcf55(ah}Cr-UcUU5Yd~wf^blnGE8l6CdoTTk<s2@P<K5`_IeAa#Z$h
z)w#!MZfg*;e2e6~=W5rtgy<WddjD*)+RNaA>^{+q)uJM)S+cw;9WN@a_!kxJJNw_1
zF)u^uVw%PGAHs}z274xDyI7>p=ZITYTzGKb>eh9g+xEOOJa*H1uE2q1vlDYpf8G&(
hK>LB{2d*0;KbRafyW`FnF5C@Dt)8xaF6*2UngEntH*)|0

literal 0
HcmV?d00001

diff --git a/assets/images/icon-chevron-white-9x6@2x.png b/assets/images/icon-chevron-white-9x6@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..71f774b7229e60ed47b14565123982a88641d0c1
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&J!3HGrh2HJ~Qk(@Ik;M!QVyYm_=ozH)0Vv2=
z9OUlAu<o49OCX0O-O<;Pfnj4m_n$;oAivbp#WAFUaqR>~-Ub667HvjNk6DvF9S*7Z
zFbPdC;#@jG&_lC!+nY)L)7I=YQ)M#vtP-hu`{S~>C6=Fkm&q+L{5adh>5|&yL#>9K
zo{KJqWSMLXHM*WKQ@!%ak4^SMD!c90Y98E~{6pxaW+Q`F*qW&eT~3}8eq)og^ytL=
Ss~JECFnGH9xvX<aXaWEiz)7wE

literal 0
HcmV?d00001

diff --git a/frontend/interfaces/query.ts b/frontend/interfaces/query.ts
index b4776cfd62..2ac7806c29 100644
--- a/frontend/interfaces/query.ts
+++ b/frontend/interfaces/query.ts
@@ -5,6 +5,8 @@ export default PropTypes.shape({
   name: PropTypes.string,
   query: PropTypes.string,
   id: PropTypes.number,
+  interval: PropTypes.number,
+  last_excuted: PropTypes.string,
 });
 
 export interface IQuery {
@@ -12,4 +14,6 @@ export interface IQuery {
   name: string;
   query: string;
   id: number;
+  interval: number;
+  last_excuted: string;
 }
diff --git a/frontend/kolide/helpers.ts b/frontend/kolide/helpers.ts
index 64d1e22b2b..70b13c5069 100644
--- a/frontend/kolide/helpers.ts
+++ b/frontend/kolide/helpers.ts
@@ -301,6 +301,16 @@ export const humanHostDetailUpdated = (detailUpdated: string): string => {
   return moment(detailUpdated).fromNow();
 };
 
+export const humanQueryLastRun = (lastRun: string): string => {
+  // Handles the case when a query has never been ran.
+  // July 28, 2016 is the date of the initial commit to kolide/fleet.
+  if (lastRun < "2016-07-28T00:00:00Z") {
+    return "Never";
+  }
+
+  return moment(lastRun).fromNow();
+};
+
 export default {
   addGravatarUrlToResource,
   formatConfigDataForServer,
@@ -313,6 +323,7 @@ export default {
   humanHostEnrolled,
   humanHostMemory,
   humanHostDetailUpdated,
+  humanQueryLastRun,
   labelSlug,
   setupData,
 };
diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
index 98a989fcf1..0f6c403589 100644
--- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
@@ -11,6 +11,7 @@ import Spinner from "components/loaders/Spinner";
 import Button from "components/buttons/Button";
 import Modal from "components/modals/Modal";
 import SoftwareListRow from "pages/hosts/HostDetailsPage/SoftwareListRow";
+import PackQueriesListRow from "pages/hosts/HostDetailsPage/PackQueriesListRow";
 
 import entityGetter from "redux/utilities/entityGetter";
 import queryActions from "redux/nodes/entities/queries/actions";
@@ -18,6 +19,13 @@ import queryInterface from "interfaces/query";
 import { renderFlash } from "redux/nodes/notifications/actions";
 import { push } from "react-router-redux";
 import PATHS from "router/paths";
+import {
+  Accordion,
+  AccordionItem,
+  AccordionItemHeading,
+  AccordionItemButton,
+  AccordionItemPanel,
+} from "react-accessible-accordion";
 
 import hostInterface from "interfaces/host";
 import {
@@ -234,21 +242,50 @@ export class HostDetailsPage extends Component {
   };
 
   renderPacks = () => {
-    const { onPackClick } = this;
     const { host } = this.props;
-    const { packs = [] } = host;
+    const { packs = [], pack_stats = [] } = host;
+    const wrapperClassName = `${baseClass}__table`;
 
-    const packItems = packs.map((pack) => {
+    if (pack_stats === null || pack_stats.length === 0) {
+      return <p>There are no packs for this host.</p>;
+    }
+
+    const packsAccordion = pack_stats.map((pack) => {
       return (
-        <li className="list__item" key={pack.id}>
-          <Button
-            onClick={() => onPackClick(pack)}
-            variant="text-link"
-            className="list__button"
-          >
-            {pack.name}
-          </Button>
-        </li>
+        <AccordionItem key={pack.pack_id}>
+          <AccordionItemHeading>
+            <AccordionItemButton>{pack.pack_name}</AccordionItemButton>
+          </AccordionItemHeading>
+          <AccordionItemPanel>
+            {!pack.query_stats.length ? (
+              <div>There are no schedule queries for this pack.</div>
+            ) : (
+              <div className={`${baseClass}__wrapper`}>
+                <table className={wrapperClassName}>
+                  <thead>
+                    <tr>
+                      <th>Query Name</th>
+                      <th>Description</th>
+                      <th>Frequency</th>
+                      <th>Last Run</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    {!!pack.query_stats.length &&
+                      pack.query_stats.map((query) => {
+                        return (
+                          <PackQueriesListRow
+                            key={`pack-row-${query.pack_id}-${query.scheduled_query_id}`}
+                            query={query}
+                          />
+                        );
+                      })}
+                  </tbody>
+                </table>
+              </div>
+            )}
+          </AccordionItemPanel>
+        </AccordionItem>
       );
     });
 
@@ -258,12 +295,15 @@ export class HostDetailsPage extends Component {
         {packs.length === 0 ? (
           <p className="info__item">No packs have this host as a target.</p>
         ) : (
-          <ul className="list">{packItems}</ul>
+          <Accordion allowMultipleExpanded="true" allowZeroExpanded="true">
+            {packsAccordion}
+          </Accordion>
         )}
       </div>
     );
   };
 
+  //          <ul className="list">{packItems}</ul>
   renderSoftware = () => {
     const { host } = this.props;
     const wrapperClassName = `${baseClass}__table`;
diff --git a/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/PackQueriesListRow.jsx b/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/PackQueriesListRow.jsx
new file mode 100644
index 0000000000..0899f7faa7
--- /dev/null
+++ b/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/PackQueriesListRow.jsx
@@ -0,0 +1,35 @@
+import React, { Component } from "react";
+import { humanQueryLastRun } from "kolide/helpers";
+
+import queryInterface from "interfaces/query";
+
+const baseClass = "pack-queries-list-row";
+
+class PackQueriesListRow extends Component {
+  static propTypes = {
+    query: queryInterface.isRequired,
+  };
+
+  render() {
+    const { query } = this.props;
+    const {
+      scheduled_query_name,
+      description,
+      interval,
+      last_executed,
+    } = query;
+
+    return (
+      <tr>
+        <td className={`${baseClass}__name`}>{scheduled_query_name}</td>
+        <td className={`${baseClass}__description`}>{description}</td>
+        <td className={`${baseClass}__frequency`}>{interval} seconds</td>
+        <td className={`${baseClass}__last-run`}>
+          {humanQueryLastRun(last_executed)}
+        </td>
+      </tr>
+    );
+  }
+}
+
+export default PackQueriesListRow;
diff --git a/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/_styles.scss b/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/_styles.scss
new file mode 100644
index 0000000000..a6665e0828
--- /dev/null
+++ b/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/_styles.scss
@@ -0,0 +1,29 @@
+.pack-queries-list-row {
+  line-height: 38px;
+  border-bottom: 1px solid $ui-fleet-blue-15;
+
+  &__type {
+    max-width: 280px;
+  }
+
+  &__installed-version {
+    max-width: 280px;
+  }
+
+  &:last-child {
+    border-bottom: 0;
+  }
+
+  td {
+    font-size: $x-small;
+
+    .form-field {
+      margin: 0;
+    }
+  }
+
+  &__name {
+    @include ellipsis(120px);
+    display: table-cell;
+  }
+}
diff --git a/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/index.js b/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/index.js
new file mode 100644
index 0000000000..926ed24fa8
--- /dev/null
+++ b/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/index.js
@@ -0,0 +1 @@
+export { default } from "./PackQueriesListRow";
diff --git a/frontend/pages/hosts/HostDetailsPage/_styles.scss b/frontend/pages/hosts/HostDetailsPage/_styles.scss
index f56ed3adba..7710ccd051 100644
--- a/frontend/pages/hosts/HostDetailsPage/_styles.scss
+++ b/frontend/pages/hosts/HostDetailsPage/_styles.scss
@@ -251,7 +251,71 @@ a {
   }
 
   #back-chevron {
-    width: 12px;
-    margin-right: 10px;
+    width: 16px;
+    margin-right: $pad-small;
+  }
+
+  .accordion {
+    border-radius: 2px;
+  }
+
+  .accordion__item + .accordion__item {
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+  }
+
+  .accordion__button {
+    background-color: #fff;
+    color: $core-fleet-black;
+    cursor: pointer;
+    text-align: left;
+    font-size: $x-small;
+    font-weight: bold;
+    border: none;
+    padding: 17px 12px;
+  }
+
+  .accordion__button:hover {
+    background-color: $ui-vibrant-blue-10;
+  }
+
+  .accordion__button:after {
+    display: block;
+    content: url("../assets/images/icon-chevron-purple-9x6@2x.png");
+    text-align: center;
+    top: 50%;
+    float: right;
+    width: 32px;
+    height: 32px;
+    border-radius: 4px;
+    transform: scale(0.5) translate(-50%, -60%);
+  }
+
+  .accordion__button[aria-expanded="true"]::after,
+  .accordion__button[aria-selected="true"]::after {
+    background-color: $core-vibrant-blue;
+    content: url("../assets/images/icon-accordion-collapse-16x16@2x.png");
+  }
+
+  [hidden] {
+    display: none;
+  }
+
+  .accordion__panel {
+    padding: 20px;
+    animation: fadein 0.35s ease-in;
+  }
+
+  /* -------------------------------------------------- */
+  /* ---------------- Animation part ------------------ */
+  /* -------------------------------------------------- */
+
+  @keyframes fadein {
+    0% {
+      opacity: 0;
+    }
+
+    100% {
+      opacity: 1;
+    }
   }
 }
diff --git a/package.json b/package.json
index 17dad6ca43..019240a97a 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "proxy-middleware": "0.15.0",
     "rc-pagination": "1.16.3",
     "react": "^16.8.6",
+    "react-accessible-accordion": "^3.3.4",
     "react-ace": "^6.3.2",
     "react-dom": "^16",
     "react-entity-getter": "0.0.8",
diff --git a/yarn.lock b/yarn.lock
index 38012508fd..da028184a9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10566,6 +10566,11 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-accessible-accordion@^3.3.4:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/react-accessible-accordion/-/react-accessible-accordion-3.3.4.tgz#84b08015e74d6b3b225e0101b518b2ea8969e292"
+  integrity sha512-EUq+KmVRIIG5u1fR5XIbb2JU7w7NouLjuyfuPvnhuDIfNNWNYap1I8ijn2rdA6OQi1gGSRGbVzHs+3wxH/M0Sw==
+
 react-ace@^6.3.2:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/react-ace/-/react-ace-6.6.0.tgz#a79457ef03c3b1f8d4fc598a003b1d6ad464f1a0"

From 1cb514c4602ac575b861cf2783e25a9edf11b0cf Mon Sep 17 00:00:00 2001
From: dsbaha <10324923+dsbaha@users.noreply.github.com>
Date: Fri, 7 May 2021 17:29:54 -0700
Subject: [PATCH 18/51] Add flag to disable HTTP keepalives (#741)

In some environments, disabling keepalives helps prevent buildup of TCP sockets.
---
 cmd/fleet/serve.go                   |  1 +
 docs/3-Deployment/2-Configuration.md | 15 +++++++++++++++
 docs/3-Deployment/FAQ.md             |  2 ++
 server/config/config.go              |  4 ++++
 4 files changed, 22 insertions(+)

diff --git a/cmd/fleet/serve.go b/cmd/fleet/serve.go
index 3c931cf5d6..522a092a9d 100644
--- a/cmd/fleet/serve.go
+++ b/cmd/fleet/serve.go
@@ -368,6 +368,7 @@ the way that the Fleet server works.
 				IdleTimeout:       5 * time.Minute,
 				MaxHeaderBytes:    1 << 18, // 0.25 MB (262144 bytes)
 			}
+			srv.SetKeepAlivesEnabled(config.Server.Keepalive)
 			errs := make(chan error, 2)
 			go func() {
 				if !config.Server.TLS {
diff --git a/docs/3-Deployment/2-Configuration.md b/docs/3-Deployment/2-Configuration.md
index 8b31cff321..4bb32e5734 100644
--- a/docs/3-Deployment/2-Configuration.md
+++ b/docs/3-Deployment/2-Configuration.md
@@ -420,6 +420,21 @@ Note that some other configurations may need to be changed when modifying the UR
   	url_prefix: /apps/fleet
   ```
 
+###### `server_keepalive`
+
+Controls the server side http keep alive property.
+
+Turning off keepalives has helped reduce outstanding TCP connections in some deployments.
+
+- Default value: true
+- Environment variable: `FLEET_SERVER_KEEPALIVE`
+- Config file format:
+
+  ```
+  server:
+  	keepalive: true
+  ```
+
 ##### Auth
 
 ###### `auth_jwt_key`
diff --git a/docs/3-Deployment/FAQ.md b/docs/3-Deployment/FAQ.md
index a8184ca7b7..0de639071f 100644
--- a/docs/3-Deployment/FAQ.md
+++ b/docs/3-Deployment/FAQ.md
@@ -47,6 +47,8 @@ Osquery requires that all communication between the agent and Fleet are over a s
 
 This error usually indicates that the Fleet server has run out of file descriptors. Fix this by increasing the `ulimit` on the Fleet process. See the `LimitNOFILE` setting in the [example systemd unit file](./2-Configuration.md#runing-with-systemd) for an example of how to do this with systemd.
 
+Some deployments may benefit by setting the [`--server_keepalive`](./2-Configuration.md#server_keepalive) flag to false.
+
 ## I upgraded my database, but Fleet is still running slowly. What could be going on?
 
 This could be caused by a mismatched connection limit between the Fleet server and the MySQL server that prevents Fleet from fully utilizing the database. First [determine how many open connections your MySQL server supports](https://dev.mysql.com/doc/refman/8.0/en/too-many-connections.html). Now set the [`--mysql_max_open_conns`](./2-Configuration.md#mysql_max_open_conns) and [`--mysql_max_idle_conns`](./2-Configuration.md#mysql_max_idle_conns) flags appropriately.
diff --git a/server/config/config.go b/server/config/config.go
index 62e6d7a18a..011cca4bcc 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -55,6 +55,7 @@ type ServerConfig struct {
 	TLS        bool
 	TLSProfile string // TODO #271 set `yaml:"tls_compatibility"`
 	URLPrefix  string `yaml:"url_prefix"`
+	Keepalive  bool   `yaml:"keepalive"`
 }
 
 // AuthConfig defines configs related to user authorization
@@ -226,6 +227,8 @@ func (man Manager) addConfigs() {
 			TLSProfileModern, TLSProfileIntermediate))
 	man.addConfigString("server.url_prefix", "",
 		"URL prefix used on server and frontend endpoints")
+	man.addConfigBool("server.keepalive", true,
+		"Controls wether HTTP keep-alives are enabled.")
 
 	// Auth
 	man.addConfigString("auth.jwt_key", "",
@@ -395,6 +398,7 @@ func (man Manager) LoadConfig() KolideConfig {
 			TLS:        man.getConfigBool("server.tls"),
 			TLSProfile: man.getConfigTLSProfile(),
 			URLPrefix:  man.getConfigString("server.url_prefix"),
+			Keepalive:  man.getConfigBool("server.keepalive"),
 		},
 		Auth: AuthConfig{
 			JwtKey:      man.getConfigString("auth.jwt_key"),

From fb458060880212750df90f0d9fc00c833e264016 Mon Sep 17 00:00:00 2001
From: Michael Samuel <msamuel@squareup.com>
Date: Sun, 9 May 2021 05:29:52 +1000
Subject: [PATCH 19/51] Copy log fields into GCP PubSub attributes (#712)

Add a config setting to allow copying message fields and decorations into Google Pub/Sub attributes, making it possible to use these values for subscription filters.
---
 docs/3-Deployment/2-Configuration.md | 22 +++++++++++++
 server/config/config.go              | 15 +++++----
 server/logging/logging.go            |  2 ++
 server/logging/pubsub.go             | 48 ++++++++++++++++++++++++----
 4 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/docs/3-Deployment/2-Configuration.md b/docs/3-Deployment/2-Configuration.md
index 4bb32e5734..8b9596c29d 100644
--- a/docs/3-Deployment/2-Configuration.md
+++ b/docs/3-Deployment/2-Configuration.md
@@ -1183,6 +1183,28 @@ The identifier of the pubsub topic that osquery status logs will be published to
     status_topic: osquery_status
   ```
 
+###### `pubsub_add_attributes`
+
+This flag only has effect if `osquery_status_log_plugin` is set to `pubsub`.
+
+Add Pub/Sub attributes to messages.  When enabled, the plugin parses the osquery result
+messages, and adds the following Pub/Sub message attributes:
+
+- `name` - the `name` attribute from the message body
+- `timestamp` - the `unixTime` attribute from the message body, converted to rfc3339 format
+- Each decoration from the message
+
+This feature is useful when combined with [subscription filters](https://cloud.google.com/pubsub/docs/filtering).
+
+- Default value: false
+- Environment variable: `FLEET_PUBSUB_ADD_ATTRIBUTES`
+- Config file format:
+
+  ```
+  pubsub:
+    status_topic: osquery_status
+  ```
+
 ##### S3 file carving backend
 
 ###### `s3_bucket`
diff --git a/server/config/config.go b/server/config/config.go
index 011cca4bcc..b0d94011c9 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -140,9 +140,10 @@ type S3Config struct {
 
 // PubSubConfig defines configs the for Google PubSub logging plugin
 type PubSubConfig struct {
-	Project     string
-	StatusTopic string `yaml:"status_topic"`
-	ResultTopic string `yaml:"result_topic"`
+	Project       string
+	StatusTopic   string `yaml:"status_topic"`
+	ResultTopic   string `yaml:"result_topic"`
+	AddAttributes bool   `yaml:"add_attributes"`
 }
 
 // FilesystemConfig defines configs for the Filesystem logging plugin
@@ -328,6 +329,7 @@ func (man Manager) addConfigs() {
 	man.addConfigString("pubsub.project", "", "Google Cloud Project to use")
 	man.addConfigString("pubsub.status_topic", "", "PubSub topic for status logs")
 	man.addConfigString("pubsub.result_topic", "", "PubSub topic for result logs")
+	man.addConfigBool("pubsub.add_attributes", false, "Add PubSub attributes in addition to the message body")
 
 	// Filesystem
 	man.addConfigString("filesystem.status_log_file", "/tmp/osquery_status",
@@ -463,9 +465,10 @@ func (man Manager) LoadConfig() KolideConfig {
 			StsAssumeRoleArn: man.getConfigString("s3.sts_assume_role_arn"),
 		},
 		PubSub: PubSubConfig{
-			Project:     man.getConfigString("pubsub.project"),
-			StatusTopic: man.getConfigString("pubsub.status_topic"),
-			ResultTopic: man.getConfigString("pubsub.result_topic"),
+			Project:       man.getConfigString("pubsub.project"),
+			StatusTopic:   man.getConfigString("pubsub.status_topic"),
+			ResultTopic:   man.getConfigString("pubsub.result_topic"),
+			AddAttributes: man.getConfigBool("pubsub.add_attributes"),
 		},
 		Filesystem: FilesystemConfig{
 			StatusLogFile:        man.getConfigString("filesystem.status_log_file"),
diff --git a/server/logging/logging.go b/server/logging/logging.go
index 33755208da..b870698bd3 100644
--- a/server/logging/logging.go
+++ b/server/logging/logging.go
@@ -74,6 +74,7 @@ func New(config config.KolideConfig, logger log.Logger) (*OsqueryLogger, error)
 		status, err = NewPubSubLogWriter(
 			config.PubSub.Project,
 			config.PubSub.StatusTopic,
+			false,
 			logger,
 		)
 		if err != nil {
@@ -145,6 +146,7 @@ func New(config config.KolideConfig, logger log.Logger) (*OsqueryLogger, error)
 		result, err = NewPubSubLogWriter(
 			config.PubSub.Project,
 			config.PubSub.ResultTopic,
+			config.PubSub.AddAttributes,
 			logger,
 		)
 		if err != nil {
diff --git a/server/logging/pubsub.go b/server/logging/pubsub.go
index 9ea8d0e431..981c236d8a 100644
--- a/server/logging/pubsub.go
+++ b/server/logging/pubsub.go
@@ -3,6 +3,7 @@ package logging
 import (
 	"context"
 	"encoding/json"
+	"time"
 
 	"cloud.google.com/go/pubsub"
 	"github.com/go-kit/kit/log"
@@ -11,11 +12,18 @@ import (
 )
 
 type pubSubLogWriter struct {
-	topic  *pubsub.Topic
-	logger log.Logger
+	topic         *pubsub.Topic
+	logger        log.Logger
+	addAttributes bool
 }
 
-func NewPubSubLogWriter(projectId string, topicName string, logger log.Logger) (*pubSubLogWriter, error) {
+type PubSubAttributes struct {
+	Name        string            `json:"name"`
+	UnixTime    int64             `json:"unixTime"`
+	Decorations map[string]string `json:"decorations"`
+}
+
+func NewPubSubLogWriter(projectId string, topicName string, addAttributes bool, logger log.Logger) (*pubSubLogWriter, error) {
 	ctx := context.Background()
 
 	client, err := pubsub.NewClient(ctx, projectId)
@@ -29,14 +37,24 @@ func NewPubSubLogWriter(projectId string, topicName string, logger log.Logger) (
 		"msg", "GCP PubSub writer configured",
 		"project", projectId,
 		"topic", topicName,
+		"add_attributes", addAttributes,
 	)
 
 	return &pubSubLogWriter{
-		topic:  topic,
-		logger: logger,
+		topic:         topic,
+		logger:        logger,
+		addAttributes: addAttributes,
 	}, nil
 }
 
+func estimateAttributeSize(attributes map[string]string) int {
+	var sz int
+	for k, v := range attributes {
+		sz += len(k) + len(v) + 2
+	}
+	return sz
+}
+
 func (w *pubSubLogWriter) Write(ctx context.Context, logs []json.RawMessage) error {
 	results := make([]*pubsub.PublishResult, len(logs))
 
@@ -47,7 +65,22 @@ func (w *pubSubLogWriter) Write(ctx context.Context, logs []json.RawMessage) err
 			return errors.Wrap(err, "marshal message into JSON")
 		}
 
-		if len(data) > pubsub.MaxPublishRequestBytes {
+		attributes := make(map[string]string)
+
+		if w.addAttributes {
+			var unmarshaled PubSubAttributes
+
+			if err := json.Unmarshal(log, &unmarshaled); err != nil {
+				return errors.Wrap(err, "unmarshalling log message JSON")
+			}
+			attributes["name"] = unmarshaled.Name
+			attributes["timestamp"] = time.Unix(unmarshaled.UnixTime, 0).Format(time.RFC3339)
+			for k, v := range unmarshaled.Decorations {
+				attributes[k] = v
+			}
+		}
+
+		if len(data)+estimateAttributeSize(attributes) > pubsub.MaxPublishRequestBytes {
 			level.Info(w.logger).Log(
 				"msg", "dropping log over 10MB PubSub limit",
 				"size", len(data),
@@ -57,7 +90,8 @@ func (w *pubSubLogWriter) Write(ctx context.Context, logs []json.RawMessage) err
 		}
 
 		message := &pubsub.Message{
-			Data: data,
+			Data:       data,
+			Attributes: attributes,
 		}
 
 		results[i] = w.topic.Publish(ctx, message)

From 56e143a14f262e4ad9bded5db0f11ee6e29d79b4 Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Sun, 9 May 2021 23:48:59 -0500
Subject: [PATCH 20/51] Compile markdown docs (#714)

* Brought in the mostly-unchanged stuff from Sails website- changed just enough to get it working

* inline beforeConvert and afterConvert, for readability

because it's better when you tell a story with the parts of the story in order

* trivial (change arg name for clarity)

* trivial (apply more up-to-date err callback convention)

* modernize some of the bits relying on reassigning arguments

* convert the rest of the way to async/await

* trivial

* just aesthetics

* remove reliance on app-level config

* mostly i'm doing this to remember how it works

* normalize better so this can be more flexible

* this makes it work (albeit needs a bit more fluffing)

* strip out more sails-specific stuff

* clean up menu files between runs, scrape off a bit more technical debt

* scrape out some more dead code

* use devDependencies for markdown compilation stuff since it won't be compiling at runtime

* stub script for compiling markdown content

* Fill in implementation of script, rename helper.

* add note about the non-markdown file problem

* tweak output paths for clarity

* Improve generated menu content and set up groundwork for being able to easily access it via config

* Use .sailsrc to hold onto menu content, so it's injected into config for easier access (rather than reading JSON files whenever needed)

* more explicit tmp filename, in case we forget how this works later

* fix typo in build script (missing .js extension)

* Stub query detail page and a dev route for developing it

http://localhost:2024/sandbox/example-query

* fix helper friendlyName

* Run compilation in series to avoid race condition in doc-templater when cloning from the same repo.  Add todos about sitemap and further menu data cleanup.

* make sandbox actually useful

* Help prevent accidental checking in of compiled HTML files.

* rename script and generated folder in partials/

* fix/expand script metadata
---
 .github/workflows/deploy-fleet-website.yml    |   9 +-
 website/.gitignore                            |   6 +
 website/api/controllers/view-query-detail.js  |  27 +
 .../api/helpers/compile-markdown-content.js   | 193 ++++++
 website/api/helpers/to-sentence-case.js       |  33 +
 website/assets/js/pages/query-detail.page.js  |  25 +
 website/assets/styles/importer.less           |   2 +
 website/assets/styles/pages/query-detail.less |   5 +
 website/config/env/development.js             |   6 +
 website/config/policies.js                    |   1 +
 website/package-lock.json                     | 596 +++++++++++++++++-
 website/package.json                          |   4 +-
 website/scripts/build-from-markdown.js        |  44 ++
 website/views/layouts/layout.ejs              |   1 +
 website/views/pages/query-detail.ejs          |  11 +
 15 files changed, 936 insertions(+), 27 deletions(-)
 create mode 100644 website/api/controllers/view-query-detail.js
 create mode 100644 website/api/helpers/compile-markdown-content.js
 create mode 100644 website/api/helpers/to-sentence-case.js
 create mode 100644 website/assets/js/pages/query-detail.page.js
 create mode 100644 website/assets/styles/pages/query-detail.less
 create mode 100644 website/scripts/build-from-markdown.js
 create mode 100644 website/views/pages/query-detail.ejs

diff --git a/.github/workflows/deploy-fleet-website.yml b/.github/workflows/deploy-fleet-website.yml
index 9dfe4c2f62..683c406eb0 100644
--- a/.github/workflows/deploy-fleet-website.yml
+++ b/.github/workflows/deploy-fleet-website.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build:
     if: ${{ github.repository == 'fleetdm/fleet' }}
-    
+
     runs-on: ubuntu-latest
 
     strategy:
@@ -49,14 +49,15 @@ jobs:
     # Run sanity checks
     - run: cd website/ && npm test
 
-    # Compile assets
+    # Compile browser assets & markdown content into generated collateral
     - run: cd website/ && npm run build-for-prod
 
-    # Commit newly-built assets locally so we can push them to Heroku below.
+    # Commit newly-generated collateral locally so we can push them to Heroku below.
     # (This commit will never be pushed to GitHub- only to Heroku.)
     # > The local config flags make this work in GitHub's environment.
     - run: git add website/.www
-    - run: git -c "user.name=Fleetwood" -c "user.email=github@example.com" commit -am 'AUTOMATED COMMIT - Deployed the latest, including modified HTML layouts and .sailsrc file that reference minified assets.'
+    - run: git add -f website/views/partials/built-from-markdown # « for new HTML files compiled from markdown content
+    - run: git -c "user.name=Fleetwood" -c "user.email=github@example.com" commit -am 'AUTOMATED COMMIT - Deployed the latest, including generated collateral such as compiled documentation, modified HTML layouts, and a .sailsrc file that references minified client-side code assets.'
 
     # Configure the Heroku app we'll be deploying to
     - run: heroku git:remote -a production-fleetdm-website
diff --git a/website/.gitignore b/website/.gitignore
index a1ddb80e79..51ae97f9c0 100644
--- a/website/.gitignore
+++ b/website/.gitignore
@@ -132,3 +132,9 @@ lib-cov
 *.out
 *.pid
 
+
+################################################
+# HTML files compiled from markdown in build.
+################################################
+
+partials/built-from-markdown/
diff --git a/website/api/controllers/view-query-detail.js b/website/api/controllers/view-query-detail.js
new file mode 100644
index 0000000000..01ba96b1ec
--- /dev/null
+++ b/website/api/controllers/view-query-detail.js
@@ -0,0 +1,27 @@
+module.exports = {
+
+
+  friendlyName: 'View query detail',
+
+
+  description: 'Display "Query detail" page.',
+
+
+  exits: {
+
+    success: {
+      viewTemplatePath: 'pages/query-detail'
+    }
+
+  },
+
+
+  fn: async function () {
+
+    // Respond with view.
+    return {};
+
+  }
+
+
+};
diff --git a/website/api/helpers/compile-markdown-content.js b/website/api/helpers/compile-markdown-content.js
new file mode 100644
index 0000000000..937bb63900
--- /dev/null
+++ b/website/api/helpers/compile-markdown-content.js
@@ -0,0 +1,193 @@
+module.exports = {
+
+
+  friendlyName: 'Compile markdown content',
+
+
+  description: 'Compile documentation templates from markdown.',
+
+
+  inputs: {
+
+    repoPath: {
+      description: 'The path of the subdirectory in the Git repo to compile from.',
+      type: 'string',
+      example: 'docs/',
+      required: true
+    },
+
+    repoBranch: {
+      description: 'The name of the branch to compile from.',
+      type: 'string',
+      defaultsTo: 'master'
+    },
+
+    repoUrl: {
+      description: 'The git:// URL of the remote Git repo to compile from.',
+      type: 'string',
+      defaultsTo: 'git://github.com/fleetdm/fleet.git',
+    }
+
+  },
+
+
+  exits: {
+    success: { outputDescription: 'A list of metadata about all generated HTML files.', outputType: [{}] }
+  },
+
+
+  fn: async function ({repoPath, repoBranch, repoUrl}) {
+
+    let path = require('path');
+    let cheerio = require('cheerio');
+    let DocTemplater = require('doc-templater');
+
+    sails.log.info('Compiling `%s` docs from the `%s` branch of `%s`...', repoPath, repoBranch, repoUrl);
+
+    // Relative path within this app where output will be written.
+    let htmlOutputPath = path.join('views/partials/built-from-markdown/', _.kebabCase(repoPath));
+
+    // Relative path within this app where temporary menu data will be written.
+    // (This is consumed later in this file.)
+    let jsMenuOutputPath = path.join('.tmp/doc-templater/menus/', `${_.kebabCase(repoPath)}.tmp-menu.json`);// fka "the .jsmenu file"
+
+    // Delete existing output from previous runs, if any.
+    await sails.helpers.fs.rmrf(path.resolve(sails.config.appPath, htmlOutputPath));
+    await sails.helpers.fs.rmrf(path.resolve(sails.config.appPath, jsMenuOutputPath));
+
+    // Compile the markdown into HTML files and a JSON file (aka "jsmenu") representing
+    // the manifest of all compiled HTML files and their hierarchy.
+    await new Promise((resolve, reject)=>{
+      DocTemplater().build([{
+        remote: repoUrl,
+        branch: repoBranch,
+        remoteSubPath: repoPath,
+        outputExtension: 'ejs',//« the file extension for resulting HTML files
+        htmlDirPath: htmlOutputPath,
+        jsMenuPath: jsMenuOutputPath,
+        beforeConvert: (mdString, proceed)=>{// This function is applied to each template before the markdown is converted to markup
+          // Based on the github-flavored markdown's language annotation, (e.g. ```js```) add a temporary marker to code blocks that can be parsed post-md-compilation by the `afterConvert()` lifecycle hook
+          // Note: This is an HTML comment because it is easy to over-match and "accidentally" add it underneath each code block as well (being an HTML comment ensures it doesn't show up or break anything)
+          let LANG_MARKER_PREFIX = '<!-- __LANG=%';
+          let LANG_MARKER_SUFFIX = '%__ -->';
+          let modifiedMd = mdString.replace(/(```)([a-zA-Z0-9\-]*)(\s*\n)/g, '$1\n' + LANG_MARKER_PREFIX + '$2' + LANG_MARKER_SUFFIX + '$3');
+
+          // FUTURE: implement a way of skipping non-markdown files, such as pngs (maybe here, but prbly just make it built-in)
+
+          return proceed(undefined, modifiedMd);
+        },
+        afterConvert: (html, proceed)=>{// This function is applied to each template after the markdown is converted to markup
+
+          let modifiedHtml = html;
+
+          // Replace github emoji with unicode emojis
+          // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+          // TODO: actually sub unicode, instead of the following  (there's probably an open source lib out there to do it)
+          // modifiedHtml = html.replace(/\:white_check_mark\:/g, '<i class="sails-icon icon-plus"></i>');
+          // modifiedHtml = modifiedHtml.replace(/\:white_large_square\:/g, '<i class="sails-icon icon-minus"></i>');
+          // modifiedHtml = modifiedHtml.replace(/\:heavy_multiplication_x\:/g, '<i class="sails-icon icon-times"></i>');
+          // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+          // TODO: As equivalent concepts are identified in the Fleet docs (e.g. in the API reference), maybe bring this back:
+          // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+          // // Replace ((bubble))s with HTML
+          // modifiedHtml = modifiedHtml.replace(/\(\(([^())]*)\)\)/g, '<bubble type="$1" class="colors"><span is="bubble-heart"></span></bubble>');
+          // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+          // Flag <h2>, <h3>, <h4>, and <h5> tags with the `permalinkable` directive, so they can be clicked
+          // e.g. ?q=transport-compatibility
+          let $ = cheerio.load(modifiedHtml);
+          $('h2, h3, h4, h5').each(function() {
+            let content = $(this).text() || '';
+
+            // build the URL slug suffix
+            let slug = content
+              .replace(/[\?\!\.\-\_\:\;\'\"]/g, '') // punctuation => gone
+              .replace(/\s/g, '-') // spaces => dashes
+              .toLowerCase();
+
+            // set the "permalink" HTML attr to the slug
+            $(this).attr('permalink', slug);
+
+            if ($(this) && typeof $(this).wrap === 'function') {// this was throwing ".wrap is undefined"
+              $(this).wrap('<div class="permalink-header"></div>');
+            }
+
+          });
+          modifiedHtml = $.html();
+
+          // Modify links
+          modifiedHtml = modifiedHtml.replace(/(href="https?:\/\/([^"]+)")/g, (hrefString)=>{
+            // Check if this is an external link (like https://google.com) but that is ALSO not a link
+            // to some page on the destination site where this will be hosted, like `(*.)?sailsjs.com`.
+            // If external, add target="_blank" so the link will open in a new tab.
+            let isExternal = ! hrefString.match(/^href=\"https?:\/\/([^\.]+\.)*fleetdm\.com/g);
+            if (isExternal) {
+              return hrefString.replace(/(href="https?:\/\/([^"]+)")/g, '$1 target="_blank"');
+            } else {
+              // Otherwise, change the link to be web root relative.
+              // (e.g. 'href="http://sailsjs.com/documentation/concepts"'' becomes simply 'href="/documentation/concepts"'')
+              // Note: See the Git version history of this file for examples of ways this can work across versioned subdomains.
+              return hrefString.replace(/href="https?:\/\//, '').replace(/^fleetdm\.com/, 'href="');
+            }
+          });//∞
+
+          // Add the appropriate class to the `<code>` based on the temporary marker that was added in the `beforeConvert` function above
+          // console.log('RAN AFTER HOOK, found: ',modifiedHtml.match(/(<code)([^>]*)(>\s*)(\&lt;!--\s*__LANG=\%[^\%]*\%__\s*--\&gt;)/g));
+          modifiedHtml = modifiedHtml.replace(// Interpret `js` as `javascript`
+            // $1     $2     $3   $4
+            /(<code)([^>]*)(>\s*)(\&lt;!-- __LANG=\%js\%__ --\&gt;)\s*/gm,
+            '$1 class="javascript"$2$3'
+          );
+          modifiedHtml = modifiedHtml.replace(// Interpret `sh` and `bash` as `bash`
+            // $1     $2     $3   $4
+            /(<code)([^>]*)(>\s*)(\&lt;!-- __LANG=\%(bash|sh)\%__ --\&gt;)\s*/gm,
+            '$1 class="bash"$2$3'
+          );
+          modifiedHtml = modifiedHtml.replace(// When unspecified, default to `text`
+            // $1     $2     $3   $4
+            /(<code)([^>]*)(>\s*)(\&lt;!-- __LANG=\%\%__ --\&gt;)\s*/gm,
+            '$1 class="nohighlight"$2$3'
+          );
+          modifiedHtml = modifiedHtml.replace(// Finally, nab the rest, leaving the code language as-is.
+            // $1     $2     $3   $4               $5    $6
+            /(<code)([^>]*)(>\s*)(\&lt;!-- __LANG=\%)([^%]+)(\%__ --\&gt;)\s*/gm,
+            '$1 class="$5"$2$3'
+          );
+
+          return proceed(undefined, modifiedHtml);
+        },
+      }], (err)=>{
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });//_∏_
+    });
+
+    // Now return the menu data, to provide a nicer way of programmatically working with it.
+    // But first, we'll clean it up a bit.
+    let filesGenerated = await sails.helpers.fs.readJson(jsMenuOutputPath);
+
+    // TODO: bring in the other cleanup in marshal-doc-page-metadata from sailsjs.com repo
+
+    // Since the format from the doc-templater package can be a little bit misleading,
+    // we'll also munge the resulting data a little bit.
+    for (let fileInfo of filesGenerated) {
+
+      fileInfo.path = fileInfo.fullPathAndFileName;// « for clarity (it's not technically the full path)
+      delete fileInfo.fullPathAndFileName;
+
+      fileInfo.fallbackTitle = sails.helpers.toSentenceCase(path.basename(fileInfo.templateTitle, '.ejs'));// « for clarity (the page isn't a template, necessarily, and this title is just a guess.  Display title will, more likely than not, come from a <docmeta> tag -- see the bottom of the original, raw unformatted markdown of any page in the sailsjs docs for an example of how to use docmeta tags)
+      delete fileInfo.templateTitle;
+
+      delete fileInfo.data.lastModified;// « for clarity (this isn't the timestamp you're expecting, so we delete it)
+    }//∞
+
+    return filesGenerated;
+
+  }
+
+
+};
diff --git a/website/api/helpers/to-sentence-case.js b/website/api/helpers/to-sentence-case.js
new file mode 100644
index 0000000000..3454aaaa8f
--- /dev/null
+++ b/website/api/helpers/to-sentence-case.js
@@ -0,0 +1,33 @@
+module.exports = {
+
+
+  friendlyName: 'To sentence case',
+
+
+  description: 'Make a best-effort conversion of the specified text into sentence case.',
+
+
+  sync: true,
+
+
+  inputs: {
+    text: { type: 'string', example: 'the-Weird Catfood', required: true }
+  },
+
+
+  exits: {
+    success: { outputType: 'string', outputExample: 'The weird catfood' },
+  },
+
+
+  fn: function ({ text }) {
+    return text
+      .split(/[\s-_]+/)
+      .filter((word, idx) => !(idx === 0 && word.match(/[0-9]+/))) // « strip off any leading numbers so first word is actually capitalized
+      .map((word, idx) => (idx === 0? word[0].toUpperCase() : word[0].toLowerCase())+word.slice(1))
+      .join(' ');
+  }
+
+
+};
+
diff --git a/website/assets/js/pages/query-detail.page.js b/website/assets/js/pages/query-detail.page.js
new file mode 100644
index 0000000000..752921e501
--- /dev/null
+++ b/website/assets/js/pages/query-detail.page.js
@@ -0,0 +1,25 @@
+parasails.registerPage('query-detail', {
+  //  ╦╔╗╔╦╔╦╗╦╔═╗╦    ╔═╗╔╦╗╔═╗╔╦╗╔═╗
+  //  ║║║║║ ║ ║╠═╣║    ╚═╗ ║ ╠═╣ ║ ║╣
+  //  ╩╝╚╝╩ ╩ ╩╩ ╩╩═╝  ╚═╝ ╩ ╩ ╩ ╩ ╚═╝
+  data: {
+    //…
+  },
+
+  //  ╦  ╦╔═╗╔═╗╔═╗╦ ╦╔═╗╦  ╔═╗
+  //  ║  ║╠╣ ║╣ ║  ╚╦╝║  ║  ║╣
+  //  ╩═╝╩╚  ╚═╝╚═╝ ╩ ╚═╝╩═╝╚═╝
+  beforeMount: function() {
+    //…
+  },
+  mounted: async function() {
+    //…
+  },
+
+  //  ╦╔╗╔╔╦╗╔═╗╦═╗╔═╗╔═╗╔╦╗╦╔═╗╔╗╔╔═╗
+  //  ║║║║ ║ ║╣ ╠╦╝╠═╣║   ║ ║║ ║║║║╚═╗
+  //  ╩╝╚╝ ╩ ╚═╝╩╚═╩ ╩╚═╝ ╩ ╩╚═╝╝╚╝╚═╝
+  methods: {
+    //…
+  }
+});
diff --git a/website/assets/styles/importer.less b/website/assets/styles/importer.less
index 4b287d8fc1..00cd70bcc7 100644
--- a/website/assets/styles/importer.less
+++ b/website/assets/styles/importer.less
@@ -42,3 +42,5 @@
 @import 'pages/404.less';
 @import 'pages/500.less';
 @import 'pages/498.less';
+
+@import 'pages/query-detail.less';
diff --git a/website/assets/styles/pages/query-detail.less b/website/assets/styles/pages/query-detail.less
new file mode 100644
index 0000000000..f3963d5be7
--- /dev/null
+++ b/website/assets/styles/pages/query-detail.less
@@ -0,0 +1,5 @@
+#query-detail {
+
+  //…
+
+}
diff --git a/website/config/env/development.js b/website/config/env/development.js
index fdd45c303e..19ac24135e 100644
--- a/website/config/env/development.js
+++ b/website/config/env/development.js
@@ -14,4 +14,10 @@ module.exports = {
   // be running on port 1337 on your computer.)
   port: 2024,
 
+  // Add any dev-only routes for local development of not-yet-released pages.
+  // e.g. http://localhost:2024/sandbox/example-query
+  routes: {
+    'GET /sandbox/example-query': { action: 'view-query-detail' },
+  },
+
 };
diff --git a/website/config/policies.js b/website/config/policies.js
index 97d83384b1..662f79a854 100644
--- a/website/config/policies.js
+++ b/website/config/policies.js
@@ -23,5 +23,6 @@ module.exports.policies = {
   'legal/view-terms': true,
   'legal/view-privacy': true,
   'deliver-contact-form-message': true,
+  'view-query-detail': true,
 
 };
diff --git a/website/package-lock.json b/website/package-lock.json
index 8ad0b5f8bf..9f6a492a8f 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -72,6 +72,30 @@
         "uid2": "0.0.3"
       }
     },
+    "CSSselect": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz",
+      "integrity": "sha1-+Kt+H4QYzmPNput713ioXX7EkrI=",
+      "requires": {
+        "CSSwhat": "0.4",
+        "domutils": "1.4"
+      },
+      "dependencies": {
+        "domutils": {
+          "version": "1.4.3",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz",
+          "integrity": "sha1-CGVRN5bGswYDGFDhdVFrr4C3Km8=",
+          "requires": {
+            "domelementtype": "1"
+          }
+        }
+      }
+    },
+    "CSSwhat": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz",
+      "integrity": "sha1-hn2g/zn3eGEyQsRM/qg/CqTr35s="
+    },
     "abbrev": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -646,6 +670,44 @@
       "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
       "dev": true
     },
+    "cheerio": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz",
+      "integrity": "sha1-ThwGN35yW3QOmW4N/sNThj3md/o=",
+      "requires": {
+        "CSSselect": "~0.4.0",
+        "dom-serializer": "~0.0.0",
+        "entities": "~1.1.1",
+        "htmlparser2": "~3.8.1",
+        "lodash": "~2.4.1"
+      },
+      "dependencies": {
+        "dom-serializer": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz",
+          "integrity": "sha1-lYmCfx4y0iw3yCmtq9WbMkevjq8=",
+          "requires": {
+            "domelementtype": "~1.1.1",
+            "entities": "~1.1.1"
+          }
+        },
+        "domelementtype": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz",
+          "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs="
+        },
+        "entities": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+          "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+        }
+      }
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -843,6 +905,11 @@
       "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
+    "convert-to-ecmascript-compatible-varname": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/convert-to-ecmascript-compatible-varname/-/convert-to-ecmascript-compatible-varname-0.1.5.tgz",
+      "integrity": "sha1-9npJOMUjNENWQlBHnGcBS6yHhJk="
+    },
     "cookie": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
@@ -1166,6 +1233,305 @@
         }
       }
     },
+    "doc-templater": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/doc-templater/-/doc-templater-0.4.0.tgz",
+      "integrity": "sha1-/3UagCSWN/ePUlYkjIvw1g2BWb0=",
+      "requires": {
+        "async": "~0.9.0",
+        "fs-extra": "~0.8.1",
+        "lodash": "~2.4.1",
+        "machine": "^2.0.4",
+        "machinepack-fs": "~1.3.4",
+        "machinepack-git": "^2.2.0",
+        "machinepack-markdown": "^1.0.1",
+        "machinepack-process": "^3.0.0-4"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
+        },
+        "fs-extra": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.8.1.tgz",
+          "integrity": "sha1-Dld5/7/t9RG8dVWVx/A8BtS0Po0=",
+          "requires": {
+            "jsonfile": "~1.1.0",
+            "mkdirp": "0.3.x",
+            "ncp": "~0.4.2",
+            "rimraf": "~2.2.0"
+          }
+        },
+        "include-all": {
+          "version": "1.0.8",
+          "resolved": "https://registry.npmjs.org/include-all/-/include-all-1.0.8.tgz",
+          "integrity": "sha1-6LuEsFcniiLPlEMZA32XAMGKQ3k=",
+          "requires": {
+            "lodash": "3.10.1"
+          },
+          "dependencies": {
+            "lodash": {
+              "version": "3.10.1",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+              "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+            }
+          }
+        },
+        "jsonfile": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz",
+          "integrity": "sha1-2k/WrXfxolUgPqY8e8Mtwx72RDM="
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+        },
+        "machine": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/machine/-/machine-2.0.6.tgz",
+          "integrity": "sha1-pO3cp6zoy6I8KYdI0oov70z3myM=",
+          "requires": {
+            "convert-to-ecmascript-compatible-varname": "^0.1.0",
+            "debug": "^2.1.1",
+            "lodash": "~2.4.1",
+            "object-hash": "~0.3.0",
+            "rttc": "^1.0.0",
+            "switchback": "~1.1.0"
+          }
+        },
+        "machinepack-fs": {
+          "version": "1.3.4",
+          "resolved": "https://registry.npmjs.org/machinepack-fs/-/machinepack-fs-1.3.4.tgz",
+          "integrity": "sha1-5MoHeslnhelPFLp8L29KI8+OYl8=",
+          "requires": {
+            "async": "^0.9.0",
+            "fs-extra": "~0.10.0",
+            "list-directory-contents": "0.0.2",
+            "lodash": "^2.4.1",
+            "machine": "^1.0.0"
+          },
+          "dependencies": {
+            "fs-extra": {
+              "version": "0.10.0",
+              "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.10.0.tgz",
+              "integrity": "sha1-mcDsL9XqqtnWRiReSwFLVnKZgq8=",
+              "requires": {
+                "jsonfile": "^1.2.0",
+                "mkdirp": "^0.5.0",
+                "ncp": "^0.5.1",
+                "rimraf": "^2.2.8"
+              }
+            },
+            "jsonfile": {
+              "version": "1.2.0",
+              "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.2.0.tgz",
+              "integrity": "sha1-XzXWzZ+Ubsl7Wxg1P6nljfG4b2o="
+            },
+            "machine": {
+              "version": "1.3.2",
+              "resolved": "https://registry.npmjs.org/machine/-/machine-1.3.2.tgz",
+              "integrity": "sha1-m/Z4xdpXV2p+HyZRWw6squzMj0g=",
+              "requires": {
+                "convert-to-ecmascript-compatible-varname": "^0.1.0",
+                "lodash": "~2.4.1",
+                "object-hash": "~0.3.0",
+                "rttc": "^0.2.2",
+                "switchback": "~1.1.0"
+              }
+            },
+            "mkdirp": {
+              "version": "0.5.5",
+              "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+              "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+              "requires": {
+                "minimist": "^1.2.5"
+              }
+            },
+            "ncp": {
+              "version": "0.5.1",
+              "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz",
+              "integrity": "sha1-dDmFMW49tFkoG1hxaehFc1oFQ58="
+            },
+            "rttc": {
+              "version": "0.2.4",
+              "resolved": "https://registry.npmjs.org/rttc/-/rttc-0.2.4.tgz",
+              "integrity": "sha1-XlctrnBlhZSqC2cAgKIxZCGfqVE=",
+              "requires": {
+                "lodash": "~2.4.1"
+              }
+            }
+          }
+        },
+        "machinepack-json": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/machinepack-json/-/machinepack-json-2.0.1.tgz",
+          "integrity": "sha1-uZGrXIjYxR6dgafe87U4gpVmzEA=",
+          "requires": {
+            "lodash.iserror": "3.1.1",
+            "lodash.isfunction": "3.0.8",
+            "lodash.isregexp": "3.0.5",
+            "machine": "~12.1.0"
+          },
+          "dependencies": {
+            "convert-to-ecmascript-compatible-varname": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/convert-to-ecmascript-compatible-varname/-/convert-to-ecmascript-compatible-varname-0.1.4.tgz",
+              "integrity": "sha1-Sf9G6WwdNWqR1Lg+X/4BM8PIrBQ="
+            },
+            "debug": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+              "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "lodash": {
+              "version": "3.10.1",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+              "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+            },
+            "machine": {
+              "version": "12.1.1",
+              "resolved": "https://registry.npmjs.org/machine/-/machine-12.1.1.tgz",
+              "integrity": "sha512-fohf/zxGNvZL69JfbZI/rf660cLnC2tU3tSz8BHGrl+5c7C/82Zypy2fpT2FKPh1q56zfAaCqyI5hSROqBF90g==",
+              "requires": {
+                "convert-to-ecmascript-compatible-varname": "0.1.4",
+                "debug": "3.1.0",
+                "lodash": "3.10.1",
+                "object-hash": "0.3.0",
+                "rttc": "~9.3.0",
+                "switchback": "2.0.0"
+              }
+            },
+            "rttc": {
+              "version": "9.3.4",
+              "resolved": "https://registry.npmjs.org/rttc/-/rttc-9.3.4.tgz",
+              "integrity": "sha1-vABXU7c80WrFANkURta5kyBhctc=",
+              "requires": {
+                "lodash": "3.8.0"
+              },
+              "dependencies": {
+                "lodash": {
+                  "version": "3.8.0",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz",
+                  "integrity": "sha1-N265i9zZOCqTZcM8TLglDeEyW5E="
+                }
+              }
+            },
+            "switchback": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/switchback/-/switchback-2.0.0.tgz",
+              "integrity": "sha1-KifZAzPe8wWnUh3MHjL2qOOtcgU=",
+              "requires": {
+                "lodash": "~2.4.1"
+              },
+              "dependencies": {
+                "lodash": {
+                  "version": "2.4.2",
+                  "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+                  "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+                }
+              }
+            }
+          }
+        },
+        "machinepack-process": {
+          "version": "3.0.0-4",
+          "resolved": "https://registry.npmjs.org/machinepack-process/-/machinepack-process-3.0.0-4.tgz",
+          "integrity": "sha1-t6q3yCdAnfxCC+2gkBZYMd5wuIA=",
+          "requires": {
+            "lodash": "3.10.1",
+            "machine": "^13.0.0-7",
+            "machinepack-json": "~2.0.0",
+            "open": "0.0.5"
+          },
+          "dependencies": {
+            "convert-to-ecmascript-compatible-varname": {
+              "version": "0.1.4",
+              "resolved": "https://registry.npmjs.org/convert-to-ecmascript-compatible-varname/-/convert-to-ecmascript-compatible-varname-0.1.4.tgz",
+              "integrity": "sha1-Sf9G6WwdNWqR1Lg+X/4BM8PIrBQ="
+            },
+            "debug": {
+              "version": "3.1.0",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+              "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+              "requires": {
+                "ms": "2.0.0"
+              }
+            },
+            "lodash": {
+              "version": "3.10.1",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+              "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+            },
+            "machine": {
+              "version": "13.0.0-24",
+              "resolved": "https://registry.npmjs.org/machine/-/machine-13.0.0-24.tgz",
+              "integrity": "sha512-M4jMQbHlAgPklsGdCxP6udDgeOEABlYxwSV0oybcgt4bZ5hz0CLIIpJUtBNtpDNe29K9u6qFHQrGAAIkEiNa7w==",
+              "requires": {
+                "@sailshq/lodash": "^3.10.2",
+                "convert-to-ecmascript-compatible-varname": "0.1.4",
+                "debug": "3.1.0",
+                "include-all": "^1.0.5",
+                "rttc": "^9.8.1",
+                "switchback": "^2.0.1"
+              }
+            },
+            "rttc": {
+              "version": "9.8.2",
+              "resolved": "https://registry.npmjs.org/rttc/-/rttc-9.8.2.tgz",
+              "integrity": "sha1-IzfSHUE/SjT/+IF3+V6uft+9Jr8=",
+              "requires": {
+                "lodash": "3.10.1"
+              }
+            },
+            "switchback": {
+              "version": "2.0.5",
+              "resolved": "https://registry.npmjs.org/switchback/-/switchback-2.0.5.tgz",
+              "integrity": "sha512-w9gnsTxR5geOKt45QUryhDP9KTLcOAqje9usR2VQ2ng8DfhaF+mkIcArxioMP/p6Z/ecKE58i2/B0DDlMJK1jw==",
+              "requires": {
+                "@sailshq/lodash": "^3.10.3"
+              }
+            }
+          }
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc="
+        },
+        "ncp": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz",
+          "integrity": "sha1-q8xsvT7C7Spyn/bnwfqPAXhKhXQ="
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI="
+        },
+        "rttc": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/rttc/-/rttc-1.0.2.tgz",
+          "integrity": "sha1-TTZCjpUoQrJ0P6cC5PVhoi9kje8=",
+          "requires": {
+            "lodash": "~2.4.1"
+          }
+        },
+        "switchback": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/switchback/-/switchback-1.1.3.tgz",
+          "integrity": "sha1-EscBCTSNailvc5upEO64U/i25jE=",
+          "requires": {
+            "lodash": "~2.4.1"
+          }
+        }
+      }
+    },
     "doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -1179,8 +1545,6 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
       "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "domelementtype": "^2.0.1",
         "entities": "^2.0.0"
@@ -1189,32 +1553,24 @@
         "domelementtype": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
         },
         "entities": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true,
-          "optional": true
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
         }
       }
     },
     "domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true,
-      "optional": true
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
     },
     "domhandler": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz",
       "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "domelementtype": "1"
       }
@@ -1223,8 +1579,6 @@
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
       "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "dom-serializer": "0",
         "domelementtype": "1"
@@ -1349,9 +1703,7 @@
     "entities": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz",
-      "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY="
     },
     "error-ex": {
       "version": "1.3.2",
@@ -2910,8 +3262,6 @@
       "version": "3.8.3",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
       "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "domelementtype": "1",
         "domhandler": "2.3",
@@ -2924,8 +3274,6 @@
           "version": "1.1.14",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
           "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "dev": true,
-          "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
             "inherits": "~2.0.1",
@@ -3588,6 +3936,14 @@
         "resolve": "^1.1.7"
       }
     },
+    "list-directory-contents": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/list-directory-contents/-/list-directory-contents-0.0.2.tgz",
+      "integrity": "sha1-D3Kqpy9xJum6LvJkUnt8E2ihnJY=",
+      "requires": {
+        "walker": "~1.0.6"
+      }
+    },
     "load-json-file": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
@@ -3614,11 +3970,26 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
+    "lodash.iserror": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.iserror/-/lodash.iserror-3.1.1.tgz",
+      "integrity": "sha1-KXuaBfq2cUvCRE18wZ0dfES17Ow="
+    },
+    "lodash.isfunction": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-3.0.8.tgz",
+      "integrity": "sha1-TbcJ/IG8So/XEnpFilNGxc3OLGs="
+    },
     "lodash.isplainobject": {
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
       "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs="
     },
+    "lodash.isregexp": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/lodash.isregexp/-/lodash.isregexp-3.0.5.tgz",
+      "integrity": "sha1-4PWWJC8voiioQAhrbIrYLktx/S0="
+    },
     "lodash.issafeinteger": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/lodash.issafeinteger/-/lodash.issafeinteger-4.0.4.tgz",
@@ -3689,6 +4060,54 @@
         "walker": "1.0.7"
       }
     },
+    "machinepack-git": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/machinepack-git/-/machinepack-git-2.2.0.tgz",
+      "integrity": "sha1-ahYf8Z3+npQgujDovkpP4wEBods=",
+      "requires": {
+        "machine": "^10.3.1",
+        "machinepack-process": "^1.2.0"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+        },
+        "machine": {
+          "version": "10.4.0",
+          "resolved": "https://registry.npmjs.org/machine/-/machine-10.4.0.tgz",
+          "integrity": "sha1-m1Ys5GeCEzKCijd9GQ65NrTkB7I=",
+          "requires": {
+            "convert-to-ecmascript-compatible-varname": "^0.1.0",
+            "debug": "^2.1.1",
+            "lodash": "^3.8.0",
+            "object-hash": "~0.3.0",
+            "rttc": "^7.2.1",
+            "switchback": "^2.0.0"
+          }
+        },
+        "machinepack-process": {
+          "version": "1.4.0",
+          "resolved": "https://registry.npmjs.org/machinepack-process/-/machinepack-process-1.4.0.tgz",
+          "integrity": "sha1-MDE++2I+pO5Hc4a1gKhcpGI2Ymg=",
+          "requires": {
+            "lodash": "^3.9.2",
+            "machine": "^10.3.1",
+            "machinepack-json": "^1.1.0",
+            "open": "0.0.5"
+          }
+        },
+        "rttc": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/rttc/-/rttc-7.4.0.tgz",
+          "integrity": "sha1-vJys1Grdkj3rYklaAZNOt+9hn7Q=",
+          "requires": {
+            "lodash": "^3.8.0"
+          }
+        }
+      }
+    },
     "machinepack-http": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/machinepack-http/-/machinepack-http-8.0.0.tgz",
@@ -3701,6 +4120,124 @@
         "rttc": "^10.0.1"
       }
     },
+    "machinepack-json": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/machinepack-json/-/machinepack-json-1.2.1.tgz",
+      "integrity": "sha1-lRj+7w6LYD01e4ExLBhM3Yv33gU=",
+      "requires": {
+        "lodash": "^3.9.2",
+        "machine": "^11.0.1",
+        "rttc": "^8.1.5"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "3.10.1",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+          "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+        },
+        "machine": {
+          "version": "11.0.3",
+          "resolved": "https://registry.npmjs.org/machine/-/machine-11.0.3.tgz",
+          "integrity": "sha1-a0fMYVgGr+D+0CquYf9K72oREOk=",
+          "requires": {
+            "convert-to-ecmascript-compatible-varname": "^0.1.0",
+            "debug": "^2.1.1",
+            "lodash": "^3.8.0",
+            "object-hash": "~0.3.0",
+            "rttc": "^8.1.5",
+            "switchback": "^2.0.0"
+          }
+        },
+        "rttc": {
+          "version": "8.1.7",
+          "resolved": "https://registry.npmjs.org/rttc/-/rttc-8.1.7.tgz",
+          "integrity": "sha1-ODksjpA5beVdgbnxjR/2D3RDAgw=",
+          "requires": {
+            "lodash": "^3.8.0"
+          }
+        }
+      }
+    },
+    "machinepack-markdown": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/machinepack-markdown/-/machinepack-markdown-1.1.0.tgz",
+      "integrity": "sha1-lACobKM1wS9gGGU25Dfhgy2oZEg=",
+      "requires": {
+        "async": "~0.9.0",
+        "fs-extra": "~0.10.0",
+        "lodash": "~2.4.1",
+        "machine": "^10.3.1",
+        "marked": "~0.3.2"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0="
+        },
+        "fs-extra": {
+          "version": "0.10.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.10.0.tgz",
+          "integrity": "sha1-mcDsL9XqqtnWRiReSwFLVnKZgq8=",
+          "requires": {
+            "jsonfile": "^1.2.0",
+            "mkdirp": "^0.5.0",
+            "ncp": "^0.5.1",
+            "rimraf": "^2.2.8"
+          }
+        },
+        "jsonfile": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-1.2.0.tgz",
+          "integrity": "sha1-XzXWzZ+Ubsl7Wxg1P6nljfG4b2o="
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
+        },
+        "machine": {
+          "version": "10.4.0",
+          "resolved": "https://registry.npmjs.org/machine/-/machine-10.4.0.tgz",
+          "integrity": "sha1-m1Ys5GeCEzKCijd9GQ65NrTkB7I=",
+          "requires": {
+            "convert-to-ecmascript-compatible-varname": "^0.1.0",
+            "debug": "^2.1.1",
+            "lodash": "^3.8.0",
+            "object-hash": "~0.3.0",
+            "rttc": "^7.2.1",
+            "switchback": "^2.0.0"
+          },
+          "dependencies": {
+            "lodash": {
+              "version": "3.10.1",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+              "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+            }
+          }
+        },
+        "ncp": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/ncp/-/ncp-0.5.1.tgz",
+          "integrity": "sha1-dDmFMW49tFkoG1hxaehFc1oFQ58="
+        },
+        "rttc": {
+          "version": "7.4.0",
+          "resolved": "https://registry.npmjs.org/rttc/-/rttc-7.4.0.tgz",
+          "integrity": "sha1-vJys1Grdkj3rYklaAZNOt+9hn7Q=",
+          "requires": {
+            "lodash": "^3.8.0"
+          },
+          "dependencies": {
+            "lodash": {
+              "version": "3.10.1",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+              "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
+            }
+          }
+        }
+      }
+    },
     "machinepack-postgresql": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/machinepack-postgresql/-/machinepack-postgresql-1.0.2.tgz",
@@ -3816,6 +4353,11 @@
         "object-visit": "^1.0.0"
       }
     },
+    "marked": {
+      "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz",
+      "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="
+    },
     "math-random": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.4.tgz",
@@ -4132,6 +4674,11 @@
         }
       }
     },
+    "object-hash": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-0.3.0.tgz",
+      "integrity": "sha1-VIII5Ds2pE5NowutbFasU7iF50Q="
+    },
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -4210,6 +4757,11 @@
         "mimic-fn": "^1.0.0"
       }
     },
+    "open": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz",
+      "integrity": "sha1-QsPhjslUZra/DcQvOilFw/DK2Pw="
+    },
     "opn": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz",
diff --git a/website/package.json b/website/package.json
index 0792d77840..29fa037a6f 100644
--- a/website/package.json
+++ b/website/package.json
@@ -16,6 +16,8 @@
     "sails-postgresql": "^1.0.2"
   },
   "devDependencies": {
+    "cheerio": "0.18.0",
+    "doc-templater": "^0.4.0",
     "eslint": "5.16.0",
     "grunt": "1.0.4",
     "htmlhint": "0.11.0",
@@ -24,7 +26,7 @@
   },
   "scripts": {
     "custom-tests": "echo \"(No other custom tests yet.)\" && echo",
-    "build-for-prod": "echo 'Now building+minifying assets for production...' && echo '(Hang tight, this could take a while.)' && echo && node node_modules/grunt/bin/grunt buildProd || (echo && echo '------------------------------------------' && echo 'IMPORTANT!  IMPORTANT!  IMPORTANT!' && echo 'ERROR: Could not compile assets for production!' && echo && echo 'Please fix the issues logged above' && echo 'and push that up.  Then, try deploying again.' && echo '------------------------------------------' && echo) && mv www .www && node -e 'sailsrc = JSON.parse(require(\"fs\").readFileSync(\"./.sailsrc\", \"utf8\"));  if (sailsrc.paths&&sailsrc.paths.public !== undefined || sailsrc.hooks&&sailsrc.hooks.grunt !== undefined) { throw new Error(\"Cannot complete deployment script: .sailsrc file has conflicting contents!  Please remove the conflicting stuff from .sailsrc, then commit and push that up.\"); }  sailsrc.paths = sailsrc.paths || {};  sailsrc.paths.public = \"./.www\";   sailsrc.hooks = sailsrc.hooks || {};  sailsrc.hooks.grunt = false;  require(\"fs\").writeFileSync(\"./.sailsrc\", JSON.stringify(sailsrc))' && echo 'Build is complete.  Ready to deploy.'",
+    "build-for-prod": "echo 'Now compiling markdown content and building+minifying assets for production...' && echo '(Hang tight, this could take a while.)' && echo && ./node_modules/sails/bin/sails.js run build-from-markdown && echo && node node_modules/grunt/bin/grunt buildProd || (echo && echo '------------------------------------------' && echo 'IMPORTANT!  IMPORTANT!  IMPORTANT!' && echo 'ERROR: Could not compile assets for production!' && echo && echo 'Please fix the issues logged above' && echo 'and push that up.  Then, try deploying again.' && echo '------------------------------------------' && echo) && mv www .www && node -e 'sailsrc = JSON.parse(require(\"fs\").readFileSync(\"./.sailsrc\", \"utf8\"));  if (sailsrc.paths&&sailsrc.paths.public !== undefined || sailsrc.hooks&&sailsrc.hooks.grunt !== undefined) { throw new Error(\"Cannot complete deployment script: .sailsrc file has conflicting contents!  Please remove the conflicting stuff from .sailsrc, then commit and push that up.\"); }  sailsrc.paths = sailsrc.paths || {};  sailsrc.paths.public = \"./.www\";   sailsrc.hooks = sailsrc.hooks || {};  sailsrc.hooks.grunt = false;  require(\"fs\").writeFileSync(\"./.sailsrc\", JSON.stringify(sailsrc))' && echo 'Build is complete.  Ready to deploy.'",
     "build": "echo '\"npm run build\" deliberately left unimplemented to prevent its use, since different platforms like Heroku and GitHub Actions all like to try and run it by default, which can lead to inadvertent duplication and unnecessary lock-in, since one has to find the config to turn that off.'",
     "lint": "./node_modules/eslint/bin/eslint.js . --max-warnings=0 --report-unused-disable-directives && echo '✔  Your .js files look so good.' && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/**/**/**/*.ejs && echo '✔  So do your .ejs files.' && ./node_modules/lesshint/bin/lesshint assets/styles/ --max-warnings=0 && echo '✔  Your .less files look good, too.'",
     "start": "NODE_ENV=production node app.js",
diff --git a/website/scripts/build-from-markdown.js b/website/scripts/build-from-markdown.js
new file mode 100644
index 0000000000..bafcc76135
--- /dev/null
+++ b/website/scripts/build-from-markdown.js
@@ -0,0 +1,44 @@
+module.exports = {
+
+
+  friendlyName: 'Build from markdown',
+
+
+  description: 'Generate HTML partials from markdown content in fleetdm/fleet repo, and configure metadata about the generate files so it is available in `sails.config.builtFromMarkdown`.',
+
+
+  fn: async function () {
+
+    let path = require('path');
+
+    let filesGeneratedBySection = {
+      documentation: await sails.helpers.compileMarkdownContent('docs/'),
+      queryLibrary: await sails.helpers.compileMarkdownContent('handbook/queries/')
+    };
+    // FUTURE: Make this work in parallel as shown here by improving doctemplater to avoid the alreadyExists error
+    // (this actually only fails the very first time, but still, thinking is that it's not worth leaving a hack in
+    // here for a trivial build perf boost right now, especially since it only affects website deploys)
+    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    // let filesGeneratedBySection = await sails.helpers.flow.simultaneously({
+    //   documentation: async() => await sails.helpers.compileMarkdownContent('docs/'),
+    //   queryLibrary: async() => await sails.helpers.compileMarkdownContent('handbook/queries/')
+    // });
+    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+    // console.log(filesGeneratedBySection);
+
+    // Compile and generate XML sitemap
+    // (see "refresh" action in sailsjs.com repo for example)
+    // TODO
+
+    // Now take the compiled menu file and inject it into the .sailsrc file so it
+    // can be accessed for the purposes of config using `sails.config.builtFromMarkdown`.
+    let sailsrcPath = path.resolve(sails.config.appPath, '.sailsrc');
+    let sailsrcContent = await sails.helpers.fs.readJson(sailsrcPath);
+    sailsrcContent.builtFromMarkdown = filesGeneratedBySection;
+    await sails.helpers.fs.writeJson(sailsrcPath, sailsrcContent, true);
+
+  }
+
+
+};
+
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index e5069d7bc7..c0ee82a184 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -229,6 +229,7 @@
     <script src="/js/pages/legal/privacy.page.js"></script>
     <script src="/js/pages/legal/terms.page.js"></script>
     <script src="/js/pages/pricing.page.js"></script>
+    <script src="/js/pages/query-detail.page.js"></script>
     <!--SCRIPTS END-->
 
     <% /* Display an overlay if the current browser is not supported.
diff --git a/website/views/pages/query-detail.ejs b/website/views/pages/query-detail.ejs
new file mode 100644
index 0000000000..48ee108b7b
--- /dev/null
+++ b/website/views/pages/query-detail.ejs
@@ -0,0 +1,11 @@
+<div id="query-detail" v-cloak>
+
+  <h1>TODO: Implement this page.</h1>
+  <p>(See also <em>assets/styles/pages/query-detail.less</em>, <em>assets/js/pages/query-detail.page.js</em>, and <em>api/controllers/view-query-detail.js</em>.)</p>
+
+  <p>This paragraph, and the content above it, are just here for reference.  The HTML generated from markdown is below.</p>
+
+  <%- partial('../partials/built-from-markdown/handbook-queries/get-installed-macos-software.ejs') %>
+
+</div>
+<%- /* Expose server-rendered data as window.SAILS_LOCALS :: */ exposeLocalsToBrowser() %>

From fa3c4e7446038d553abb33663d5181e7b7811e7e Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Mon, 10 May 2021 22:57:40 +0900
Subject: [PATCH 21/51] query-library-crashes (#743)

Daily addition to the query library.
---
 handbook/queries/README.md             |  1 +
 handbook/queries/get-system-crashes.md | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 handbook/queries/get-system-crashes.md

diff --git a/handbook/queries/README.md b/handbook/queries/README.md
index 31682612b9..2681da492d 100644
--- a/handbook/queries/README.md
+++ b/handbook/queries/README.md
@@ -28,6 +28,7 @@ Fleet's standard query library includes a growing collection of useful queries f
 - [Get mounts](./get-mounts.md) (macOS, Linux)
 - [Get startup items](./get-startup-items.md) (macOS, Linux, Windows, FreeBSD)
 - [Get system uptime](./get-system-uptime.md) (macOS, Linux, Windows, FreeBSD)
+- [Get system crashes](./get-system-crashes.md) (macOS)
 
 ### Contributors
 
diff --git a/handbook/queries/get-system-crashes.md b/handbook/queries/get-system-crashes.md
new file mode 100644
index 0000000000..df6bbc1dde
--- /dev/null
+++ b/handbook/queries/get-system-crashes.md
@@ -0,0 +1,16 @@
+# Get system crashes
+
+Retrieve application, system, and mobile app crash logs.
+
+### Support
+macOS
+
+### Query
+```sql
+SELECT uid, datetime, responsible, exception_type, identifier, version, crash_path FROM users CROSS JOIN crashes USING (uid);
+```
+### Purpose
+Informational
+
+### Remediation
+N/A
\ No newline at end of file

From 724278bd179405dcf561fce86aee621a32385bb8 Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Tue, 11 May 2021 01:06:44 +0900
Subject: [PATCH 22/51] Query library crashes (#745)

* query-library-crashes

Daily addition to the query library.

* name change

changed the name to "Get crashes".

* Resolving conflicts in filenames

Resolving conflicts in filenames and deleting old version.
---
 handbook/queries/README.md                                 | 3 ++-
 handbook/queries/{get-system-crashes.md => get-crashes.md} | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
 rename handbook/queries/{get-system-crashes.md => get-crashes.md} (92%)

diff --git a/handbook/queries/README.md b/handbook/queries/README.md
index 2681da492d..da038cf0c3 100644
--- a/handbook/queries/README.md
+++ b/handbook/queries/README.md
@@ -28,7 +28,8 @@ Fleet's standard query library includes a growing collection of useful queries f
 - [Get mounts](./get-mounts.md) (macOS, Linux)
 - [Get startup items](./get-startup-items.md) (macOS, Linux, Windows, FreeBSD)
 - [Get system uptime](./get-system-uptime.md) (macOS, Linux, Windows, FreeBSD)
-- [Get system crashes](./get-system-crashes.md) (macOS)
+- [Get crashes](./get-crashes.md) (macOS)
+
 
 ### Contributors
 
diff --git a/handbook/queries/get-system-crashes.md b/handbook/queries/get-crashes.md
similarity index 92%
rename from handbook/queries/get-system-crashes.md
rename to handbook/queries/get-crashes.md
index df6bbc1dde..cf41ddbd7a 100644
--- a/handbook/queries/get-system-crashes.md
+++ b/handbook/queries/get-crashes.md
@@ -1,4 +1,4 @@
-# Get system crashes
+# Get crashes
 
 Retrieve application, system, and mobile app crash logs.
 

From 58445ede82550cb574775a83ae4cf5433f325a7e Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Mon, 10 May 2021 16:00:34 -0400
Subject: [PATCH 23/51] Replace icons (#747)

* Replaces dropdown icon, close icon, carat icon, collapse icon, add icon

Co-authored-by: Sarah Gillespie <sarahgillespi314@gmail.com>
---
 ...icon-accordion-collapse-black-16x16@2x.png | Bin 0 -> 682 bytes
 .../icon-accordion-collapse-blue-16x16@2x.png | Bin 0 -> 682 bytes
 assets/images/icon-chevron-black-16x16@2x.png | Bin 0 -> 460 bytes
 assets/images/icon-chevron-black-9x6@2x.png   | Bin 0 -> 397 bytes
 assets/images/icon-chevron-blue-16x16@2x.png  | Bin 0 -> 383 bytes
 assets/images/icon-chevron-blue-9x6@2x.png    | Bin 0 -> 331 bytes
 assets/images/icon-chevron-white-16x16@2x.png | Bin 0 -> 248 bytes
 assets/images/icon-close-8x8@2x.png           | Bin 0 -> 363 bytes
 .../images/icon-close-fleet-blue-16x16@2x.png | Bin 0 -> 442 bytes
 .../icon-close-vibrant-blue-16x16@2x.png      | Bin 0 -> 409 bytes
 .../images/icon-collapse-black-16x16@2x.png   | Bin 0 -> 682 bytes
 assets/images/icon-collapse-blue-16x16@2x.png | Bin 0 -> 682 bytes
 assets/images/icon-plus-circle-16x16@2x.png   | Bin 0 -> 1009 bytes
 .../buttons/DropdownButton/DropdownButton.jsx |   3 +-
 .../buttons/DropdownButton/_styles.scss       |  12 +++
 .../admin/AppConfigForm/AppConfigForm.jsx     |   6 +-
 .../forms/admin/AppConfigForm/_styles.scss    |  18 ++++
 .../forms/fields/Dropdown/_styles.scss        |  58 +++++++++----
 .../TargetOption/TargetOption.jsx             |   4 +-
 .../TargetOption/_styles.scss                 |   9 +-
 .../fields/SelectTargetsDropdown/_styles.scss |  77 +++++++++++-------
 frontend/components/modals/Modal/Modal.jsx    |   6 +-
 frontend/components/modals/Modal/_styles.scss |  17 ++--
 23 files changed, 146 insertions(+), 64 deletions(-)
 create mode 100644 assets/images/icon-accordion-collapse-black-16x16@2x.png
 create mode 100644 assets/images/icon-accordion-collapse-blue-16x16@2x.png
 create mode 100644 assets/images/icon-chevron-black-16x16@2x.png
 create mode 100644 assets/images/icon-chevron-black-9x6@2x.png
 create mode 100644 assets/images/icon-chevron-blue-16x16@2x.png
 create mode 100644 assets/images/icon-chevron-blue-9x6@2x.png
 create mode 100644 assets/images/icon-chevron-white-16x16@2x.png
 create mode 100644 assets/images/icon-close-8x8@2x.png
 create mode 100644 assets/images/icon-close-fleet-blue-16x16@2x.png
 create mode 100644 assets/images/icon-close-vibrant-blue-16x16@2x.png
 create mode 100644 assets/images/icon-collapse-black-16x16@2x.png
 create mode 100644 assets/images/icon-collapse-blue-16x16@2x.png
 create mode 100644 assets/images/icon-plus-circle-16x16@2x.png

diff --git a/assets/images/icon-accordion-collapse-black-16x16@2x.png b/assets/images/icon-accordion-collapse-black-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d89ec4e6524ca399f41b4ce9ef06c0b4f7d53da5
GIT binary patch
literal 682
zcmV;b0#*HqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0zXMaK~#7F?U&DM
z6G0Tmzi%UkQW8?|P!Gb2J&D*JtEUvK_8>G;u^?V5h&>1fQtPR0qMlNU5fS<qh?WW#
zJg7aico7f6B2+K_SkObI2bZG6Ma=kK?1ubkchhaVOQ9dwF!N@z-|xPeN%j%yXxC3A
z36XvfQry+CJs3nVN+rrIo6pVa0dg7%J(+0Hq7zU^V<#aLiX}T|nTyu{t|Ly-1#WgB
z7>uH_d&Gn$z4DU>CoXiYX@c7IKAlK?K?o>CJ(>nJfsi1ml%_}pnfiJM{k#V#JOg~p
zHH6IWH4u-tV)kJkFP}X?Jk|=o_%=|;kKknYaU45(1ck{F_{Eoj!ej=0r%zP+(!QI|
zzz>@?AmSGWdK=<{=X-sb*pz|X*wuB#w_+j^YwO51Gcj}h60Qvo*2Gp<f5Eo@AR66Y
ziOHT2UcY(Q%x#;?fQZXgFFtT_w0ue1YyL)fX24B+>HR0Hto*>jtG7s<P1a;WPKe-@
z30DJN;tpFe;kpD@hR!v_#_vqmh&xDZ{PuK1+-=i(8mM32^yn03X6HAYKl5ZB=^Im(
zzI^xc@GZFEx&+m!y*YN@Ror3e!)JW`_MOw;*|1dWK?e_?Q3#Q}zhizSgo*GlBm;8@
z3B}ctra(^-7F?=Dep(;RSfZni-%z^|BntPI%@>c#n=lGH%Mk;?VHC@n{6i!kmSz4v
zkT~@CFZQ+UcqaJCS$wFbIITuXHC~)74|IaIr)E%m()fOJvfsEoU#uSc2WOYuD<t?J
Q?EnA(07*qoM6N<$g6ID*Hvj+t

literal 0
HcmV?d00001

diff --git a/assets/images/icon-accordion-collapse-blue-16x16@2x.png b/assets/images/icon-accordion-collapse-blue-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d89ec4e6524ca399f41b4ce9ef06c0b4f7d53da5
GIT binary patch
literal 682
zcmV;b0#*HqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0zXMaK~#7F?U&DM
z6G0Tmzi%UkQW8?|P!Gb2J&D*JtEUvK_8>G;u^?V5h&>1fQtPR0qMlNU5fS<qh?WW#
zJg7aico7f6B2+K_SkObI2bZG6Ma=kK?1ubkchhaVOQ9dwF!N@z-|xPeN%j%yXxC3A
z36XvfQry+CJs3nVN+rrIo6pVa0dg7%J(+0Hq7zU^V<#aLiX}T|nTyu{t|Ly-1#WgB
z7>uH_d&Gn$z4DU>CoXiYX@c7IKAlK?K?o>CJ(>nJfsi1ml%_}pnfiJM{k#V#JOg~p
zHH6IWH4u-tV)kJkFP}X?Jk|=o_%=|;kKknYaU45(1ck{F_{Eoj!ej=0r%zP+(!QI|
zzz>@?AmSGWdK=<{=X-sb*pz|X*wuB#w_+j^YwO51Gcj}h60Qvo*2Gp<f5Eo@AR66Y
ziOHT2UcY(Q%x#;?fQZXgFFtT_w0ue1YyL)fX24B+>HR0Hto*>jtG7s<P1a;WPKe-@
z30DJN;tpFe;kpD@hR!v_#_vqmh&xDZ{PuK1+-=i(8mM32^yn03X6HAYKl5ZB=^Im(
zzI^xc@GZFEx&+m!y*YN@Ror3e!)JW`_MOw;*|1dWK?e_?Q3#Q}zhizSgo*GlBm;8@
z3B}ctra(^-7F?=Dep(;RSfZni-%z^|BntPI%@>c#n=lGH%Mk;?VHC@n{6i!kmSz4v
zkT~@CFZQ+UcqaJCS$wFbIITuXHC~)74|IaIr)E%m()fOJvfsEoU#uSc2WOYuD<t?J
Q?EnA(07*qoM6N<$g6ID*Hvj+t

literal 0
HcmV?d00001

diff --git a/assets/images/icon-chevron-black-16x16@2x.png b/assets/images/icon-chevron-black-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc37f8848bd16308917d2915055977aa3c18f9ac
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0bxl*K~#7F?US)i
z!cY{3&#44!Qj;2Ef^n%7b{|0pl~Ff0VDk~&#5aI9z$bvQjRQP_PA)*Y*~GyP#Ms2#
z>n+e&OUu1i2Sakd?cSW8|G(!y1yCpy3dKLOAyRZ;ogNuGm1kqO>QCQBPeR|=XLZA@
z47bd(`yNdEygKAIV&VjGz)H>NOf_uyW9J??;)Gy#aST2wIeGOS9<ypS;6PC8#o{x^
zgmz1Itu81YVHQvu<kfQxP>M^hWhUBtY%)vY(X<G(GkSC&2ks6`gVE41tB454iECX$
zyh`Sqjw&I3=X*{ouRnJOVoFx6g-CBx*Ry<!5Je>~E@fbq2_^-<5swi14P&A>woUsG
z5R>`qOkDp_NTK6<?u|f8IRkSO<9>#TZ*8`;O#B)Ikv6c(#9Z8IfCN%IkY>Mp-ecpw
zSaj;YOx#P5qyT?llZ4F>ixzu%@Ik{SC=?3CI`RcCS%~A<(G5ue0000<MNUMnLSTYD
C^SZPE

literal 0
HcmV?d00001

diff --git a/assets/images/icon-chevron-black-9x6@2x.png b/assets/images/icon-chevron-black-9x6@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..58e9f47f74ad53c8ad2d838df45c267046c9ce64
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq000sI000aK1^@s6ZxZdi00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0U}96K~#7Ft&l%X
z0znkU-#25-nykqfV}hYU7J84Mg-WTN9h4ryPP_r!08RkqZUtAcvH?QpbZ$Yc%#1V0
zl403hDENxW%=`0u?;D~6iQA)Gxx4nyYM=gjT`s;SANw?xgZrj0YU2}8jeg>pgoP+z
zL<C_AG($^H!~QOaQs}Lo@vm05Oo0s&h!vFXm4ZfdPl%N`0vj={u{GVmIu~ZsEr{J-
zQ70WYj4ofqld&)A0O-cac?@_?{I4O-7dVi2IS<=N0;Ni$4d}Pju%-WFb18x>UAT!n
zm}#LRh!uB}*5;`Qt_X1d$1@Ob1Ffkm=h3Sh;;HEdHXUZb+)erh@{*48tl~V_KO}5r
r^?(X=S$!B78;`5X;nysB%B%eYRNi~aEcj$c00000NkvXXu0mjfy6d9<

literal 0
HcmV?d00001

diff --git a/assets/images/icon-chevron-blue-16x16@2x.png b/assets/images/icon-chevron-blue-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..121e004fcf03cdb1f52f6e6845869390799fa4f3
GIT binary patch
literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0Tf9@K~#7F?UBuG
z!axv(-`EDEoG2kBq=j^lQ~(@^LUN&lkPhGwte6W_Ksum>l)~9y4<3FbFtT^oJ|Lv|
zPWEVa-nX-Wq9}@TW5}kd-;bXf6s*Xn;ZH~ln=_vS?r_TEO}c%a&6@wHDsT$VI@|jL
z9(7F;$ME^_cU>mo!9c?cmZxw*21|ftxX{jKtcv=L0wBJ+t*llyldnsS6CPj9V4k38
zJS_NlPex$+%9Srxn}4da@b78lk5EUzBq1MF!kq-lB*6Pg&f(4i!r(2L6H%wUizm}x
ze+Ubl1xymmya*$|3ri{q6iK*-*Ah5Lq)Q^a9K!JzM&2tN2~dMpOue|pkJ&BO%?Ij1
dQ55AK*#RxLhiI?vqWAy+002ovPDHLkV1h;Jo1Fjv

literal 0
HcmV?d00001

diff --git a/assets/images/icon-chevron-blue-9x6@2x.png b/assets/images/icon-chevron-blue-9x6@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..a633a5ec4bde8ca627d20acbb6e9f1186aba45d7
GIT binary patch
literal 331
zcmeAS@N?(olHy`uVBq!ia0vp^LO{&J!3HGrh2HJ~Qk(@Ik;M!QVyYm_=ozH)0Vv2=
z9OUlAu<o49OCX0O-O<;Pfnj4m_n$;oApe1<i(^Oy<Jt>*1)CfMSRYikOGS6--e?S4
z(Aj6tDcd3IpwKhHf%OKXZUomxE^Y2RJj^meI~a?%+t|Ge>#!I7vGMj^v0xt|34?sO
zMTYY8`nN2c^QQb?B-_C^oUI~H_DoUTwts^Z=j+^4Gv=J~TqB^zS5TmG$W*__g)89s
z`<fKH%-!d0Pn~%8!o|;W@nyx$EDtYL&0Y0ddx>QeTTyB4;ig;siF+iRDmv5R+c~u+
zM=fD4l>Hvb;b8qHs_@S4L^JCb-Mon|B9;3#=6<hMlwIb`wvg*|vcnoJ7aN=Sb)`4;
Z|E_B&`f}m?9iU$sJYD@<);T3K0RZ|ydR+hj

literal 0
HcmV?d00001

diff --git a/assets/images/icon-chevron-white-16x16@2x.png b/assets/images/icon-chevron-white-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f6b4cfe439cee2d7dd149d346a0b1069523d74e
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?2=RS;(M3{v?36l5$8
za(7}_cTVOdki(Mh=<CS9u(6-}Pa-Rj-|Ok(7*fIb_Cg|WgMt9-1M!0zW{bK6dmNaR
zBo1=8862w2dvN1Oqrs1_``()UlX=hR;Nl{wWb}HD)wAP$AFYj}Tpl`ZYvJd=<@Mr|
zV*WCNKbnnEyY?*6^VzHQG5TPWn5yco*6CAT$i)RLs;>w+<aMuWo{_4K+YgOI!%1wr
pH0~st@XjqMoBP(TxuZiX_U7LWK^4Y|*MSaW@O1TaS?83{1ON+CSRMcX

literal 0
HcmV?d00001

diff --git a/assets/images/icon-close-8x8@2x.png b/assets/images/icon-close-8x8@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..22fc241309d2ce01835e471471fa7f7f8ac2a072
GIT binary patch
literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?2=RS;(M3{v?36l5$8
za(7}_cTVOdki(Mh=<CS9u(6-}Pa-Q&j=|H#F{FZV?c}|pO$GwT-xn~d2S}G+aPpE<
zmF|!}z?Q=x-4Pv-?Yz>q)uK^Ypt$lFyCS>hpZ(L%@BY2_jw<7i$rE-tPjKO=n6`R*
z&dsf-^z{zbO^|yU5HM$XM#s(=ou?(tOkVaOe4hncf{trW;EChgla^rb;m@UFGqG=v
z<P2V?sDSTTuYPCk&Q6`HbXacf_TTBZuk>qnI20cGcTCYINo3QDWdcbru4J^{S+&UJ
z@_|D-mjo`X{AxN;jeBELOoCd=6Gr7X0UOLDZm&^)l(&5O!Q3cEJ^^i>ScMSbr)O+<
zf6acubg^}ARr(9Ai;oiSO`oyT!DGwvVA<xL`{x~(CCKZ&o-#|CJM$4RY#2OU{an^L
HB{Ts5YYB_{

literal 0
HcmV?d00001

diff --git a/assets/images/icon-close-fleet-blue-16x16@2x.png b/assets/images/icon-close-fleet-blue-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e5c63aef20850932ed3465d816ef5405b36ed9b
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0Z&OpK~#7F?UlW8
z!axv(cSQqKU^}4)JAjZOR0qZ#pbqQ`PzT5zIAk1}gwW0jz!j(h)+;gcAgtZnJ3Iry
zeKQ*U?A^XMy4zcTNF;J$Pzw&nvlIarJgVgD`C~bM1p}jT_Q<!qnny(0>OFsx#wJ=K
zM4WSyK0n?8K{1-tiQVD|MKh0cEVS{e0T%6_ysIXD#oLq+YJd{T{(kH>A&3JZy?{bb
z3x03bpEra19q)tmB$VC`9=5y9`pY5yv|8qcrlD@ahT&v3Me0~fgemOndl4djNMS@Y
z(ScRGq6bEl<p>t{GGH;`D_)U+C%8uvV<5*Qy#9c++mC2f$G;jdhzFT4Re@ILbrPXO
zExp6}2V94Y^{@&uU_If^F`-uhw_uleL-nm$lJ*2{%L-oI&{gMxi8Hz()XBE|P+AX}
kBNK;t)X`BRk;pai19|wzOEGs9DF6Tf07*qoM6N<$f(9?Np#T5?

literal 0
HcmV?d00001

diff --git a/assets/images/icon-close-vibrant-blue-16x16@2x.png b/assets/images/icon-close-vibrant-blue-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdaaae88d28b81d0d819590356af27dc90c7f3b1
GIT binary patch
literal 409
zcmV;K0cQS*P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0WL{IK~#7F?Ul<7
z!Y~Ym?Z5zxz({NWTo8y88^8o`;UO--28_fA9ROmSN<e|eaRL$?@=I0Q#PR<r4+kJC
zE9=KXsdF?qcM!~uqY5-QU9Rx}3XMn9r3)?GI3hb)Z<|M7tdSBSnmH$F@n@SX?OkHf
zm~-rH9Ou|c@ge|FndI>sfVi7KtAJDhYwYB;%?IHz=V`Pv5G3var{VD2GxR=<yeE3M
zJt3I)SDWS@J^=_pxOb|#8bE@m&#E(z0#HLlm`4KyAtKG43`DAd4f6G&(B~Z!6YSmX
z)r6JP@l^ngc?yJT38Zsw`FU;DmhCb{C_qzWG{q_jAg02lLWoPi=2MNi(}vqT%dr4K
zQMX~}oO>YBZ$pAI*@-_2ZIP)!l;f!8M$O8~`YT-l)~wWcB<FMM00000NkvXXu0mjf
DSxcjm

literal 0
HcmV?d00001

diff --git a/assets/images/icon-collapse-black-16x16@2x.png b/assets/images/icon-collapse-black-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d89ec4e6524ca399f41b4ce9ef06c0b4f7d53da5
GIT binary patch
literal 682
zcmV;b0#*HqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0zXMaK~#7F?U&DM
z6G0Tmzi%UkQW8?|P!Gb2J&D*JtEUvK_8>G;u^?V5h&>1fQtPR0qMlNU5fS<qh?WW#
zJg7aico7f6B2+K_SkObI2bZG6Ma=kK?1ubkchhaVOQ9dwF!N@z-|xPeN%j%yXxC3A
z36XvfQry+CJs3nVN+rrIo6pVa0dg7%J(+0Hq7zU^V<#aLiX}T|nTyu{t|Ly-1#WgB
z7>uH_d&Gn$z4DU>CoXiYX@c7IKAlK?K?o>CJ(>nJfsi1ml%_}pnfiJM{k#V#JOg~p
zHH6IWH4u-tV)kJkFP}X?Jk|=o_%=|;kKknYaU45(1ck{F_{Eoj!ej=0r%zP+(!QI|
zzz>@?AmSGWdK=<{=X-sb*pz|X*wuB#w_+j^YwO51Gcj}h60Qvo*2Gp<f5Eo@AR66Y
ziOHT2UcY(Q%x#;?fQZXgFFtT_w0ue1YyL)fX24B+>HR0Hto*>jtG7s<P1a;WPKe-@
z30DJN;tpFe;kpD@hR!v_#_vqmh&xDZ{PuK1+-=i(8mM32^yn03X6HAYKl5ZB=^Im(
zzI^xc@GZFEx&+m!y*YN@Ror3e!)JW`_MOw;*|1dWK?e_?Q3#Q}zhizSgo*GlBm;8@
z3B}ctra(^-7F?=Dep(;RSfZni-%z^|BntPI%@>c#n=lGH%Mk;?VHC@n{6i!kmSz4v
zkT~@CFZQ+UcqaJCS$wFbIITuXHC~)74|IaIr)E%m()fOJvfsEoU#uSc2WOYuD<t?J
Q?EnA(07*qoM6N<$g6ID*Hvj+t

literal 0
HcmV?d00001

diff --git a/assets/images/icon-collapse-blue-16x16@2x.png b/assets/images/icon-collapse-blue-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..d89ec4e6524ca399f41b4ce9ef06c0b4f7d53da5
GIT binary patch
literal 682
zcmV;b0#*HqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0zXMaK~#7F?U&DM
z6G0Tmzi%UkQW8?|P!Gb2J&D*JtEUvK_8>G;u^?V5h&>1fQtPR0qMlNU5fS<qh?WW#
zJg7aico7f6B2+K_SkObI2bZG6Ma=kK?1ubkchhaVOQ9dwF!N@z-|xPeN%j%yXxC3A
z36XvfQry+CJs3nVN+rrIo6pVa0dg7%J(+0Hq7zU^V<#aLiX}T|nTyu{t|Ly-1#WgB
z7>uH_d&Gn$z4DU>CoXiYX@c7IKAlK?K?o>CJ(>nJfsi1ml%_}pnfiJM{k#V#JOg~p
zHH6IWH4u-tV)kJkFP}X?Jk|=o_%=|;kKknYaU45(1ck{F_{Eoj!ej=0r%zP+(!QI|
zzz>@?AmSGWdK=<{=X-sb*pz|X*wuB#w_+j^YwO51Gcj}h60Qvo*2Gp<f5Eo@AR66Y
ziOHT2UcY(Q%x#;?fQZXgFFtT_w0ue1YyL)fX24B+>HR0Hto*>jtG7s<P1a;WPKe-@
z30DJN;tpFe;kpD@hR!v_#_vqmh&xDZ{PuK1+-=i(8mM32^yn03X6HAYKl5ZB=^Im(
zzI^xc@GZFEx&+m!y*YN@Ror3e!)JW`_MOw;*|1dWK?e_?Q3#Q}zhizSgo*GlBm;8@
z3B}ctra(^-7F?=Dep(;RSfZni-%z^|BntPI%@>c#n=lGH%Mk;?VHC@n{6i!kmSz4v
zkT~@CFZQ+UcqaJCS$wFbIITuXHC~)74|IaIr)E%m()fOJvfsEoU#uSc2WOYuD<t?J
Q?EnA(07*qoM6N<$g6ID*Hvj+t

literal 0
HcmV?d00001

diff --git a/assets/images/icon-plus-circle-16x16@2x.png b/assets/images/icon-plus-circle-16x16@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f1b4475f6197f1ae9b0deba35277c60886017ea
GIT binary patch
literal 1009
zcmV<N0}lL&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1BOXNK~#7F%~xGg
z+b|H`l}!k3ALt31o}h4o!U+l|Af0Kz4G)A9gxnx`NlfSr;RJ*e04HdAg1R@zOG|!i
zZM6yxmg6{XAT#}DJeFixtCjZWTZD|LRA_VXJJ=J#`iKBqL{tETP5qIekBA-t^gssp
zxz|>=UdMixb#c)I$Dx8naH0ejrvftpI}!&q*WK_^XU+S-8jl~KN<bBO28gh}{t9aI
zP9$*ythFGzRm}pt3_OX$-K5hH@qtolv^7__x@$nHNep(?g72H>0{O{p;9DM36B;ZG
zW}y^XzvZ>#AB+=7(OhW|e0JTnJIDaX@r!~)HF+KLB&H|8cb+Vq8cM_Mtil<tYj<)(
z+<rWfDD+9NtZ={%8*Feh!ij3lwsi(epx)6&S1CI|9|)__O$`5NS*P65SMYfBKg}hm
z(LA?OJ>cu1zsK)Z+wP{#D<1`QCF&$P#x}%Pp|3y?RAc{mxealawy5KbcM!!jKhBr&
zPTJhuP_N}h#{}iHa-ve?`%pn93Y4{lku0za)5Q=AX;b++*oe(hJkWMGSPS-I^S!1r
zB6wkFBW5>#!sbYab`{&rsdNLYf{1yAk}VL(2o5rkU04w$$U9?zfP<dtdighY4^{@-
zGrC9xEFVdVj&W#>_RB}a?lbF-q>ML`jsa(lmPj^QZL4msXUel-F_dtX`{O{P&7L%q
zsuf4z&DS9XB4(Lzd`$16eG;;POf)8b{PaZso3y?7qd0_NbQ701(6<qRnatD>gQ5Rk
zy?%xLR!bk@j22FbiUR3!vH^M8Y%g}*LEcwJXFUxNdO{NYh)z;|xdSVL%8+KvLFg$j
z5O?OF8M9v&_{r=B_aZ-rZahLQitWq5DfvZ+W!qfd>I$7Uk*=a2gk@bubM|wgW4;iv
zgoho@H#!?i6mcU9bM|~#z85x?9eHU}leh*mW`64pxGs8e_JT;2@*&OL1Sc02X!e;4
zy5HurrLsc_%$gb@Et`fD_R-NgeUI;S5v`tw6k6{w#S7QVOiDq@TJs`Xnr0(rJAw?P
zbfzv~>bxfGYe=pMJOu0pfq%nEE7Zbq9tz;w1tDye+Lgx16_huY{{F>9&PaCuUtz*v
zqntylmq1AClWW9G#VJa8rZU?BWW}U{x{^4mFI}9*q093@u!j<N6bb#HiHuR6b5g^e
fRONa8AIkH;LR8C9R#KMw00000NkvXXu0mjf3W3Ie

literal 0
HcmV?d00001

diff --git a/frontend/components/buttons/DropdownButton/DropdownButton.jsx b/frontend/components/buttons/DropdownButton/DropdownButton.jsx
index 82b06dcf43..db81ffe59b 100644
--- a/frontend/components/buttons/DropdownButton/DropdownButton.jsx
+++ b/frontend/components/buttons/DropdownButton/DropdownButton.jsx
@@ -93,7 +93,7 @@ export class DropdownButton extends Component {
     return (
       <div className={`${baseClass}__wrapper`} ref={setDOMNode}>
         <Button
-          className={buttonClass}
+          className={`${buttonClass} downcarat`}
           disabled={disabled}
           onClick={toggleDropdown}
           size={size}
@@ -102,7 +102,6 @@ export class DropdownButton extends Component {
           variant={variant}
         >
           {children}{" "}
-          <KolideIcon name="downcarat" className={`${baseClass}__carat`} />
         </Button>
 
         <ul className={optionsClass}>
diff --git a/frontend/components/buttons/DropdownButton/_styles.scss b/frontend/components/buttons/DropdownButton/_styles.scss
index 8221835232..0b448932bb 100644
--- a/frontend/components/buttons/DropdownButton/_styles.scss
+++ b/frontend/components/buttons/DropdownButton/_styles.scss
@@ -52,3 +52,15 @@
     }
   }
 }
+
+.downcarat {
+  &::after {
+    content: url("../assets/images/icon-chevron-white-16x16@2x.png");
+    transform: scale(0.5);
+    width: 16px;
+    border-radius: 0px;
+    padding: 0px;
+    padding-left: 2px;
+    margin-top: 2px;
+  }
+}
diff --git a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
index 62f1b3565d..7b007e9739 100644
--- a/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
+++ b/frontend/components/forms/admin/AppConfigForm/AppConfigForm.jsx
@@ -56,7 +56,11 @@ const formFields = [
 ];
 const Header = ({ showAdvancedOptions }) => {
   const CaratIcon = (
-    <KolideIcon name={showAdvancedOptions ? "downcarat" : "upcarat"} />
+    <Button
+      className={`button button--unstyled ${
+        showAdvancedOptions ? "upcarat" : "downcarat"
+      }`}
+    />
   );
 
   return (
diff --git a/frontend/components/forms/admin/AppConfigForm/_styles.scss b/frontend/components/forms/admin/AppConfigForm/_styles.scss
index 00f7f73ccb..17f18d3fb1 100644
--- a/frontend/components/forms/admin/AppConfigForm/_styles.scss
+++ b/frontend/components/forms/admin/AppConfigForm/_styles.scss
@@ -32,6 +32,24 @@
     @include clearfix;
     margin: 0 0 30px;
 
+    .upcarat {
+      content: url("../assets/images/icon-collapse-black-16x16@2x.png");
+      width: 16px;
+      height: 16px;
+      border-radius: 0px;
+      top: 5px;
+      margin: 4px;
+    }
+
+    .downcarat {
+      content: url("../assets/images/icon-chevron-black-16x16@2x.png");
+      width: 16px;
+      height: 16px;
+      border-radius: 0px;
+      top: 5px;
+      margin: 4px;
+    }
+
     h2 {
       a {
         color: $core-fleet-black;
diff --git a/frontend/components/forms/fields/Dropdown/_styles.scss b/frontend/components/forms/fields/Dropdown/_styles.scss
index 5f3b2ee42f..86a18a7d2a 100644
--- a/frontend/components/forms/fields/Dropdown/_styles.scss
+++ b/frontend/components/forms/fields/Dropdown/_styles.scss
@@ -62,7 +62,7 @@
       border: 0;
       float: right;
       position: relative;
-      line-height: 28px;
+      line-height: 34px;
       width: 25px;
       padding: 0;
       margin: 0 5px;
@@ -81,12 +81,6 @@
         color: $ui-gray;
         text-indent: 0;
       }
-
-      &:hover {
-        &::after {
-          color: $core-fleet-blue;
-        }
-      }
     }
 
     .Select-value-label {
@@ -106,21 +100,57 @@
   }
 
   .Select-arrow {
-    border-top-color: $core-fleet-black;
+    content: url("../assets/images/icon-chevron-black-16x16@2x.png");
+    height: 16px;
+    width: 16px;
+    margin-top: 6px;
+    margin-left: -4px;
+    border: none;
+
+    &:hover {
+      content: url("../assets/images/icon-chevron-blue-16x16@2x.png");
+    }
   }
 
-  &.is-focused {
-    .Select-control {
-      border: 1px solid $core-vibrant-blue;
+  &.is-open {
+    .Select-arrow {
+      content: url("../assets/images/icon-collapse-black-16x16@2x.png");
+      height: 16px;
+      width: 16px;
+      margin-top: 11px;
+      margin-left: -3px;
+      border: none;
+
+      &:hover {
+        content: url("../assets/images/icon-collapse-blue-16x16@2x.png");
+      }
     }
 
-    &:not(.is-open) {
-      .Select-control {
-        box-shadow: none;
+    .Select-arrow-zone {
+      &:hover {
+        .Select-arrow {
+          border-top-color: transparent;
+        }
       }
     }
   }
 
+  // .Select-arrow {
+  //   border-top-color: $core-vibrant-blue;
+  // }
+
+  // &.is-focused {
+  //   .Select-control {
+  //     border: 1px solid $core-vibrant-blue;
+  //   }
+
+  //   &:not(.is-open) {
+  //     .Select-control {
+  //       box-shadow: none;
+  //     }
+  //   }
+  // }
+
   &.has-value {
     > .Select-control,
     &.is-pseudo-focused > .Select-control {
diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.jsx
index 267a64dd65..fff755afe4 100644
--- a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.jsx
+++ b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.jsx
@@ -68,9 +68,7 @@ class TargetOption extends Component {
         <button
           className={`button button--unstyled ${baseClass}__add-btn`}
           onClick={handleSelect}
-        >
-          <KolideIcon name="add-button" />
-        </button>
+        />
       </div>
     );
   }
diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/_styles.scss b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/_styles.scss
index 7c9a44f418..8d6e45ef32 100644
--- a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/_styles.scss
+++ b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/_styles.scss
@@ -26,10 +26,11 @@
   }
 
   &__add-btn {
-    transition: color 0ms;
-    color: $core-vibrant-blue;
-
-    font-size: $medium;
+    content: url("../assets/images/icon-plus-circle-16x16@2x.png");
+    height: 16px;
+    width: 16px;
+    margin-top: 8px;
+    border: none;
   }
 
   &__target-content {
diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/_styles.scss b/frontend/components/forms/fields/SelectTargetsDropdown/_styles.scss
index ffbe37c68b..2b6f9a3066 100644
--- a/frontend/components/forms/fields/SelectTargetsDropdown/_styles.scss
+++ b/frontend/components/forms/fields/SelectTargetsDropdown/_styles.scss
@@ -31,12 +31,30 @@
     }
 
     .Select-arrow {
-      border-width: 8px 8px 2.5px;
+      content: url("../assets/images/icon-chevron-black-16x16@2x.png");
+      height: 16px;
+      width: 16px;
+      margin-top: 6px;
+      margin-left: 6px;
+      border: none;
+
+      &:hover {
+        content: url("../assets/images/icon-chevron-blue-16x16@2x.png");
+      }
     }
 
     &.is-open {
       .Select-arrow {
-        border-width: 2.5px 8px 8px;
+        content: url("../assets/images/icon-collapse-black-16x16@2x.png");
+        height: 16px;
+        width: 16px;
+        margin-top: 11px;
+        margin-left: 6px;
+        border: none;
+
+        &:hover {
+          content: url("../assets/images/icon-collapse-blue-16x16@2x.png");
+        }
       }
 
       .Select-arrow-zone {
@@ -67,7 +85,7 @@
     }
 
     .Select-arrow-zone {
-      padding-right: 19px;
+      padding-right: 30px;
     }
 
     &.Select--multi {
@@ -139,32 +157,20 @@
     border: solid 1px $ui-fleet-blue-15;
 
     .Select-value-icon {
-      border: 0;
-      float: right;
-      position: relative;
-      line-height: 34px;
-      width: 25px;
-      padding: 0;
-      margin: 0 5px;
-      text-indent: -999em;
+      height: 100%;
 
       &::after {
-        @extend %kolidecon;
-        transition: color 150ms ease-in-out;
-        transform: translate(-50%, -50%);
-        content: "\2715"; // hex code for multiplication cross
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        visibility: visible;
-        color: $core-fleet-black;
-        display: block;
-        text-indent: 0;
+        content: url("../assets/images/icon-close-fleet-blue-16x16@2x.png");
+        transform: scale(0.5);
+        border-radius: 0px;
+        margin-top: -15px;
+        margin-left: -15px;
       }
 
       &:hover {
         &::after {
-          color: $ui-error;
+          content: url("../assets/images/icon-close-vibrant-blue-16x16@2x.png");
+          transform: scale(0.5);
         }
       }
     }
@@ -179,17 +185,32 @@
   }
 
   .Select-clear {
-    font-size: $x-large;
-    margin-right: 10px;
-    color: $core-fleet-black;
+    content: url("../assets/images/icon-close-fleet-blue-16x16@2x.png");
+    width: 16px;
+    height: 16px;
+    border-radius: 0px;
+    margin-left: -4px;
+    margin-top: 6px;
 
     &:hover {
-      color: $ui-error;
+      content: url("../assets/images/icon-close-vibrant-blue-16x16@2x.png");
+      width: 16px;
+      height: 16px;
+      border-radius: 0px;
     }
   }
 
+  .Select-clear-zone {
+    width: 30px;
+  }
+
+  .Select-arrow-zone {
+    width: 30px;
+    margin-right: 5px;
+  }
+
   .Select-loading-zone {
-    padding-right: 10px;
+    margin-right: 10px;
   }
 
   &.is-empty {
diff --git a/frontend/components/modals/Modal/Modal.jsx b/frontend/components/modals/Modal/Modal.jsx
index 971f9da3da..56d839ba2d 100644
--- a/frontend/components/modals/Modal/Modal.jsx
+++ b/frontend/components/modals/Modal/Modal.jsx
@@ -2,8 +2,6 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import classnames from "classnames";
 
-import KolideIcon from "components/icons/KolideIcon";
-
 const baseClass = "modal";
 
 class Modal extends Component {
@@ -27,9 +25,7 @@ class Modal extends Component {
           <div className={`${baseClass}__header`}>
             <span>{title}</span>
             <div className={`${baseClass}__ex`}>
-              <button className="button button--unstyled" onClick={onExit}>
-                <KolideIcon name="x" />
-              </button>
+              <button className="button button--unstyled" onClick={onExit} />
             </div>
           </div>
           <div className={`${baseClass}__content`}>{children}</div>
diff --git a/frontend/components/modals/Modal/_styles.scss b/frontend/components/modals/Modal/_styles.scss
index 182e15c262..4470d73d48 100644
--- a/frontend/components/modals/Modal/_styles.scss
+++ b/frontend/components/modals/Modal/_styles.scss
@@ -21,14 +21,17 @@
     text-decoration: none;
 
     .button {
-      @include size(30px);
-      line-height: 30px;
-      color: $core-fleet-black;
-      font-size: $x-large;
+      content: url("../assets/images/icon-close-fleet-blue-16x16@2x.png");
+      width: 17px;
+      height: 17px;
+      border-radius: 0px;
+    }
 
-      &:hover {
-        color: $ui-error;
-      }
+    .button:hover {
+      content: url("../assets/images/icon-close-vibrant-blue-16x16@2x.png");
+      width: 17px;
+      height: 17px;
+      border-radius: 0px;
     }
   }
 

From 834ff4371ca1f365913a0be4bab9f2c754cd2393 Mon Sep 17 00:00:00 2001
From: noahtalerman <47070608+noahtalerman@users.noreply.github.com>
Date: Mon, 10 May 2021 18:54:27 -0400
Subject: [PATCH 24/51] Add "how to automatically target hosts" to 1-Using
 Fleet/FAQ docs (#751)

- Add question and answer to the following question: How do I automatically add hosts to packs when the hosts enroll to Fleet?
---
 docs/1-Using-Fleet/FAQ.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/1-Using-Fleet/FAQ.md b/docs/1-Using-Fleet/FAQ.md
index 125c1228bf..7aeb59eaae 100644
--- a/docs/1-Using-Fleet/FAQ.md
+++ b/docs/1-Using-Fleet/FAQ.md
@@ -11,6 +11,7 @@
 - [Where are my query results?](#where-are-my-query-results)
 - [Why aren’t my live queries being logged?](#why-arent-my-live-queries-being-logged)
 - [Can I use the Fleet API to fetch results from a scheduled query pack?](#can-i-use-the-fleet-api-to-fetch-results-from-a-scheduled-query-pack)
+- [How do I automatically add hosts to packs when the hosts enroll to Fleet?](#how-do-i-automatically-add-hosts-to-packs-when-the-hosts-enroll-to-Fleet)
 
 ## Has anyone stress tested Fleet? How many clients can the Fleet server handle?
 
@@ -103,4 +104,10 @@ The ability to view each host’s installed software was released behind a featu
 
 Once the Software inventory feature is turned on, a list of a specific host’s installed software is available using the `api/v1/fleet/hosts/{id}` endpoint. [Check out the documentation for this endpoint](./3-REST-API.md#get-host).
 
-It’s possible in Fleet to retrieve each host’s kernel version, using the Fleet API, through `additional_queries`. The Fleet configuration options yaml file includes an `additional_queries` property that allows you to append custom query results to the host details returned by the `api/v1/fleet/hosts`  endpoint. [Check out an example configuration file with the additional_queries field](./2-fleetctl-CLI.md#fleet-configuration-options).
\ No newline at end of file
+It’s possible in Fleet to retrieve each host’s kernel version, using the Fleet API, through `additional_queries`. The Fleet configuration options yaml file includes an `additional_queries` property that allows you to append custom query results to the host details returned by the `api/v1/fleet/hosts`  endpoint. [Check out an example configuration file with the additional_queries field](./2-fleetctl-CLI.md#fleet-configuration-options).
+
+## How do I automatically add hosts to packs when the hosts enroll to Fleet?
+
+You can do this by setting the `targets` field in the [YAML configuration file](./2-fleetctl-CLI.md#query-packs) that manages the packs that are added to your Fleet instance. 
+
+The `targets` field allows you to specify the `labels` field. With the `labels` field, the hosts that become members of the specified labels, upon enrolling to Fleet, will automatically become targets of the given pack.

From e01157d681456e5dcaead1fe95e781e2cf2ee2e3 Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Tue, 11 May 2021 16:01:25 -0500
Subject: [PATCH 25/51] fix gitignore

---
 website/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/.gitignore b/website/.gitignore
index 51ae97f9c0..4177735bbc 100644
--- a/website/.gitignore
+++ b/website/.gitignore
@@ -137,4 +137,4 @@ lib-cov
 # HTML files compiled from markdown in build.
 ################################################
 
-partials/built-from-markdown/
+views/partials/built-from-markdown/

From 4d913b166c48dd544828828daeb2e869b91aa8b1 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Wed, 12 May 2021 11:49:57 -0400
Subject: [PATCH 26/51] Host Details Page: Convert seconds to larger units,
 clean repetitive edge case code (#750)

* Create and use seconds conversion helper function
* Debug edge cases between packs and pack_stats discrepancies
---
 frontend/kolide/helpers.ts                    | 11 +++
 .../hosts/HostDetailsPage/HostDetailsPage.jsx | 97 ++++++++++---------
 .../PackQueriesListRow/PackQueriesListRow.jsx |  6 +-
 3 files changed, 64 insertions(+), 50 deletions(-)

diff --git a/frontend/kolide/helpers.ts b/frontend/kolide/helpers.ts
index 70b13c5069..0853083f39 100644
--- a/frontend/kolide/helpers.ts
+++ b/frontend/kolide/helpers.ts
@@ -311,6 +311,16 @@ export const humanQueryLastRun = (lastRun: string): string => {
   return moment(lastRun).fromNow();
 };
 
+export const secondsToHms = (d: number): string => {
+  const h = Math.floor(d / 3600);
+  const m = Math.floor((d % 3600) / 60);
+  const s = Math.floor((d % 3600) % 60);
+
+  const hDisplay = h > 0 ? h + (h === 1 ? " hr " : " hrs ") : "";
+  const mDisplay = m > 0 ? m + (m === 1 ? " min " : " mins ") : "";
+  const sDisplay = s > 0 ? s + (s === 1 ? " sec " : " secs ") : "";
+  return hDisplay + mDisplay + sDisplay;
+};
 export default {
   addGravatarUrlToResource,
   formatConfigDataForServer,
@@ -324,6 +334,7 @@ export default {
   humanHostMemory,
   humanHostDetailUpdated,
   humanQueryLastRun,
+  secondsToHms,
   labelSlug,
   setupData,
 };
diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
index 0f6c403589..cd7e6f65b5 100644
--- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
@@ -34,6 +34,7 @@ import {
   humanHostEnrolled,
   humanHostMemory,
   humanHostDetailUpdated,
+  secondsToHms,
 } from "kolide/helpers";
 import helpers from "./helpers";
 import SelectQueryModal from "./SelectQueryModal";
@@ -243,57 +244,58 @@ export class HostDetailsPage extends Component {
 
   renderPacks = () => {
     const { host } = this.props;
-    const { packs = [], pack_stats = [] } = host;
+    const { pack_stats } = host;
     const wrapperClassName = `${baseClass}__table`;
 
-    if (pack_stats === null || pack_stats.length === 0) {
-      return <p>There are no packs for this host.</p>;
+    let packsAccordion;
+    if (pack_stats) {
+      packsAccordion = pack_stats.map((pack) => {
+        return (
+          <AccordionItem key={pack.pack_id}>
+            <AccordionItemHeading>
+              <AccordionItemButton>{pack.pack_name}</AccordionItemButton>
+            </AccordionItemHeading>
+            <AccordionItemPanel>
+              {pack.query_stats.length === 0 ? (
+                <div>There are no schedule queries for this pack.</div>
+              ) : (
+                <div className={`${baseClass}__wrapper`}>
+                  <table className={wrapperClassName}>
+                    <thead>
+                      <tr>
+                        <th>Query Name</th>
+                        <th>Description</th>
+                        <th>Frequency</th>
+                        <th>Last Run</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {!!pack.query_stats.length &&
+                        pack.query_stats.map((query) => {
+                          return (
+                            <PackQueriesListRow
+                              key={`pack-row-${query.pack_id}-${query.scheduled_query_id}`}
+                              query={query}
+                            />
+                          );
+                        })}
+                    </tbody>
+                  </table>
+                </div>
+              )}
+            </AccordionItemPanel>
+          </AccordionItem>
+        );
+      });
     }
 
-    const packsAccordion = pack_stats.map((pack) => {
-      return (
-        <AccordionItem key={pack.pack_id}>
-          <AccordionItemHeading>
-            <AccordionItemButton>{pack.pack_name}</AccordionItemButton>
-          </AccordionItemHeading>
-          <AccordionItemPanel>
-            {!pack.query_stats.length ? (
-              <div>There are no schedule queries for this pack.</div>
-            ) : (
-              <div className={`${baseClass}__wrapper`}>
-                <table className={wrapperClassName}>
-                  <thead>
-                    <tr>
-                      <th>Query Name</th>
-                      <th>Description</th>
-                      <th>Frequency</th>
-                      <th>Last Run</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    {!!pack.query_stats.length &&
-                      pack.query_stats.map((query) => {
-                        return (
-                          <PackQueriesListRow
-                            key={`pack-row-${query.pack_id}-${query.scheduled_query_id}`}
-                            query={query}
-                          />
-                        );
-                      })}
-                  </tbody>
-                </table>
-              </div>
-            )}
-          </AccordionItemPanel>
-        </AccordionItem>
-      );
-    });
-
     return (
       <div className="section section--packs">
         <p className="section__header">Packs</p>
-        {packs.length === 0 ? (
-          <p className="info__item">No packs have this host as a target.</p>
+        {!pack_stats ? (
+          <p className="info__item">
+            No packs with scheduled queries have this host as a target.
+          </p>
         ) : (
           <Accordion allowMultipleExpanded="true" allowZeroExpanded="true">
             {packsAccordion}
@@ -303,7 +305,6 @@ export class HostDetailsPage extends Component {
     );
   };
 
-  //          <ul className="list">{packItems}</ul>
   renderSoftware = () => {
     const { host } = this.props;
     const wrapperClassName = `${baseClass}__table`;
@@ -311,7 +312,7 @@ export class HostDetailsPage extends Component {
     return (
       <div className="section section--software">
         <p className="section__header">Software</p>
-        {host.software.length === 0 ? (
+        {!host.software ? (
           <div className="results">
             <p className="results__header">
               No installed software detected on this host.
@@ -392,7 +393,7 @@ export class HostDetailsPage extends Component {
           key === "config_tls_refresh" ||
           key === "distributed_interval"
         ) {
-          object[key] = `${object[key]} sec`;
+          object[key] = secondsToHms(object[key]);
         }
       });
     });
@@ -502,7 +503,7 @@ export class HostDetailsPage extends Component {
         </div>
         {renderLabels()}
         {renderPacks()}
-        {host.software && renderSoftware()}
+        {renderSoftware()}
         {renderDeleteHostModal()}
         {showQueryHostModal && (
           <SelectQueryModal
diff --git a/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/PackQueriesListRow.jsx b/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/PackQueriesListRow.jsx
index 0899f7faa7..7826d5402f 100644
--- a/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/PackQueriesListRow.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/PackQueriesListRow/PackQueriesListRow.jsx
@@ -1,5 +1,5 @@
 import React, { Component } from "react";
-import { humanQueryLastRun } from "kolide/helpers";
+import { humanQueryLastRun, secondsToHms } from "kolide/helpers";
 
 import queryInterface from "interfaces/query";
 
@@ -19,11 +19,13 @@ class PackQueriesListRow extends Component {
       last_executed,
     } = query;
 
+    const frequency = secondsToHms(interval);
+
     return (
       <tr>
         <td className={`${baseClass}__name`}>{scheduled_query_name}</td>
         <td className={`${baseClass}__description`}>{description}</td>
-        <td className={`${baseClass}__frequency`}>{interval} seconds</td>
+        <td className={`${baseClass}__frequency`}>{frequency}</td>
         <td className={`${baseClass}__last-run`}>
           {humanQueryLastRun(last_executed)}
         </td>

From 74b4cd535f0c86cfdc691ccb7efeac4b3f162ade Mon Sep 17 00:00:00 2001
From: gillespi314 <73313222+gillespi314@users.noreply.github.com>
Date: Thu, 13 May 2021 09:13:34 -0500
Subject: [PATCH 27/51] Revise website contact form (#753)

* Add topic select, revise content of contact form

* Fix styling of btn-primary class

* Restore deliver-contact-form-message function

* Fix lesshint linting errors

* Fix on hover style of btn-primary

* Adjust box-shadow for btn-primary

* Update contact form

* Fix lesshint linting errors

* Add personalization to submitted form modal

* Add responsive styles to contact form
---
 .../deliver-contact-form-message.js           |  34 +++++++----
 website/assets/images/chevron-12x8@2x.png     | Bin 0 -> 497 bytes
 website/assets/js/pages/contact.page.js       |   5 +-
 .../assets/styles/bootstrap-overrides.less    |  55 ++++++++++++++++++
 .../styles/mixins-and-variables/colors.less   |   8 ++-
 website/assets/styles/pages/contact.less      |  40 ++++++++++++-
 website/assets/styles/pages/homepage.less     |   8 +++
 website/views/pages/contact.ejs               |  52 +++++++++++------
 8 files changed, 167 insertions(+), 35 deletions(-)
 create mode 100644 website/assets/images/chevron-12x8@2x.png

diff --git a/website/api/controllers/deliver-contact-form-message.js b/website/api/controllers/deliver-contact-form-message.js
index 4e04aed81c..d8db0de47d 100644
--- a/website/api/controllers/deliver-contact-form-message.js
+++ b/website/api/controllers/deliver-contact-form-message.js
@@ -23,15 +23,22 @@ module.exports = {
       example: 'I want to buy stuff.'
     },
 
-    fullName: {
+    firstName: {
       required: true,
       type: 'string',
-      description: 'The full name of the human sending this message.',
-      example: 'Hermione Granger'
+      description: 'The first name of the human sending this message.',
+      example: 'Emma'
+    },
+
+    lastName: {
+      required: true,
+      type: 'string',
+      description: 'The last name of the human sending this message.',
+      example: 'Watson'
     },
 
     message: {
-      required: true,
+      required: false,
       type: 'string',
       description: 'The custom message, in plain text.'
     }
@@ -48,14 +55,19 @@ module.exports = {
   },
 
 
-  fn: async function({emailAddress, topic, fullName, message}) {
-
-    await sails.helpers.http.post(sails.config.custom.slackWebhookUrlForContactForm, {
-      text: `New contact form message: (Remember: we have to email back; can't just reply to this thread.) cc @sales `+
-      `Name: ${fullName}, Email: ${emailAddress}, Topic: ${topic}, Message: ${message}`
-    });
+  fn: async function({emailAddress, topic, firstName, lastName, message}) {
 
+    if (!sails.config.custom.slackWebhookUrlForContactForm) {
+      sails.log.warn(
+        'Message not delivered: slackWebhookUrlForContactForm needs to be configured in sails.config.custom. Here\'s the undelivered message: ' +
+        `Name: ${firstName + ' ' + lastName}, Email: ${emailAddress}, Topic: ${topic}, Message: ${message ? message : 'No message.'}`
+      );
+    } else {
+      await sails.helpers.http.post(sails.config.custom.slackWebhookUrlForContactForm, {
+        text: `New contact form message: (Remember: we have to email back; can't just reply to this thread.) cc @sales `+
+        `Name: ${firstName + ' ' + lastName}, Email: ${emailAddress}, Topic: ${topic}, Message: ${message ? message : 'No message.'}`
+      });
+    }
   }
 
-
 };
diff --git a/website/assets/images/chevron-12x8@2x.png b/website/assets/images/chevron-12x8@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..c58c19b7ee1cf885ba1c030adc23ac86b89b25b8
GIT binary patch
literal 497
zcmV<N0S^9&P)<h;3K|Lk000e1NJLTq000;O000mO1^@s63?#pm00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0ftFLK~#7Ft&=@Y
z0znkV-`h1n0cL|S0ci$TdXB&rf+eLL-atG7a09u4cG_vB#)9<(LT3TVbedQ&i6jPM
z9N!Q&S#f7Si2r1>llSrazwFL4VWqwOdM9fgxY?ZwpH0Uj*gz$_-pX0Fo6FmokLlz|
z#Y_(_C3e*rB{ZpMG!v5-NT4FCHznW|5i<1Dw(~Y96ZFG<5?}J$dFPMAIPelXtV+ZI
z8Cbs(63(z#Zb(gEEE6q!#V~04o~GB@LSwK?0N4x;#O|9jF?O?71rebZP?Iqbk12mm
zb;6%0up<VDcl5mr8hG!G-*=ZkIm(3MP0HVTCJK%y2Xtg%aCOGDsk+qIfnafJbe2sq
z;eQO2imY)?(NoZvtllgzE200&AKLy92G!A>zMwH%kU%u~B~5;^9yf!EX~}MA*~(<1
zy+Lu{T7x7eVQ?iQtT_#fHi8UWv|$)L(tvYUq~yZUm<&JV+<^!o#1LaOYk?`Xu~k1@
n&;b8p;F-)Z{Y*y@7q0XJpN_g+%CeXr00000NkvXXu0mjf?bFLE

literal 0
HcmV?d00001

diff --git a/website/assets/js/pages/contact.page.js b/website/assets/js/pages/contact.page.js
index 035e53d7b5..5f6b65b6f7 100644
--- a/website/assets/js/pages/contact.page.js
+++ b/website/assets/js/pages/contact.page.js
@@ -16,9 +16,10 @@ parasails.registerPage('contact', {
     // Form rules
     formRules: {
       emailAddress: {isEmail: true, required: true},
-      fullName: {required: true},
+      firstName: {required: true},
+      lastName: {required: true},
       topic: {required: true},
-      message: {required: true},
+      message: {required: false},
     },
 
     // Server error state for the form
diff --git a/website/assets/styles/bootstrap-overrides.less b/website/assets/styles/bootstrap-overrides.less
index f5c0f36a76..c03b5974b3 100644
--- a/website/assets/styles/bootstrap-overrides.less
+++ b/website/assets/styles/bootstrap-overrides.less
@@ -12,6 +12,7 @@
 
 body {
   font-family: @main-font;
+  color: @core-fleet-black;
 }
 
 img {
@@ -51,6 +52,14 @@ footer {
   line-height: 24px;
 }
 
+.text-danger {
+  color: @core-vibrant-red !important; //lesshint-disable-line importantRule
+}
+
+a.text-danger:hover, a.text-danger:focus {
+  color: darken(@core-vibrant-red, 20%) !important; //lesshint-disable-line importantRule
+}
+
 .btn {
   font-family: @header-font;
   font-weight: 700;
@@ -84,7 +93,24 @@ footer {
       background-color: darken(#ff5c83, 10%);
       border-color: darken(#ff5c83, 10%);
     }
+    &:focus, &.focus {
+      box-shadow: 0 0 0.25rem 0.2rem #ff5c83;
+    }
+    &.disabled, &:disabled {
+      color: #fff;
+      background-color: darken(#ff5c83, 10%), 0.25;
+      border-color: darken(#ff5c83, 10%), 0.25;
+    }
+    &:not(:disabled):not(.disabled):active, &:not(:disabled):not(.disabled).active, .show > &.dropdown-toggle {
+      color: #fff;
+      background-color: darken(#ff5c83, 10%), 0.25;
+      border-color: darken(#ff5c83, 10%), 0.25;
+    }
+    &:not(:disabled):not(.disabled):active:focus, &:not(:disabled):not(.disabled).active:focus, .show > &.dropdown-toggle:focus {
+      box-shadow: 0 0 0.25rem 0.2rem #ff5c83;
+    }
   }
+
   &.btn-info {
     background-color: #6b6cfa;
     border-color: #6b6cfa;
@@ -132,3 +158,32 @@ footer {
   pointer-events: none;
   font-weight: @bold;
 }
+
+.form-control {
+	height: 54px;
+	padding: 8px 16px;
+	font-size: 18px;
+	color: #192147;
+	border: 1px solid #C5C7D1;
+}
+.form-control:focus {
+	border: 2px solid #6a67fe;
+	box-shadow: unset;
+}
+.form-control.is-invalid:focus {
+	box-shadow: unset;
+}
+.form-control.is-invalid {
+	border: 2px solid #FF5C83;
+}
+textarea.form-control {
+	height: 108px;
+}
+.form-group {
+	margin-bottom: 24px;
+}
+
+.invalid-feedback {
+  color: @core-vibrant-red;
+}
+
diff --git a/website/assets/styles/mixins-and-variables/colors.less b/website/assets/styles/mixins-and-variables/colors.less
index 42f35bd939..817041b2cc 100644
--- a/website/assets/styles/mixins-and-variables/colors.less
+++ b/website/assets/styles/mixins-and-variables/colors.less
@@ -2,12 +2,14 @@
  * Color Variables
  */
 
+@core-fleet-black: #192147;
+@core-vibrant-red: #FF5C83;
+
 @brand: #14acc2;
 
-@error: #B53A03;
+@error: @core-vibrant-red;
 
-
-@text-normal: #000;
+@text-normal: @core-fleet-black;
 @text-muted: lighten(@text-normal, 60%);
 
 @bg-lt-gray: #f1f1f1;
diff --git a/website/assets/styles/pages/contact.less b/website/assets/styles/pages/contact.less
index 488cc71e78..c240d894f0 100644
--- a/website/assets/styles/pages/contact.less
+++ b/website/assets/styles/pages/contact.less
@@ -1,5 +1,43 @@
 #contact {
 
-  //…
+  label {
+    font-weight: 700;
+    font-size: 18px;
+  }
 
+  .btn-primary {
+    background-color: #ff5c83;
+    border-color: #ff5c83;
+    &:hover {
+      background-color: darken(#ff5c83, 10%);
+      border-color: darken(#ff5c83, 10%);
+    }
+  }
+
+  .selectbox {
+    position: relative;
+  }
+  .selectbox::after {
+    content: url('/images/chevron-12x8@2x.png');
+    right: 16px;
+    transform: scale(0.5);
+    top: 16px;
+    position: absolute;
+    pointer-events: none;
+  }
+  .selectbox select {
+    appearance: none;
+  }
+
+  @media (max-width: 575px) {
+    h2, p, .btn-container {
+      text-align: center;
+    }
+
+    button {
+      display: inline;
+      width: 100%;
+      max-width: 325px;
+    }
+  }
 }
diff --git a/website/assets/styles/pages/homepage.less b/website/assets/styles/pages/homepage.less
index 91867093cf..379ed16179 100644
--- a/website/assets/styles/pages/homepage.less
+++ b/website/assets/styles/pages/homepage.less
@@ -1,4 +1,12 @@
 #homepage {
+  .btn-primary {
+    background-color: #ff5c83;
+    border-color: #ff5c83;
+    &:hover {
+      background-color: darken(#ff5c83, 10%);
+      border-color: darken(#ff5c83, 10%);
+    }
+  }
   .hero-banner {
     background: rgb(31, 29, 66);
     background: linear-gradient(170.26deg, #1F1D42 7.33%, #00FFF0 130.16%);//lesshint-disable-line duplicateProperty
diff --git a/website/views/pages/contact.ejs b/website/views/pages/contact.ejs
index d1ed43b775..af62062579 100644
--- a/website/views/pages/contact.ejs
+++ b/website/views/pages/contact.ejs
@@ -1,40 +1,56 @@
 <div id="contact" v-cloak>
   <div class="container-fluid pt-5 pb-5">
-    <h1 class="text-center">Get in touch</h1>
     <div style="max-width:  650px;" class="mx-auto" v-if="!cloudSuccess">
-      <p class="text-center">Have a question for us?  Maybe some feedback?  We love talking to users about NEW_APP_NAME, and we're happy to answer questions about our pricing, roadmap, or business solutions.  Send us a note and we'll get back to you as soon as possible.</p>
-      <hr/>
+      <h2 style="max-width: 650px;" class="mx-auto">Contact our team</h2>
+      <p>We're here to answer your questions, and familiarize you with Fleet.</p>
       <ajax-form action="deliverContactFormMessage" :form-errors.sync="formErrors" :form-data="formData" :form-rules="formRules" :syncing.sync="syncing" :cloud-error.sync="cloudError" @submitted="submittedForm()">
         <div class="form-group">
-          <label for="full-name">Name</label>
-          <input class="form-control" id="full-name" name="full-name" type="text"  :class="[formErrors.fullName ? 'is-invalid' : '']" v-model.trim="formData.fullName" placeholder="Sturgis P. Sturgeon" autocomplete="name" focus-first>
-          <div class="invalid-feedback" v-if="formErrors.fullName">Please let us know what to call you.</div>
+          <div class="row">
+            <div class="col-sm pt-4">
+              <label for="first-name">First name<span style="font-weight: 400; color: #FF5C83"> *</span></label>
+              <input class="form-control" id="first-name" name="first-name" type="text" :class="[formErrors.firstName ? 'is-invalid' : '']" v-model.trim="formData.firstName" autocomplete="given-name" focus-first>
+              <div class="invalid-feedback" v-if="formErrors.firstName">Please let us know what to call you.</div>
+            </div>
+            <div class="col-sm pt-4">
+              <label for="last-name">Last name<span style="font-weight: 400; color: #FF5C83"> *</span></label>
+              <input class="form-control" id="last-name" name="last-name" type="text" :class="[formErrors.lastName ? 'is-invalid' : '']" v-model.trim="formData.lastName" autocomplete="family-name">
+              <div class="invalid-feedback" v-if="formErrors.lastName">Please let us know what to call you.</div>
+            </div>
+          </div>
         </div>
         <div class="form-group">
-          <label for="email-address">Email address</label>
-          <input class="form-control" id="email-address" name="email-address" type="email"  :class="[formErrors.emailAddress ? 'is-invalid' : '']" v-model.trim="formData.emailAddress" placeholder="sturgeon@example.com" autocomplete="email">
+          <label for="email-address">Email<span style="font-weight: 400; color: #FF5C83"> *</span></label>
+          <input class="form-control" id="email-address" name="email-address" type="email" :class="[formErrors.emailAddress ? 'is-invalid' : '']" v-model.trim="formData.emailAddress" autocomplete="email">
           <div class="invalid-feedback" v-if="formErrors.emailAddress">Please enter a valid email address.</div>
         </div>
         <div class="form-group">
-          <label for="topic">Topic</label>
-          <input class="form-control" id="topic" name="topic" type="text"  :class="[formErrors.topic ? 'is-invalid' : '']" v-model.trim="formData.topic" placeholder="Pricing question" autocomplete="none">
-          <div class="invalid-feedback" v-if="formErrors.topic">Please choose a topic for your message.</div>
+          <label for="topic">How can we help you?</label>
+          <div class="selectbox">
+          <select class="form-control" id="topic" name="topic" :class="[formErrors.topic ? 'is-invalid' : '']" v-model="formData.topic">
+            <option disabled hidden value="undefined">Please select one</option>
+            <option value="I want to evaluate Fleet Basic for my organization">I want to evaluate Fleet Basic for my organization</option>
+            <option value="I want to understand which plan is right for me">I want to understand which plan is right for me</option>
+            <option value="I have a product question">I have a product question</option>
+            <option value="Something else">Something else</option>
+          </select>
+          </div>
+          <div class="d-block invalid-feedback" v-if="formErrors.topic">Please choose a topic for your message.</div>
         </div>
         <div class="form-group">
           <label for="message">Message</label>
-          <textarea class="form-control" id="message" name="message" :class="[formErrors.message ? 'is-invalid' : '']" v-model.trim="formData.message" placeholder="What is the difference between the &quot;Individual&quot; plan and the &quot;Professional&quot; plan?" autocomplete="none"></textarea>
+          <textarea class="form-control" id="message" name="message" :class="[formErrors.message ? 'is-invalid' : '']" v-model.trim="formData.message" autocomplete="none"></textarea>
           <div class="invalid-feedback" v-if="formErrors.message">Message cannot be empty.</div>
         </div>
+        <p style="color: #FF5C83">Fields marked with an asterisk (*) are required.</p>
         <cloud-error v-if="cloudError"></cloud-error>
-        <div class="form-group">
-          <ajax-button type="submit" :syncing="syncing" class="btn btn-dark btn-lg btn-block">Send message</ajax-button>
+        <div class="form-group btn-container">
+          <ajax-button type="submit" :syncing="syncing" class="btn btn-primary btn-sm">Submit</ajax-button>
         </div>
       </ajax-form>
     </div>
-    <div style="max-width: 450px;" class="mx-auto text-center" v-else>
-      <p class="text-center">Thanks for reaching out!</p>
-      <hr/>
-      <p>We have received your message, and someone from our team will get back to you soon.</p>
+    <div style="max-width: 725px;" class="mx-auto text-center" v-else>
+      <h2>Thank you, {{formData.firstName}}!</h2>
+      <p class="mt-3">We’re happy to hear from you. A member of our team will get back to you soon - usually within 1 business day (or less!).</p>
     </div>
   </div>
 </div>

From 32b4d53e7f1428ce43b0f9fa52838cbe7b413eed Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Thu, 13 May 2021 09:24:53 -0500
Subject: [PATCH 28/51] swap warning for error

@gillespi314 btw you did this exactly right, I just realized when I tested this out (after realizing I had it configured wrong in prod) that I should have recommended an error instead of a warning
---
 website/api/controllers/deliver-contact-form-message.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/api/controllers/deliver-contact-form-message.js b/website/api/controllers/deliver-contact-form-message.js
index d8db0de47d..a129cc4c79 100644
--- a/website/api/controllers/deliver-contact-form-message.js
+++ b/website/api/controllers/deliver-contact-form-message.js
@@ -58,7 +58,7 @@ module.exports = {
   fn: async function({emailAddress, topic, firstName, lastName, message}) {
 
     if (!sails.config.custom.slackWebhookUrlForContactForm) {
-      sails.log.warn(
+      throw new Error(
         'Message not delivered: slackWebhookUrlForContactForm needs to be configured in sails.config.custom. Here\'s the undelivered message: ' +
         `Name: ${firstName + ' ' + lastName}, Email: ${emailAddress}, Topic: ${topic}, Message: ${message ? message : 'No message.'}`
       );

From daa8eeb9d05f35be3679604d3fd2a61d34f258ed Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Thu, 13 May 2021 13:09:22 -0700
Subject: [PATCH 29/51] Add refetch host API (#767)

This allows the host details to be refetched on the next check in,
rather than waiting for the normal interval to go by. Associated UI
changes are in-progress.

- Migration and service methods for requesting refetch.
- Expose refetch over API.
- Change detail query logic to respect this flag.
---
 docs/1-Using-Fleet/3-REST-API.md              | 651 +++++++++---------
 server/datastore/mysql/hosts.go               |  10 +-
 .../20210513115729_RefetchHostDetail.go       |  26 +
 server/kolide/hosts.go                        |   3 +
 server/service/endpoint_hosts.go              |  25 +
 server/service/handler.go                     |   5 +
 server/service/service_hosts.go               |  14 +
 server/service/service_hosts_test.go          |  18 +
 server/service/service_osquery.go             |   5 +-
 server/service/service_osquery_test.go        |   9 +-
 server/service/transport_hosts.go             |   8 +
 11 files changed, 447 insertions(+), 327 deletions(-)
 create mode 100644 server/datastore/mysql/migrations/tables/20210513115729_RefetchHostDetail.go

diff --git a/docs/1-Using-Fleet/3-REST-API.md b/docs/1-Using-Fleet/3-REST-API.md
index f4962fe1cd..066eb9cac1 100644
--- a/docs/1-Using-Fleet/3-REST-API.md
+++ b/docs/1-Using-Fleet/3-REST-API.md
@@ -1,4 +1,5 @@
 # REST API
+
 - [Overview](#overview)
   - [fleetctl](#fleetctl)
   - [Current API](#current-api)
@@ -23,8 +24,8 @@ Fleet is powered by a Go API server which serves three types of endpoints:
 - All other endpoints are served by the React single page application bundle.
   The React app uses React Router to determine whether or not the URI is a valid
   route and what to do.
-  
-Note: We have deprecated `/api/v1/kolide/` routes and will remove them in the Fleet 4.0 release. Please migrate all routes to `/api/v1/fleet/`. 
+
+Note: We have deprecated `/api/v1/kolide/` routes and will remove them in the Fleet 4.0 release. Please migrate all routes to `/api/v1/fleet/`.
 
 ### fleetctl
 
@@ -51,8 +52,6 @@ Queries, packs, scheduled queries, labels, invites, users, sessions all behave t
 
 All of these objects are put together and distributed to the appropriate osquery agents at the appropriate time. At this time, the best source of truth for the API is the [HTTP handler file](https://github.com/fleetdm/fleet/blob/master/server/service/handler.go) in the Go application. The REST API is exposed via a transport layer on top of an RPC service which is implemented using a micro-service library called [Go Kit](https://github.com/go-kit/kit). If using the Fleet API is important to you right now, being familiar with Go Kit would definitely be helpful.
 
-
-
 ## Authentication
 
 - [Log in](#log-in)
@@ -94,7 +93,7 @@ Then, use that API token to authenticate all subsequent API requests by sending
 Authorization: Bearer <your token>
 ```
 
-> For SSO users, username/password login is disabled.  The API token can instead be retrieved from the "Settings" page in the UI.
+> For SSO users, username/password login is disabled. The API token can instead be retrieved from the "Settings" page in the UI.
 
 ### Log in
 
@@ -263,11 +262,11 @@ Resets a user's password. Which user is determined by the password reset token u
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| new_password   | string | body | **Required**. The new password. |
-| new_password_confirmation   | string | body | **Required**. Confirmation for the new password. |
-| password_reset_token   | string | body | **Required**. The token provided to the user in the password reset email. |
+| Name                      | Type   | In   | Description                                                               |
+| ------------------------- | ------ | ---- | ------------------------------------------------------------------------- |
+| new_password              | string | body | **Required**. The new password.                                           |
+| new_password_confirmation | string | body | **Required**. Confirmation for the new password.                          |
+| password_reset_token      | string | body | **Required**. The token provided to the user in the password reset email. |
 
 #### Example
 
@@ -401,8 +400,8 @@ Gets the current SSO configuration.
 
 #### Parameters
 
-| Name      | Type   | In   | Description                                                                |
-| --------- | ------ | ---- | -------------------------------------------------------------------------- |
+| Name      | Type   | In   | Description                                                                 |
+| --------- | ------ | ---- | --------------------------------------------------------------------------- |
 | relay_url | string | body | **Required**. The relative url to be navigated to after successful sign in. |
 
 #### Example
@@ -445,8 +444,8 @@ This is the callback endpoint that the identity provider will use to send securi
 
 #### Parameters
 
-| Name      | Type   | In   | Description                                                                |
-| --------- | ------ | ---- | -------------------------------------------------------------------------- |
+| Name         | Type   | In   | Description                                                 |
+| ------------ | ------ | ---- | ----------------------------------------------------------- |
 | SAMLResponse | string | body | **Required**. The SAML response from the identity provider. |
 
 #### Example
@@ -478,6 +477,7 @@ This is the callback endpoint that the identity provider will use to send securi
 - [Get host](#get-host)
 - [Get host by identifier](#get-host-by-identifier)
 - [Delete host](#delete-host)
+- [Refetch host](#refetch-host)
 
 ### List hosts
 
@@ -485,14 +485,14 @@ This is the callback endpoint that the identity provider will use to send securi
 
 #### Parameters
 
-| Name                    | Type    | In    | Description                                                                                                                                                                                                                                                                                    |
-| ----------------------- | ------- | ----- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| page                    | integer | query | Page number of the results to fetch.                                                                                                                                                                                                                                                           |
-| per_page                | integer | query | Results per page.                                                                                                                                                                                                                                                                              |
-| order_key               | string  | query | What to order results by. Can be any column in the hosts table.                                                                                                                                                                                                                                |
-| order_direction               | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`.                                                                                                                                                                                                 |
-| status                  | string  | query | Indicates the status of the hosts to return. Can either be `new`, `online`, `offline`, or `mia`.                                                                                                                                                                                               |
-| query                  | string  | query | Search query keywords. Searchable fields include `hostname`, `machine_serial`, `uuid`, and `ipv4`.                                                                                                                                                                                               |
+| Name                    | Type    | In    | Description                                                                                                                                                                                                                                                                                                 |
+| ----------------------- | ------- | ----- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| page                    | integer | query | Page number of the results to fetch.                                                                                                                                                                                                                                                                        |
+| per_page                | integer | query | Results per page.                                                                                                                                                                                                                                                                                           |
+| order_key               | string  | query | What to order results by. Can be any column in the hosts table.                                                                                                                                                                                                                                             |
+| order_direction         | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`.                                                                                                                                                                               |
+| status                  | string  | query | Indicates the status of the hosts to return. Can either be `new`, `online`, `offline`, or `mia`.                                                                                                                                                                                                            |
+| query                   | string  | query | Search query keywords. Searchable fields include `hostname`, `machine_serial`, `uuid`, and `ipv4`.                                                                                                                                                                                                          |
 | additional_info_filters | string  | query | A comma-delimited list of fields to include in each host's additional information object. See [Fleet Configuration Options](https://github.com/fleetdm/fleet/blob/master/docs/1-Using-Fleet/2-fleetctl-CLI.md#fleet-configuration-options) for an example configuration with hosts' additional information. |
 
 #### Example
@@ -571,7 +571,6 @@ None.
 
 `GET /api/v1/fleet/host_summary`
 
-
 ##### Default response
 
 `Status: 200`
@@ -587,7 +586,7 @@ None.
 
 ### Get host
 
-Returns the information of the specified host. 
+Returns the information of the specified host.
 
 The endpoint returns the host's installed `software` if the software inventory feature flag is turned on. This feature flag is turned off by default. [Check out the feature flag documentation](../3-Deployment/2-Configuration.md#feature-flags) for instructions on how to turn on the software inventory feature.
 
@@ -595,15 +594,14 @@ The endpoint returns the host's installed `software` if the software inventory f
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| id                 | integer | path | **Required**. The host's id.                    |
+| Name | Type    | In   | Description                  |
+| ---- | ------- | ---- | ---------------------------- |
+| id   | integer | path | **Required**. The host's id. |
 
 #### Example
 
 `GET /api/v1/fleet/hosts/121`
 
-
 ##### Default response
 
 `Status: 200`
@@ -704,15 +702,14 @@ Returns the information of the host specified using the `uuid`, `osquery_host_id
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| identifier                 | integer or string | path | **Required**. The host's `uuid`, `osquery_host_id`, `hostname`, or `node_key`|
+| Name       | Type              | In   | Description                                                                   |
+| ---------- | ----------------- | ---- | ----------------------------------------------------------------------------- |
+| identifier | integer or string | path | **Required**. The host's `uuid`, `osquery_host_id`, `hostname`, or `node_key` |
 
 #### Example
 
 `GET /api/v1/fleet/hosts/identifier/f01c4390-0000-0000-a1e5-14346a5724dc`
 
-
 ##### Default response
 
 `Status: 200`
@@ -768,14 +765,37 @@ Deletes the specified host from Fleet. Note that a deleted host will fail authen
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| id                 | integer | path | **Required**. The host's id.                    |
+| Name | Type    | In   | Description                  |
+| ---- | ------- | ---- | ---------------------------- |
+| id   | integer | path | **Required**. The host's id. |
 
 #### Example
 
 `DELETE /api/v1/fleet/hosts/121`
 
+##### Default response
+
+`Status: 200`
+
+```
+{}
+```
+
+### Refetch host
+
+Flags the host details to be refetched the next time the host checks in for live queries. Note that we cannot be certain when the host will actually check in and update these details. Further requests to the host APIs will indicate that the refetch has been requested through the `refetch_requested` field on the host object.
+
+`POST /api/v1/fleet/hosts/{id}/refetch`
+
+#### Parameters
+
+| Name | Type    | In   | Description                  |
+| ---- | ------- | ---- | ---------------------------- |
+| id   | integer | path | **Required**. The host's id. |
+
+#### Example
+
+`POST /api/v1/fleet/hosts/121/refetch`
 
 ##### Default response
 
@@ -808,12 +828,12 @@ Creates a dynamic label.
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| name                 | string | body | **Required**. The label's name.                    |
-| description                 | string | body | The label's description.                    |
-| query                 | string | body | **Required**. The query in SQL syntax used to filter the hosts.                    |
-| platform                 | string | body | The specific platform for the label to target. Provides an additional filter. Choices for platform are `darwin`, `windows`, `ubuntu`, and `centos`. All platforms are included by default and this option is represented by an empty string.|
+| Name        | Type   | In   | Description                                                                                                                                                                                                                                  |
+| ----------- | ------ | ---- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| name        | string | body | **Required**. The label's name.                                                                                                                                                                                                              |
+| description | string | body | The label's description.                                                                                                                                                                                                                     |
+| query       | string | body | **Required**. The query in SQL syntax used to filter the hosts.                                                                                                                                                                              |
+| platform    | string | body | The specific platform for the label to target. Provides an additional filter. Choices for platform are `darwin`, `windows`, `ubuntu`, and `centos`. All platforms are included by default and this option is represented by an empty string. |
 
 #### Example
 
@@ -860,12 +880,12 @@ Modifies the specified label. Note: Label queries are immutable. To change the q
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| id                 | integer | path | **Required**. The label's id.                    |
-| name                 | string | body | The label's name.                    |
-| description                 | string | body | The label's description.                    |
-| platform                 | string | body | The specific platform for the label to target. Provides an additional filter. Choices for platform are `darwin`, `windows`, `ubuntu`, and `centos`. All platforms are included by default and this option is represented by an empty string.|
+| Name        | Type    | In   | Description                                                                                                                                                                                                                                  |
+| ----------- | ------- | ---- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| id          | integer | path | **Required**. The label's id.                                                                                                                                                                                                                |
+| name        | string  | body | The label's name.                                                                                                                                                                                                                            |
+| description | string  | body | The label's description.                                                                                                                                                                                                                     |
+| platform    | string  | body | The specific platform for the label to target. Provides an additional filter. Choices for platform are `darwin`, `windows`, `ubuntu`, and `centos`. All platforms are included by default and this option is represented by an empty string. |
 
 #### Example
 
@@ -912,9 +932,9 @@ Returns the specified label.
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| id                 | integer | path | **Required**. The label's id.                    |
+| Name | Type    | In   | Description                   |
+| ---- | ------- | ---- | ----------------------------- |
+| id   | integer | path | **Required**. The label's id. |
 
 #### Example
 
@@ -950,11 +970,11 @@ Returns a list of all the labels in Fleet.
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| id                 | integer | path | **Required**. The label's id.                    |
-| order_key               | string  | query | What to order results by. Can be any column in the labels table.                                                                                                                                                                                                                                |
-| order_direction               | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`.   |
+| Name            | Type    | In    | Description                                                                                                                   |
+| --------------- | ------- | ----- | ----------------------------------------------------------------------------------------------------------------------------- |
+| id              | integer | path  | **Required**. The label's id.                                                                                                 |
+| order_key       | string  | query | What to order results by. Can be any column in the labels table.                                                              |
+| order_direction | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`. |
 
 #### Example
 
@@ -1051,12 +1071,12 @@ Returns a list of the hosts that belong to the specified label.
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| id                 | integer | path | **Required**. The label's id.                    |
-| order_key          | string  | query | What to order results by. Can be any column in the hosts table.                                                                                                                                                                                                                                |
-| order_direction   | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`.   |
-| query              | string  | query | Search query keywords. Searchable fields include `hostname`, `machine_serial`, `uuid`, and `ipv4`. |                                                                        
+| Name            | Type    | In    | Description                                                                                                                   |
+| --------------- | ------- | ----- | ----------------------------------------------------------------------------------------------------------------------------- |
+| id              | integer | path  | **Required**. The label's id.                                                                                                 |
+| order_key       | string  | query | What to order results by. Can be any column in the hosts table.                                                               |
+| order_direction | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`. |
+| query           | string  | query | Search query keywords. Searchable fields include `hostname`, `machine_serial`, `uuid`, and `ipv4`.                            |
 
 #### Example
 
@@ -1119,9 +1139,9 @@ Deletes the label specified by name.
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| name                 | string | path | **Required**. The label's name.                    |
+| Name | Type   | In   | Description                     |
+| ---- | ------ | ---- | ------------------------------- |
+| name | string | path | **Required**. The label's name. |
 
 #### Example
 
@@ -1143,9 +1163,9 @@ Deletes the label specified by ID.
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| id                 | integer | path | **Required**. The label's id.                    |
+| Name | Type    | In   | Description                   |
+| ---- | ------- | ---- | ----------------------------- |
+| id   | integer | path | **Required**. The label's id. |
 
 #### Example
 
@@ -1171,9 +1191,9 @@ If the `label_membership_type` is set to `manual`, the `hosts` property must als
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| specs                 | list | path | A list of the label to apply. Each label requires the `name`, `query`, and `label_membership_type` properties|
+| Name  | Type | In   | Description                                                                                                   |
+| ----- | ---- | ---- | ------------------------------------------------------------------------------------------------------------- |
+| specs | list | path | A list of the label to apply. Each label requires the `name`, `query`, and `label_membership_type` properties |
 
 #### Example
 
@@ -1341,10 +1361,10 @@ Returns a list of all enabled users
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| order_key               | string  | query | What to order results by. Can be any column in the users table.                                                                                                                                                                                                                                |
-| order_direction               | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`.   |
+| Name            | Type   | In    | Description                                                                                                                   |
+| --------------- | ------ | ----- | ----------------------------------------------------------------------------------------------------------------------------- |
+| order_key       | string | query | What to order results by. Can be any column in the users table.                                                               |
+| order_direction | string | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`. |
 
 #### Example
 
@@ -1402,14 +1422,14 @@ Creates a user account after an invited user provides registration information a
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| email                 | string | body | **Required**. The email address of the user.                    |
+| Name                  | Type   | In   | Description                                                       |
+| --------------------- | ------ | ---- | ----------------------------------------------------------------- |
+| email                 | string | body | **Required**. The email address of the user.                      |
 | invite_token          | string | body | **Required**. Token provided to the user in the invitation email. |
-| name                  | string | body | The name of the user.                                           |
-| username              | string | body | **Required**. The username chosen by the user                   |
-| password              | string | body | **Required**. The password chosen by the user.                  |
-| password_confirmation | string | body | **Required**. Confirmation of the password chosen by the user.  |
+| name                  | string | body | The name of the user.                                             |
+| username              | string | body | **Required**. The username chosen by the user                     |
+| password              | string | body | **Required**. The password chosen by the user.                    |
+| password_confirmation | string | body | **Required**. Confirmation of the password chosen by the user.    |
 
 #### Example
 
@@ -1508,12 +1528,12 @@ Creates a user account without requiring an invitation, the user is enabled imme
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| username   | string  | body | **Required**. The user's username.               |
-| email      | string  | body | **Required**. The user's email address.          |
-| password   | string  | body | **Required**. The user's password.               |
-| invited_by | integer | body | **Required**. ID of the admin creating the user. |
+| Name       | Type    | In   | Description                                          |
+| ---------- | ------- | ---- | ---------------------------------------------------- |
+| username   | string  | body | **Required**. The user's username.                   |
+| email      | string  | body | **Required**. The user's email address.              |
+| password   | string  | body | **Required**. The user's password.                   |
+| invited_by | integer | body | **Required**. ID of the admin creating the user.     |
 | admin      | boolean | body | **Required**. Whether the user has admin privileges. |
 
 #### Example
@@ -1594,8 +1614,8 @@ Returns all information about a specific user.
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
+| Name | Type    | In   | Description                  |
+| ---- | ------- | ---- | ---------------------------- |
 | id   | integer | path | **Required**. The user's id. |
 
 #### Example
@@ -1670,14 +1690,14 @@ Returns all information about a specific user.
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| id   | integer | path | **Required**. The user's id. |
-| name   | string | body | The user's name. |
-| username   | string | body | The user's username. |
-| position   | string | body | The user's position. |
-| email   | string | body | The user's email. |
-| sso_enabled   | boolean | body | Whether or not SSO is enabled for the user. |
+| Name        | Type    | In   | Description                                 |
+| ----------- | ------- | ---- | ------------------------------------------- |
+| id          | integer | path | **Required**. The user's id.                |
+| name        | string  | body | The user's name.                            |
+| username    | string  | body | The user's username.                        |
+| position    | string  | body | The user's position.                        |
+| email       | string  | body | The user's email.                           |
+| sso_enabled | boolean | body | Whether or not SSO is enabled for the user. |
 
 #### Example
 
@@ -1723,10 +1743,10 @@ Revokes or renews the selected user's access to Fleet. Returns the user object.
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| id   | integer | path | **Required**. The user's id. |
-| enabled   | boolean | body | **Required**. Whether or not the user can access Fleet. |
+| Name    | Type    | In   | Description                                             |
+| ------- | ------- | ---- | ------------------------------------------------------- |
+| id      | integer | path | **Required**. The user's id.                            |
+| enabled | boolean | body | **Required**. Whether or not the user can access Fleet. |
 
 #### Example
 
@@ -1770,9 +1790,9 @@ Promotes or demotes the selected user's level of access as an admin in Fleet. Ad
 
 #### Parameters
 
-| Name  | Type    | In    | Description                  |
-| ----- | ------- | ----- | ---------------------------- |
-| id    | integer | path | **Required**. The user's id. |
+| Name  | Type    | In   | Description                                        |
+| ----- | ------- | ---- | -------------------------------------------------- |
+| id    | integer | path | **Required**. The user's id.                       |
 | admin | boolean | body | **Required**. Whether or not the user is an admin. |
 
 #### Example
@@ -1817,10 +1837,10 @@ The selected user is logged out of Fleet and required to reset their password du
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| id   | integer | path | **Required**. The user's id. |
-| reset   | boolean | body | Whether or not the user is required to reset their password during the next attempt to log in. |
+| Name  | Type    | In   | Description                                                                                    |
+| ----- | ------- | ---- | ---------------------------------------------------------------------------------------------- |
+| id    | integer | path | **Required**. The user's id.                                                                   |
+| reset | boolean | body | Whether or not the user is required to reset their password during the next attempt to log in. |
 
 #### Example
 
@@ -1904,9 +1924,9 @@ Deletes the selected user's sessions in Fleet. Also deletes the user's API token
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| id   | integer  | path | **Required**. The ID of the desired user.               |
+| Name | Type    | In   | Description                               |
+| ---- | ------- | ---- | ----------------------------------------- |
+| id   | integer | path | **Required**. The ID of the desired user. |
 
 #### Example
 
@@ -1923,6 +1943,7 @@ Deletes the selected user's sessions in Fleet. Also deletes the user's API token
 ---
 
 ## Sessions
+
 - [Get session info](#get-session-info)
 - [Delete session](#delete-session)
 
@@ -1934,9 +1955,9 @@ Returns the session information for the session specified by ID.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| id   | integer  | path | **Required**. The ID of the desired session.               |
+| Name | Type    | In   | Description                                  |
+| ---- | ------- | ---- | -------------------------------------------- |
+| id   | integer | path | **Required**. The ID of the desired session. |
 
 #### Example
 
@@ -1962,15 +1983,14 @@ Deletes the session specified by ID. When the user associated with the session n
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| id   | integer  | path | **Required**. The id of the desired session.               |
+| Name | Type    | In   | Description                                  |
+| ---- | ------- | ---- | -------------------------------------------- |
+| id   | integer | path | **Required**. The id of the desired session. |
 
 #### Example
 
 `DELETE /api/v1/fleet/sessions/1`
 
-
 ##### Default response
 
 `Status: 200`
@@ -2008,15 +2028,14 @@ Returns the query specified by ID.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| id   | integer  | path | **Required**. The id of the desired query.               |
+| Name | Type    | In   | Description                                |
+| ---- | ------- | ---- | ------------------------------------------ |
+| id   | integer | path | **Required**. The id of the desired query. |
 
 #### Example
 
 `GET /api/v1/fleet/queries/31`
 
-
 ##### Default response
 
 `Status: 200`
@@ -2056,16 +2075,15 @@ Returns a list of all queries in the Fleet instance.
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| order_key               | string  | query | What to order results by. Can be any column in the queries table.                                                                                                                                                                                                                                |
-| order_direction               | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`.   |
+| Name            | Type   | In    | Description                                                                                                                   |
+| --------------- | ------ | ----- | ----------------------------------------------------------------------------------------------------------------------------- |
+| order_key       | string | query | What to order results by. Can be any column in the queries table.                                                             |
+| order_direction | string | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`. |
 
 #### Example
 
 `GET /api/v1/fleet/queries`
 
-
 ##### Default response
 
 `Status: 200`
@@ -2157,11 +2175,11 @@ Returns a list of all queries in the Fleet instance.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| name   | string  | body | **Required**. The name of the query.               |
-| query   | string  | body | **Required**. The query in SQL syntax.              |
-| description   | string  | body | The query's description.               |
+| Name        | Type   | In   | Description                            |
+| ----------- | ------ | ---- | -------------------------------------- |
+| name        | string | body | **Required**. The name of the query.   |
+| query       | string | body | **Required**. The query in SQL syntax. |
+| description | string | body | The query's description.               |
 
 #### Example
 
@@ -2206,12 +2224,12 @@ Returns the query specified by ID.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| id   | integer  | path | **Required.** The ID of the query.               |
-| name   | string  | body | The name of the query.               |
-| query   | string  | body | The query in SQL syntax.              |
-| description   | string  | body | The query's description.               |
+| Name        | Type    | In   | Description                        |
+| ----------- | ------- | ---- | ---------------------------------- |
+| id          | integer | path | **Required.** The ID of the query. |
+| name        | string  | body | The name of the query.             |
+| query       | string  | body | The query in SQL syntax.           |
+| description | string  | body | The query's description.           |
 
 #### Example
 
@@ -2254,9 +2272,9 @@ Deletes the query specified by name.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| name   | string  | path | **Required.** The name of the query.               |
+| Name | Type   | In   | Description                          |
+| ---- | ------ | ---- | ------------------------------------ |
+| name | string | path | **Required.** The name of the query. |
 
 #### Example
 
@@ -2278,9 +2296,9 @@ Deletes the query specified by ID.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| id   | integer  | path | **Required.** The ID of the query.               |
+| Name | Type    | In   | Description                        |
+| ---- | ------- | ---- | ---------------------------------- |
+| id   | integer | path | **Required.** The ID of the query. |
 
 #### Example
 
@@ -2302,9 +2320,9 @@ Deletes the queries specified by ID. Returns the count of queries successfully d
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| ids   | list  | body | **Required.** The IDs of the queries.               |
+| Name | Type | In   | Description                           |
+| ---- | ---- | ---- | ------------------------------------- |
+| ids  | list | body | **Required.** The IDs of the queries. |
 
 #### Example
 
@@ -2378,9 +2396,9 @@ Returns the name, description, and SQL of the query specified by name.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| name   | string  | path | **Required.** The name of the query.               |
+| Name | Type   | In   | Description                          |
+| ---- | ------ | ---- | ------------------------------------ |
+| name | string | path | **Required.** The name of the query. |
 
 #### Example
 
@@ -2408,9 +2426,9 @@ Creates and/or modifies the queries included in the specs list. To modify an exi
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| specs   | list  | body | **Required.** The list of the queries to be created or modified.               |
+| Name  | Type | In   | Description                                                      |
+| ----- | ---- | ---- | ---------------------------------------------------------------- |
+| specs | list | body | **Required.** The list of the queries to be created or modified. |
 
 #### Example
 
@@ -2500,10 +2518,10 @@ Runs the specified query as a live query on the specified hosts or group of host
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| query   | string  | body | **Required.** The SQL of the query.               |
-| selected   | object  | body | **Required.** The desired targets for the query specified by ID. This object can contain `hosts` and/or `labels` properties. See examples below.     |
+| Name     | Type   | In   | Description                                                                                                                                      |
+| -------- | ------ | ---- | ------------------------------------------------------------------------------------------------------------------------------------------------ |
+| query    | string | body | **Required.** The SQL of the query.                                                                                                              |
+| selected | object | body | **Required.** The desired targets for the query specified by ID. This object can contain `hosts` and/or `labels` properties. See examples below. |
 
 #### Example with one host targeted by ID
 
@@ -2514,7 +2532,7 @@ Runs the specified query as a live query on the specified hosts or group of host
 ```
 {
   "query": "select instance_id from system_info",
-  "selected": { 
+  "selected": {
     "hosts": [171]
   }
 }
@@ -2553,7 +2571,7 @@ Runs the specified query as a live query on the specified hosts or group of host
 ```
 {
   "query": "select instance_id from system_info;",
-  "selected": { 
+  "selected": {
     "labels": [7]
   }
 }
@@ -2591,10 +2609,10 @@ Runs the specified query as a live query on the specified hosts or group of host
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| query   | string  | body | **Required.** The SQL of the query.              |
-| selected   | object  | body | **Required.** The desired targets for the query specified by name. This object can contain `hosts` and/or `labels` properties. See examples below.     |
+| Name     | Type   | In   | Description                                                                                                                                        |
+| -------- | ------ | ---- | -------------------------------------------------------------------------------------------------------------------------------------------------- |
+| query    | string | body | **Required.** The SQL of the query.                                                                                                                |
+| selected | object | body | **Required.** The desired targets for the query specified by name. This object can contain `hosts` and/or `labels` properties. See examples below. |
 
 #### Example with one host targeted by hostname
 
@@ -2605,9 +2623,9 @@ Runs the specified query as a live query on the specified hosts or group of host
 ```
 {
   "query": "select instance_id from system_info",
-  "selected": { 
+  "selected": {
     "hosts": [
-      "macbook-pro.local", 
+      "macbook-pro.local",
     ]
   }
 }
@@ -2646,7 +2664,7 @@ Runs the specified query as a live query on the specified hosts or group of host
 ```
 {
   "query": "select instance_id from system_info",
-  "selected": { 
+  "selected": {
     "labels": [
       "All Hosts"
     ]
@@ -2680,7 +2698,7 @@ Runs the specified query as a live query on the specified hosts or group of host
 
 ### Retrieve live query results (standard WebSocket API)
 
-You can retrieve the results of a live query using the [standard WebSocket API](#https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_client_applications). 
+You can retrieve the results of a live query using the [standard WebSocket API](#https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API/Writing_WebSocket_client_applications).
 
 Before you retrieve the live query results, you must create a live query campaign by running the live query. See the documentation for the [Run live query](#run-live-query) endpoint to create a live query campaign.
 
@@ -2688,10 +2706,10 @@ Before you retrieve the live query results, you must create a live query campaig
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| token  | string  |  | **Required.** The token used to authenticate with the Fleet API. |
-| campaignID   | integer  |  | **Required.** The ID of the live query campaign. |
+| Name       | Type    | In  | Description                                                      |
+| ---------- | ------- | --- | ---------------------------------------------------------------- |
+| token      | string  |     | **Required.** The token used to authenticate with the Fleet API. |
+| campaignID | integer |     | **Required.** The ID of the live query campaign.                 |
 
 #### Example
 
@@ -2730,9 +2748,9 @@ o
 
 ```
 [
-  { 
-    "type": "auth", 
-    "data": { "token": <insert_token_here> } 
+  {
+    "type": "auth",
+    "data": { "token": <insert_token_here> }
   }
 ]
 ```
@@ -2740,7 +2758,7 @@ o
 ```
 [
   {
-    "type": "select_campaign", 
+    "type": "select_campaign",
     "data": { "campaign_id": 12 }
   }
 ]
@@ -2827,10 +2845,10 @@ You can also retrieve live query results with a [SockJS client](https://github.c
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| token  | string  |  | **Required.** The token used to authenticate with the Fleet API. |
-| campaignID   | integer  |  | **Required.** The ID of the live query campaign. |
+| Name       | Type    | In  | Description                                                      |
+| ---------- | ------- | --- | ---------------------------------------------------------------- |
+| token      | string  |     | **Required.** The token used to authenticate with the Fleet API. |
+| campaignID | integer |     | **Required.** The ID of the live query campaign.                 |
 
 #### Example
 
@@ -2847,7 +2865,7 @@ socket.onopen = () => {
 socket.onmessage = ({ data }) => {
   console.log(data);
   const message = JSON.parse(data);
-  
+
   if (message.type === 'status' && message.data.status === 'finished') {
     socket.close();
   }
@@ -2870,9 +2888,9 @@ o
 
 ```
 [
-  { 
-    "type": "auth", 
-    "data": { "token": <insert_token_here> } 
+  {
+    "type": "auth",
+    "data": { "token": <insert_token_here> }
   }
 ]
 ```
@@ -2880,7 +2898,7 @@ o
 ```
 [
   {
-    "type": "select_campaign", 
+    "type": "select_campaign",
     "data": { "campaign_id": 12 }
   }
 ]
@@ -2984,12 +3002,12 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| name   | string | body | **Required**. The pack's name. |
-| description   | string | body | The pack's description. |
-| host_ids   | list | body | A list containing the targeted host IDs. |
-| label_ids   | list | body | A list containing the targeted label's IDs. |
+| Name        | Type   | In   | Description                                 |
+| ----------- | ------ | ---- | ------------------------------------------- |
+| name        | string | body | **Required**. The pack's name.              |
+| description | string | body | The pack's description.                     |
+| host_ids    | list   | body | A list containing the targeted host IDs.    |
+| label_ids   | list   | body | A list containing the targeted label's IDs. |
 
 #### Example
 
@@ -3034,13 +3052,13 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| id   | integer | path | **Required.** The pack's id. |
-| name   | string | body | The pack's name. |
-| description   | string | body | The pack's description. |
-| host_ids   | list | body | A list containing the targeted host IDs. |
-| label_ids   | list | body | A list containing the targeted label's IDs. |
+| Name        | Type    | In   | Description                                 |
+| ----------- | ------- | ---- | ------------------------------------------- |
+| id          | integer | path | **Required.** The pack's id.                |
+| name        | string  | body | The pack's name.                            |
+| description | string  | body | The pack's description.                     |
+| host_ids    | list    | body | A list containing the targeted host IDs.    |
+| label_ids   | list    | body | A list containing the targeted label's IDs. |
 
 #### Example
 
@@ -3084,8 +3102,8 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
+| Name | Type    | In   | Description                  |
+| ---- | ------- | ---- | ---------------------------- |
 | id   | integer | path | **Required.** The pack's id. |
 
 #### Example
@@ -3120,10 +3138,10 @@ o
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| order_key               | string  | query | What to order results by. Can be any column in the packs table.                                                                                                                                                                                                                                |
-| order_direction               | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`.   |
+| Name            | Type   | In    | Description                                                                                                                   |
+| --------------- | ------ | ----- | ----------------------------------------------------------------------------------------------------------------------------- |
+| order_key       | string | query | What to order results by. Can be any column in the packs table.                                                               |
+| order_direction | string | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`. |
 
 #### Example
 
@@ -3172,9 +3190,9 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| name   | string | path | **Required.** The pack's name. |
+| Name | Type   | In   | Description                    |
+| ---- | ------ | ---- | ------------------------------ |
+| name | string | path | **Required.** The pack's name. |
 
 #### Example
 
@@ -3194,8 +3212,8 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
+| Name | Type    | In   | Description                  |
+| ---- | ------- | ---- | ---------------------------- |
 | id   | integer | path | **Required.** The pack's ID. |
 
 #### Example
@@ -3216,8 +3234,8 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
+| Name | Type    | In   | Description                  |
+| ---- | ------- | ---- | ---------------------------- |
 | id   | integer | path | **Required.** The pack's ID. |
 
 #### Example
@@ -3283,22 +3301,22 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| pack_id   | integer | body | **Required.** The pack's ID. |
-| query_id   | integer | body | **Required.** The query's ID. |
-| interval   | integer | body | **Required.** The amount of time, in seconds, the query waits before running. |
-| snapshot   | boolean | body | **Required.** Whether the queries logs show everything in its current state. |
-| removed   | boolean | body | **Required.** Whether "removed" actions should be logged. |
-| platform   | string | body | The computer platform where this query will run (other platforms ignored). Empty value runs on all platforms. |
-| shard   | integer | body | Restrict this query to a percentage (1-100) of target hosts. |
-| version   | string | body | The minimum required osqueryd version installed on a host. |
+| Name     | Type    | In   | Description                                                                                                   |
+| -------- | ------- | ---- | ------------------------------------------------------------------------------------------------------------- |
+| pack_id  | integer | body | **Required.** The pack's ID.                                                                                  |
+| query_id | integer | body | **Required.** The query's ID.                                                                                 |
+| interval | integer | body | **Required.** The amount of time, in seconds, the query waits before running.                                 |
+| snapshot | boolean | body | **Required.** Whether the queries logs show everything in its current state.                                  |
+| removed  | boolean | body | **Required.** Whether "removed" actions should be logged.                                                     |
+| platform | string  | body | The computer platform where this query will run (other platforms ignored). Empty value runs on all platforms. |
+| shard    | integer | body | Restrict this query to a percentage (1-100) of target hosts.                                                  |
+| version  | string  | body | The minimum required osqueryd version installed on a host.                                                    |
 
 #### Example
 
 `POST /api/v1/fleet/schedule`
 
-#### Request body 
+#### Request body
 
 ```
 {
@@ -3344,8 +3362,8 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
+| Name | Type    | In   | Description                             |
+| ---- | ------- | ---- | --------------------------------------- |
 | id   | integer | path | **Required.** The scheduled query's ID. |
 
 #### Example
@@ -3383,21 +3401,21 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| id   | integer | path | **Required.** The scheduled query's ID. |
-| interval   | integer | body | The amount of time, in seconds, the query waits before running. |
-| snapshot   | boolean | body | Whether the queries logs show everything in its current state. |
-| removed   | boolean | body | Whether "removed" actions should be logged. |
-| platform   | string | body | The computer platform where this query will run (other platforms ignored). Empty value runs on all platforms. |
-| shard   | integer | body | Restrict this query to a percentage (1-100) of target hosts. |
-| version   | string | body | The minimum required osqueryd version installed on a host. |
+| Name     | Type    | In   | Description                                                                                                   |
+| -------- | ------- | ---- | ------------------------------------------------------------------------------------------------------------- |
+| id       | integer | path | **Required.** The scheduled query's ID.                                                                       |
+| interval | integer | body | The amount of time, in seconds, the query waits before running.                                               |
+| snapshot | boolean | body | Whether the queries logs show everything in its current state.                                                |
+| removed  | boolean | body | Whether "removed" actions should be logged.                                                                   |
+| platform | string  | body | The computer platform where this query will run (other platforms ignored). Empty value runs on all platforms. |
+| shard    | integer | body | Restrict this query to a percentage (1-100) of target hosts.                                                  |
+| version  | string  | body | The minimum required osqueryd version installed on a host.                                                    |
 
 #### Example
 
 `PATCH /api/v1/fleet/schedule/56`
 
-#### Request body 
+#### Request body
 
 ```
 {
@@ -3436,8 +3454,8 @@ o
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
+| Name | Type    | In   | Description                             |
+| ---- | ------- | ---- | --------------------------------------- |
 | id   | integer | path | **Required.** The scheduled query's ID. |
 
 #### Example
@@ -3561,9 +3579,9 @@ Returns the specs for all packs in the Fleet instance.
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| specs   | list | body | **Required.** A list that includes the specs for each pack to be added to the Fleet instance. |
+| Name  | Type | In   | Description                                                                                   |
+| ----- | ---- | ---- | --------------------------------------------------------------------------------------------- |
+| specs | list | body | **Required.** A list that includes the specs for each pack to be added to the Fleet instance. |
 
 #### Example
 
@@ -3674,9 +3692,9 @@ Returns the spec for the specified pack by pack name.
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| name   | string | path | **Required.** The pack's name. |
+| Name | Type   | In   | Description                    |
+| ---- | ------ | ---- | ------------------------------ |
+| name | string | path | **Required.** The pack's name. |
 
 #### Example
 
@@ -3758,10 +3776,10 @@ The search targets endpoint returns two lists. The first list includes the possi
 
 #### Parameters
 
-| Name | Type    | In    | Description                  |
-| ---- | ------- | ----- | ---------------------------- |
-| query   | string | body | The search query. Searchable items include a host's hostname or IPv4 address and labels. |
-| selected   | object | body | The targets already selected. The object includes a `hosts` property which contains a list of host IDs and a `labels` property which contains a list of label IDs.|
+| Name     | Type   | In   | Description                                                                                                                                                        |
+| -------- | ------ | ---- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| query    | string | body | The search query. Searchable items include a host's hostname or IPv4 address and labels.                                                                           |
+| selected | object | body | The targets already selected. The object includes a `hosts` property which contains a list of host IDs and a `labels` property which contains a list of label IDs. |
 
 #### Example
 
@@ -3773,7 +3791,7 @@ The search targets endpoint returns two lists. The first list includes the possi
 {
   "query": "172",
   "selected": {
-    "hosts": [], 
+    "hosts": [],
     "labels": [7]
   }
 }
@@ -3916,7 +3934,6 @@ None.
 
 `GET /api/v1/fleet/config/certificate`
 
-
 ##### Default response
 
 `Status: 200`
@@ -3941,7 +3958,6 @@ None.
 
 `GET /api/v1/fleet/config`
 
-
 ##### Default response
 
 `Status: 200`
@@ -3998,33 +4014,33 @@ Modifies the Fleet's configuration with the supplied information.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| org_name   | string  | body | *Organization information*. The organization name.               |
-| org_logo_url      | string  | body | *Organization information*. The URL for the organization logo.          |
-| kolide_server_url   | string  | body | *Server settings*. The Fleet server URL.               |
-| live_query_disabled | boolean | body | *Server settings*. Whether the live query capabilities are disabled. |
-| enable_smtp      | boolean | body | *SMTP settings*. Whether SMTP is enabled for the Fleet app. |
-| sender_address      | string | body | *SMTP settings*. The sender email address for the Fleet app. An invitation email is an example of the emails that may use this sender address  |
-| server      | string | body | *SMTP settings*. The SMTP server for the Fleet app. |
-| port      | integer | body | *SMTP settings*. The SMTP port for the Fleet app. |
-| authentication_type | string | body | *SMTP settings*. The authentication type used by the SMTP server. Options include `"authtype_username_and_password"` or `"none"`|
-| username_name | string | body | *SMTP settings*. The username used to authenticate requests made to the SMTP server.|
-| password | string | body | *SMTP settings*. The password used to authenticate requests made to the SMTP server.|
-| enable_ssl_tls | boolean | body | *SMTP settings*. Whether or not SSL and TLS are enabled for the SMTP server.|
-| authentication_method | string | body | *SMTP settings*. The authentication method used to make authenticate requests to SMTP server. Options include `"authmethod_plain"`, `"authmethod_cram_md5"`, and `"authmethod_login"`.|
-| domain | string | body | *SMTP settings*. The domain for the SMTP server.|
-| verify_ssl_certs | boolean | body | *SMTP settings*. Whether or not SSL certificates are verified by the SMTP server. Turn this off (not recommended) if you use a self-signed certificate. |
-| enabled_start_tls | boolean | body | *SMTP settings*. Detects if STARTTLS is enabled in your SMTP server and starts to use it.|
-| enabled_sso      | boolean | body | *SSO settings*. Whether or not SSO is enabled for the Fleet application. If this value is true, you must also include most of the SSO settings parameters below.|
-| entity_id      | string | body | *SSO settings*. The required entity ID is a URI that you use to identify Fleet when configuring the identity provider. |
-| issuer_uri      | string | body | *SSO settings*. The URI you provide here must exactly match the Entity ID field used in the identity provider configuration. |
-| idp_image_url      | string | body | *SSO settings*. An optional link to an image such as a logo for the identity provider. |
-| metadata      | string | body | *SSO settings*. Metadata provided by the identity provider. Either metadata or a metadata URL must be provided. |
-| metadata_url      | string | body | *SSO settings*. A URL that references the identity provider metadata. If available from the identity provider, this is the preferred means of providing metadata. |
-| host_expiry_enabled      | boolean | body | *Host expiry settings*. When enabled, allows automatic cleanup of hosts that have not communicated with Fleet in some number of days. |
-| host_expiry_window      | integer | body | *Host expiry settings*. If a host has not communicated with Fleet in the specified number of days, it will be removed. |
-| additional_queries      | boolean | body | Whether or not additional queries are enabled on hosts. |
+| Name                  | Type    | In   | Description                                                                                                                                                                            |
+| --------------------- | ------- | ---- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| org_name              | string  | body | _Organization information_. The organization name.                                                                                                                                     |
+| org_logo_url          | string  | body | _Organization information_. The URL for the organization logo.                                                                                                                         |
+| kolide_server_url     | string  | body | _Server settings_. The Fleet server URL.                                                                                                                                               |
+| live_query_disabled   | boolean | body | _Server settings_. Whether the live query capabilities are disabled.                                                                                                                   |
+| enable_smtp           | boolean | body | _SMTP settings_. Whether SMTP is enabled for the Fleet app.                                                                                                                            |
+| sender_address        | string  | body | _SMTP settings_. The sender email address for the Fleet app. An invitation email is an example of the emails that may use this sender address                                          |
+| server                | string  | body | _SMTP settings_. The SMTP server for the Fleet app.                                                                                                                                    |
+| port                  | integer | body | _SMTP settings_. The SMTP port for the Fleet app.                                                                                                                                      |
+| authentication_type   | string  | body | _SMTP settings_. The authentication type used by the SMTP server. Options include `"authtype_username_and_password"` or `"none"`                                                       |
+| username_name         | string  | body | _SMTP settings_. The username used to authenticate requests made to the SMTP server.                                                                                                   |
+| password              | string  | body | _SMTP settings_. The password used to authenticate requests made to the SMTP server.                                                                                                   |
+| enable_ssl_tls        | boolean | body | _SMTP settings_. Whether or not SSL and TLS are enabled for the SMTP server.                                                                                                           |
+| authentication_method | string  | body | _SMTP settings_. The authentication method used to make authenticate requests to SMTP server. Options include `"authmethod_plain"`, `"authmethod_cram_md5"`, and `"authmethod_login"`. |
+| domain                | string  | body | _SMTP settings_. The domain for the SMTP server.                                                                                                                                       |
+| verify_ssl_certs      | boolean | body | _SMTP settings_. Whether or not SSL certificates are verified by the SMTP server. Turn this off (not recommended) if you use a self-signed certificate.                                |
+| enabled_start_tls     | boolean | body | _SMTP settings_. Detects if STARTTLS is enabled in your SMTP server and starts to use it.                                                                                              |
+| enabled_sso           | boolean | body | _SSO settings_. Whether or not SSO is enabled for the Fleet application. If this value is true, you must also include most of the SSO settings parameters below.                       |
+| entity_id             | string  | body | _SSO settings_. The required entity ID is a URI that you use to identify Fleet when configuring the identity provider.                                                                 |
+| issuer_uri            | string  | body | _SSO settings_. The URI you provide here must exactly match the Entity ID field used in the identity provider configuration.                                                           |
+| idp_image_url         | string  | body | _SSO settings_. An optional link to an image such as a logo for the identity provider.                                                                                                 |
+| metadata              | string  | body | _SSO settings_. Metadata provided by the identity provider. Either metadata or a metadata URL must be provided.                                                                        |
+| metadata_url          | string  | body | _SSO settings_. A URL that references the identity provider metadata. If available from the identity provider, this is the preferred means of providing metadata.                      |
+| host_expiry_enabled   | boolean | body | _Host expiry settings_. When enabled, allows automatic cleanup of hosts that have not communicated with Fleet in some number of days.                                                  |
+| host_expiry_window    | integer | body | _Host expiry settings_. If a host has not communicated with Fleet in the specified number of days, it will be removed.                                                                 |
+| additional_queries    | boolean | body | Whether or not additional queries are enabled on hosts.                                                                                                                                |
 
 #### Example
 
@@ -4046,7 +4062,6 @@ Modifies the Fleet's configuration with the supplied information.
 }
 ```
 
-
 ##### Default response
 
 `Status: 200`
@@ -4109,7 +4124,6 @@ None.
 
 `GET /api/v1/fleet/spec/enroll_secret`
 
-
 ##### Default response
 
 `Status: 200`
@@ -4149,11 +4163,11 @@ Modifies and/or creates the specified enroll secret(s).
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| name   | string  | body | **Required.** The name of the enroll secret              |
-| secret   | string  | body | **Required.** The plain text string used as the enroll secret.               |
-| active      | boolean  | body | Whether or not the enroll secret is active. Must be set to true for hosts to enroll using the enroll secret.          |
+| Name   | Type    | In   | Description                                                                                                  |
+| ------ | ------- | ---- | ------------------------------------------------------------------------------------------------------------ |
+| name   | string  | body | **Required.** The name of the enroll secret                                                                  |
+| secret | string  | body | **Required.** The plain text string used as the enroll secret.                                               |
+| active | boolean | body | Whether or not the enroll secret is active. Must be set to true for hosts to enroll using the enroll secret. |
 
 #### Example
 
@@ -4175,7 +4189,6 @@ Modifies and/or creates the specified enroll secret(s).
 
 `POST /api/v1/fleet/spec/enroll_secret`
 
-
 ##### Default response
 
 `Status: 200`
@@ -4186,18 +4199,17 @@ Modifies and/or creates the specified enroll secret(s).
 
 ### Create invite
 
-
 `POST /api/v1/fleet/invites`
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| admin   | boolean  | body | **Required.** Whether or not the invited user will be granted admin privileges.             |
-| email   | string  | body | **Required.** The email of the invited user. This email will receive the invitation link.              |
-| invited_by      | integer  | body | **Required.** The id of the user that is extending the invitation. See the [Get user information](#get-user-information) endpoint for how to retrieve a user's id.          |
-| name     | string  | body | **Required.** The name of the invited user.         |
-| sso_enabled     | boolean  | body | **Required.** Whether or not SSO will be enabled for the invited user.   |
+| Name        | Type    | In   | Description                                                                                                                                                        |
+| ----------- | ------- | ---- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| admin       | boolean | body | **Required.** Whether or not the invited user will be granted admin privileges.                                                                                    |
+| email       | string  | body | **Required.** The email of the invited user. This email will receive the invitation link.                                                                          |
+| invited_by  | integer | body | **Required.** The id of the user that is extending the invitation. See the [Get user information](#get-user-information) endpoint for how to retrieve a user's id. |
+| name        | string  | body | **Required.** The name of the invited user.                                                                                                                        |
+| sso_enabled | boolean | body | **Required.** Whether or not SSO will be enabled for the invited user.                                                                                             |
 
 #### Example
 
@@ -4215,7 +4227,6 @@ Modifies and/or creates the specified enroll secret(s).
 
 `POST /api/v1/fleet/invites`
 
-
 ##### Default response
 
 `Status: 200`
@@ -4243,16 +4254,15 @@ Returns a list of the active invitations in Fleet.
 
 #### Parameters
 
-| Name                  | Type   | In   | Description                                                     |
-| --------------------- | ------ | ---- | --------------------------------------------------------------- |
-| order_key               | string  | query | What to order results by. Can be any column in the invites table.                                                                                                                                                                                                                                |
-| order_direction               | string  | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`.   |
+| Name            | Type   | In    | Description                                                                                                                   |
+| --------------- | ------ | ----- | ----------------------------------------------------------------------------------------------------------------------------- |
+| order_key       | string | query | What to order results by. Can be any column in the invites table.                                                             |
+| order_direction | string | query | **Requires `order_key`**. The direction of the order given the order key. Options include `asc` and `desc`. Default is `asc`. |
 
 #### Example
 
 `GET /api/v1/fleet/invites`
 
-
 ##### Default response
 
 `Status: 200`
@@ -4292,15 +4302,14 @@ Delete the specified invite from Fleet.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| id   | integer  | path | **Required.** The user's id.            |
+| Name | Type    | In   | Description                  |
+| ---- | ------- | ---- | ---------------------------- |
+| id   | integer | path | **Required.** The user's id. |
 
 #### Example
 
 `DELETE /api/v1/fleet/invites/{id}`
 
-
 ##### Default response
 
 `Status: 200`
@@ -4317,15 +4326,14 @@ Verify the specified invite.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| token   | integer  | path | **Required.** Token provided to the user in the invitation email.|
+| Name  | Type    | In   | Description                                                       |
+| ----- | ------- | ---- | ----------------------------------------------------------------- |
+| token | integer | path | **Required.** Token provided to the user in the invitation email. |
 
 #### Example
 
 `GET /api/v1/fleet/invites/{token}`
 
-
 ##### Default response
 
 `Status: 200`
@@ -4369,15 +4377,14 @@ Changes the email specified by token.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| token   | integer  | path | **Required.** The token provided to the user in the email change confirmation email.|
+| Name  | Type    | In   | Description                                                                          |
+| ----- | ------- | ---- | ------------------------------------------------------------------------------------ |
+| token | integer | path | **Required.** The token provided to the user in the email change confirmation email. |
 
 #### Example
 
 `GET /api/v1/fleet/invites/{token}`
 
-
 ##### Default response
 
 `Status: 200`
@@ -4387,6 +4394,7 @@ Changes the email specified by token.
   "new_email": janedoe@example.com
 }
 ```
+
 ---
 
 ### Version
@@ -4417,6 +4425,7 @@ None.
   "build_user": "zwass"
 }
 ```
+
 ---
 
 ## Osquery options
@@ -4438,7 +4447,6 @@ None.
 
 `GET /api/v1/fleet/spec/osquery_options`
 
-
 ##### Default response
 
 `Status: 200`
@@ -4477,9 +4485,9 @@ Modifies the osquery options configuration set in Fleet.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| spec   | JSON  | body | **Required.** The modified osquery spec.            |
+| Name | Type | In   | Description                              |
+| ---- | ---- | ---- | ---------------------------------------- |
+| spec | JSON | body | **Required.** The modified osquery spec. |
 
 #### Example
 
@@ -4513,7 +4521,6 @@ Modifies the osquery options configuration set in Fleet.
 }
 ```
 
-
 ##### Default response
 
 `Status: 200`
@@ -4532,7 +4539,7 @@ Modifies the osquery options configuration set in Fleet.
 
 Fleet supports osquery's file carving functionality as of Fleet 3.3.0. This allows the Fleet server to request files (and sets of files) from osquery agents, returning the full contents to Fleet.
 
-To initiate a file carve using the Fleet API, you can use the [live query](#run-live-query) or [scheduled query](#add-scheduled-query-to-a-pack) endpoints to run a query against the `carves` table. 
+To initiate a file carve using the Fleet API, you can use the [live query](#run-live-query) or [scheduled query](#add-scheduled-query-to-a-pack) endpoints to run a query against the `carves` table.
 
 For more information on executing a file carve in Fleet, go to the [File carving with Fleet docs](../1-Using-Fleet/2-fleetctl-CLI.md#file-carving-with-fleet).
 
@@ -4597,9 +4604,9 @@ Retrieves the specified carve.
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| id   | integer  | path | **Required.** The desired carve's ID.            |
+| Name | Type    | In   | Description                           |
+| ---- | ------- | ---- | ------------------------------------- |
+| id   | integer | path | **Required.** The desired carve's ID. |
 
 #### Example
 
@@ -4636,10 +4643,10 @@ Retrieves the specified carve block. This endpoint retrieves the data that was c
 
 #### Parameters
 
-| Name       | Type    | In   | Description                                      |
-| ---------- | ------- | ---- | ------------------------------------------------ |
-| id   | integer  | path | **Required.** The desired carve's ID.            |
-| block_id   | integer  | path | **Required.** The desired carve block's ID.            |
+| Name     | Type    | In   | Description                                 |
+| -------- | ------- | ---- | ------------------------------------------- |
+| id       | integer | path | **Required.** The desired carve's ID.       |
+| block_id | integer | path | **Required.** The desired carve block's ID. |
 
 #### Example
 
diff --git a/server/datastore/mysql/hosts.go b/server/datastore/mysql/hosts.go
index 234be740ee..dca30836b4 100644
--- a/server/datastore/mysql/hosts.go
+++ b/server/datastore/mysql/hosts.go
@@ -89,7 +89,8 @@ func (d *Datastore) SaveHost(host *kolide.Host) error {
 			additional = COALESCE(?, additional),
 			enroll_secret_name = ?,
 			primary_ip = ?,
-			primary_mac = ?
+			primary_mac = ?,
+			refetch_requested = ?
 		WHERE id = ?
 	`
 	_, err := d.db.Exec(sqlStatement,
@@ -124,6 +125,7 @@ func (d *Datastore) SaveHost(host *kolide.Host) error {
 		host.EnrollSecretName,
 		host.PrimaryIP,
 		host.PrimaryMac,
+		host.RefetchRequested,
 		host.ID,
 	)
 	if err != nil {
@@ -314,7 +316,8 @@ func (d *Datastore) ListHosts(opt kolide.HostListOptions) ([]*kolide.Host, error
         primary_mac, 
         label_update_time, 
         enroll_secret_name,
-		`
+		refetch_requested,
+	`
 
 	var params []interface{}
 
@@ -531,7 +534,8 @@ func (d *Datastore) AuthenticateHost(nodeKey string) (*kolide.Host, error) {
 			config_tls_refresh,
 			primary_ip,
 			primary_mac,
-			enroll_secret_name
+			enroll_secret_name,
+			refetch_requested
 		FROM hosts
 		WHERE node_key = ?
 		LIMIT 1
diff --git a/server/datastore/mysql/migrations/tables/20210513115729_RefetchHostDetail.go b/server/datastore/mysql/migrations/tables/20210513115729_RefetchHostDetail.go
new file mode 100644
index 0000000000..9f3ee04fb3
--- /dev/null
+++ b/server/datastore/mysql/migrations/tables/20210513115729_RefetchHostDetail.go
@@ -0,0 +1,26 @@
+package tables
+
+import (
+	"database/sql"
+
+	"github.com/pkg/errors"
+)
+
+func init() {
+	MigrationClient.AddMigration(Up_20210513115729, Down_20210513115729)
+}
+
+func Up_20210513115729(tx *sql.Tx) error {
+	sql := `
+		ALTER TABLE hosts
+		ADD COLUMN refetch_requested TINYINT(1) NOT NULL DEFAULT 0
+	`
+	if _, err := tx.Exec(sql); err != nil {
+		return errors.Wrap(err, "add column refetch_requested")
+	}
+	return nil
+}
+
+func Down_20210513115729(tx *sql.Tx) error {
+	return nil
+}
diff --git a/server/kolide/hosts.go b/server/kolide/hosts.go
index 6877b2469d..92549982df 100644
--- a/server/kolide/hosts.go
+++ b/server/kolide/hosts.go
@@ -84,6 +84,8 @@ type HostService interface {
 	// Possible matches can be on osquery_host_identifier, node_key, UUID, or
 	// hostname.
 	HostByIdentifier(ctx context.Context, identifier string) (*HostDetail, error)
+	// RefetchHost requests a refetch of host details for the provided host.
+	RefetchHost(ctx context.Context, id uint) (err error)
 
 	FlushSeenHosts(ctx context.Context) error
 }
@@ -112,6 +114,7 @@ type Host struct {
 	LabelUpdateTime  time.Time     `json:"label_updated_at" db:"label_update_time"`   // Time that the host details were last updated
 	LastEnrollTime   time.Time     `json:"last_enrolled_at" db:"last_enroll_time"`    // Time that the host last enrolled
 	SeenTime         time.Time     `json:"seen_time" db:"seen_time"`                  // Time that the host was last "seen"
+	RefetchRequested bool          `json:"refetch_requested" db:"refetch_requested"`
 	NodeKey          string        `json:"-" db:"node_key"`
 	HostName         string        `json:"hostname" db:"host_name"` // there is a fulltext index on this field
 	UUID             string        `json:"uuid" db:"uuid"`          // there is a fulltext index on this field
diff --git a/server/service/endpoint_hosts.go b/server/service/endpoint_hosts.go
index 3a0eb8ccdf..88f3ee26f6 100644
--- a/server/service/endpoint_hosts.go
+++ b/server/service/endpoint_hosts.go
@@ -188,3 +188,28 @@ func makeDeleteHostEndpoint(svc kolide.Service) endpoint.Endpoint {
 		return deleteHostResponse{}, nil
 	}
 }
+
+////////////////////////////////////////////////////////////////////////////////
+// Refetch Host
+////////////////////////////////////////////////////////////////////////////////
+
+type refetchHostRequest struct {
+	ID uint `json:"id"`
+}
+
+type refetchHostResponse struct {
+	Err error `json:"error,omitempty"`
+}
+
+func (r refetchHostResponse) error() error { return r.Err }
+
+func makeRefetchHostEndpoint(svc kolide.Service) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (interface{}, error) {
+		req := request.(refetchHostRequest)
+		err := svc.RefetchHost(ctx, req.ID)
+		if err != nil {
+			return refetchHostResponse{Err: err}, nil
+		}
+		return refetchHostResponse{}, nil
+	}
+}
diff --git a/server/service/handler.go b/server/service/handler.go
index 1df123eb6e..822ec0c417 100644
--- a/server/service/handler.go
+++ b/server/service/handler.go
@@ -94,6 +94,7 @@ type KolideEndpoints struct {
 	GetHost                               endpoint.Endpoint
 	HostByIdentifier                      endpoint.Endpoint
 	DeleteHost                            endpoint.Endpoint
+	RefetchHost                           endpoint.Endpoint
 	ListHosts                             endpoint.Endpoint
 	GetHostSummary                        endpoint.Endpoint
 	SearchTargets                         endpoint.Endpoint
@@ -193,6 +194,7 @@ func MakeKolideServerEndpoints(svc kolide.Service, jwtKey, urlPrefix string, lim
 		ListHosts:                             authenticatedUser(jwtKey, svc, makeListHostsEndpoint(svc)),
 		GetHostSummary:                        authenticatedUser(jwtKey, svc, makeGetHostSummaryEndpoint(svc)),
 		DeleteHost:                            authenticatedUser(jwtKey, svc, makeDeleteHostEndpoint(svc)),
+		RefetchHost:                           authenticatedUser(jwtKey, svc, makeRefetchHostEndpoint(svc)),
 		CreateLabel:                           authenticatedUser(jwtKey, svc, makeCreateLabelEndpoint(svc)),
 		ModifyLabel:                           authenticatedUser(jwtKey, svc, makeModifyLabelEndpoint(svc)),
 		GetLabel:                              authenticatedUser(jwtKey, svc, makeGetLabelEndpoint(svc)),
@@ -305,6 +307,7 @@ type kolideHandlers struct {
 	GetHost                               http.Handler
 	HostByIdentifier                      http.Handler
 	DeleteHost                            http.Handler
+	RefetchHost                           http.Handler
 	ListHosts                             http.Handler
 	GetHostSummary                        http.Handler
 	SearchTargets                         http.Handler
@@ -401,6 +404,7 @@ func makeKolideKitHandlers(e KolideEndpoints, opts []kithttp.ServerOption) *koli
 		GetHost:                               newServer(e.GetHost, decodeGetHostRequest),
 		HostByIdentifier:                      newServer(e.HostByIdentifier, decodeHostByIdentifierRequest),
 		DeleteHost:                            newServer(e.DeleteHost, decodeDeleteHostRequest),
+		RefetchHost:                           newServer(e.RefetchHost, decodeRefetchHostRequest),
 		ListHosts:                             newServer(e.ListHosts, decodeListHostsRequest),
 		GetHostSummary:                        newServer(e.GetHostSummary, decodeNoParamsRequest),
 		SearchTargets:                         newServer(e.SearchTargets, decodeSearchTargetsRequest),
@@ -614,6 +618,7 @@ func attachKolideAPIRoutes(r *mux.Router, h *kolideHandlers) {
 	r.Handle("/api/v1/fleet/hosts/{id}", h.GetHost).Methods("GET").Name("get_host")
 	r.Handle("/api/v1/fleet/hosts/identifier/{identifier}", h.HostByIdentifier).Methods("GET").Name("host_by_identifier")
 	r.Handle("/api/v1/fleet/hosts/{id}", h.DeleteHost).Methods("DELETE").Name("delete_host")
+	r.Handle("/api/v1/fleet/hosts/{id}/refetch", h.RefetchHost).Methods("POST").Name("refetch_host")
 
 	r.Handle("/api/v1/fleet/spec/osquery_options", h.ApplyOsqueryOptionsSpec).Methods("POST").Name("apply_osquery_options_spec")
 	r.Handle("/api/v1/fleet/spec/osquery_options", h.GetOsqueryOptionsSpec).Methods("GET").Name("get_osquery_options_spec")
diff --git a/server/service/service_hosts.go b/server/service/service_hosts.go
index 5cbb7e3c14..eeb178bf30 100644
--- a/server/service/service_hosts.go
+++ b/server/service/service_hosts.go
@@ -75,3 +75,17 @@ func (svc *service) FlushSeenHosts(ctx context.Context) error {
 	hostIDs := svc.seenHostSet.getAndClearHostIDs()
 	return svc.ds.MarkHostsSeen(hostIDs, svc.clock.Now())
 }
+
+func (svc *service) RefetchHost(ctx context.Context, id uint) error {
+	host, err := svc.ds.Host(id)
+	if err != nil {
+		return errors.Wrap(err, "find host for refetch")
+	}
+
+	host.RefetchRequested = true
+	if err := svc.ds.SaveHost(host); err != nil {
+		return errors.Wrap(err, "save host")
+	}
+
+	return nil
+}
diff --git a/server/service/service_hosts_test.go b/server/service/service_hosts_test.go
index 14b141dc55..bdb801ab40 100644
--- a/server/service/service_hosts_test.go
+++ b/server/service/service_hosts_test.go
@@ -100,3 +100,21 @@ func TestHostDetails(t *testing.T) {
 	assert.Equal(t, expectedLabels, hostDetail.Labels)
 	assert.Equal(t, expectedPacks, hostDetail.Packs)
 }
+
+func TestRefetchHost(t *testing.T) {
+	ds := new(mock.Store)
+	svc := service{ds: ds}
+
+	host := &kolide.Host{ID: 3}
+	ctx := context.Background()
+
+	ds.HostFunc = func(hid uint) (*kolide.Host, error) {
+		return host, nil
+	}
+	ds.SaveHostFunc = func(host *kolide.Host) error {
+		assert.True(t, host.RefetchRequested)
+		return nil
+	}
+
+	require.NoError(t, svc.RefetchHost(ctx, host.ID))
+}
diff --git a/server/service/service_osquery.go b/server/service/service_osquery.go
index 5b9893570c..4412b7ecc4 100644
--- a/server/service/service_osquery.go
+++ b/server/service/service_osquery.go
@@ -861,7 +861,7 @@ func ingestSoftware(logger log.Logger, host *kolide.Host, rows []map[string]stri
 // osqueryd to fill in the host details
 func (svc service) hostDetailQueries(host kolide.Host) (map[string]string, error) {
 	queries := make(map[string]string)
-	if host.DetailUpdateTime.After(svc.clock.Now().Add(-svc.config.Osquery.DetailUpdateInterval)) {
+	if host.DetailUpdateTime.After(svc.clock.Now().Add(-svc.config.Osquery.DetailUpdateInterval)) && !host.RefetchRequested {
 		// No need to update already fresh details
 		return queries, nil
 	}
@@ -959,6 +959,9 @@ func (svc service) ingestDetailQuery(host *kolide.Host, name string, rows []map[
 		}
 	}
 
+	// Refetch is no longer needed after ingesting details.
+	host.RefetchRequested = false
+
 	return nil
 }
 
diff --git a/server/service/service_osquery_test.go b/server/service/service_osquery_test.go
index 23103676d7..e60edb8d3a 100644
--- a/server/service/service_osquery_test.go
+++ b/server/service/service_osquery_test.go
@@ -274,7 +274,14 @@ func TestHostDetailQueries(t *testing.T) {
 
 	queries, err := svc.hostDetailQueries(host)
 	assert.Nil(t, err)
-	assert.Empty(t, queries, 0)
+	assert.Empty(t, queries)
+
+	// With refetch requested queries should be returned
+	host.RefetchRequested = true
+	queries, err = svc.hostDetailQueries(host)
+	assert.Nil(t, err)
+	assert.NotEmpty(t, queries)
+	host.RefetchRequested = false
 
 	// Advance the time
 	mockClock.AddTime(1*time.Hour + 1*time.Minute)
diff --git a/server/service/transport_hosts.go b/server/service/transport_hosts.go
index ad817aebb6..4cf7a5750d 100644
--- a/server/service/transport_hosts.go
+++ b/server/service/transport_hosts.go
@@ -29,6 +29,14 @@ func decodeDeleteHostRequest(ctx context.Context, r *http.Request) (interface{},
 	return deleteHostRequest{ID: id}, nil
 }
 
+func decodeRefetchHostRequest(ctx context.Context, r *http.Request) (interface{}, error) {
+	id, err := idFromRequest(r, "id")
+	if err != nil {
+		return nil, err
+	}
+	return refetchHostRequest{ID: id}, nil
+}
+
 func decodeListHostsRequest(ctx context.Context, r *http.Request) (interface{}, error) {
 	hopt, err := hostListOptionsFromRequest(r)
 	if err != nil {

From 86745ba2dc0c8928714d171ca34f7459394951c9 Mon Sep 17 00:00:00 2001
From: Josh Brower <josh@defensivedepth.com>
Date: Thu, 13 May 2021 19:01:31 -0400
Subject: [PATCH 30/51] Add ability to duplicate live query results in Redis
 (#762)

This feature enables a new config option (redis.duplicate_results). When set to true, all Live Query results will be copied to an additional Redis pubsub channel named LQDuplicate

This is useful in a scenario that would involve shipping the Live Query results outside of Fleet, near-realtime.
---
 cmd/fleet/serve.go                   |  2 +-
 docs/3-Deployment/2-Configuration.md | 13 +++++++++++++
 server/config/config.go              | 19 +++++++++++--------
 server/pubsub/query_results_test.go  | 11 ++++++-----
 server/pubsub/redis_query_results.go | 14 ++++++++++----
 5 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/cmd/fleet/serve.go b/cmd/fleet/serve.go
index 522a092a9d..bfd72636ca 100644
--- a/cmd/fleet/serve.go
+++ b/cmd/fleet/serve.go
@@ -216,7 +216,7 @@ the way that the Fleet server works.
 			}
 
 			redisPool := pubsub.NewRedisPool(config.Redis.Address, config.Redis.Password, config.Redis.Database, config.Redis.UseTLS)
-			resultStore := pubsub.NewRedisQueryResults(redisPool)
+			resultStore := pubsub.NewRedisQueryResults(redisPool, config.Redis.DuplicateResults)
 			liveQueryStore := live_query.NewRedisLiveQuery(redisPool)
 			ssoSessionStore := sso.NewSessionStore(redisPool)
 
diff --git a/docs/3-Deployment/2-Configuration.md b/docs/3-Deployment/2-Configuration.md
index 8b9596c29d..edabb998a8 100644
--- a/docs/3-Deployment/2-Configuration.md
+++ b/docs/3-Deployment/2-Configuration.md
@@ -333,6 +333,19 @@ The database to use when connecting to the Redis instance.
   redis:
     database: 14
   ```
+  
+###### `redis_duplicate_results`
+
+Whether or not to duplicate Live Query results to another Redis channel named `LQDuplicate`. This is useful in a scenario that would involve shipping the Live Query results outside of Fleet, near-realtime.
+
+- Default value: `false`
+- Environment variable: `FLEET_REDIS_DUPLICATE_RESULTS`
+- Config file format:
+
+  ```
+  redis:
+    duplicate_results: true
+  ```
 
 ##### Server
 
diff --git a/server/config/config.go b/server/config/config.go
index b0d94011c9..2ec2c535dd 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -35,10 +35,11 @@ type MysqlConfig struct {
 
 // RedisConfig defines configs related to Redis
 type RedisConfig struct {
-	Address  string
-	Password string
-	Database int
-	UseTLS   bool `yaml:"use_tls"`
+	Address          string
+	Password         string
+	Database         int
+	UseTLS           bool `yaml:"use_tls"`
+	DuplicateResults bool `yaml:"duplicate_results"`
 }
 
 const (
@@ -213,6 +214,7 @@ func (man Manager) addConfigs() {
 	man.addConfigInt("redis.database", 0,
 		"Redis server database number")
 	man.addConfigBool("redis.use_tls", false, "Redis server enable TLS")
+	man.addConfigBool("redis.duplicate_results", false, "Duplicate Live Query results to another Redis channel")
 
 	// Server
 	man.addConfigString("server.address", "0.0.0.0:8080",
@@ -388,10 +390,11 @@ func (man Manager) LoadConfig() KolideConfig {
 			ConnMaxLifetime: man.getConfigInt("mysql.conn_max_lifetime"),
 		},
 		Redis: RedisConfig{
-			Address:  man.getConfigString("redis.address"),
-			Password: man.getConfigString("redis.password"),
-			Database: man.getConfigInt("redis.database"),
-			UseTLS:   man.getConfigBool("redis.use_tls"),
+			Address:          man.getConfigString("redis.address"),
+			Password:         man.getConfigString("redis.password"),
+			Database:         man.getConfigInt("redis.database"),
+			UseTLS:           man.getConfigBool("redis.use_tls"),
+			DuplicateResults: man.getConfigBool("redis.duplicate_results"),
 		},
 		Server: ServerConfig{
 			Address:    man.getConfigString("server.address"),
diff --git a/server/pubsub/query_results_test.go b/server/pubsub/query_results_test.go
index 5f5b8315de..86ec22fc95 100644
--- a/server/pubsub/query_results_test.go
+++ b/server/pubsub/query_results_test.go
@@ -61,13 +61,14 @@ func TestInmem(t *testing.T) {
 
 func setupRedis(t *testing.T) (store *redisQueryResults, teardown func()) {
 	var (
-		addr     = "127.0.0.1:6379"
-		password = ""
-		database = 0
-		useTLS   = false
+		addr       = "127.0.0.1:6379"
+		password   = ""
+		database   = 0
+		useTLS     = false
+		dupResults = false
 	)
 
-	store = NewRedisQueryResults(NewRedisPool(addr, password, database, useTLS))
+	store = NewRedisQueryResults(NewRedisPool(addr, password, database, useTLS), dupResults)
 
 	_, err := store.pool.Get().Do("PING")
 	require.Nil(t, err)
diff --git a/server/pubsub/redis_query_results.go b/server/pubsub/redis_query_results.go
index 647be5766e..a6c5c36f77 100644
--- a/server/pubsub/redis_query_results.go
+++ b/server/pubsub/redis_query_results.go
@@ -6,14 +6,15 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gomodule/redigo/redis"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/gomodule/redigo/redis"
 	"github.com/pkg/errors"
 )
 
 type redisQueryResults struct {
 	// connection pool
-	pool *redis.Pool
+	pool             *redis.Pool
+	duplicateResults bool
 }
 
 var _ kolide.QueryResultStore = &redisQueryResults{}
@@ -49,8 +50,8 @@ func NewRedisPool(server, password string, database int, useTLS bool) *redis.Poo
 
 // NewRedisQueryResults creats a new Redis implementation of the
 // QueryResultStore interface using the provided Redis connection pool.
-func NewRedisQueryResults(pool *redis.Pool) *redisQueryResults {
-	return &redisQueryResults{pool: pool}
+func NewRedisQueryResults(pool *redis.Pool, duplicateResults bool) *redisQueryResults {
+	return &redisQueryResults{pool: pool, duplicateResults: duplicateResults}
 }
 
 func pubSubForID(id uint) string {
@@ -69,6 +70,11 @@ func (r *redisQueryResults) WriteResult(result kolide.DistributedQueryResult) er
 	}
 
 	n, err := redis.Int(conn.Do("PUBLISH", channelName, string(jsonVal)))
+
+	if n != 0 && r.duplicateResults {
+		redis.Int(conn.Do("PUBLISH", "LQDuplicate", string(jsonVal)))
+	}
+
 	if err != nil {
 		return errors.Wrap(err, "PUBLISH failed to channel "+channelName)
 	}

From 381956b528bd8efe794c345b6dda4f1cef45028d Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Thu, 13 May 2021 19:29:31 -0400
Subject: [PATCH 31/51] Host custom query button modification (#758)

* Improve UX custom query option
* Edge case custom query button persists
---
 .../SelectQueryModal/SelectQueryModal.jsx     | 91 +++++++++++--------
 .../SelectQueryModal/_styles.scss             | 15 ++-
 2 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/SelectQueryModal.jsx b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/SelectQueryModal.jsx
index 0769fd0d57..420d000fa9 100644
--- a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/SelectQueryModal.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/SelectQueryModal.jsx
@@ -57,6 +57,18 @@ const SelectQueryModal = (props) => {
     });
   };
 
+  const customQueryButton = () => {
+    return (
+      <Button
+        onClick={() => onQueryHostCustom(host, dispatch)}
+        variant="brand"
+        className={`${baseClass}__custom-query-button`}
+      >
+        Create custom query
+      </Button>
+    );
+  };
+
   const onFilterQueries = (event) => {
     setQueriesFilter(event);
     return false;
@@ -86,6 +98,20 @@ const SelectQueryModal = (props) => {
               <img src={OpenNewTabIcon} alt="open new tab" id="new-tab-icon" />
             </a>
           </span>
+          <div>{customQueryButton()}</div>
+        </div>
+      );
+    }
+
+    if (!queriesFilter && queriesCount === 0) {
+      return (
+        <div className={`${baseClass}__no-query-results`}>
+          <span className="info__header">You have no saved queries.</span>
+          <span className="info__data">
+            Expecting to see queries? Try again in a few seconds as the system
+            catches up.
+          </span>
+          <div>{customQueryButton()}</div>
         </div>
       );
     }
@@ -106,43 +132,43 @@ const SelectQueryModal = (props) => {
       });
       return (
         <div>
-          <div className={`${baseClass}__filter-queries`}>
-            <InputField
-              name="query-filter"
-              onChange={onFilterQueries}
-              placeholder="Filter queries"
-              value={queriesFilter}
-            />
-            <KolideIcon name="search" />
+          <div className={`${baseClass}__query-modal`}>
+            <div className={`${baseClass}__filter-queries`}>
+              <InputField
+                name="query-filter"
+                onChange={onFilterQueries}
+                placeholder="Filter queries"
+                value={queriesFilter}
+              />
+              <KolideIcon name="search" />
+            </div>
+            <div className={`${baseClass}__create-query`}>
+              <span>OR</span>
+              {customQueryButton()}
+            </div>
           </div>
           <div>{queryList}</div>
         </div>
       );
     }
 
-    if (!queriesFilter && queriesCount === 0) {
-      return (
-        <div className={`${baseClass}__no-query-results`}>
-          <span className="info__header">You have no saved queries.</span>
-          <span className="info__data">
-            Expecting to see queries? Try again in a few seconds as the system
-            catches up.
-          </span>
-        </div>
-      );
-    }
-
     if (queriesFilter && queriesCount === 0) {
       return (
         <div>
-          <div className={`${baseClass}__filter-queries`}>
-            <InputField
-              name="query-filter"
-              onChange={onFilterQueries}
-              placeholder="Filter queries"
-              value={queriesFilter}
-            />
-            <KolideIcon name="search" />
+          <div className={`${baseClass}__query-modal`}>
+            <div className={`${baseClass}__filter-queries`}>
+              <InputField
+                name="query-filter"
+                onChange={onFilterQueries}
+                placeholder="Filter queries"
+                value={queriesFilter}
+              />
+              <KolideIcon name="search" />
+            </div>
+            <div className={`${baseClass}__create-query`}>
+              <span>OR</span>
+              {customQueryButton()}
+            </div>
           </div>
           <div className={`${baseClass}__no-query-results`}>
             <span className="info__header">
@@ -165,15 +191,6 @@ const SelectQueryModal = (props) => {
       className={`${baseClass}__modal`}
     >
       {results()}
-      <p>
-        <Button
-          onClick={() => onQueryHostCustom(host, dispatch)}
-          variant="unstyled"
-          className={`${baseClass}__custom-query-button`}
-        >
-          Create custom query
-        </Button>
-      </p>
     </Modal>
   );
 };
diff --git a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss
index 2a93e306eb..e93b8a5343 100644
--- a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss
+++ b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss
@@ -46,8 +46,12 @@
     }
   }
 
+  &__query-modal {
+    display: flex;
+  }
+
   &__filter-queries {
-    flex-grow: 1;
+    flex-grow: 3;
     position: relative;
 
     .input-field {
@@ -63,9 +67,14 @@
     }
   }
 
+  &__create-query {
+    span {
+      margin: 15px;
+      font-weight: bold;
+    }
+  }
+
   &__custom-query-button {
     font-size: $x-small;
-    color: $core-vibrant-blue;
-    font-weight: $bold;
   }
 }

From 9d420068efa9650ff0ad270d0943f51c0d9cc4e5 Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Fri, 14 May 2021 03:25:40 -0500
Subject: [PATCH 32/51] Update capabilities chart + copy edits + fix lint (was
 broken for local dev only - re md compilation) (#768)

* fix linter so it doesn't freak out when developing w/ compiled markdown content locally

* copy edits + add back call to action at bottom of homepage so there's somewhere to go
---
 website/assets/styles/pages/homepage.less |  42 +++
 website/assets/styles/pages/pricing.less  |  25 +-
 website/config/routes.js                  |   6 +-
 website/package.json                      |   2 +-
 website/views/layouts/layout.ejs          |   4 +-
 website/views/pages/homepage.ejs          |  31 +-
 website/views/pages/pricing.ejs           | 345 ++++++++++++----------
 7 files changed, 270 insertions(+), 185 deletions(-)

diff --git a/website/assets/styles/pages/homepage.less b/website/assets/styles/pages/homepage.less
index 379ed16179..942632c780 100644
--- a/website/assets/styles/pages/homepage.less
+++ b/website/assets/styles/pages/homepage.less
@@ -58,6 +58,48 @@
     font-weight: bold;
     font-size: 0.9rem;
   }
+
+  // TODO: dedupe this into a mixin and use from here and in pricing.less, or use existing transition mixin
+  [purpose='animated-arrow-button'] {
+    padding-right: 45px;
+    cursor: pointer;
+    position: relative;
+    width: auto;
+    color: #192147;
+    font-weight: bold;
+    user-select: none;
+    transition: 0.2s ease-in-out;
+    -o-transition: 0.2s ease-in-out;
+    -ms-transition: 0.2s ease-in-out;
+    -moz-transition: 0.2s ease-in-out;
+    -webkit-transition: 0.2s ease-in-out;
+  }
+
+  [purpose='animated-arrow-button']:before {
+    content: url('/images/arrow-right-16x16@2x.png');
+    transform: scale(0.5);
+    position: absolute;
+    top: 12px;
+    left: 80%; // <--- here
+    transition: 0.2s ease-in-out;
+    -o-transition: 0.2s ease-in-out;
+    -ms-transition: 0.2s ease-in-out;
+    -moz-transition: 0.2s ease-in-out;
+    -webkit-transition: 0.2s ease-in-out;
+    /*   opacity: 0; */
+  }
+
+  [purpose='animated-arrow-button']:hover:before {
+    left: 82%; // <--- here
+    transition: 0.2s ease-in-out;
+    -o-transition: 0.2s ease-in-out;
+    -ms-transition: 0.2s ease-in-out;
+    -moz-transition: 0.2s ease-in-out;
+    -webkit-transition: 0.2s ease-in-out;
+    /*   opacity:1; */
+  }
+
+
   @media (max-width: 1175px) {
     .hero-bg {
       background-position: -1100px bottom;
diff --git a/website/assets/styles/pages/pricing.less b/website/assets/styles/pages/pricing.less
index 6adfce6e85..1446e6c4e1 100644
--- a/website/assets/styles/pages/pricing.less
+++ b/website/assets/styles/pages/pricing.less
@@ -2,27 +2,12 @@
   h1, p {
     color: #192147;
   }
-  section {
+  section {// TODO remove this in favor of making HTML match homepage.ejs w/ bootstrap row classes and such
     max-width: 800px;
   }
-  .btn {
-    font-family: @header-font;
-    font-weight: 700;
-    padding-top: 18px;
-    padding-bottom: 18px;
-    font-size: 20px;
-    line-height: 23px;
-    border-radius: 10px;
-    &.btn-white {
-      position: relative;
-      padding-right: 20px;
-      color: #192147;
-      background-color: #fff;
-      border-color: #fff;
-    }
-  }
 
-  #arrow {
+  // TODO: dedupe animated-arrow-button (see homepage.less)
+  [purpose='animated-arrow-button'] {
     padding-right: 45px;
     cursor: pointer;
     position: relative;
@@ -37,7 +22,7 @@
     -webkit-transition: 0.2s ease-in-out;
   }
 
-  #arrow:before {
+  [purpose='animated-arrow-button']:before {
     content: url('/images/arrow-right-16x16@2x.png');
     transform: scale(0.5);
     position: absolute;
@@ -51,7 +36,7 @@
     /*   opacity: 0; */
   }
 
-  #arrow:hover:before {
+  [purpose='animated-arrow-button']:hover:before {
     left: 82%; // <--- here
     transition: 0.2s ease-in-out;
     -o-transition: 0.2s ease-in-out;
diff --git a/website/config/routes.js b/website/config/routes.js
index 8173d80c06..0d3458635e 100644
--- a/website/config/routes.js
+++ b/website/config/routes.js
@@ -25,8 +25,9 @@ module.exports.routes = {
   '/company/stewardship':    'https://github.com/fleetdm/fleet', // FUTURE: page about how we approach open source and our commitments to the community
   'GET /company/contact':    { action:   'view-contact' },
   'GET /apply': 'https://fleet-device-management.breezy.hr',
-  'GET /get-started': 'https://github.com/fleetdm/fleet/blob/master/README.md', // « FUTURE: When ready, bring back { action:   'view-get-started' }
-  'GET /pricing':    { action:   'view-pricing' },
+
+  'GET /get-started':    { action:   'view-pricing' },
+  'GET /install': 'https://github.com/fleetdm/fleet/blob/master/README.md', // « FUTURE: When ready, bring back { action:   'view-get-started' }
   '/documentation': 'https://github.com/fleetdm/fleet/tree/master/docs',
   '/contribute': 'https://github.com/fleetdm/fleet/tree/master/docs/4-Contribution',
   '/hall-of-fame': 'https://github.com/fleetdm/fleet/pulse',
@@ -56,6 +57,7 @@ module.exports.routes = {
   //  ╩ ╩╩╚═╝╚═╝  ╩╚═╚═╝═╩╝╩╩╚═╚═╝╚═╝ ╩ ╚═╝  └┘   ═╩╝╚═╝╚╩╝╝╚╝╩═╝╚═╝╩ ╩═╩╝╚═╝
 
   // Convenience
+  '/pricing':                    '/get-started',
   '/company':                    '/company/about',
   '/support':                    '/company/contact',
   '/contact':                    '/company/contact',
diff --git a/website/package.json b/website/package.json
index 29fa037a6f..d4422f9f90 100644
--- a/website/package.json
+++ b/website/package.json
@@ -28,7 +28,7 @@
     "custom-tests": "echo \"(No other custom tests yet.)\" && echo",
     "build-for-prod": "echo 'Now compiling markdown content and building+minifying assets for production...' && echo '(Hang tight, this could take a while.)' && echo && ./node_modules/sails/bin/sails.js run build-from-markdown && echo && node node_modules/grunt/bin/grunt buildProd || (echo && echo '------------------------------------------' && echo 'IMPORTANT!  IMPORTANT!  IMPORTANT!' && echo 'ERROR: Could not compile assets for production!' && echo && echo 'Please fix the issues logged above' && echo 'and push that up.  Then, try deploying again.' && echo '------------------------------------------' && echo) && mv www .www && node -e 'sailsrc = JSON.parse(require(\"fs\").readFileSync(\"./.sailsrc\", \"utf8\"));  if (sailsrc.paths&&sailsrc.paths.public !== undefined || sailsrc.hooks&&sailsrc.hooks.grunt !== undefined) { throw new Error(\"Cannot complete deployment script: .sailsrc file has conflicting contents!  Please remove the conflicting stuff from .sailsrc, then commit and push that up.\"); }  sailsrc.paths = sailsrc.paths || {};  sailsrc.paths.public = \"./.www\";   sailsrc.hooks = sailsrc.hooks || {};  sailsrc.hooks.grunt = false;  require(\"fs\").writeFileSync(\"./.sailsrc\", JSON.stringify(sailsrc))' && echo 'Build is complete.  Ready to deploy.'",
     "build": "echo '\"npm run build\" deliberately left unimplemented to prevent its use, since different platforms like Heroku and GitHub Actions all like to try and run it by default, which can lead to inadvertent duplication and unnecessary lock-in, since one has to find the config to turn that off.'",
-    "lint": "./node_modules/eslint/bin/eslint.js . --max-warnings=0 --report-unused-disable-directives && echo '✔  Your .js files look so good.' && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/**/**/**/**/*.ejs && echo '✔  So do your .ejs files.' && ./node_modules/lesshint/bin/lesshint assets/styles/ --max-warnings=0 && echo '✔  Your .less files look good, too.'",
+    "lint": "./node_modules/eslint/bin/eslint.js . --max-warnings=0 --report-unused-disable-directives && echo '✔  Your .js files look so good.' && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/pages/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/pages/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/pages/**/**/**/**/*.ejs && ./node_modules/htmlhint/bin/htmlhint -c ./.htmlhintrc views/pages/**/**/**/**/**/*.ejs && echo '✔  So do your .ejs files.' && ./node_modules/lesshint/bin/lesshint assets/styles/ --max-warnings=0 && echo '✔  Your .less files look good, too.'",
     "start": "NODE_ENV=production node app.js",
     "test": "npm run lint && npm run custom-tests && echo 'Done.'",
     "wipe-staging": "sails_datastores__default__adapter=sails-postgresql sails_datastores__default__ssl=true sails_datastores__default__url='REAL_DB_URI_HERE' sails lift --drop"
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index c0ee82a184..5cdbdb223d 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -81,7 +81,7 @@
             <div class="pt-2">
               <div class="d-flex flex-column mb-4">
                 <span style="font-weight: 700;" class="py-2 px-3">Get started</span>
-                <a class="mobile-menu-item py-2 px-3" target="_blank" href="/get-started" data-text="Try Fleet">Try Fleet</a>
+                <a class="mobile-menu-item py-2 px-3" target="_blank" href="/install" data-text="Try Fleet">Try Fleet</a>
                 <a class="mobile-menu-item py-2 px-3" target="_blank" href="/documentation" data-text="Documentation">Documentation</a>
                 <a class="mobile-menu-item py-2 px-3" target="_blank" href="/contribute" data-text="Contribute">Contribute</a>
                 <a class="mobile-menu-item py-2 px-3" target="_blank" href="/hall-of-fame" data-text="Hall of fame">Hall of fame</a>
@@ -104,7 +104,7 @@
               Get started
             </button>
             <div style="border-radius: 8px;" class="dropdown-menu dropdown-container p-2" aria-labelledby="dropdownMenuButton">
-              <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" href="/get-started" data-text="Try Fleet">Try Fleet</a>
+              <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" target="_blank" href="/install" data-text="Try Fleet">Try Fleet</a>
               <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" target="_blank" href="/documentation" data-text="Documentation">Documentation</a>
               <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" target="_blank" href="/contribute" data-text="Contribute">Contribute</a>
               <a style="border-radius: 4px;" class="dropdown-item py-2 px-3" target="_blank" href="/hall-of-fame" data-text="Hall of fame">Hall of fame</a>
diff --git a/website/views/pages/homepage.ejs b/website/views/pages/homepage.ejs
index bba3dea08e..ac3de0f9f9 100644
--- a/website/views/pages/homepage.ejs
+++ b/website/views/pages/homepage.ejs
@@ -22,7 +22,7 @@
               <img title="Other Linux distros, like Debian" alt="linux logo" src="/images/os-linux-32x36@2x.png" style="width: 32px;" class="d-block mx-auto h-100"/>
             </div>
           </div>
-          <a target="_blank" href="/get-started" class="btn btn-block btn-lg btn-primary mb-5">Get started with Fleet</a>
+          <a class="btn btn-block btn-lg btn-primary mb-5" href="/get-started">Get started with Fleet</a>
         </div>
       </div>
     </div>
@@ -63,7 +63,7 @@
         <h2 class="mb-5">Send device data to any log destination.</h2>
         <p style="max-width: 866px;" class="mx-auto">Fleet makes it easier to query and track your servers, containers, and laptops.  It extends <a style="color:#6a67fe; text-decoration: underline;" target="_blank" href="https://osquery.io/">osquery</a> to answer questions about multiple devices at the same time and provides log streams that enable automated threat detection.</p>
       </div>
-      <div class="log-destinations-container pb-5"> 
+      <div class="log-destinations-container pb-5">
         <div class="log-destination-card">
           <img alt="filesystem log destination" src="/images/log-destination-filesystem@2x.png" style="width: 80px; height: 80px;"/>
           <h6>Filesystem</h6>
@@ -124,15 +124,32 @@
       </div>
     </div>
   </div>
-  <div style="max-width: 1260px;" class="container-fluid py-5 px-4 px-sm-5 mx-auto">
+  <div style="max-width: 1260px;" class="container-fluid pt-5 pb-4 px-4 px-sm-5 mx-auto">
     <div style="max-width: 800px" class="py-5 mx-auto">
       <div style="max-width: 760px; padding-left: 38px" class="position-relative mx-auto">
-        <span style="font-size: 48px; line-height: 60px; left: 0; top: 0;" class="quote-mark position-absolute">“</span>
-        <p style="font-size: 24px;">I've been using Fleet to manage thousands of hosts running osquery. Fleet itself is pretty low-maintenance; mostly I don't have to worry about Fleet uptime and instead focus on what matters: deploying osquery, developing better queries, and getting the most out of osquery logs.</p>
-        <p style="color: #676A7A" class="mb-4">- Brendan Shaklovitz, Senior Site Reliability Engineer, Security Team @ Atlassian</p>
-        <img alt="Atlassian logo" src="/images/logo-atlassian-194x24@2x.png" style="height: 24px; width: 194px;" class="mt-5"/>
+        <!-- <span style="font-size: 48px; line-height: 60px; left: 0; top: 0;" class="quote-mark position-absolute">“</span> -->
+        <p style="font-size: 24px;" class="text-center">&ldquo;I've been using Fleet to manage thousands of hosts running osquery: deploying, developing better queries, and getting the most out of osquery logs.&rdquo;</p>
+        <p style="color: #676A7A" class="mb-4 text-center">Brendan Shaklovitz, Site Reliability Engineer</p>
+        <img style="height: 24px; width: 194px;" class="mt-4 d-block ml-auto mr-auto" alt="Atlassian logo" src="/images/logo-atlassian-194x24@2x.png" />
       </div>
     </div>
+    <div class="btn-toolbar justify-content-center pt-1">
+      <a
+        style="max-width: 250px"
+        class="btn btn-block btn-md btn-primary my-3 mx-2"
+        href="/get-started"
+      >
+        Get started
+      </a>
+      <a
+        style="max-width: 250px"
+        class="btn btn-block btn-lg btn-white my-3 mx-2"
+        purpose="animated-arrow-button"
+        target="_blank"
+        href="https://calendly.com/fleetdm/demo"
+        >Schedule a demo
+      </a>
+    </div>
   </div>
   <div style="max-width: 1260px;" class="container-fluid pt-5 px-4 px-sm-5 mx-auto">
     <% /*
diff --git a/website/views/pages/pricing.ejs b/website/views/pages/pricing.ejs
index aafe49483f..7dd2d4a2e6 100644
--- a/website/views/pages/pricing.ejs
+++ b/website/views/pages/pricing.ejs
@@ -7,7 +7,7 @@
       <section id="pricing-section" class="pt-5 mx-auto">
         <h1 class="text-center">Choose your plan</h1>
         <p class="text-center mb-5">
-          Choose the right plan for your business
+          Choose the right plan for where your organization is at today.
         </p>
         <div style="max-width: 810px">
           <div class="row">
@@ -22,10 +22,11 @@
                     <p style="padding-bottom: 28px" class="mb-0">/host/month</p>
                   </div>
                   <a
-                    href="/get-started"
                     style="max-width: 242px"
                     class="btn btn-block btn-lg btn-info my-3 mx-auto"
-                    >Start now</a
+                    target="_blank"
+                    href="/install"
+                    >Install Fleet</a
                   >
                   <div
                     style="max-width: 242px; min-height: 150px"
@@ -89,7 +90,7 @@
                     class="btn btn-block btn-lg btn-info my-3 mx-auto"
                     @click="clickChatButton()"
                   >
-                    Get free trial
+                    Chat with us
                   </button>
                   <div
                     style="max-width: 242px; min-height: 150px"
@@ -166,7 +167,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">Community GitHub</p>
+                      <p class="ml-2 my-0">Public issue tracker (GitHub)</p>
                     </div>
                     <div class="col-3 col-md-2">
                       <img
@@ -190,7 +191,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">Community Slack</p>
+                      <p class="ml-2 my-0">Community Slack channel</p>
                     </div>
                     <div class="col-3 col-md-2">
                       <img
@@ -214,7 +215,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">Telephone support</p>
+                      <p class="ml-2 my-0">Unlimited email support (confidential)</p>
                     </div>
                     <div class="col-3 col-md-2"></div>
                     <div class="col-3 col-md-2">
@@ -232,7 +233,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">Email support</p>
+                      <p class="ml-2 my-0">Phone and video call support</p>
                     </div>
                     <div class="col-3 col-md-2"></div>
                     <div class="col-3 col-md-2">
@@ -277,9 +278,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">
-                        Device management & inventory dashboard
-                      </p>
+                      <p class="ml-2 my-0">Secure REST API</p>
                     </div>
                     <div class="col-3 col-md-2">
                       <img
@@ -303,7 +302,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">Realtime device inventory</p>
+                      <p class="ml-2 my-0">Command line tool (CLI)</p>
                     </div>
                     <div class="col-3 col-md-2">
                       <img
@@ -327,7 +326,31 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">REST API & CLI tool</p>
+                      <p class="ml-2 my-0">Realtime device inventory dashboard</p>
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                  </div>
+                  <div class="row mb-3">
+                    <div class="col-6 col-md-8 d-flex">
+                      <img
+                        alt="a bullet point ellipse"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
+                      />
+                      <p class="ml-2 my-0">Browse installed software packages</p>
                     </div>
                     <div class="col-3 col-md-2">
                       <img
@@ -370,30 +393,6 @@
                       />
                     </div>
                   </div>
-                  <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
-                      <img
-                        alt="a bullet point ellipse"
-                        src="/images/ellipse-6x6@2x.png"
-                        style="width: 6px; height: 6px; margin-top: 09.6px"
-                      />
-                      <p class="ml-2 my-0">Software inventory*†</p>
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                  </div>
                   <div class="row mb-3">
                     <div class="col-6 col-md-8 d-flex">
                       <img
@@ -402,57 +401,7 @@
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
-                        Integration users with API-only access*†
-                      </p>
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                  </div>
-                  <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
-                      <img
-                        alt="a bullet point ellipse"
-                        src="/images/ellipse-6x6@2x.png"
-                        style="width: 6px; height: 6px; margin-top: 09.6px"
-                      />
-                      <p class="ml-2 my-0">Human-to-device mapping*†</p>
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                  </div>
-                  <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
-                      <img
-                        alt="a bullet point ellipse"
-                        src="/images/ellipse-6x6@2x.png"
-                        style="width: 6px; height: 6px; margin-top: 09.6px"
-                      />
-                      <p class="ml-2 my-0">
-                        Target and configure specific groups of systems*†
+                        Target and configure specific groups of devices*†
                       </p>
                     </div>
                     <div class="col-3 col-md-2"></div>
@@ -472,7 +421,7 @@
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
-                        Aggregate insights for groups of systems*†
+                        Aggregate insights for groups of devices*†
                       </p>
                     </div>
                     <div class="col-3 col-md-2"></div>
@@ -515,6 +464,54 @@
                       />
                     </div>
                   </div>
+                  <div class="row mb-3">
+                    <div class="col-6 col-md-8 d-flex">
+                      <img
+                        alt="a bullet point ellipse"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
+                      />
+                      <p class="ml-2 my-0">Versionable queries and config (GitOps)</p>
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                  </div>
+                  <div class="row mb-3">
+                    <div class="col-6 col-md-8 d-flex">
+                      <img
+                        alt="a bullet point ellipse"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
+                      />
+                      <p class="ml-2 my-0">Human-to-device mapping*†</p>
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                  </div>
                   <div class="row mb-3">
                     <div class="col-6 col-md-8 d-flex">
                       <img
@@ -590,6 +587,56 @@
                       />
                     </div>
                   </div>
+                  <div class="row mb-3">
+                    <div class="col-6 col-md-8 d-flex">
+                      <img
+                        alt="a bullet point ellipse"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
+                      />
+                      <p class="ml-2 my-0">Audit queries and user activities*</p>
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                  </div>
+                  <div class="row mb-3">
+                    <div class="col-6 col-md-8 d-flex">
+                      <img
+                        alt="a bullet point ellipse"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
+                      />
+                      <p class="ml-2 my-0">
+                        Grant API-only access*†
+                      </p>
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                  </div>
                   <div class="row mb-3">
                     <div class="col-6 col-md-8 d-flex">
                       <img
@@ -622,7 +669,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">Audit queries and other activity*</p>
+                      <p class="ml-2 my-0">Schedule and automate custom queries</p>
                     </div>
                     <div class="col-3 col-md-2">
                       <img
@@ -647,7 +694,7 @@
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
                       <p class="ml-2 my-0">
-                        Programmable vulnerability management*†
+                        Detect vulnerable software*†
                       </p>
                     </div>
                     <div class="col-3 col-md-2">
@@ -814,6 +861,30 @@
                       />
                     </div>
                   </div>
+                  <div class="row mb-3">
+                    <div class="col-6 col-md-8 d-flex">
+                      <img
+                        alt="a bullet point ellipse"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
+                      />
+                      <p class="ml-2 my-0">File carving (AWS S3)</p>
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                  </div>
                   <div class="row mb-4 mt-5">
                     <div class="col-6 col-md-8">
                       <p class="m-0" style="color: #8b8fa2">DEPLOYMENT</p>
@@ -828,7 +899,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">Self-managed</p>
+                      <p class="ml-2 my-0">Self-managed (host Fleet in your own environment)</p>
                     </div>
                     <div class="col-3 col-md-2">
                       <img
@@ -878,9 +949,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">
-                        Compatible with custom osquery extensions
-                      </p>
+                      <p class="ml-2 my-0">Configure osquery startup flags on the fly*</p>
                     </div>
                     <div class="col-3 col-md-2">
                       <img
@@ -904,7 +973,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">Configure osquery startup flags*</p>
+                      <p class="ml-2 my-0">Autoupdate osquery agents†</p>
                     </div>
                     <div class="col-3 col-md-2">
                       <img
@@ -928,57 +997,7 @@
                         src="/images/ellipse-6x6@2x.png"
                         style="width: 6px; height: 6px; margin-top: 09.6px"
                       />
-                      <p class="ml-2 my-0">
-                        Programmable vulnerability management*
-                      </p>
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                  </div>
-                  <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
-                      <img
-                        alt="a bullet point ellipse"
-                        src="/images/ellipse-6x6@2x.png"
-                        style="width: 6px; height: 6px; margin-top: 09.6px"
-                      />
-                      <p class="ml-2 my-0">Osquery agent autoupdates†</p>
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                    <div class="col-3 col-md-2">
-                      <img
-                        alt="a check mark"
-                        src="/images/check-16x16@2x.png"
-                        style="width: 16px; height: 16px"
-                      />
-                    </div>
-                  </div>
-                  <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
-                      <img
-                        alt="a bullet point ellipse"
-                        src="/images/ellipse-6x6@2x.png"
-                        style="width: 6px; height: 6px; margin-top: 09.6px"
-                      />
-                      <p class="ml-2 my-0">Self-hosted agent autoupdates†</p>
+                      <p class="ml-2 my-0">Self-hosted autoupdate registry†</p>
                     </div>
                     <div class="col-3 col-md-2"></div>
                     <div class="col-3 col-md-2">
@@ -1009,6 +1028,26 @@
                       />
                     </div>
                   </div>
+                  <div class="row mb-3">
+                    <div class="col-6 col-md-8 d-flex">
+                      <img
+                        alt="a bullet point ellipse"
+                        src="/images/ellipse-6x6@2x.png"
+                        style="width: 6px; height: 6px; margin-top: 09.6px"
+                      />
+                      <p class="ml-2 my-0">
+                        Autoupdate custom osquery extensions*
+                      </p>
+                    </div>
+                    <div class="col-3 col-md-2"></div>
+                    <div class="col-3 col-md-2">
+                      <img
+                        alt="a check mark"
+                        src="/images/check-16x16@2x.png"
+                        style="width: 16px; height: 16px"
+                      />
+                    </div>
+                  </div>
                   <p style="font-size: 13px; left: 0" class="mt-5 mb-0 w-100">
                     * Coming soon
                   </p>
@@ -1023,25 +1062,25 @@
       </section>
       <section id="questions" class="py-5 mx-auto">
         <h1 class="text-center">
-          Still got questions? Get in touch.
+          Still got questions?
         </h1>
         <div
           class="tpbutton btn-toolbar justify-content-center"
           style="text-align: center"
         >
           <button
-            style="max-width: 150px"
+            style="max-width: 250px"
             class="btn btn-block btn-md btn-primary my-3 mx-2"
             @click="clickChatButton()"
           >
-            Contact Us
+            Ask us anything
           </button>
           <a
+            style="max-width: 350px"
+            class="btn btn-block btn-lg btn-white my-3 mx-2"
+            purpose="animated-arrow-button"
             target="_blank"
             href="https://calendly.com/fleetdm/demo"
-            style="max-width: 250px"
-            class="btn btn-block btn-lg btn-white my-3 mx-2"
-            id="arrow"
             >Schedule a demo
           </a>
         </div>

From 7d9ca2cee731b0713fa27ba829f6bfedf5ad266c Mon Sep 17 00:00:00 2001
From: noahtalerman <47070608+noahtalerman@users.noreply.github.com>
Date: Fri, 14 May 2021 13:38:33 -0400
Subject: [PATCH 33/51] Convert standard query library to YAML format (#749)

- Create `/configuration-files/` directory inside of `/1-Using-Fleet` directory. This directory contains example Fleet configuration files in yaml format. Replaces the `/examples` directory.
- Create `/standard-query-library/` directory inside of `/1-Using-Fleet` directory. This directory contains the new `standard-query-library.yml`. This file will act as the source of community contributions to the standard query library.
- Edit references to `/examples` directory
---
 .../workflows/markdown-link-check-config.json |   3 +
 docs/1-Using-Fleet/2-fleetctl-CLI.md          |  25 +-
 .../configuration-files/README.md             |  34 +++
 .../kubernetes/fleet-deployment.yml           |   0
 .../kubernetes/fleet-migrations.yml           |   0
 .../kubernetes/fleet-service.yml              |   0
 .../agent-options.yml                         |   0
 .../enroll-secrets.yml                        |   0
 .../multi-file-configuration}/labels.yml      |   0
 .../packs/osquery-monitoring.yml              |   0
 .../multi-file-configuration}/queries.yml     |   0
 .../single-file-configuration.yml             |   0
 .../standard-query-library/README.md          |  38 +++
 .../standard-query-library.yml                | 250 ++++++++++++++++++
 .../4-Example-deployment-scenarios.md         |  10 +-
 handbook/queries/README.md                    |   7 -
 .../get-installed-safari-extensions.md        |   2 +-
 17 files changed, 332 insertions(+), 37 deletions(-)
 create mode 100644 docs/1-Using-Fleet/configuration-files/README.md
 rename {examples => docs/1-Using-Fleet/configuration-files}/kubernetes/fleet-deployment.yml (100%)
 rename {examples => docs/1-Using-Fleet/configuration-files}/kubernetes/fleet-migrations.yml (100%)
 rename {examples => docs/1-Using-Fleet/configuration-files}/kubernetes/fleet-service.yml (100%)
 rename examples/config-many-files/config.yml => docs/1-Using-Fleet/configuration-files/multi-file-configuration/agent-options.yml (100%)
 rename examples/config-many-files/enroll-secret.yml => docs/1-Using-Fleet/configuration-files/multi-file-configuration/enroll-secrets.yml (100%)
 rename {examples/config-many-files => docs/1-Using-Fleet/configuration-files/multi-file-configuration}/labels.yml (100%)
 rename {examples/config-many-files => docs/1-Using-Fleet/configuration-files/multi-file-configuration}/packs/osquery-monitoring.yml (100%)
 rename {examples/config-many-files => docs/1-Using-Fleet/configuration-files/multi-file-configuration}/queries.yml (100%)
 rename examples/config-single-file.yml => docs/1-Using-Fleet/configuration-files/single-file-configuration.yml (100%)
 create mode 100644 docs/1-Using-Fleet/standard-query-library/README.md
 create mode 100644 docs/1-Using-Fleet/standard-query-library/standard-query-library.yml

diff --git a/.github/workflows/markdown-link-check-config.json b/.github/workflows/markdown-link-check-config.json
index 470c4b521d..e7d33f6cbf 100644
--- a/.github/workflows/markdown-link-check-config.json
+++ b/.github/workflows/markdown-link-check-config.json
@@ -23,6 +23,9 @@
         },
         {
             "pattern": "github.com/fleetdm/confidential"
+        },
+        {
+            "pattern": "osquery.io/schema"
         }
     ],
     "retryOn429": true,
diff --git a/docs/1-Using-Fleet/2-fleetctl-CLI.md b/docs/1-Using-Fleet/2-fleetctl-CLI.md
index cf85636d6c..2ddba8aeaf 100644
--- a/docs/1-Using-Fleet/2-fleetctl-CLI.md
+++ b/docs/1-Using-Fleet/2-fleetctl-CLI.md
@@ -211,30 +211,7 @@ Note the token can also be set with `fleetctl config set --token`, but this may
 
 ## Using fleetctl for configuration
 
-A Fleet configuration is defined using one or more declarative "messages" in yaml syntax. Each message can live in it's own file or multiple in one file, each separated by `---`. Each file/message contains a few required top-level keys:
-
-- `apiVersion` - the API version of the file/request
-- `spec` - the "data" of the request
-- `kind ` - the type of file/object (i.e.: pack, query, config)
-
-The file may optionally also include some `metadata` for more complex data types (i.e.: packs).
-
-When you reason about how to manage these config files, consider following the [General Config Tips](https://kubernetes.io/docs/concepts/configuration/overview/#general-config-tips) published by the Kubernetes project. Some of the especially relevant tips are included here as well:
-
-- When defining configurations, specify the latest stable API version.
-- Configuration files should be stored in version control before being pushed to the cluster. This allows quick roll-back of a configuration if needed. It also aids with cluster re-creation and restoration if necessary.
-- Group related objects into a single file whenever it makes sense. One file is often easier to manage than several. See the [config-single-file.yml](../../examples/config-single-file.yml) file as an example of this syntax.
-- Don’t specify default values unnecessarily – simple and minimal configs will reduce errors.
-
-All of these files can be concatenated together into [one file](../../examples/config-single-file.yml) (separated by `---`), or they can be in [individual files with a directory structure](../../examples/config-many-files) like the following:
-
-```
-|-- config.yml
-|-- labels.yml
-|-- packs
-|   `-- osquery-monitoring.yml
-`-- queries.yml
-```
+A Fleet configuration is defined using one or more declarative "messages" in yaml syntax. Check out the [configuration files](./configuration-files/README.md) section of the documentation for example yaml files.
 
 ### Convert osquery JSON
 
diff --git a/docs/1-Using-Fleet/configuration-files/README.md b/docs/1-Using-Fleet/configuration-files/README.md
new file mode 100644
index 0000000000..83d8ca7de0
--- /dev/null
+++ b/docs/1-Using-Fleet/configuration-files/README.md
@@ -0,0 +1,34 @@
+# Configuration files
+
+Entities in Fleet, such as queries, packs, labels, agent options, and enroll secrets, can be managed with configuration files in yaml syntax.
+
+This page contains links to examples that can help you understand the configuration options for your Fleet yaml file(s).
+
+Examples in this directory are presented in two forms:
+- [`single-file-configuration.yml`](./single-file-configuration.yml) presents multiple yaml documents in one file. One file is often easier to manage than several. Group related objects into a single file whenever it makes sense.
+- The `multi-file-configuration` directory presents multiple yaml documents in separate files. They are in the following structure:
+
+```
+├─ packs
+├   └─ osquery-monitoring.yml
+├─ agent-options.yml
+├─ enroll-secrets.yml
+├─ labels.yml
+├─ queries.yml
+```
+
+## Using yaml files in Fleet
+
+A Fleet configuration is defined using one or more declarative "messages" in yaml syntax. Each message can live in it's own file or multiple in one file, each separated by `---`. Each file/message contains a few required top-level keys:
+
+- `apiVersion` - the API version of the file/request
+- `spec` - the "data" of the request
+- `kind ` - the type of file/object (i.e.: pack, query, config)
+
+The file may optionally also include some `metadata` for more complex data types (i.e.: packs).
+
+When you reason about how to manage these config files, consider following the [General Config Tips](https://kubernetes.io/docs/concepts/configuration/overview/#general-config-tips) published by the Kubernetes project. Some of the especially relevant tips are included here as well:
+
+- When defining configurations, specify the latest stable API version.
+- Configuration files should be stored in version control before being pushed to the cluster. This allows quick roll-back of a configuration if needed. It also aids with cluster re-creation and restoration if necessary.
+- Don’t specify default values unnecessarily – simple and minimal configs will reduce errors.
diff --git a/examples/kubernetes/fleet-deployment.yml b/docs/1-Using-Fleet/configuration-files/kubernetes/fleet-deployment.yml
similarity index 100%
rename from examples/kubernetes/fleet-deployment.yml
rename to docs/1-Using-Fleet/configuration-files/kubernetes/fleet-deployment.yml
diff --git a/examples/kubernetes/fleet-migrations.yml b/docs/1-Using-Fleet/configuration-files/kubernetes/fleet-migrations.yml
similarity index 100%
rename from examples/kubernetes/fleet-migrations.yml
rename to docs/1-Using-Fleet/configuration-files/kubernetes/fleet-migrations.yml
diff --git a/examples/kubernetes/fleet-service.yml b/docs/1-Using-Fleet/configuration-files/kubernetes/fleet-service.yml
similarity index 100%
rename from examples/kubernetes/fleet-service.yml
rename to docs/1-Using-Fleet/configuration-files/kubernetes/fleet-service.yml
diff --git a/examples/config-many-files/config.yml b/docs/1-Using-Fleet/configuration-files/multi-file-configuration/agent-options.yml
similarity index 100%
rename from examples/config-many-files/config.yml
rename to docs/1-Using-Fleet/configuration-files/multi-file-configuration/agent-options.yml
diff --git a/examples/config-many-files/enroll-secret.yml b/docs/1-Using-Fleet/configuration-files/multi-file-configuration/enroll-secrets.yml
similarity index 100%
rename from examples/config-many-files/enroll-secret.yml
rename to docs/1-Using-Fleet/configuration-files/multi-file-configuration/enroll-secrets.yml
diff --git a/examples/config-many-files/labels.yml b/docs/1-Using-Fleet/configuration-files/multi-file-configuration/labels.yml
similarity index 100%
rename from examples/config-many-files/labels.yml
rename to docs/1-Using-Fleet/configuration-files/multi-file-configuration/labels.yml
diff --git a/examples/config-many-files/packs/osquery-monitoring.yml b/docs/1-Using-Fleet/configuration-files/multi-file-configuration/packs/osquery-monitoring.yml
similarity index 100%
rename from examples/config-many-files/packs/osquery-monitoring.yml
rename to docs/1-Using-Fleet/configuration-files/multi-file-configuration/packs/osquery-monitoring.yml
diff --git a/examples/config-many-files/queries.yml b/docs/1-Using-Fleet/configuration-files/multi-file-configuration/queries.yml
similarity index 100%
rename from examples/config-many-files/queries.yml
rename to docs/1-Using-Fleet/configuration-files/multi-file-configuration/queries.yml
diff --git a/examples/config-single-file.yml b/docs/1-Using-Fleet/configuration-files/single-file-configuration.yml
similarity index 100%
rename from examples/config-single-file.yml
rename to docs/1-Using-Fleet/configuration-files/single-file-configuration.yml
diff --git a/docs/1-Using-Fleet/standard-query-library/README.md b/docs/1-Using-Fleet/standard-query-library/README.md
new file mode 100644
index 0000000000..800454449e
--- /dev/null
+++ b/docs/1-Using-Fleet/standard-query-library/README.md
@@ -0,0 +1,38 @@
+# Standard query library
+
+Fleet's standard query library includes a growing collection of useful queries for organizations deploying Fleet and osquery.
+
+## Importing the queries in Fleet
+
+#### After cloning the fleetdm/fleet repo, import the queries using fleetctl:
+```
+fleetctl apply -f fleet/docs/1-Using-Fleet/standard-query-library/standard-query-library.yml
+```
+
+## Contributors
+
+Want to add your own query?
+
+1. Please copy the following yaml section and paste it at the bottom of the [`standard-query-library.yml`](./standard-query-library.yml) file.
+```yaml
+---
+apiVersion: v1
+kind: query
+spec:
+  name: What is your query called? Please use a human readable query name.
+  platforms: What operating systems support your query? This can usually be determined by the osquery tables included in your query. Heading to the https://osquery.io/schema webpage to see which operating systems are supported by the tables you include.
+  description: Describe your query. What does information does your query reveal?
+  query: Insert query here
+  purpose: What is the goal of running your query? Ex. Detection
+  remediation: Are there any remediation steps to resolve the detection triggered by your query? If not, insert "N/A."
+```
+2. Replace each field and submit a pull request to the fleetdm/fleet GitHub repository.
+
+For instructions on submitting pull requests to Fleet check out [the Committing Changes section](https://github.com/fleetdm/fleet/blob/58445ede82550cb574775a83ae4cf5433f325a7e/docs/4-Contribution/4-Committing-Changes.md#committing-changes) in the Contributors documentation.
+
+## Additional resources
+
+Listed below are great resources that contain additional queries.
+
+- Osquery (https://github.com/osquery/osquery/tree/master/packs)
+- Palantir osquery configuration (https://github.com/palantir/osquery-configuration/tree/master/Fleet)
\ No newline at end of file
diff --git a/docs/1-Using-Fleet/standard-query-library/standard-query-library.yml b/docs/1-Using-Fleet/standard-query-library/standard-query-library.yml
new file mode 100644
index 0000000000..c822af202b
--- /dev/null
+++ b/docs/1-Using-Fleet/standard-query-library/standard-query-library.yml
@@ -0,0 +1,250 @@
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Count Apple applications installed
+  platforms: macOS
+  description: Count the number of Apple applications installed on the machine.
+  query: SELECT COUNT(*) FROM apps WHERE bundle_identifier LIKE 'com.apple.%';
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Detect Linux hosts with high severity vulnerable versions of OpenSSL
+  platforms: Linux
+  description: Retrieves the OpenSSL version.
+  query: SELECT name AS name, version AS version, 'deb_packages' AS source FROM deb_packages WHERE name LIKE 'openssl%' UNION SELECT name AS name, version AS version, 'apt_sources' AS source FROM apt_sources WHERE name LIKE 'openssl%' UNION SELECT name AS name, version AS version, 'rpm_packages' AS source FROM rpm_packages WHERE name LIKE 'openssl%';
+  purpose: Detection
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Detect machines with Gatekeeper disabled
+  platforms: macOS
+  description: Gatekeeper tries to ensure only trusted software is run on a mac machine.
+  query: SELECT * FROM gatekeeper WHERE assessments_enabled = 0;
+  purpose: Detection
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Detect presence of authorized SSH keys
+  platforms: macOS, Linux
+  description: Presence of authorized SSH keys may be unusual on laptops. Could be completely normal on servers, but may be worth auditing for unusual keys and/or changes.
+  query: SELECT username, authorized_keys. * FROM users CROSS JOIN authorized_keys USING (uid);
+  purpose: Detection
+  remediation: Check out the linked table (https://github.com/fleetdm/fleet/blob/32b4d53e7f1428ce43b0f9fa52838cbe7b413eed/handbook/queries/detect-hosts-with-high-severity-vulnerable-versions-of-openssl.md#table-of-vulnerable-openssl-versions) to determine if the installed version is a high severity vulnerability and view the corresponding CVE(s)
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get authorized keys
+  platforms: macOS, Linux
+  description: List authorized_keys for each user on the system.
+  query: SELECT * FROM users CROSS JOIN authorized_keys USING (uid);
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get crashes
+  platforms: macOS
+  description: Retrieve application, system, and mobile app crash logs.
+  query: SELECT uid, datetime, responsible, exception_type, identifier, version, crash_path FROM users CROSS JOIN crashes USING (uid);
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get installed Chrome Extensions
+  platforms: macOS, Linux, Windows, FreeBSD
+  description: List installed Chrome Extensions for all users.
+  query: SELECT uid, datetime, responsible, exception_type, identifier, version, crash_path FROM users CROSS JOIN crashes USING (uid);
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get installed FreeBSD software
+  platforms: FreeBSD
+  description: Get all software installed on a FreeBSD computer, including browser plugins and installed packages. Note, this does not included other running processes in the processes table.
+  query: SELECT name AS name, version AS version, 'Browser plugin (Chrome)' AS type, 'chrome_extensions' AS source FROM chrome_extensions UNION SELECT name AS name, version AS version, 'Browser plugin (Firefox)' AS type, 'firefox_addons' AS source FROM firefox_addons UNION SELECT name AS name, version AS version, 'Package (Atom)' AS type, 'atom_packages' AS source FROM atom_packages UNION SELECT name AS name, version AS version, 'Package (Python)' AS type, 'python_packages' AS source FROM python_packages UNION SELECT name AS name, version AS version, 'Package (pkg)' AS type, 'pkg_packages' AS source FROM pkg_packages;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get Homebrew Packages
+  platforms: macOS
+  description: Get the installed homebrew package database.
+  query: SELECT * FROM homebrew_packages;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get installed Linux software
+  platforms: Linux
+  description: Get all software installed on a Linux computer, including browser plugins and installed packages. Note, this does not included other running processes in the processes table.
+  query: SELECT name AS name, version AS version, 'Package (APT)' AS type, 'apt_sources' AS source FROM apt_sources UNION SELECT name AS name, version AS version, 'Package (deb)' AS type, 'deb_packages' AS source FROM deb_packages UNION SELECT package AS name, version AS version, 'Package (Portage)' AS type, 'portage_packages' AS source FROM portage_packages UNION SELECT name AS name, version AS version, 'Package (RPM)' AS type, 'rpm_packages' AS source FROM rpm_packages UNION SELECT name AS name, '' AS version, 'Package (YUM)' AS type, 'yum_sources' AS source FROM yum_sources UNION SELECT name AS name, version AS version, 'Package (NPM)' AS type, 'npm_packages' AS source FROM npm_packages UNION SELECT name AS name, version AS version, 'Package (Atom)' AS type, 'atom_packages' AS source FROM atom_packages UNION SELECT name AS name, version AS version, 'Package (Python)' AS type, 'python_packages' AS source FROM python_packages;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get installed macOS software
+  platforms: macOS
+  description: Get all software installed on a macOS computer, including apps, browser plugins, and installed packages. Note, this does not included other running processes in the processes table.
+  query: SELECT name AS name, bundle_short_version AS version, 'Application (macOS)' AS type, 'apps' AS source FROM apps UNION SELECT name AS name, version AS version, 'Package (Python)' AS type, 'python_packages' AS source FROM python_packages UNION SELECT name AS name, version AS version, 'Browser plugin (Chrome)' AS type, 'chrome_extensions' AS source FROM chrome_extensions UNION SELECT name AS name, version AS version, 'Browser plugin (Firefox)' AS type, 'firefox_addons' AS source FROM firefox_addons UNION SELECT name As name, version AS version, 'Browser plugin (Safari)' AS type, 'safari_extensions' AS source FROM safari_extensions UNION SELECT name AS name, version AS version, 'Package (Homebrew)' AS type, 'homebrew_packages' AS source FROM homebrew_packages;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get installed Safari extensions
+  platforms: macOS
+  description: Retrieves the list of installed Safari Extensions for all users in the target system.
+  query: SELECT safari_extensions.* FROM users join safari_extensions USING (uid);
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get installed Windows software
+  platforms: Windows
+  description: Get all software installed on a Windows computer, including programs, browser plugins, and installed packages. Note, this does not included other running processes in the processes table.
+  query: SELECT name AS name, version AS version, 'Program (Windows)' AS type, 'programs' AS source FROM programs UNION SELECT name AS name, version AS version, 'Package (Python)' AS type, 'python_packages' AS source FROM python_packages UNION SELECT name AS name, version AS version, 'Browser plugin (IE)' AS type, 'ie_extensions' AS source FROM ie_extensions UNION SELECT name AS name, version AS version, 'Browser plugin (Chrome)' AS type, 'chrome_extensions' AS source FROM chrome_extensions UNION SELECT name AS name, version AS version, 'Browser plugin (Firefox)' AS type, 'firefox_addons' AS source FROM firefox_addons UNION SELECT name AS name, version AS version, 'Package (Chocolatey)' AS type, 'chocolatey_packages' AS source FROM chocolatey_packages UNION SELECT name AS name, version AS version, 'Package (Atom)' AS type, 'atom_packages' AS source FROM atom_packages UNION SELECT name AS name, version AS version, 'Package (Python)' AS type, 'python_packages' AS source FROM python_packages;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get laptops with failing batteries
+  platforms: macOS
+  description:
+  query: SELECT * FROM battery WHERE health != 'Good' AND condition NOT IN ('', 'Normal');
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get macOS disk free space percentage
+  platforms: macOS
+  description: Displays the percentage of free space available on the primary disk partition.
+  query: SELECT (blocks_available * 100 / blocks) AS pct, * FROM mounts WHERE path = '/';
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get macOS disk free space percentage
+  platforms: macOS
+  description: Displays the percentage of free space available on the primary disk partition.
+  query: SELECT (blocks_available * 100 / blocks) AS pct, * FROM mounts WHERE path = '/';
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get mounts
+  platforms: macOS, Linux
+  description: Shows system mounted devices and filesystems (not process specific).
+  query: SELECT device, device_alias, path, type, blocks_size FROM mounts;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get the version of the resident operating system
+  platforms: macOS, Linux, Windows, FreeBSD
+  description: Shows system mounted devices and filesystems (not process specific).
+  query: SELECT * FROM os_version;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get platform info
+  platforms: macOS
+  description: Shows information about the host platform
+  query: SELECT vendor, version, date, revision from platform_info;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get startup items
+  platforms: macOS, Linux, Windows, FreeBSD
+  description: Shows applications and binaries set as user/login startup items.
+  query: SELECT * FROM startup_items;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get system logins and logouts
+  platforms: macOS
+  description: Get a list of system logins and logouts.
+  query: SELECT * FROM last;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get system uptime
+  platforms: macOS, Linux, Windows, FreeBSD
+  description: Shows the system uptime.
+  query: SELECT * FROM uptime;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get USB devices
+  platforms: macOS, Linux
+  description: Shows all USB devices that are actively plugged into the host system.
+  query: SELECT * FROM usb_devices;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get wifi status
+  platforms: macOS
+  description: Shows information about the wifi network that a host is currently connected to.
+  query: SELECT * FROM wifi_status;
+  purpose: Informational
+  remediation: N/A
+---
+apiVersion: v1
+kind: query
+spec:
+  name: Get Windows machines with unencrypted hard disks
+  platforms: Windows
+  description:
+  query: SELECT * FROM bitlocker_info WHERE protection_status = 0;
+  purpose: Informational
+  remediation: N/A
diff --git a/docs/3-Deployment/4-Example-deployment-scenarios.md b/docs/3-Deployment/4-Example-deployment-scenarios.md
index f9ba2e7e2a..a99fac5a6d 100644
--- a/docs/3-Deployment/4-Example-deployment-scenarios.md
+++ b/docs/3-Deployment/4-Example-deployment-scenarios.md
@@ -447,14 +447,14 @@ We will use this address when we configure the Kubernetes deployment and databas
 The last step is to run the Fleet database migrations on your new MySQL server. To do this, run the following:
 
 ```
-kubectl create -f ./examples/kubernetes/fleet-migrations.yml
+kubectl create -f ./docs/1-Using-Fleet/configuration-files/kubernetes/fleet-migrations.yml
 ```
 
 In Kubernetes, you can only run a job once. If you'd like to run it again (i.e.: you'd like to run the migrations again using the same file), you must delete the job before re-creating it. To delete the job and re-run it, you can run the following commands:
 
 ```
-kubectl delete -f ./examples/kubernetes/fleet-migrations.yml
-kubectl create -f ./examples/kubernetes/fleet-migrations.yml
+kubectl delete -f ./docs/1-Using-Fleet/configuration-files/kubernetes/fleet-migrations.yml
+kubectl create -f ./docs/1-Using-Fleet/configuration-files/kubernetes/fleet-migrations.yml
 ```
 
 #### Redis
@@ -523,7 +523,7 @@ kubectl create secret generic fleet-server-auth-key --from-file=./build/fleet-se
 First we must deploy the instances of the Fleet webserver. The Fleet webserver is described using a Kubernetes deployment object. To create this deployment, run the following:
 
 ```
-kubectl apply -f ./examples/kubernetes/fleet-deployment.yml
+kubectl apply -f ./docs/1-Using-Fleet/configuration-files/kubernetes/fleet-deployment.yml
 ```
 
 You should be able to get an instance of the webserver running via `kubectl get pods` and you should see the following logs:
@@ -539,7 +539,7 @@ ts=2017-11-16T02:48:38.441148166Z transport=https address=0.0.0.0:443 msg=listen
 Now that the Fleet server is running on our cluster, we have to expose the Fleet webservers to the internet via a load balancer. To create a Kubernetes `Service` of type `LoadBalancer`, run the following:
 
 ```
-kubectl apply -f ./examples/kubernetes/fleet-service.yml
+kubectl apply -f ./docs/1-Using-Fleet/configuration-files/kubernetes/fleet-service.yml
 ```
 
 #### Configure DNS
diff --git a/handbook/queries/README.md b/handbook/queries/README.md
index da038cf0c3..1b56c69ed7 100644
--- a/handbook/queries/README.md
+++ b/handbook/queries/README.md
@@ -30,13 +30,6 @@ Fleet's standard query library includes a growing collection of useful queries f
 - [Get system uptime](./get-system-uptime.md) (macOS, Linux, Windows, FreeBSD)
 - [Get crashes](./get-crashes.md) (macOS)
 
-
-### Contributors
-
-Want to add your own query? 
-
-Please submit a pull request using the [Fleet standard query library template](./standard-query-library-template.md).
-
 ### Additional resources
 
 Listed below are great resources that contain additional queries.
diff --git a/handbook/queries/get-installed-safari-extensions.md b/handbook/queries/get-installed-safari-extensions.md
index d26b050cf4..4e80c0703f 100644
--- a/handbook/queries/get-installed-safari-extensions.md
+++ b/handbook/queries/get-installed-safari-extensions.md
@@ -1,6 +1,6 @@
 # Get installed Safari Extensions
 
-Retreives the list of installed Safari Extensions for all users in the target system.
+Retrieves the list of installed Safari Extensions for all users in the target system.
 
 ### Support
 macOS

From 08b659ce40451a09bca49e9204671f1a48fa5ad9 Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Sat, 15 May 2021 02:52:22 +0900
Subject: [PATCH 34/51] Update README.md - merging to Fleet website (#755)

Update handbook to include information about when to merge to Fleet website.
---
 handbook/README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/handbook/README.md b/handbook/README.md
index 057147279d..bb299b9e0b 100644
--- a/handbook/README.md
+++ b/handbook/README.md
@@ -44,6 +44,13 @@ In brief, this means that as a Fleet team member, you may:
 
 For more detailed information about __spending guidelines and limits__, please read [GitLab's expense policy](https://about.gitlab.com/handbook/spending-company-money/)
 
+### Fleet website
+
+### When can I merge a change to the website?
+When merging a PR to master, bear in mind that whatever you merge to master gets deployed live immediately. So if the PR's changes contain anything that you don't think is appropriate to be seen publicly by all guests of [fleetdm.com](https://fleetdm.com/), then please do not merge.
+
+Merge a PR (aka deploy the website) when you think it is appropriately clean to represent our brand. When in doubt, use the standards and level of quality seen on existing pages, ensure correct functionality, and check responsive behavior - starting widescreen and resizing down to ≈320px width. 
+
 
 ### About the handbook
 #### Why bother?

From 9a4e3e4c0cf8c669a4d5232528183316cd94740e Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Mon, 17 May 2021 10:25:19 -0500
Subject: [PATCH 35/51] 50,000 devices => 100,000 devices

---
 website/views/pages/homepage.ejs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/views/pages/homepage.ejs b/website/views/pages/homepage.ejs
index ac3de0f9f9..f8924b6ab6 100644
--- a/website/views/pages/homepage.ejs
+++ b/website/views/pages/homepage.ejs
@@ -4,7 +4,7 @@
       <div style="max-width: 1260px; padding-top: 167px;" class="prop-statement container-fluid px-4 px-sm-5">
         <div style="max-width: 500px" class="prop-statement__container mx-auto mx-sm-0">
           <h1 class="prop-statement__header mb-4">Open source<br/><span class="d-sm-none">&nbsp;</span>endpoint visibility.</h1>
-          <p class="prop-statement__paragraph mb-4">Ask questions about your servers, containers, and laptops running Linux, Windows, and macOS.  Quickly deploy <a style="color:#fff; font-weight:bold;" target="_blank" href="https://osquery.io/">osquery</a> and scale your fleet to 50,000+ devices on top of a stable core technology.</p>
+          <p class="prop-statement__paragraph mb-4">Ask questions about your servers, containers, and laptops running Linux, Windows, and macOS.  Quickly deploy <a style="color:#fff; font-weight:bold;" target="_blank" href="https://osquery.io/">osquery</a> and scale your fleet to 100,000+ devices on top of a stable core technology.</p>
           <div class="mb-4">
             <div class="d-inline-block mr-3 mr-lg-4">
               <img title="macOS" alt="apple logo" src="/images/os-macos-31x35@2x.png" style="width: 31px;" class="d-block mx-auto h-100"/>

From 027b12e6c419e737d8f9856074a5365633970eb9 Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Mon, 17 May 2021 10:26:01 -0700
Subject: [PATCH 36/51] Fix foreign key cascade for query stats table (#776)

Introduces the appropriate cascading for foreign keys on the
scheduled_query_stats table to prevent errors when deleting the
associated packs, scheduled queries, and queries.

Fixes #764
Fixes #766
---
 .../tables/20210506095025_AddScheduledQueryStats.go           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/datastore/mysql/migrations/tables/20210506095025_AddScheduledQueryStats.go b/server/datastore/mysql/migrations/tables/20210506095025_AddScheduledQueryStats.go
index 119aa7f9d3..d6be87535e 100644
--- a/server/datastore/mysql/migrations/tables/20210506095025_AddScheduledQueryStats.go
+++ b/server/datastore/mysql/migrations/tables/20210506095025_AddScheduledQueryStats.go
@@ -25,8 +25,8 @@ func Up_20210506095025(tx *sql.Tx) error {
 			user_time int,
 			wall_time int,
 			PRIMARY KEY (host_id, scheduled_query_id),
-			FOREIGN KEY (host_id) REFERENCES hosts (id),
-			FOREIGN KEY (scheduled_query_id) REFERENCES scheduled_queries (id)
+			FOREIGN KEY (host_id) REFERENCES hosts (id) ON DELETE CASCADE ON UPDATE CASCADE,
+			FOREIGN KEY (scheduled_query_id) REFERENCES scheduled_queries (id) ON DELETE CASCADE ON UPDATE CASCADE
 		)
 	`
 	if _, err := tx.Exec(sql); err != nil {

From 468754f2b9b06d6f5b6d3812aced42012834dec8 Mon Sep 17 00:00:00 2001
From: WangXiang <wx347249478@gmail.com>
Date: Tue, 18 May 2021 01:29:50 +0800
Subject: [PATCH 37/51] Format and clean code (#774)

1. use [staticcheck](https://staticcheck.io/) to check the code, and fix some issues.
2. use `go fmt` to format the code.
3. use `go mod tidy` clean the go mod.
---
 go.mod                                        |  4 +--
 go.sum                                        |  2 --
 server/datastore/inmem/hosts.go               |  6 ++---
 server/datastore/inmem/invites.go             |  2 +-
 server/datastore/inmem/packs.go               |  2 +-
 server/datastore/inmem/queries.go             |  2 +-
 server/datastore/inmem/users.go               |  2 +-
 server/datastore/mysql/hosts.go               |  2 +-
 ...0171116163618_CreateTableOsqueryOptions.go |  2 +-
 ...2520_ModifyEnrollSecretNodeKeyCollation.go | 26 +++++++++----------
 server/datastore/mysql/osquery_options.go     |  2 +-
 server/datastore/mysql/queries.go             |  2 +-
 server/datastore/mysql/targets.go             |  2 +-
 server/logging/firehose_test.go               |  2 +-
 server/logging/kinesis_test.go                |  2 +-
 server/service/client.go                      |  2 +-
 server/service/endpoint_carves.go             | 13 +++++-----
 server/service/endpoint_certificate.go        |  2 +-
 server/service/endpoint_change_email.go       |  2 +-
 server/service/endpoint_invites.go            |  2 +-
 server/service/endpoint_middleware_test.go    |  2 +-
 server/service/endpoint_osquery_options.go    |  2 +-
 server/service/endpoint_queries.go            |  2 +-
 server/service/endpoint_scheduled_queries.go  |  2 +-
 server/service/endpoint_setup.go              |  2 +-
 server/service/endpoint_status.go             |  2 +-
 server/service/endpoint_targets.go            |  2 +-
 server/service/frontend.go                    |  2 +-
 server/service/http_auth.go                   |  2 +-
 server/service/metrics.go                     |  2 +-
 server/service/service.go                     |  2 +-
 server/service/service_osquery.go             |  2 +-
 server/service/service_osquery_test.go        |  2 +-
 server/service/service_users.go               |  2 +-
 server/service/transport_carves.go            |  3 +--
 server/service/transport_osquery_test.go      |  2 +-
 server/service/util_test.go                   |  2 +-
 server/test/testingt.go                       |  1 -
 38 files changed, 55 insertions(+), 62 deletions(-)

diff --git a/go.mod b/go.mod
index 0b6b078541..ca449bd7b4 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/briandowns/spinner v0.0.0-20170614154858-48dbb65d7bd5
 	github.com/cenkalti/backoff/v4 v4.0.0
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/e-dard/netbug v0.0.0-20151029172837-e64d308a0b20
 	github.com/elazarl/go-bindata-assetfs v1.0.0
@@ -24,7 +24,7 @@ require (
 	github.com/go-kit/kit v0.9.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/gomodule/redigo v2.0.0+incompatible
-	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/google/go-cmp v0.5.5
 	github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c
 	github.com/gorilla/mux v1.6.2
 	github.com/gorilla/websocket v1.4.2
diff --git a/go.sum b/go.sum
index cf41a90436..ba973c58db 100644
--- a/go.sum
+++ b/go.sum
@@ -53,8 +53,6 @@ github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3C
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fleetdm/goose v0.0.0-20210205022138-27718647ba5b h1:Ybt9lIr16BghU3nK0jpeRC4B6JguVLtdubUEcRBPdzQ=
-github.com/fleetdm/goose v0.0.0-20210205022138-27718647ba5b/go.mod h1:d7Q+0eCENnKQUhkfAUVLfGnD4QcgJMF/uB9WRTN9TDI=
 github.com/fleetdm/goose v0.0.0-20210209032905-c3c01484bacb h1:p02npmJlTo+Px1s0VptKOJOJqH/rGlGBEVvLJRtzY3A=
 github.com/fleetdm/goose v0.0.0-20210209032905-c3c01484bacb/go.mod h1:d7Q+0eCENnKQUhkfAUVLfGnD4QcgJMF/uB9WRTN9TDI=
 github.com/flynn/go-docopt v0.0.0-20140912013429-f6dd2ebbb31e/go.mod h1:HyVoz1Mz5Co8TFO8EupIdlcpwShBmY98dkT2xeHkvEI=
diff --git a/server/datastore/inmem/hosts.go b/server/datastore/inmem/hosts.go
index 5f23cbdb47..10a24e3e15 100644
--- a/server/datastore/inmem/hosts.go
+++ b/server/datastore/inmem/hosts.go
@@ -43,9 +43,7 @@ func (d *Datastore) DeleteHost(hid uint) error {
 	d.mtx.Lock()
 	defer d.mtx.Unlock()
 
-	if _, ok := d.hosts[hid]; ok {
-		delete(d.hosts, hid)
-	}
+	delete(d.hosts, hid)
 
 	return nil
 }
@@ -68,7 +66,7 @@ func (d *Datastore) ListHosts(opt kolide.HostListOptions) ([]*kolide.Host, error
 
 	// We need to sort by keys to provide reliable ordering
 	keys := []int{}
-	for k, _ := range d.hosts {
+	for k := range d.hosts {
 		keys = append(keys, int(k))
 	}
 	sort.Ints(keys)
diff --git a/server/datastore/inmem/invites.go b/server/datastore/inmem/invites.go
index c08472baac..d5db6e03fc 100644
--- a/server/datastore/inmem/invites.go
+++ b/server/datastore/inmem/invites.go
@@ -36,7 +36,7 @@ func (d *Datastore) ListInvites(opt kolide.ListOptions) ([]*kolide.Invite, error
 
 	// We need to sort by keys to provide reliable ordering
 	keys := []int{}
-	for k, _ := range d.invites {
+	for k := range d.invites {
 		keys = append(keys, int(k))
 	}
 	sort.Ints(keys)
diff --git a/server/datastore/inmem/packs.go b/server/datastore/inmem/packs.go
index f7b2af2ec1..c6e3e8f3fc 100644
--- a/server/datastore/inmem/packs.go
+++ b/server/datastore/inmem/packs.go
@@ -67,7 +67,7 @@ func (d *Datastore) ListPacks(opt kolide.ListOptions) ([]*kolide.Pack, error) {
 
 	// We need to sort by keys to provide reliable ordering
 	keys := []int{}
-	for k, _ := range d.packs {
+	for k := range d.packs {
 		keys = append(keys, int(k))
 	}
 	sort.Ints(keys)
diff --git a/server/datastore/inmem/queries.go b/server/datastore/inmem/queries.go
index a4ce751446..5762eed89c 100644
--- a/server/datastore/inmem/queries.go
+++ b/server/datastore/inmem/queries.go
@@ -86,7 +86,7 @@ func (d *Datastore) ListQueries(opt kolide.ListOptions) ([]*kolide.Query, error)
 
 	// We need to sort by keys to provide reliable ordering
 	keys := []int{}
-	for k, _ := range d.queries {
+	for k := range d.queries {
 		keys = append(keys, int(k))
 	}
 	sort.Ints(keys)
diff --git a/server/datastore/inmem/users.go b/server/datastore/inmem/users.go
index 7578a7f39e..203c4925dd 100644
--- a/server/datastore/inmem/users.go
+++ b/server/datastore/inmem/users.go
@@ -43,7 +43,7 @@ func (d *Datastore) ListUsers(opt kolide.ListOptions) ([]*kolide.User, error) {
 
 	// We need to sort by keys to provide reliable ordering
 	keys := []int{}
-	for k, _ := range d.users {
+	for k := range d.users {
 		keys = append(keys, int(k))
 	}
 	sort.Ints(keys)
diff --git a/server/datastore/mysql/hosts.go b/server/datastore/mysql/hosts.go
index dca30836b4..0f95a8e702 100644
--- a/server/datastore/mysql/hosts.go
+++ b/server/datastore/mysql/hosts.go
@@ -326,7 +326,7 @@ func (d *Datastore) ListHosts(opt kolide.HostListOptions) ([]*kolide.Host, error
 		sql += `JSON_OBJECT(
 			`
 		for _, field := range opt.AdditionalFilters {
-			sql += fmt.Sprintf(`?, JSON_EXTRACT(additional, ?), `)
+			sql += `?, JSON_EXTRACT(additional, ?), `
 			params = append(params, field, fmt.Sprintf(`$."%s"`, field))
 		}
 		sql = sql[:len(sql)-2]
diff --git a/server/datastore/mysql/migrations/tables/20171116163618_CreateTableOsqueryOptions.go b/server/datastore/mysql/migrations/tables/20171116163618_CreateTableOsqueryOptions.go
index dddaf78126..e18891213b 100644
--- a/server/datastore/mysql/migrations/tables/20171116163618_CreateTableOsqueryOptions.go
+++ b/server/datastore/mysql/migrations/tables/20171116163618_CreateTableOsqueryOptions.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/fleetdm/fleet/server/kolide"
 	"github.com/jmoiron/sqlx"
 	"github.com/jmoiron/sqlx/reflectx"
-	"github.com/fleetdm/fleet/server/kolide"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/datastore/mysql/migrations/tables/20201102112520_ModifyEnrollSecretNodeKeyCollation.go b/server/datastore/mysql/migrations/tables/20201102112520_ModifyEnrollSecretNodeKeyCollation.go
index b9e6b3285a..59269fe629 100644
--- a/server/datastore/mysql/migrations/tables/20201102112520_ModifyEnrollSecretNodeKeyCollation.go
+++ b/server/datastore/mysql/migrations/tables/20201102112520_ModifyEnrollSecretNodeKeyCollation.go
@@ -1,35 +1,35 @@
 package tables
 
 import (
-    "database/sql"
+	"database/sql"
 
-    "github.com/pkg/errors"
+	"github.com/pkg/errors"
 )
 
 func init() {
-    MigrationClient.AddMigration(Up_20201102112520, Down_20201102112520)
+	MigrationClient.AddMigration(Up_20201102112520, Down_20201102112520)
 }
 
 func Up_20201102112520(tx *sql.Tx) error {
-    query := `
+	query := `
 		ALTER TABLE enroll_secrets
 		MODIFY secret VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin
 	`
-    if _, err := tx.Exec(query); err != nil {
-        return errors.Wrap(err, "alter enroll secret collation")
-    }
+	if _, err := tx.Exec(query); err != nil {
+		return errors.Wrap(err, "alter enroll secret collation")
+	}
 
-    query = `
+	query = `
 		ALTER TABLE hosts
 		MODIFY node_key VARCHAR(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin
 	`
-    if _, err := tx.Exec(query); err != nil {
-        return errors.Wrap(err, "alter node key collation")
-    }
+	if _, err := tx.Exec(query); err != nil {
+		return errors.Wrap(err, "alter node key collation")
+	}
 
-    return nil
+	return nil
 }
 
 func Down_20201102112520(tx *sql.Tx) error {
-    return nil
+	return nil
 }
diff --git a/server/datastore/mysql/osquery_options.go b/server/datastore/mysql/osquery_options.go
index 6039e1023d..f11d4e424e 100644
--- a/server/datastore/mysql/osquery_options.go
+++ b/server/datastore/mysql/osquery_options.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/go-kit/kit/log/level"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/log/level"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/datastore/mysql/queries.go b/server/datastore/mysql/queries.go
index 7cb0513b09..2a47c20775 100644
--- a/server/datastore/mysql/queries.go
+++ b/server/datastore/mysql/queries.go
@@ -4,8 +4,8 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/jmoiron/sqlx"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/datastore/mysql/targets.go b/server/datastore/mysql/targets.go
index c2397f3ae4..5e5a4dda57 100644
--- a/server/datastore/mysql/targets.go
+++ b/server/datastore/mysql/targets.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/jmoiron/sqlx"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/logging/firehose_test.go b/server/logging/firehose_test.go
index 1f5c393c93..97a47d23f0 100644
--- a/server/logging/firehose_test.go
+++ b/server/logging/firehose_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/firehose"
 	"github.com/aws/aws-sdk-go/service/firehose/firehoseiface"
-	"github.com/go-kit/kit/log"
 	"github.com/fleetdm/fleet/server/logging/mock"
+	"github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/server/logging/kinesis_test.go b/server/logging/kinesis_test.go
index 87ba95c698..e087825d39 100644
--- a/server/logging/kinesis_test.go
+++ b/server/logging/kinesis_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/kinesis"
 	"github.com/aws/aws-sdk-go/service/kinesis/kinesisiface"
-	"github.com/go-kit/kit/log"
 	"github.com/fleetdm/fleet/server/logging/mock"
+	"github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/server/service/client.go b/server/service/client.go
index 587d146374..42332f7616 100644
--- a/server/service/client.go
+++ b/server/service/client.go
@@ -196,7 +196,7 @@ func (l *logRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	}
 
 	// Log response
-	took := time.Now().Sub(start).Truncate(time.Millisecond)
+	took := time.Since(start).Truncate(time.Millisecond)
 	fmt.Fprintf(os.Stderr, "%s %s %s (%s)\n", res.Request.Method, res.Request.URL, res.Status, took)
 
 	resBody := &bytes.Buffer{}
diff --git a/server/service/endpoint_carves.go b/server/service/endpoint_carves.go
index 5825f27008..db3c04e3d4 100644
--- a/server/service/endpoint_carves.go
+++ b/server/service/endpoint_carves.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -84,7 +84,6 @@ func makeCarveBlockEndpoint(svc kolide.Service) endpoint.Endpoint {
 			return carveBlockResponse{Err: err}, nil
 		}
 
-
 		return carveBlockResponse{Success: true}, nil
 	}
 }
@@ -99,7 +98,7 @@ type getCarveRequest struct {
 
 type getCarveResponse struct {
 	Carve kolide.CarveMetadata `json:"carve"`
-	Err    error           `json:"error,omitempty"`
+	Err   error                `json:"error,omitempty"`
 }
 
 func (r getCarveResponse) error() error { return r.Err }
@@ -112,7 +111,7 @@ func makeGetCarveEndpoint(svc kolide.Service) endpoint.Endpoint {
 			return getCarveResponse{Err: err}, nil
 		}
 
-		return getCarveResponse{Carve:*carve}, nil
+		return getCarveResponse{Carve: *carve}, nil
 
 	}
 }
@@ -127,7 +126,7 @@ type listCarvesRequest struct {
 
 type listCarvesResponse struct {
 	Carves []kolide.CarveMetadata `json:"carves"`
-	Err    error           `json:"error,omitempty"`
+	Err    error                  `json:"error,omitempty"`
 }
 
 func (r listCarvesResponse) error() error { return r.Err }
@@ -153,13 +152,13 @@ func makeListCarvesEndpoint(svc kolide.Service) endpoint.Endpoint {
 ////////////////////////////////////////////////////////////////////////////////
 
 type getCarveBlockRequest struct {
-	ID int64
+	ID      int64
 	BlockId int64
 }
 
 type getCarveBlockResponse struct {
 	Data []byte `json:"data"`
-	Err    error     `json:"error,omitempty"`
+	Err  error  `json:"error,omitempty"`
 }
 
 func (r getCarveBlockResponse) error() error { return r.Err }
diff --git a/server/service/endpoint_certificate.go b/server/service/endpoint_certificate.go
index 6814e988cc..46f1870882 100644
--- a/server/service/endpoint_certificate.go
+++ b/server/service/endpoint_certificate.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 )
 
 type certificateResponse struct {
diff --git a/server/service/endpoint_change_email.go b/server/service/endpoint_change_email.go
index a707b82be6..128fc43b90 100644
--- a/server/service/endpoint_change_email.go
+++ b/server/service/endpoint_change_email.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 )
 
 type changeEmailRequest struct {
diff --git a/server/service/endpoint_invites.go b/server/service/endpoint_invites.go
index abaf3ddfdc..88bc0f3d8e 100644
--- a/server/service/endpoint_invites.go
+++ b/server/service/endpoint_invites.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 )
 
 type createInviteRequest struct {
diff --git a/server/service/endpoint_middleware_test.go b/server/service/endpoint_middleware_test.go
index a9d1d10820..1e349bdce2 100644
--- a/server/service/endpoint_middleware_test.go
+++ b/server/service/endpoint_middleware_test.go
@@ -5,13 +5,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/config"
 	hostctx "github.com/fleetdm/fleet/server/contexts/host"
 	"github.com/fleetdm/fleet/server/contexts/viewer"
 	"github.com/fleetdm/fleet/server/datastore/inmem"
 	"github.com/fleetdm/fleet/server/kolide"
 	"github.com/fleetdm/fleet/server/mock"
+	"github.com/go-kit/kit/endpoint"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/server/service/endpoint_osquery_options.go b/server/service/endpoint_osquery_options.go
index 9545bb415d..1a323453b6 100644
--- a/server/service/endpoint_osquery_options.go
+++ b/server/service/endpoint_osquery_options.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/server/service/endpoint_queries.go b/server/service/endpoint_queries.go
index ac0d095f85..5e95cb70d8 100644
--- a/server/service/endpoint_queries.go
+++ b/server/service/endpoint_queries.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/server/service/endpoint_scheduled_queries.go b/server/service/endpoint_scheduled_queries.go
index 8d3165c265..b95f191529 100644
--- a/server/service/endpoint_scheduled_queries.go
+++ b/server/service/endpoint_scheduled_queries.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/server/service/endpoint_setup.go b/server/service/endpoint_setup.go
index a43e6270ce..ab4a902b58 100644
--- a/server/service/endpoint_setup.go
+++ b/server/service/endpoint_setup.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 	"github.com/pkg/errors"
 )
 
diff --git a/server/service/endpoint_status.go b/server/service/endpoint_status.go
index 3ffaec315e..4f837b3fec 100644
--- a/server/service/endpoint_status.go
+++ b/server/service/endpoint_status.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 )
 
 type statusResponse struct {
diff --git a/server/service/endpoint_targets.go b/server/service/endpoint_targets.go
index 44e3792f6f..f7399c9813 100644
--- a/server/service/endpoint_targets.go
+++ b/server/service/endpoint_targets.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/go-kit/kit/endpoint"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/endpoint"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/server/service/frontend.go b/server/service/frontend.go
index 5b02b0182d..c4544e4f4f 100644
--- a/server/service/frontend.go
+++ b/server/service/frontend.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 
 	assetfs "github.com/elazarl/go-bindata-assetfs"
-	"github.com/go-kit/kit/log"
 	"github.com/fleetdm/fleet/server/bindata"
+	"github.com/go-kit/kit/log"
 )
 
 func newBinaryFileSystem(root string) *assetfs.AssetFS {
diff --git a/server/service/http_auth.go b/server/service/http_auth.go
index 6897f687ca..d4ee49e447 100644
--- a/server/service/http_auth.go
+++ b/server/service/http_auth.go
@@ -5,10 +5,10 @@ import (
 	"net/http"
 	"strings"
 
-	kithttp "github.com/go-kit/kit/transport/http"
 	"github.com/fleetdm/fleet/server/contexts/token"
 	"github.com/fleetdm/fleet/server/contexts/viewer"
 	"github.com/fleetdm/fleet/server/kolide"
+	kithttp "github.com/go-kit/kit/transport/http"
 )
 
 // setRequestsContexts updates the request with necessary context values for a request
diff --git a/server/service/metrics.go b/server/service/metrics.go
index 1211302393..97937432e8 100644
--- a/server/service/metrics.go
+++ b/server/service/metrics.go
@@ -1,8 +1,8 @@
 package service
 
 import (
-	"github.com/go-kit/kit/metrics"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/go-kit/kit/metrics"
 )
 
 type metricsMiddleware struct {
diff --git a/server/service/service.go b/server/service/service.go
index c6fcf01fea..e3a0cfd6f2 100644
--- a/server/service/service.go
+++ b/server/service/service.go
@@ -121,7 +121,7 @@ func (m *seenHostSet) getAndClearHostIDs() []uint {
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
 	var ids []uint
-	for id, _ := range m.hostIDs {
+	for id := range m.hostIDs {
 		ids = append(ids, id)
 	}
 	m.hostIDs = make(map[uint]bool)
diff --git a/server/service/service_osquery.go b/server/service/service_osquery.go
index 4412b7ecc4..f2146bfd44 100644
--- a/server/service/service_osquery.go
+++ b/server/service/service_osquery.go
@@ -1052,7 +1052,7 @@ func (svc service) SubmitDistributedQueryResults(ctx context.Context, results ko
 	// Check for label queries and if so, load host additional. If we don't do
 	// this, we will end up unintentionally dropping any existing host
 	// additional info.
-	for query, _ := range results {
+	for query := range results {
 		if strings.HasPrefix(query, hostLabelQueryPrefix) {
 			fullHost, err := svc.ds.Host(host.ID)
 			if err != nil {
diff --git a/server/service/service_osquery_test.go b/server/service/service_osquery_test.go
index e60edb8d3a..f927caee47 100644
--- a/server/service/service_osquery_test.go
+++ b/server/service/service_osquery_test.go
@@ -289,7 +289,7 @@ func TestHostDetailQueries(t *testing.T) {
 	queries, err = svc.hostDetailQueries(host)
 	assert.Nil(t, err)
 	assert.Len(t, queries, expectedDetailQueries+2)
-	for name, _ := range queries {
+	for name := range queries {
 		assert.True(t,
 			strings.HasPrefix(name, hostDetailQueryPrefix) || strings.HasPrefix(name, hostAdditionalQueryPrefix),
 		)
diff --git a/server/service/service_users.go b/server/service/service_users.go
index 81c6b49c31..bd9f033e71 100644
--- a/server/service/service_users.go
+++ b/server/service/service_users.go
@@ -347,7 +347,7 @@ func (svc service) RequestPasswordReset(ctx context.Context, email string) error
 		UserID:    user.ID,
 		Token:     token,
 	}
-	request, err = svc.ds.NewPasswordResetRequest(request)
+	_, err = svc.ds.NewPasswordResetRequest(request)
 	if err != nil {
 		return err
 	}
diff --git a/server/service/transport_carves.go b/server/service/transport_carves.go
index ad8839014d..960f4cf2bf 100644
--- a/server/service/transport_carves.go
+++ b/server/service/transport_carves.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/pkg/errors"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/pkg/errors"
 )
 
 func decodeCarveBeginRequest(ctx context.Context, r *http.Request) (interface{}, error) {
@@ -68,4 +68,3 @@ func decodeGetCarveBlockRequest(ctx context.Context, r *http.Request) (interface
 	}
 	return getCarveBlockRequest{ID: int64(id), BlockId: int64(blockId)}, nil
 }
-
diff --git a/server/service/transport_osquery_test.go b/server/service/transport_osquery_test.go
index c0c23f01fe..03facd43d0 100644
--- a/server/service/transport_osquery_test.go
+++ b/server/service/transport_osquery_test.go
@@ -8,8 +8,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/gorilla/mux"
 	"github.com/fleetdm/fleet/server/kolide"
+	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/server/service/util_test.go b/server/service/util_test.go
index 08410cf74d..201b019c89 100644
--- a/server/service/util_test.go
+++ b/server/service/util_test.go
@@ -4,9 +4,9 @@ import (
 	"testing"
 
 	"github.com/WatchBeam/clock"
-	kitlog "github.com/go-kit/kit/log"
 	"github.com/fleetdm/fleet/server/config"
 	"github.com/fleetdm/fleet/server/kolide"
+	kitlog "github.com/go-kit/kit/log"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/server/test/testingt.go b/server/test/testingt.go
index f80332a367..06cc52d46a 100644
--- a/server/test/testingt.go
+++ b/server/test/testingt.go
@@ -13,5 +13,4 @@ func Quiet(t *testing.T) *quiet {
 
 func (q *quiet) Logf(format string, args ...interface{}) {
 	// No logging
-	return
 }

From 240107813148c02e83de160a55c08ee3b05f7272 Mon Sep 17 00:00:00 2001
From: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com>
Date: Tue, 18 May 2021 03:08:43 +0900
Subject: [PATCH 38/51] Clickable Fleet logo (#773)

Added a tag to logo
---
 website/views/layouts/layout.ejs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
index 5cdbdb223d..20248f1104 100644
--- a/website/views/layouts/layout.ejs
+++ b/website/views/layouts/layout.ejs
@@ -73,7 +73,9 @@
           </button>
           <div class="mobile-menu collapse px-4 px-sm-5" id="navbarToggleExternalContent">
             <div class="d-flex justify-content-between">
-              <img alt="Fleet logo" src="/images/logo-blue-162x92@2x.png" style="height: 92px; width: 162px;" class="mt-3"/>
+              <a href="/">
+                <img alt="Fleet logo" src="/images/logo-blue-162x92@2x.png" style="height: 92px; width: 162px;" class="mt-3"/>
+              </a>  
               <button style="font-size: 16px; text-decoration: none;" class="header-btn btn btn-link d-flex align-items-center" data-toggle="collapse" data-target="#navbarToggleExternalContent">
                 <img alt="An 'X' icon indicating that this can be interacted with to close the navigation menu." src="/images/icon-close-16x16@2x.png" style="width: 16px;" />
               </button>

From 117130701a07774b321c4733484848d18e5ce28e Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Mon, 17 May 2021 17:04:21 -0400
Subject: [PATCH 39/51] Fix url-prefix links (#769)

* Fix various url-prefix links

Co-authored-by: gillespi314 <73313222+gillespi314@users.noreply.github.com>
---
 .../PackDetailsSidePanel/ScheduledQueriesSection.jsx          | 4 +++-
 .../PackDetailsSidePanel/ScheduledQueriesSection.tests.jsx    | 4 +++-
 frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx      | 4 +++-
 frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx      | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.jsx b/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.jsx
index 0a75f3a68c..460b7613e4 100644
--- a/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.jsx
+++ b/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.jsx
@@ -2,6 +2,8 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { Link } from "react-router";
 
+import PATHS from "router/paths";
+
 import scheduledQueryInterface from "interfaces/scheduled_query";
 
 const baseClass = "pack-details-side-panel";
@@ -23,7 +25,7 @@ class ScheduledQueriesSection extends Component {
             return (
               <li key={`scheduled-query-${scheduledQuery.id}`}>
                 <Link
-                  to={`/queries/${scheduledQuery.query_id}`}
+                  to={PATHS.EDIT_QUERY({ id: scheduledQuery.query_id })}
                   className={`${baseClass}__query-name`}
                 >
                   {scheduledQuery.name}
diff --git a/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.tests.jsx b/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.tests.jsx
index 21d61a630b..8e69206f18 100644
--- a/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.tests.jsx
+++ b/frontend/components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection.tests.jsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { mount } from "enzyme";
+import PATHS from "router/paths";
 
 import ScheduledQueriesSection from "components/side_panels/PackDetailsSidePanel/ScheduledQueriesSection";
 import { scheduledQueryStub } from "test/stubs";
@@ -11,7 +12,8 @@ describe("ScheduledQueriesSection - component", () => {
       <ScheduledQueriesSection scheduledQueries={[scheduledQuery]} />
     );
     const Link = Component.find("Link");
+    const path = `${PATHS.EDIT_QUERY({ id: scheduledQuery.query_id })}`;
 
-    expect(Link.prop("to")).toEqual(`/queries/${scheduledQuery.query_id}`);
+    expect(Link.prop("to")).toEqual(path);
   });
 });
diff --git a/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx b/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx
index 98c6e9ab49..8ecef067a0 100644
--- a/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx
+++ b/frontend/pages/ForgotPasswordPage/ForgotPasswordPage.jsx
@@ -4,6 +4,8 @@ import { connect } from "react-redux";
 import { push } from "react-router-redux";
 import { noop } from "lodash";
 
+import PATHS from "router/paths";
+
 import {
   clearForgotPasswordErrors,
   forgotPasswordAction,
@@ -84,7 +86,7 @@ export class ForgotPasswordPage extends Component {
     return (
       <StackedWhiteBoxes
         leadText={leadText}
-        previousLocation="/login"
+        previousLocation={PATHS.LOGIN}
         className="forgot-password"
         onLeave={handleLeave}
       >
diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
index cd7e6f65b5..a7ac16ef02 100644
--- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
@@ -407,7 +407,7 @@ export class HostDetailsPage extends Component {
     return (
       <div className={`${baseClass} body-wrap`}>
         <div>
-          <Link to="/hosts/manage">
+          <Link to={PATHS.MANAGE_HOSTS}>
             <img src={BackChevron} alt="back chevron" id="back-chevron" />
             Back to Hosts
           </Link>

From 2d1c8e7d4d07e87ac91c00df53a7578999c5d245 Mon Sep 17 00:00:00 2001
From: William Theaker <williamtheaker@users.noreply.github.com>
Date: Mon, 17 May 2021 16:04:16 -0700
Subject: [PATCH 40/51] Replace README logo with one from orbit (#760)

- Add Fleet logo with transparent background to top-level README
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b95e51a7af..fc82ef88ca 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<h1><img width="200" alt="Fleet logo, landscape, dark text, transparent background" src="https://user-images.githubusercontent.com/78363703/112149147-06746480-8c22-11eb-8893-031ffa99539b.png"></h1>
+<h1><img width="200" alt="Fleet logo, landscape, dark text, transparent background" src="https://user-images.githubusercontent.com/618009/103300491-9197e280-49c4-11eb-8677-6b41027be800.png"></h1>
 
 #### [Website](https://fleetdm.com/)  &nbsp;  [News](http://twitter.com/fleetctl) &nbsp; [Report a bug](https://github.com/fleetdm/fleet/issues/new)
 

From 2036b4ded6ad7e70e2f23e3fb5e1b2009122863d Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Mon, 17 May 2021 19:10:59 -0400
Subject: [PATCH 41/51] Host details page: Refetch button (frontend) (#765)

Feature: Refetch button on the host details page
* Button refetches data for an online host
* Button disabled with UI tooltip for an offline host
---
 assets/images/icon-refetch-12x12@2x.png       | Bin 0 -> 710 bytes
 assets/images/icon-refetch-36x36@2x.png       | Bin 0 -> 1928 bytes
 frontend/kolide/entities/hosts.js             |  10 +++
 .../hosts/HostDetailsPage/HostDetailsPage.jsx |  75 ++++++++++++++++--
 .../HostDetailsPage/HostDetailsPage.tests.jsx |   6 +-
 .../pages/hosts/HostDetailsPage/_styles.scss  |  65 +++++++++++++++
 .../pages/hosts/HostDetailsPage/helpers.js    |  12 ++-
 .../redux/nodes/entities/hosts/actions.js     |  30 +++++++
 .../redux/nodes/entities/hosts/reducer.js     |  21 ++++-
 9 files changed, 208 insertions(+), 11 deletions(-)
 create mode 100644 assets/images/icon-refetch-12x12@2x.png
 create mode 100644 assets/images/icon-refetch-36x36@2x.png

diff --git a/assets/images/icon-refetch-12x12@2x.png b/assets/images/icon-refetch-12x12@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..960ea80732fffd5b7be9ce685464ab0e6bd8e21b
GIT binary patch
literal 710
zcmV;%0y+JOP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0$WK$K~#7FtyW!j
znotm)8HhG-SpwYw-2tv3-GTO;dP3<#><Yvc)F%&(FS>&23bZSTJ19%YQ<Gqr>AeUD
z8W7L%dl0#I_-2@&?}AW+!9Z@Je{hcojsREyV(oS?M1YWEUWyqlg5WwVKIgeI1Q8zu
zeSDADb;UxKpNjZ1Gy={TUq+cD?~Wzgp+nQ}-=s?{kIl(7q({<TdHuKEk?Z13{%U1|
zb<8{mW4q2G?Dr$vFvvE9x++ws><fLsJxA`qyOVphJ1&@pjPaKsxLQLEJTI~#Hh)7>
zqhllvbk22J)ZI<GzG+=!XFSFyXn;XaHA7og>aTscXX+mk7#7IGrsP>lBaliPOrjV0
zn=LTDemrcuN(Y5*sRAK$-YpEUY)ZZhPe!%-A|sQKZY6z1<!u3HU=kR<y7+ZArWC5b
zjg1Xl0K2B)9#b?k_u~&Ro#I6tsG6<-QPsBH)sq~i>mghYR(2&u?C4^s?&-h<kPO})
zp&0}i!ihqi1KyHNslsW+HQ&>p5|p+~9&iK=VUW?yx{^hfR7;+Oabmv!-93uj$z!8v
zK_{OQX%xLaoRaR@M>f+#YgX8wCwBVedrru$T~P4E^pXTt^#-<j;8E*7oPhgv>u6gj
zD5*+Qe!5{vu(Y-a4vPc`xE7A*Tj0%f+DZn|b)PMWubi}?PRXN6>Et1i5IAx$`9(@y
z-_-F(L#Q}FDxuN>#6Kp1IV&z7r6^DadiX?S4o$fQ7EG_74#_plJS~N8Nr$he+RoQ<
sPKdXuC|apW^4TINe_9`CT-OZ$0mzs!9-5zHCjbBd07*qoM6N<$g3BN<d;kCd

literal 0
HcmV?d00001

diff --git a/assets/images/icon-refetch-36x36@2x.png b/assets/images/icon-refetch-36x36@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..185a15aa2191d084e6a9d6edcaa9695e10bcd176
GIT binary patch
literal 1928
zcmV;32Y2|1P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH2OUX7K~#7F?VMd!
z8d(s4t8OD2=Y?6p;0i)kFtCD{6{zP-5<(tARuEZ1@L>@3A-IB=6@*!VofX*G0dvkw
zf<WJzs^({qAbtBEHQzZLly2;{y6(O8dl6FR`SU@^0#&k<^_T#P$S-~`08s&u-)Er1
z$9gb+*`(bsL(ulwS>A>isn@A6_y%wI+WP>+_k%VOT(nNH;oSu!jNHKWKYCwT>M0SG
zZVDj;!~#R?f_6V?YuIhKA2|>bPdMM{Gyhmxa@fv4!b&0nk_-3$b$3}y_6Vp93Bpgj
z%i49`I?Ht+AhjyJW6eFh^#r0utOA;;D^NYMrUb_Uts6lERePzg_^r6=Z^kB|+6#Uf
z*$8G4V?nWi$nTuU0;>KoEGx_U0IQ!w7C0KOE34)x69Fj*i43RLFX=rCM<%%<tRF>1
zn^$Aa4o@fzs#b|FP9I_U?7w!fnsf=T4;Hm45e@Q&l%`9#Bf=3_3(BlbpR3jHMF>bB
z0lj`jd)|<WI1%#=v$01<TI&OiZiVNH9kw}sZJj8Tm;5ZB$uYK_-paY-??gg|+@%<*
zLB3=>#C&ZA{|j|B(WlLA)oC`d2O*H54d9k7QfyyA8N$&+h4nv=@jSLwOf-iybs#97
z)l26Z2hAuJ?=nPKsP!Qt?m=*RLp`c&sNALBiM|4wEaRUcFxb)9Z^SK_MIs1FwAgp5
zK);LgY87-DXZyqD6=S0dDN?PD_7y2v(u)uyD<|oo!r=+^oF~{PX$wbaw{xtqSP@Sg
zV&qm05+jhrbufh;yVj|72x~yC>K+1NBm;5EQUL{?cTgX++QGf)B#BE%ONZFRw=zQP
zlywu1&}y?bBQ+o*xy28v&qw=UI`8nXIzF|UkO7O4z@;boS~>pQ7-GRzE$p;T@BlKv
zClVMdH-;G76T4uhJx=}+yoHPy^d%^ljxTsqK!|Tlz9e=|Sa%^7i1r~RW&$#wd$5y*
zowGm@Qeq|`39y@dLEHz(9CRQJ2yIV5GC7-NA4GeS^{tFReGaLhKaDlWb<0MluZ8vi
z<oilYi&ztgOR&W=@C0Nsyd<8p7TUu!JJ`!#V?_dKAX$ufam2usq@n!c8H$sP=SnCw
zwKhY9#BcS<D=}29HZV#DYZ!Ln0iyI!`5Rn3o3G38N*kpV`U?p4U+_T5A*jdX<JEBx
z%7J^#wAex+7Wtob=Bq|{6(isIhqO+5NzDvNNDRKw6%VBk>}$Q_G4(-mXs=$3#4m*$
z0T%q?0@h~k3hp5i81%9=Kd#_KMD>x6SJbVslsPsw;BUBxSXORj#1Sp)ol#~rQ_np?
z{M;*6tdjDQdq262f+Ae)(};@!_mKL&|KcRDfZUZ1sOxk5uF~H!D!_1*1iy&%Ggx%`
zyu7+TScBkLLX3*Orx5l$XZ83rcfm0sTPi1%#-e6pY3mp3qS?&d+xZE#@^#P=sW(ge
zwA)^kt^*GQME|fYuX0~P*C^g~5b$^ZlgN&>PWrAe$^ZF!2Sbfd9;ODFg_wJ1XJ~tK
zkWm^p91am)Y;HqioviUmi^R%vrZthC26<^*l={P1g(I-jM|Ju8@(^GRFwNjhL(Ix6
z&P+ayTN-@RiN=miQ3OUMG1CyULZV$rgK))`u`;fb^-o*RXK+}csTG75A!AInXFh|I
z<|^huhDdPCM0*%#z91|;0TE@ESCa+8v}%rXgh%tgrzIdezpXN<L=y(z;XN4EJ&_vR
zsFF=uK(jP%R(8;Ml{Ty=Lj6PGdk&&PcsT74UN>ql=}mzC5@%U4YIF@^12byVS`tV)
zho7GDu$HR1WuM10#MVqmGOU6%-_X%*fk8BB2{OJ6zy;y;+pO~V<LXzLkOS2)I;|76
zbKAjKCuz1ocO@%X8`nFgir6{q^IZlNjx_$RI>AhXy!dp`F2nTNp~e<+@XA-|X!MJ@
z8wqHrM^82|7qS&I89_;FWnOLUk(307xi7>15+eagAF0=mrPcee{i@R~B%<uMabq8l
zC|h0x=u9#eki5%N3$ICY7X_4HR9CzDD}lBlH*&VNwt7=z(kn;l_X{w}6*&q}l$~Pu
z<1z~+x?>%%GbxaOgpgf`*~9awR_?Q)dA`7_n52ii&c3^qlD4(F4%G=6YMB=y9iOO5
z9Q|0yLr3BZhMo5!*+J5@#@ZxCmILdDG#6J|CssX*qa4{;on&NplIl7RjM!|7j=YY;
z7*Ga{A%4d_r0ZBrcFn5<WT8>xO$-|OZQO}VID+zR3<($soEKCYwMB9bsZN;+ChoWs
zN+Ho;bM;1NQ7$^&Z-b4@ry%=n#IVU5BCkpj_W?0wX5UB~H4;9ZWH}@fc%I)<&A4yC
z+a}ObB}G``VB2r}&lY66K>o-7-zISE`}Jg-K(9s{>8sXcy9sO)=*NG_be+inlMGS-
O0000<MNUMnLSTZ*Qg<T&

literal 0
HcmV?d00001

diff --git a/frontend/kolide/entities/hosts.js b/frontend/kolide/entities/hosts.js
index f6f71a50ab..2e96a14c2f 100644
--- a/frontend/kolide/entities/hosts.js
+++ b/frontend/kolide/entities/hosts.js
@@ -8,6 +8,16 @@ export default (client) => {
 
       return client.authenticatedDelete(endpoint);
     },
+
+    refetch: (host) => {
+      const { HOSTS } = endpoints;
+      const endpoint = client._endpoint(`${HOSTS}/${host.id}/refetch`);
+
+      return client
+        .authenticatedPost(endpoint)
+        .then((response) => response.host);
+    },
+
     load: (hostID) => {
       const { HOSTS } = endpoints;
       const endpoint = client._endpoint(`${HOSTS}/${hostID}`);
diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
index a7ac16ef02..1b2d07a760 100644
--- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
@@ -64,6 +64,7 @@ export class HostDetailsPage extends Component {
     this.state = {
       showDeleteHostModal: false,
       showQueryHostModal: false,
+      showRefetchLoadingSpinner: props.host.refetch_requested,
     };
   }
 
@@ -100,6 +101,21 @@ export class HostDetailsPage extends Component {
     return false;
   };
 
+  onRefetchHost = () => {
+    const { dispatch, host } = this.props;
+    const { refetchHost } = helpers;
+
+    this.setState({ showRefetchLoadingSpinner: true });
+
+    refetchHost(dispatch, host).catch((error) => {
+      this.setState({ showRefetchLoadingSpinner: false });
+      console.log(error);
+      dispatch(renderFlash("error", `Host "${host.hostname}" refetch error`));
+    });
+
+    return false;
+  };
+
   onPackClick = (pack) => {
     const { dispatch } = this.props;
 
@@ -163,7 +179,7 @@ export class HostDetailsPage extends Component {
           revoke the host&apos;s enroll secret.
         </p>
         <div className={`${baseClass}__modal-buttons`}>
-          <Button onClick={() => onDestroyHost()} variant="alert">
+          <Button onClick={onDestroyHost} variant="alert">
             Delete
           </Button>
           <Button onClick={toggleDeleteHostModal(null)} variant="inverse">
@@ -201,7 +217,7 @@ export class HostDetailsPage extends Component {
           backgroundColor="#3e4771"
         >
           <span className={`${baseClass}__tooltip-text`}>
-            You can’t <br /> query an <br /> offline host.
+            You can’t query <br /> a offline host.
           </span>
         </ReactTooltip>
         <Button onClick={toggleDeleteHostModal()} variant="active">
@@ -350,6 +366,51 @@ export class HostDetailsPage extends Component {
     );
   };
 
+  renderRefetch = () => {
+    const { onRefetchHost } = this;
+    const { host } = this.props;
+    const { showRefetchLoadingSpinner } = this.state;
+
+    const isOnline = host.status === "online";
+    const isOffline = host.status === "offline";
+
+    return (
+      <>
+        <div
+          className="refetch"
+          data-tip
+          data-for="refetch-tooltip"
+          data-tip-disable={isOnline}
+        >
+          <Button
+            className={`
+              button
+              button--unstyled
+              ${isOffline ? "refetch-offline" : ""} 
+              ${showRefetchLoadingSpinner ? "refetch-spinner" : "refetch-btn"}
+            `}
+            onClick={onRefetchHost}
+          >
+            {showRefetchLoadingSpinner
+              ? "Fetching, try refreshing this page in just a moment."
+              : "Refetch"}
+          </Button>
+        </div>
+        <ReactTooltip
+          place="bottom"
+          type="dark"
+          effect="solid"
+          id="refetch-tooltip"
+          backgroundColor="#3e4771"
+        >
+          <span className={`${baseClass}__tooltip-text`}>
+            You can’t fetch data from <br /> an offline host.
+          </span>
+        </ReactTooltip>
+      </>
+    );
+  };
+
   render() {
     const { host, isLoadingHost, dispatch, queries, queryErrors } = this.props;
     const { showQueryHostModal } = this.state;
@@ -360,6 +421,7 @@ export class HostDetailsPage extends Component {
       renderLabels,
       renderSoftware,
       renderPacks,
+      renderRefetch,
     } = this;
 
     const titleData = pick(host, [
@@ -416,9 +478,12 @@ export class HostDetailsPage extends Component {
           <div className="title__inner">
             <div className="hostname-container">
               <h1 className="hostname">{host.hostname}</h1>
-              <p className="last-fetched">{`Last fetched ${humanHostDetailUpdated(
-                titleData.detail_updated_at
-              )}`}</p>
+              <p className="last-fetched">
+                {`Last fetched ${humanHostDetailUpdated(
+                  titleData.detail_updated_at
+                )}`}{" "}
+              </p>
+              {renderRefetch()}
             </div>
             <div className="info">
               <div className="info__item info__item--title">
diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tests.jsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tests.jsx
index b278d743cf..d4de26283f 100644
--- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tests.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tests.jsx
@@ -40,7 +40,7 @@ describe("HostDetailsPage - component", () => {
       const dispatch = () => Promise.resolve();
       const props = { ...propsWithOfflineHost, dispatch };
       const page = mount(<HostDetailsPage {...props} />);
-      const deleteBtn = page.find("Button").at(1);
+      const deleteBtn = page.find("Button").at(2);
       expect(deleteBtn.text()).toBe("Delete");
 
       jest.spyOn(hostActions, "destroy").mockImplementation(() => () => {
@@ -66,7 +66,7 @@ describe("HostDetailsPage - component", () => {
       const dispatch = () => Promise.resolve();
       const props = { ...propsWithOnlineHost, dispatch };
       const page = mount(<HostDetailsPage {...props} />);
-      const deleteBtn = page.find("Button").at(1);
+      const deleteBtn = page.find("Button").at(2);
       expect(deleteBtn.text()).toBe("Delete");
 
       jest.spyOn(hostActions, "destroy").mockImplementation(() => () => {
@@ -93,7 +93,7 @@ describe("HostDetailsPage - component", () => {
     const dispatch = () => Promise.resolve();
     const props = { ...propsWithOnlineHost, dispatch };
     const page = mount(<HostDetailsPage {...props} />);
-    const queryBtn = page.find("Button").at(0);
+    const queryBtn = page.find("Button").at(1);
     expect(queryBtn.text()).toBe("Query");
 
     expect(page.find("Modal").length).toEqual(0);
diff --git a/frontend/pages/hosts/HostDetailsPage/_styles.scss b/frontend/pages/hosts/HostDetailsPage/_styles.scss
index 7710ccd051..b1131f18bb 100644
--- a/frontend/pages/hosts/HostDetailsPage/_styles.scss
+++ b/frontend/pages/hosts/HostDetailsPage/_styles.scss
@@ -109,6 +109,71 @@ a {
       margin: 0;
       padding-left: $pad-small;
     }
+
+    .refetch {
+      display: flex;
+
+      .refetch-btn {
+        color: $core-vibrant-blue;
+        cursor: default;
+        font-size: $x-small;
+        display: inline;
+        margin: 9px 0 0 0; // aligns with spinner
+
+        &::before {
+          display: inline-block;
+          position: relative;
+          padding: 5px 0 0 0; // centers spin
+          content: url(../assets/images/icon-refetch-12x12@2x.png);
+          transform: scale(0.5);
+          vertical-align: bottom;
+          height: 20px;
+        }
+
+        &:hover {
+          cursor: pointer;
+        }
+      }
+
+      .refetch-offline {
+        opacity: 25%;
+
+        &:hover {
+          cursor: default;
+        }
+      }
+
+      .refetch-spinner {
+        color: $core-vibrant-blue;
+        cursor: default;
+        font-size: $x-small;
+        display: inline;
+        opacity: 50%;
+        filter: saturate(100%);
+
+        &::before {
+          display: inline-block;
+          position: relative;
+          top: 7px; // aligns with text
+          padding: 5px 0 0 0; // centers spin
+          display: inline-block;
+          content: url(../assets/images/icon-refetch-12x12@2x.png);
+          transform: scale(0.5);
+          animation: spin 2s linear infinite;
+        }
+
+        @keyframes spin {
+          0% {
+            transform: scale(0.5) rotate(0deg);
+            transform-origin: center center;
+          }
+          100% {
+            transform: scale(0.5) rotate(360deg);
+            transform-origin: center center;
+          }
+        }
+      }
+    }
   }
 
   .about,
diff --git a/frontend/pages/hosts/HostDetailsPage/helpers.js b/frontend/pages/hosts/HostDetailsPage/helpers.js
index bf9a54dc2c..b16e8fb1d1 100644
--- a/frontend/pages/hosts/HostDetailsPage/helpers.js
+++ b/frontend/pages/hosts/HostDetailsPage/helpers.js
@@ -16,6 +16,10 @@ export const destroyHost = (dispatch, host) => {
   });
 };
 
+export const refetchHost = (dispatch, host) => {
+  return dispatch(hostActions.refetchHostStart(host));
+};
+
 export const queryHostCustom = (dispatch, host) => {
   return dispatch(
     push({
@@ -34,4 +38,10 @@ export const queryHostSaved = (dispatch, host, selectedQuery) => {
   );
 };
 
-export default { fetchHost, destroyHost, queryHostCustom, queryHostSaved };
+export default {
+  fetchHost,
+  destroyHost,
+  queryHostCustom,
+  queryHostSaved,
+  refetchHost,
+};
diff --git a/frontend/redux/nodes/entities/hosts/actions.js b/frontend/redux/nodes/entities/hosts/actions.js
index 508b9d2097..24f5de12d4 100644
--- a/frontend/redux/nodes/entities/hosts/actions.js
+++ b/frontend/redux/nodes/entities/hosts/actions.js
@@ -5,6 +5,9 @@ import config from "./config";
 const { actions } = config;
 
 export const LOAD_PAGINATED = "LOAD_PAGINATED";
+export const REFETCH_HOST_START = "REFETCH_HOST_START";
+export const REFETCH_HOST_SUCCESS = "REFETCH_HOST_SUCCESS";
+export const REFETCH_HOST_FAILURE = "REFETCH_HOST";
 
 export const loadPaginated = () => {
   const { loadRequest } = actions;
@@ -15,6 +18,33 @@ export const loadPaginated = () => {
   };
 };
 
+export const refetchHostSuccess = (data) => {
+  return { type: REFETCH_HOST_SUCCESS, payload: { data } };
+};
+
+export const refetchHostFailure = (errors) => {
+  return { type: REFETCH_HOST_FAILURE, payload: { errors } };
+};
+
+export const refetchHostStart = (host) => {
+  return (dispatch) => {
+    return Kolide.hosts
+      .refetch(host)
+      .then((data) => {
+        dispatch(refetchHostSuccess(data));
+        return data;
+      })
+      .catch((errors) => {
+        dispatch(refetchHostFailure(errors));
+
+        throw errors;
+      });
+  };
+};
+
 export default {
   ...actions,
+  refetchHostSuccess,
+  refetchHostFailure,
+  refetchHostStart,
 };
diff --git a/frontend/redux/nodes/entities/hosts/reducer.js b/frontend/redux/nodes/entities/hosts/reducer.js
index 3dd9f98a31..d69a3606cb 100644
--- a/frontend/redux/nodes/entities/hosts/reducer.js
+++ b/frontend/redux/nodes/entities/hosts/reducer.js
@@ -1,3 +1,20 @@
-import config from "./config";
+import { REFETCH_HOST_SUCCESS, REFETCH_HOST_FAILURE } from "./actions";
+import config, { initialState } from "./config";
 
-export default config.reducer;
+export default (state = initialState, { type, payload }) => {
+  switch (type) {
+    case REFETCH_HOST_SUCCESS:
+      return {
+        ...state,
+        loading: false,
+      };
+    case REFETCH_HOST_FAILURE:
+      return {
+        ...state,
+        errors: payload.errors,
+        loading: false,
+      };
+    default:
+      return config.reducer(state, { type, payload });
+  }
+};

From d7a4eb6b695ee3066ab74621a267bb66e04854b4 Mon Sep 17 00:00:00 2001
From: noahtalerman <47070608+noahtalerman@users.noreply.github.com>
Date: Mon, 17 May 2021 19:19:24 -0400
Subject: [PATCH 42/51] Add manual QA documentation to handbook (#770)

- Add a living "Manual QA" document to Fleet's handbook.
- The goal of this document is to provide a public location to capture Fleet's manual QA process.
---
 handbook/manual-qa.md | 105 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 handbook/manual-qa.md

diff --git a/handbook/manual-qa.md b/handbook/manual-qa.md
new file mode 100644
index 0000000000..a1e55ce3c2
--- /dev/null
+++ b/handbook/manual-qa.md
@@ -0,0 +1,105 @@
+# Manual QA
+
+This living document outlines the manual quality assurance process conducted to ensure each release of Fleet meets organization standards.
+
+All steps should be conducted during each QA pass.
+
+As new features are added to Fleet, new steps and flows will be added.
+
+> Note: Currently, the testing focuses on the Fleet UI. As this document grows, more testing procedures for the fleetctl CLI tool will be added.
+
+
+## Collecting bugs
+
+The goal of manual QA is to catch unexpected behavior prior to release. 
+
+Please start the manual QA process by creating a blank GitHub issue. As you complete each of the flows, record a list of the bugs you encounter in this new issue. Each item in this list should contain one sentence describing the bug and a screenshot if the item is a frontend bug.
+
+### Clear your local MySQL database
+
+Before you fire up your local Fleet server, wipe your local MySQL database by running the following command:
+
+```
+docker volume rm fleet_mysql-persistent-volume
+```
+
+If you receive an error that says "No such volume," double check that the MySQL volume doesn't have a different name by running this command:
+
+```
+docker volume ls
+```
+
+### Start your development server
+
+Next, fire up your local Fleet server. Check out [this Loom video](https://www.loom.com/share/e7439f058eb44c45af872abe8f8de4a1) for instructions on starting up your local development environment.
+
+### Set up flow
+
+Successfully set up Fleet.
+
+### Login and logout flow
+
+Successfully logout and then login to your local Fleet.
+
+### Enroll host flow
+
+Enroll your local machine to Fleet. Check out the [Orbit for osquery documentation](../docs/2-Orbit-osquery/README.md#packaging) for instructions on generating and installing an Orbit package.
+
+### Host page
+
+To populate the Fleet UI with more than just one host you'll need to use the [fleetdm/osquery-perf tool](https://github.com/fleetdm/osquery-perf/tree/629a7efb6097f9108f706ccd45828793ff73cf9c).
+
+First, clone the fleetdm/osquery perf repo and then run the following commands from the top level of the cloned directory:
+
+```
+go run agent.go --host_count 200 --enroll_secret <your enroll secret goes here>
+```
+
+After about 10 seconds, the Fleet UI should be populated with 200 simulated hosts.
+
+### Label flow
+`Flow is covered by e2e testing`
+
+Create a new label by selecting "Add a new label" on the Hosts page. Make sure it correctly filters the host on the hosts page.
+
+Edit this label and then delete this label.
+
+### Query flow
+`Flow is covered by e2e testing`
+
+Create a new saved query.
+
+Run this query as a live query against your local machine.
+
+Edit this query and then delete this query.
+
+### Pack flow
+`Flow is covered by e2e testing`
+
+Create a new pack.
+
+Add a query as a saved query to the pack. Remove this query. Delete the pack.
+
+### Organization settings flow
+
+As an admin user, select the "Settings" tab in the top navigation and then select "Organization settings". 
+
+Follow [the instructions outlined in the Testing documentation](../docs/4-Contribution/2-Testing.md#email) to set up a local SMTP server.
+
+Successfully edit your organization's name in Fleet.
+
+### Manage users flow
+
+Invite a new user. To be able to invite users, you must have your local SMTP server configured. Instructions for setting up a local SMTP server are outlined in [the Testing documentation](../docs/4-Contribution/2-Testing.md#email)
+
+Logout of your current admin user and accept the invitation for the newly invited user. With your local SMTP server configured, head to https://localhost:8025 to view and select the invitation link.
+
+### Agent options flow
+
+Head to the global agent options page and set the `distributed_iterval` field to `5`. 
+
+Refresh the page to confirm that the agent options have been updated.
+
+### My account flow
+
+Head to the My account page by selecting the dropdown icon next to your avatar in the top navigation. Select "My account" and successfully update your password.
\ No newline at end of file

From 401eb1b16ca0725bfcdf2bfe9769b590a3734f95 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Tue, 18 May 2021 11:23:24 -0400
Subject: [PATCH 43/51] Fix website onhover cursor (#786)

---
 website/assets/styles/layout.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/assets/styles/layout.less b/website/assets/styles/layout.less
index 664062834b..c51b2f7cb3 100644
--- a/website/assets/styles/layout.less
+++ b/website/assets/styles/layout.less
@@ -22,7 +22,7 @@ html, body {
   right: 0;
   .header-btn {
     color: #ffffff;
-    cursor: default !important;//lesshint-disable-line importantRule
+    cursor: pointer !important;//lesshint-disable-line importantRule
     font-family: @navigation-font;
     font-weight: @bold;
   }
@@ -106,7 +106,7 @@ html, body {
   border-bottom: 1px solid #e2e4ea;
   .header-btn {
     color: #192147;
-    cursor: default !important;//lesshint-disable-line importantRule
+    cursor: pointer !important;//lesshint-disable-line importantRule
     font-family: @navigation-font;
     font-weight: @bold;
   }

From cc018bcfa6592cb4a8e7bb7da64c73afb7363da0 Mon Sep 17 00:00:00 2001
From: Mike McNeil <mikermcneil@users.noreply.github.com>
Date: Tue, 18 May 2021 10:33:40 -0500
Subject: [PATCH 44/51] Add "contributors" to YAML format to enable attribution
 (#780)

---
 docs/1-Using-Fleet/standard-query-library/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/1-Using-Fleet/standard-query-library/README.md b/docs/1-Using-Fleet/standard-query-library/README.md
index 800454449e..4ead185ed7 100644
--- a/docs/1-Using-Fleet/standard-query-library/README.md
+++ b/docs/1-Using-Fleet/standard-query-library/README.md
@@ -25,6 +25,7 @@ spec:
   query: Insert query here
   purpose: What is the goal of running your query? Ex. Detection
   remediation: Are there any remediation steps to resolve the detection triggered by your query? If not, insert "N/A."
+  contributors: zwass,mike-j-thomas
 ```
 2. Replace each field and submit a pull request to the fleetdm/fleet GitHub repository.
 
@@ -35,4 +36,4 @@ For instructions on submitting pull requests to Fleet check out [the Committing
 Listed below are great resources that contain additional queries.
 
 - Osquery (https://github.com/osquery/osquery/tree/master/packs)
-- Palantir osquery configuration (https://github.com/palantir/osquery-configuration/tree/master/Fleet)
\ No newline at end of file
+- Palantir osquery configuration (https://github.com/palantir/osquery-configuration/tree/master/Fleet)

From c965e9333972f68eaa2200310499a4f2af67253d Mon Sep 17 00:00:00 2001
From: noahtalerman <47070608+noahtalerman@users.noreply.github.com>
Date: Tue, 18 May 2021 16:46:44 -0400
Subject: [PATCH 45/51] Add persistent fetching to Host details page and edit
 query modal styles (#791)

* Improve UX custom query option

* Persist custom button on filter

* Remove superfluous CSS

* Edge case custom query button

* Add sentence case and edit modal margins

* Add persistent refetch state. Edit querymodal styles

* verbiage tweak (since filters are cleared)

Co-authored-by: RachelElysia <rachel.elysia.perkins@gmail.com>
Co-authored-by: Mike McNeil <mikermcneil@users.noreply.github.com>
---
 .../hosts/HostDetailsPage/HostDetailsPage.jsx | 26 ++++++++++---------
 .../SelectQueryModal/SelectQueryModal.jsx     |  8 +++---
 .../SelectQueryModal/_styles.scss             | 11 ++++++++
 .../pages/hosts/HostDetailsPage/_styles.scss  | 23 +++++++++-------
 4 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
index 1b2d07a760..a984451823 100644
--- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
@@ -64,7 +64,7 @@ export class HostDetailsPage extends Component {
     this.state = {
       showDeleteHostModal: false,
       showQueryHostModal: false,
-      showRefetchLoadingSpinner: props.host.refetch_requested,
+      showRefetchLoadingSpinner: false,
     };
   }
 
@@ -80,8 +80,9 @@ export class HostDetailsPage extends Component {
     const { dispatch, hostID } = this.props;
     const { fetchHost } = helpers;
 
-    fetchHost(dispatch, hostID);
-
+    fetchHost(dispatch, hostID).then((host) =>
+      this.setState({ showRefetchLoadingSpinner: host.refetch_requested })
+    );
     return false;
   }
 
@@ -279,10 +280,10 @@ export class HostDetailsPage extends Component {
                   <table className={wrapperClassName}>
                     <thead>
                       <tr>
-                        <th>Query Name</th>
+                        <th>Query name</th>
                         <th>Description</th>
                         <th>Frequency</th>
-                        <th>Last Run</th>
+                        <th>Last run</th>
                       </tr>
                     </thead>
                     <tbody>
@@ -309,7 +310,7 @@ export class HostDetailsPage extends Component {
       <div className="section section--packs">
         <p className="section__header">Packs</p>
         {!pack_stats ? (
-          <p className="info__item">
+          <p className="results__data">
             No packs with scheduled queries have this host as a target.
           </p>
         ) : (
@@ -328,7 +329,7 @@ export class HostDetailsPage extends Component {
     return (
       <div className="section section--software">
         <p className="section__header">Software</p>
-        {!host.software ? (
+        {host.software.length === 0 ? (
           <div className="results">
             <p className="results__header">
               No installed software detected on this host.
@@ -373,7 +374,6 @@ export class HostDetailsPage extends Component {
 
     const isOnline = host.status === "online";
     const isOffline = host.status === "offline";
-
     return (
       <>
         <div
@@ -469,9 +469,9 @@ export class HostDetailsPage extends Component {
     return (
       <div className={`${baseClass} body-wrap`}>
         <div>
-          <Link to={PATHS.MANAGE_HOSTS}>
+          <Link to={PATHS.MANAGE_HOSTS} className={`${baseClass}__back-link`}>
             <img src={BackChevron} alt="back chevron" id="back-chevron" />
-            Back to Hosts
+            <span>Back to all hosts</span>
           </Link>
         </div>
         <div className="section title">
@@ -548,7 +548,7 @@ export class HostDetailsPage extends Component {
           </div>
         </div>
         <div className="section osquery col-25">
-          <p className="section__header">Agent Options</p>
+          <p className="section__header">Agent options</p>
           <div className="info__item info__item--about">
             <div className="info__block">
               <span className="info__header">Config TLS refresh</span>
@@ -568,7 +568,9 @@ export class HostDetailsPage extends Component {
         </div>
         {renderLabels()}
         {renderPacks()}
-        {renderSoftware()}
+        {/* The Software inventory feature is behind a feature flag
+        so we only render the sofware section if the feature is enabled */}
+        {host.software && renderSoftware()}
         {renderDeleteHostModal()}
         {showQueryHostModal && (
           <SelectQueryModal
diff --git a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/SelectQueryModal.jsx b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/SelectQueryModal.jsx
index 420d000fa9..15bef27773 100644
--- a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/SelectQueryModal.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/SelectQueryModal.jsx
@@ -81,7 +81,7 @@ const SelectQueryModal = (props) => {
   const results = () => {
     if (queryErrors) {
       return (
-        <div className={`${baseClass}__no-query-results`}>
+        <div className={`${baseClass}__no-queries`}>
           <span className="info__header">
             <img src={ErrorIcon} alt="error icon" id="error-icon" />
             Something&apos;s gone wrong.
@@ -98,20 +98,20 @@ const SelectQueryModal = (props) => {
               <img src={OpenNewTabIcon} alt="open new tab" id="new-tab-icon" />
             </a>
           </span>
-          <div>{customQueryButton()}</div>
+          {customQueryButton()}
         </div>
       );
     }
 
     if (!queriesFilter && queriesCount === 0) {
       return (
-        <div className={`${baseClass}__no-query-results`}>
+        <div className={`${baseClass}__no-queries`}>
           <span className="info__header">You have no saved queries.</span>
           <span className="info__data">
             Expecting to see queries? Try again in a few seconds as the system
             catches up.
           </span>
-          <div>{customQueryButton()}</div>
+          {customQueryButton()}
         </div>
       );
     }
diff --git a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss
index e93b8a5343..71b1356f97 100644
--- a/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss
+++ b/frontend/pages/hosts/HostDetailsPage/SelectQueryModal/_styles.scss
@@ -46,6 +46,17 @@
     }
   }
 
+  &__no-queries {
+    .info {
+      &__header {
+        margin: $pad-medium 0 $pad-medium 0;
+      }
+      &__data {
+        margin: 0 0 $pad-large 0;
+      }
+    }
+  }
+
   &__query-modal {
     display: flex;
   }
diff --git a/frontend/pages/hosts/HostDetailsPage/_styles.scss b/frontend/pages/hosts/HostDetailsPage/_styles.scss
index b1131f18bb..576e55e69f 100644
--- a/frontend/pages/hosts/HostDetailsPage/_styles.scss
+++ b/frontend/pages/hosts/HostDetailsPage/_styles.scss
@@ -1,10 +1,3 @@
-a {
-  font-size: $x-small;
-  color: $core-vibrant-blue;
-  font-weight: $bold;
-  text-decoration: none;
-}
-
 .host-details {
   display: flex;
   flex-wrap: wrap;
@@ -28,7 +21,7 @@ a {
     &__header {
       font-size: $medium;
       font-weight: bold;
-      margin: 0 0 $pad-medium 0;
+      margin: 0 0 $pad-large 0;
     }
 
     .info {
@@ -67,16 +60,18 @@ a {
     }
 
     .results {
-      margin: auto;
+      margin: 0;
       width: 350px;
 
       &__header {
+        margin: 0 0 $pad-medium 0;
         font-size: $small;
         color: $core-fleet-black;
         font-weight: $bold;
       }
 
       &__data {
+        margin: 0;
         font-size: $x-small;
       }
     }
@@ -315,6 +310,16 @@ a {
     }
   }
 
+  &__back-link {
+    display: flex;
+    align-items: center;
+    height: 16px;
+    font-size: $x-small;
+    color: $core-vibrant-blue;
+    font-weight: $bold;
+    text-decoration: none;
+  }
+
   #back-chevron {
     width: 16px;
     margin-right: $pad-small;

From 27cfe19ac2159bdfe91e8cb9501ca310df6c0fb8 Mon Sep 17 00:00:00 2001
From: noahtalerman <47070608+noahtalerman@users.noreply.github.com>
Date: Tue, 18 May 2021 18:02:39 -0400
Subject: [PATCH 46/51] Disable "Refetch" button for offline hosts (#799)

- Disable "Refetch" button if the host is offline
- Disable the refetch tooltip if the host is in the `refetch_requested` state.
---
 frontend/components/LoginRoutes/_styles.scss               | 2 +-
 frontend/components/packs/PacksList/Row/_styles.scss       | 2 +-
 .../queries/QueriesList/QueriesListRow/_styles.scss        | 2 +-
 .../ScheduledQueriesListItem/_styles.scss                  | 2 +-
 .../side_panels/HostSidePanel/PanelGroupItem/_styles.scss  | 2 +-
 frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx   | 7 ++++---
 frontend/styles/global/_global.scss                        | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frontend/components/LoginRoutes/_styles.scss b/frontend/components/LoginRoutes/_styles.scss
index 90b9e1c35c..3db8a8804a 100644
--- a/frontend/components/LoginRoutes/_styles.scss
+++ b/frontend/components/LoginRoutes/_styles.scss
@@ -5,5 +5,5 @@
   justify-content: center;
   position: relative;
   min-height: 100vh;
-  background-color: $gradients-dark-gradient;
+  background-color: $gradients-dark-gradient-vertical;
 }
diff --git a/frontend/components/packs/PacksList/Row/_styles.scss b/frontend/components/packs/PacksList/Row/_styles.scss
index d4b5d13aeb..ab17fd65a2 100644
--- a/frontend/components/packs/PacksList/Row/_styles.scss
+++ b/frontend/components/packs/PacksList/Row/_styles.scss
@@ -3,7 +3,7 @@
   cursor: pointer;
 
   &--selected {
-    background-color: $ui-vibrant-blue-10;
+    background-color: $ui-vibrant-blue-25;
   }
 
   &:focus {
diff --git a/frontend/components/queries/QueriesList/QueriesListRow/_styles.scss b/frontend/components/queries/QueriesList/QueriesListRow/_styles.scss
index 08a83d0bb8..9b1ad30c13 100644
--- a/frontend/components/queries/QueriesList/QueriesListRow/_styles.scss
+++ b/frontend/components/queries/QueriesList/QueriesListRow/_styles.scss
@@ -11,7 +11,7 @@
   }
 
   &--selected {
-    background-color: $ui-vibrant-blue-10;
+    background-color: $ui-vibrant-blue-25;
   }
 
   &:hover {
diff --git a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/_styles.scss b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/_styles.scss
index 4d365643bc..9e6468be80 100644
--- a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/_styles.scss
+++ b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesListItem/_styles.scss
@@ -8,6 +8,6 @@
   }
 
   &--selected {
-    background-color: $ui-vibrant-blue-10;
+    background-color: $ui-vibrant-blue-25;
   }
 }
diff --git a/frontend/components/side_panels/HostSidePanel/PanelGroupItem/_styles.scss b/frontend/components/side_panels/HostSidePanel/PanelGroupItem/_styles.scss
index 035a709492..3d398e58cd 100644
--- a/frontend/components/side_panels/HostSidePanel/PanelGroupItem/_styles.scss
+++ b/frontend/components/side_panels/HostSidePanel/PanelGroupItem/_styles.scss
@@ -13,7 +13,7 @@ $base-class: "panel-group-item";
 
   &.#{$base-class}--selected {
     font-weight: $bold;
-    background-color: $ui-vibrant-blue-10;
+    background-color: $ui-vibrant-blue-25;
 
     .#{$base-class}__count {
       font-weight: $bold;
diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
index a984451823..e968f4239f 100644
--- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
+++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.jsx
@@ -218,7 +218,7 @@ export class HostDetailsPage extends Component {
           backgroundColor="#3e4771"
         >
           <span className={`${baseClass}__tooltip-text`}>
-            You can’t query <br /> a offline host.
+            You can’t query <br /> an offline host.
           </span>
         </ReactTooltip>
         <Button onClick={toggleDeleteHostModal()} variant="active">
@@ -380,7 +380,7 @@ export class HostDetailsPage extends Component {
           className="refetch"
           data-tip
           data-for="refetch-tooltip"
-          data-tip-disable={isOnline}
+          data-tip-disable={isOnline || showRefetchLoadingSpinner}
         >
           <Button
             className={`
@@ -389,6 +389,7 @@ export class HostDetailsPage extends Component {
               ${isOffline ? "refetch-offline" : ""} 
               ${showRefetchLoadingSpinner ? "refetch-spinner" : "refetch-btn"}
             `}
+            disabled={isOffline}
             onClick={onRefetchHost}
           >
             {showRefetchLoadingSpinner
@@ -527,7 +528,7 @@ export class HostDetailsPage extends Component {
                 </span>
                 <span className="info__header">Updated at</span>
                 <span className="info__data">
-                  {humanHostLastSeen(aboutData.seen_time)}
+                  {humanHostLastSeen(titleData.detail_updated_at)}
                 </span>
                 <span className="info__header">Uptime</span>
                 <span className="info__data">
diff --git a/frontend/styles/global/_global.scss b/frontend/styles/global/_global.scss
index 1036a56537..3aef2cf874 100644
--- a/frontend/styles/global/_global.scss
+++ b/frontend/styles/global/_global.scss
@@ -46,7 +46,7 @@ a {
 }
 
 .wrapper {
-  background: $gradients-dark-gradient;
+  background: $gradients-dark-gradient-vertical;
   margin: 0;
 }
 

From 1638d5e2da03ee59e43a578f9ccafc1421ff60f1 Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Tue, 18 May 2021 15:04:14 -0700
Subject: [PATCH 47/51] Update Redigo version and timeouts (#793)

- Use newer version of Redigo that properly handles TLS mismatch.
- Add timeouts for Redis TCP connection.

Fixes #792
---
 go.mod                               |  7 +++++++
 go.sum                               |  6 ++----
 server/pubsub/redis_query_results.go | 12 +++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index ca449bd7b4..ed87b64f7c 100644
--- a/go.mod
+++ b/go.mod
@@ -72,3 +72,10 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3
 	gopkg.in/yaml.v2 v2.2.7
 )
+
+// This replace directive needed until
+// https://github.com/throttled/throttled/issues/86 is resolved and we can
+// upgrade to redigo v1.8.4 above. Note there was also some confusion in the
+// Redigo migration that means version 2.0.0+incompatible is actually older than
+// 1.8.4. See https://github.com/gomodule/redigo/issues/366.
+replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.4
diff --git a/go.sum b/go.sum
index ba973c58db..e09b6d63d8 100644
--- a/go.sum
+++ b/go.sum
@@ -85,14 +85,13 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
 github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
-github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/gomodule/redigo v1.8.4 h1:Z5JUg94HMTR1XpwBaSH4vq3+PNSIykBLxMdglbw10gg=
+github.com/gomodule/redigo v1.8.4/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -247,7 +246,6 @@ github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
 go.opencensus.io v0.20.2 h1:NAfh7zF0/3/HqtMvJNZ/RFrSlCE6ZTlHmKfhL/Dm1Jk=
diff --git a/server/pubsub/redis_query_results.go b/server/pubsub/redis_query_results.go
index a6c5c36f77..672eed4786 100644
--- a/server/pubsub/redis_query_results.go
+++ b/server/pubsub/redis_query_results.go
@@ -26,7 +26,17 @@ func NewRedisPool(server, password string, database int, useTLS bool) *redis.Poo
 		MaxIdle:     3,
 		IdleTimeout: 240 * time.Second,
 		Dial: func() (redis.Conn, error) {
-			c, err := redis.Dial("tcp", server, redis.DialDatabase(database), redis.DialUseTLS(useTLS))
+			c, err := redis.Dial(
+				"tcp",
+				server,
+				redis.DialDatabase(database),
+				redis.DialUseTLS(useTLS),
+				redis.DialConnectTimeout(5*time.Second),
+				redis.DialReadTimeout(5*time.Second),
+				redis.DialWriteTimeout(5*time.Second),
+				redis.DialKeepAlive(5*time.Second),
+			)
+
 			if err != nil {
 				return nil, err
 			}

From adbcfc6407c4766ff3040169cec6aa5632ecd6c1 Mon Sep 17 00:00:00 2001
From: noahtalerman <47070608+noahtalerman@users.noreply.github.com>
Date: Tue, 18 May 2021 18:47:18 -0400
Subject: [PATCH 48/51] Add instructions for resolving failed website deploy
 action to /handbook (#801)

---
 handbook/README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/handbook/README.md b/handbook/README.md
index bb299b9e0b..c7a2de284f 100644
--- a/handbook/README.md
+++ b/handbook/README.md
@@ -51,6 +51,11 @@ When merging a PR to master, bear in mind that whatever you merge to master gets
 
 Merge a PR (aka deploy the website) when you think it is appropriately clean to represent our brand. When in doubt, use the standards and level of quality seen on existing pages, ensure correct functionality, and check responsive behavior - starting widescreen and resizing down to ≈320px width. 
 
+### The Deploy Fleet Website GitHub action failed
+If the action fails, please complete the following steps:
+1. Head to the fleetdm-website app in the [Heroku dashboard](https://heroku.com) and select the "Activity" tab.
+2. Select "Roll back to here" on the second to most recent deploy.
+3. Head to the fleetdm/fleet GitHub repository and re-run the Deploy Fleet Website action.
 
 ### About the handbook
 #### Why bother?

From 69f73b56f817eca010a4cd1d79981081c2010d03 Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Tue, 18 May 2021 17:00:20 -0700
Subject: [PATCH 49/51] Upgrade dependencies and remove replace directive
 (#802)

Now that https://github.com/throttled/throttled/pull/87 is merged, we
can remove the stopgap `replace` directive in `go.mod`.
---
 go.mod | 11 ++---------
 go.sum |  8 ++++----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/go.mod b/go.mod
index ed87b64f7c..957a5fe480 100644
--- a/go.mod
+++ b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-kit/kit v0.9.0
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/gomodule/redigo v2.0.0+incompatible
+	github.com/gomodule/redigo v1.8.4
 	github.com/google/go-cmp v0.5.5
 	github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c
 	github.com/gorilla/mux v1.6.2
@@ -59,7 +59,7 @@ require (
 	github.com/stretchr/testify v1.6.1
 	github.com/theupdateframework/go-tuf v0.0.0-20201230183259-aee6270feb55
 	github.com/throttled/throttled v2.2.5+incompatible
-	github.com/throttled/throttled/v2 v2.7.1
+	github.com/throttled/throttled/v2 v2.7.2
 	github.com/urfave/cli/v2 v2.3.0
 	go.opencensus.io v0.20.2 // indirect
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
@@ -72,10 +72,3 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3
 	gopkg.in/yaml.v2 v2.2.7
 )
-
-// This replace directive needed until
-// https://github.com/throttled/throttled/issues/86 is resolved and we can
-// upgrade to redigo v1.8.4 above. Note there was also some confusion in the
-// Redigo migration that means version 2.0.0+incompatible is actually older than
-// 1.8.4. See https://github.com/gomodule/redigo/issues/366.
-replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.4
diff --git a/go.sum b/go.sum
index e09b6d63d8..e50d4778a1 100644
--- a/go.sum
+++ b/go.sum
@@ -239,8 +239,8 @@ github.com/theupdateframework/go-tuf v0.0.0-20201230183259-aee6270feb55 h1:Zn+mA
 github.com/theupdateframework/go-tuf v0.0.0-20201230183259-aee6270feb55/go.mod h1:L+uU/NRFK/7h0NYAnsmvsX9EghDB5QVCcHCIrK2h5nw=
 github.com/throttled/throttled v2.2.5+incompatible h1:65UB52X0qNTYiT0Sohp8qLYVFwZQPDw85uSa65OljjQ=
 github.com/throttled/throttled v2.2.5+incompatible/go.mod h1:0BjlrEGQmvxps+HuXLsyRdqpSRvJpq0PNIsOtqP9Nos=
-github.com/throttled/throttled/v2 v2.7.1 h1:FnBysDX4Sok55bvfDMI0l2Y71V1vM2wi7O79OW7fNtw=
-github.com/throttled/throttled/v2 v2.7.1/go.mod h1:fuOeyK9fmnA+LQnsBbfT/mmPHjmkdogRBQxaD8YsgZ8=
+github.com/throttled/throttled/v2 v2.7.2 h1:UHk0GmVH5Zk1YiY2Di/C8WdtJ9E0wjjfkEiuS/e0pns=
+github.com/throttled/throttled/v2 v2.7.2/go.mod h1:q1QyZVQXxb2NUfJ+Hjucmlrsrz9s/jt2ilMwSMo7a2I=
 github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
@@ -300,9 +300,9 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

From 06f89c29787a0a78a3e4dcfaa560700dcad2f102 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Wed, 19 May 2021 11:15:57 -0400
Subject: [PATCH 50/51] Website: Pricing page (mobile) (#788)

* Cleaner mobile view

* Website styling and move quote
---
 website/assets/styles/pages/pricing.less |   4 +
 website/views/pages/homepage.ejs         |  10 -
 website/views/pages/pricing.ejs          | 346 ++++++++++++++---------
 3 files changed, 214 insertions(+), 146 deletions(-)

diff --git a/website/assets/styles/pages/pricing.less b/website/assets/styles/pages/pricing.less
index 1446e6c4e1..4c5f486c4e 100644
--- a/website/assets/styles/pages/pricing.less
+++ b/website/assets/styles/pages/pricing.less
@@ -6,6 +6,10 @@
     max-width: 800px;
   }
 
+  @media (max-width: 767px) {
+    p {font-size: 16px;}
+  }
+
   // TODO: dedupe animated-arrow-button (see homepage.less)
   [purpose='animated-arrow-button'] {
     padding-right: 45px;
diff --git a/website/views/pages/homepage.ejs b/website/views/pages/homepage.ejs
index f8924b6ab6..04f73b27d4 100644
--- a/website/views/pages/homepage.ejs
+++ b/website/views/pages/homepage.ejs
@@ -47,16 +47,6 @@
     </div>
   </div>
 
-  <div style="max-width: 1260px;" class="container-fluid pb-5 px-4 px-sm-5 mx-auto">
-    <div style="max-width: 800px" class="pb-5 mx-auto">
-      <div style="max-width: 800px; text-align: center;" class="position-relative mx-auto">
-        <p>"Fleet is hands down the best osquery platform out there. Zach and I created Fleet as a natural extension to our original vision for osquery and this has manifested in the ease-of-use, flexibility, and adoption it has today. Look to Fleet for the future of open-source endpoint monitoring."</p>
-        <p style="color: #676A7A" class="mb-4">- Mike Arpaia, Co-creator of <a style="color:#676A7A;" target="_blank" href="https://osquery.io/">osquery</a></p>
-        <a target="_blank" href="https://osquery.io/"><img alt="osquery logo" src="/images/logo-osquery-89x24@2x.png" style="height: 40px; width: 137px;" class="d-inline-block mb-3 mx-auto"/></a>
-      </div>
-    </div>
-  </div>
-
   <div style="background-color: #F2F7F9;">
     <div style="max-width: 1260px;" class="container-fluid py-5 px-4 px-sm-5 mx-auto">
       <div class="text-center py-5">
diff --git a/website/views/pages/pricing.ejs b/website/views/pages/pricing.ejs
index 7dd2d4a2e6..36391e7a3e 100644
--- a/website/views/pages/pricing.ejs
+++ b/website/views/pages/pricing.ejs
@@ -139,29 +139,29 @@
           </div>
         </div>
       </section>
-      <section id="features" class="py-5 mx-auto">
+      <section id="features" class="pt-5 mx-auto">
         <div style="max-width: 810px">
           <div class="row">
             <div class="col-lg px-1 mx-auto" style="max-width: 810px">
               <div style="border-radius: 15px" class="card mb-4">
                 <div class="card-body py-md-5 px-md-5">
                   <div class="row mb-4">
-                    <div class="col-6 col-md-8">
+                    <div class="col-8">
                       <p class="m-0" style="color: #8b8fa2">SUPPORT</p>
                     </div>
-                    <div class="col-3 col-md-2">
-                      <p class="m-0" style="font-weight: bold; font-size: 15px">
+                    <div class="col-2 m-0 px-0 px-sm-1 px-md-2">
+                      <p class="text-center" style="font-weight: bold; font-size: 15px">
                         Fleet Core
                       </p>
                     </div>
-                    <div class="col-3 col-md-2">
-                      <p class="m-0" style="font-weight: bold; font-size: 15px">
+                    <div class="col-2 m-0 px-0 px-sm-1 px-md-2 ">
+                      <p class="text-center" style="font-weight: bold; font-size: 15px">
                         Fleet Basic
                       </p>
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -169,23 +169,25 @@
                       />
                       <p class="ml-2 my-0">Public issue tracker (GitHub)</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -193,23 +195,25 @@
                       />
                       <p class="ml-2 my-0">Community Slack channel</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -217,17 +221,18 @@
                       />
                       <p class="ml-2 my-0">Unlimited email support (confidential)</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -235,17 +240,18 @@
                       />
                       <p class="ml-2 my-0">Phone and video call support</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -253,26 +259,27 @@
                       />
                       <p class="ml-2 my-0">Dedicated Slack channel</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-4 mt-5">
-                    <div class="col-6 col-md-8">
+                    <div class="col-8">
                       <p class="m-0" style="color: #8b8fa2">
                         INVENTORY MANAGEMENT
                       </p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2"></div>
+                    <div class="col-2"></div>
+                    <div class="col-2"></div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -280,23 +287,25 @@
                       />
                       <p class="ml-2 my-0">Secure REST API</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -304,23 +313,25 @@
                       />
                       <p class="ml-2 my-0">Command line tool (CLI)</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -328,23 +339,25 @@
                       />
                       <p class="ml-2 my-0">Realtime device inventory dashboard</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -352,23 +365,25 @@
                       />
                       <p class="ml-2 my-0">Browse installed software packages</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -378,23 +393,25 @@
                         Search devices by IP, serial, hostname, UUID
                       </p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -404,17 +421,18 @@
                         Target and configure specific groups of devices*†
                       </p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -424,24 +442,25 @@
                         Aggregate insights for groups of devices*†
                       </p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-4 mt-5">
-                    <div class="col-6 col-md-8">
+                    <div class="col-10 col-sm-8">
                       <p class="m-0" style="color: #8b8fa2">COLLABORATION</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2"></div>
+                    <div class="col-1 col-sm-2"></div>
+                    <div class="col-1 col-sm-2"></div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -449,23 +468,25 @@
                       />
                       <p class="ml-2 my-0">Shareable device health reports</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -473,23 +494,25 @@
                       />
                       <p class="ml-2 my-0">Versionable queries and config (GitOps)</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -497,23 +520,25 @@
                       />
                       <p class="ml-2 my-0">Human-to-device mapping*†</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -521,23 +546,25 @@
                       />
                       <p class="ml-2 my-0">Scope transparency*</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -545,26 +572,27 @@
                       />
                       <p class="ml-2 my-0">Multiple teams*</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-4 mt-5">
-                    <div class="col-6 col-md-8">
+                    <div class="col-8 pr-0 pr-md-2">
                       <p class="m-0" style="color: #8b8fa2">
                         SECURITY AND COMPLIANCE
                       </p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2"></div>
+                    <div class="col-2"></div>
+                    <div class="col-2"></div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -572,23 +600,25 @@
                       />
                       <p class="ml-2 my-0">Single sign on (SSO, SAML)</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -596,23 +626,25 @@
                       />
                       <p class="ml-2 my-0">Audit queries and user activities*</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -622,23 +654,25 @@
                         Grant API-only access*†
                       </p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -646,24 +680,25 @@
                       />
                       <p class="ml-2 my-0">Role-based access control*</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-4 mt-5">
-                    <div class="col-6 col-md-8">
+                    <div class="col-8 pr-0 pr-md-2">
                       <p class="m-0" style="color: #8b8fa2">MONITORING</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2"></div>
+                    <div class="col-2"></div>
+                    <div class="col-2"></div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -671,23 +706,25 @@
                       />
                       <p class="ml-2 my-0">Schedule and automate custom queries</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -697,23 +734,25 @@
                         Detect vulnerable software*†
                       </p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -721,23 +760,25 @@
                       />
                       <p class="ml-2 my-0">Query performance monitoring*</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -745,23 +786,25 @@
                       />
                       <p class="ml-2 my-0">Standard query library*†</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -771,23 +814,25 @@
                         Detect and surface issues with devices*†
                       </p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -795,24 +840,25 @@
                       />
                       <p class="ml-2 my-0">Self-remediation*†</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-4 mt-5">
-                    <div class="col-6 col-md-8">
+                    <div class="col-8">
                       <p class="m-0" style="color: #8b8fa2">DATA OUTPUTS</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2"></div>
+                    <div class="col-2"></div>
+                    <div class="col-2"></div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -822,23 +868,25 @@
                         Flexible log destinations (AWS Kinesis, Lambda, GCP)
                       </p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -846,23 +894,25 @@
                       />
                       <p class="ml-2 my-0">StreamAlert integration*†</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -870,30 +920,32 @@
                       />
                       <p class="ml-2 my-0">File carving (AWS S3)</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-4 mt-5">
-                    <div class="col-6 col-md-8">
+                    <div class="col-8">
                       <p class="m-0" style="color: #8b8fa2">DEPLOYMENT</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2"></div>
+                    <div class="col-2"></div>
+                    <div class="col-2"></div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -901,23 +953,25 @@
                       />
                       <p class="ml-2 my-0">Self-managed (host Fleet in your own environment)</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -927,23 +981,25 @@
                         Deployment tools (Helm, Terraform)
                       </p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -951,23 +1007,25 @@
                       />
                       <p class="ml-2 my-0">Configure osquery startup flags on the fly*</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -975,23 +1033,25 @@
                       />
                       <p class="ml-2 my-0">Autoupdate osquery agents†</p>
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -999,17 +1059,18 @@
                       />
                       <p class="ml-2 my-0">Self-hosted autoupdate registry†</p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -1019,17 +1080,18 @@
                         Mass deploy custom osquery extensions*
                       </p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
                     </div>
                   </div>
                   <div class="row mb-3">
-                    <div class="col-6 col-md-8 d-flex">
+                    <div class="col-8 d-flex">
                       <img
                         alt="a bullet point ellipse"
                         src="/images/ellipse-6x6@2x.png"
@@ -1039,10 +1101,11 @@
                         Autoupdate custom osquery extensions*
                       </p>
                     </div>
-                    <div class="col-3 col-md-2"></div>
-                    <div class="col-3 col-md-2">
+                    <div class="col-2"></div>
+                    <div class="col-2">
                       <img
                         alt="a check mark"
+                        class="mx-auto"
                         src="/images/check-16x16@2x.png"
                         style="width: 16px; height: 16px"
                       />
@@ -1059,8 +1122,19 @@
             </div>
           </div>
         </div>
+
+        <div style="max-width: 1260px;" class="container-fluid py-5 px-4 px-sm-5 mx-auto">
+          <div style="max-width: 800px" class="mx-auto">
+            <div style="max-width: 800px;" class="position-relative mx-auto">
+              <p>"Fleet is hands down the best osquery platform out there. Zach and I created Fleet as a natural extension to our original vision for osquery and this has manifested in the ease-of-use, flexibility, and adoption it has today. Look to Fleet for the future of open-source endpoint monitoring."</p>
+              <p style="color: #676A7A" class="mb-4">- Mike Arpaia, Co-creator of <a style="color:#676A7A;" target="_blank" href="https://osquery.io/">osquery</a></p>
+              <a target="_blank" href="https://osquery.io/"><img alt="osquery logo" src="/images/logo-osquery-89x24@2x.png" style="height: 40px; width: 137px;" class="d-inline-block mb-3 mx-auto"/></a>
+            </div>
+          </div>
+        </div>
+
       </section>
-      <section id="questions" class="py-5 mx-auto">
+      <section id="questions" class="py-5 mx-auto border-top">
         <h1 class="text-center">
           Still got questions?
         </h1>

From b072fd5fe53d8aacc98d57cc82f1b66e7dfc9973 Mon Sep 17 00:00:00 2001
From: noahtalerman <47070608+noahtalerman@users.noreply.github.com>
Date: Wed, 19 May 2021 12:09:23 -0400
Subject: [PATCH 51/51] Update CHANGELOG and bump versioning (#806)

---
 CHANGELOG.md                    | 14 ++++++++++++++
 charts/fleet/Chart.yaml         |  4 ++--
 charts/fleet/values.yaml        |  2 +-
 tools/fleetctl-npm/package.json |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e156fd7e7a..f0ecea52e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## Fleet 3.12.0 (May 19, 2021)
+
+* Add scheduled queries to the _Host details_ page. Surface the "Name", "Description", "Frequency", and "Last run" information for each query in a pack that apply to a specific host.
+
+* Improve the freshness of host vitals by adding the ability to "refetch" the data on the _Host details_ page.
+
+* Add ability to copy log fields into Google Cloud Pub/Sub attributes. This allows users to use these values for subscription filters.
+
+* Add ability to duplicate live query results in Redis. When the `redis_duplicate_results` configuration option is set to `true`, all live query results will be copied to an additional Redis Pub/Sub channel named LQDuplicate.
+
+* Add ability to controls the server-side HTTP keepalive property. Turning off keepalives has helped reduce outstanding TCP connections in some deployments.
+
+* Fix an issue on the _Packs_ page in which Fleet would incorrectly handle the configured `server_url_prefix`.
+
 ## Fleet 3.11.0 (Apr 28, 2021)
 
 * Improve Fleet performance by batch updating host seen time instead of updating synchronously. This improvement reduces MySQL CPU usage by ~33% with 4,000 simulated hosts and MySQL running in Docker.
diff --git a/charts/fleet/Chart.yaml b/charts/fleet/Chart.yaml
index ca00e5a206..f7b228edfc 100644
--- a/charts/fleet/Chart.yaml
+++ b/charts/fleet/Chart.yaml
@@ -4,8 +4,8 @@ name: fleet
 keywords:
   - fleet
   - osquery
-version: 3.11.0
+version: 3.12.0
 home: https://github.com/fleetdm/fleet
 sources:
   - https://github.com/fleetdm/fleet.git
-appVersion: 3.11.0
+appVersion: 3.12.0
diff --git a/charts/fleet/values.yaml b/charts/fleet/values.yaml
index 2ff8623990..8ee9bf995c 100644
--- a/charts/fleet/values.yaml
+++ b/charts/fleet/values.yaml
@@ -2,7 +2,7 @@
 # All settings related to how Fleet is deployed in Kubernetes
 hostName: fleet.localhost
 replicas: 3 # The number of Fleet instances to deploy
-imageTag: 3.11.0 # Version of Fleet to deploy
+imageTag: 3.12.0 # Version of Fleet to deploy
 createIngress: true # Whether or not to automatically create an Ingress
 ingressAnnotations: {} # Additional annotation to add to the Ingress
 podAnnotations: {} # Additional annotations to add to the Fleet pod
diff --git a/tools/fleetctl-npm/package.json b/tools/fleetctl-npm/package.json
index 173aaff891..55b03abe85 100644
--- a/tools/fleetctl-npm/package.json
+++ b/tools/fleetctl-npm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fleetctl",
-  "version": "3.11.0",
+  "version": "3.12.0",
   "description": "Installer for the fleetctl CLI tool",
   "bin": {
     "fleetctl": "./run.js"