Merge branch 'main' into mna-20595-stream-software-installers

fleetdm · Nov 12, 2024 · 22190b8 · 22190b8
2 parents d78120f + eff1041
commit 22190b8
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 39 deletions.
diff --git a/docs/Deploy/deploy-fleet.md b/docs/Deploy/deploy-fleet.md
@@ -1,6 +1,6 @@
-# Deploy Fleet
+# Hosting Fleet
 
-Deploy to Render for an easy one-click proof of concept. Or, choose AWS with Terraform to deploy at scale. Just need to kick the tires? [Try Fleet locally](https://fleetdm.com/try-fleet) on your device.
+You can deploy Fleet anywhere, or we can [host it for you](/docs/get-started/faq#can-you-host-fleet-for-me).  Deploy to Render for an easy one-click proof of concept. Or, choose AWS with Terraform to deploy at scale. Just need to kick the tires? [Try Fleet locally](https://fleetdm.com/try-fleet) on your device.
 
 <div purpose="deploying-guide-buttons" class="d-flex flex-md-row flex-column">
     <a href="#render">

diff --git a/orbit/TUF.md b/orbit/TUF.md
@@ -7,8 +7,8 @@ Following are the currently deployed versions of fleetd components on the `stabl
 
 | Component\OS |    macOS     | Linux  | Windows | Linux (arm64) |
 |--------------|--------------|--------|---------|---------------|
-| orbit        | 1.34.0       | 1.34.0 | 1.34.0  | 1.34.0        |
-| desktop      | 1.34.0       | 1.34.0 | 1.34.0  | 1.34.0        |
+| orbit        | 1.35.0       | 1.35.0 | 1.35.0  | 1.35.0        |
+| desktop      | 1.35.0       | 1.35.0 | 1.35.0  | 1.35.0        |
 | osqueryd     | 5.14.1       | 5.14.1 | 5.14.1  | 5.14.1        |
 | nudge        | 1.1.10.81462 | -      | -       | -             |
 | swiftDialog  | 2.1.0        | -      | -       | -             |

diff --git a/website/assets/images/logo-workbrew-196x28@2x.png b/website/assets/images/logo-workbrew-196x28@2x.png
diff --git a/website/assets/styles/layout.less b/website/assets/styles/layout.less
@@ -316,6 +316,9 @@ html, body {
       font-weight: 700;
       cursor: pointer;
       color: @core-fleet-black;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
       &:hover {
         color: @core-vibrant-blue;
         text-decoration: none;

diff --git a/website/assets/styles/pages/homepage.less b/website/assets/styles/pages/homepage.less
@@ -84,6 +84,7 @@
     display: flex;
     flex-direction: row;
     justify-content: center;
+    margin-top: 64px;
     h4 {
       color: #515774;
       text-align: center;
@@ -1372,7 +1373,7 @@
   @media (max-width: 575px) {
 
     h1 {
-      font-size: 36px;
+      font-size: 32px;
     }
     h4 {
       font-size: 14px;
@@ -1386,29 +1387,35 @@
     }
     [purpose='homepage-hero'] {
       padding-bottom: 320px;
+      padding-top: 32px;
       padding-left: 24px;
       padding-right: 24px;
     }
+    [purpose='category-switch'] {
+      margin-top: 32px;
+    }
     [purpose='statistics'] {
       flex-direction: column;
       max-width: fit-content;
       margin-left: auto;
       margin-right: auto;
-      [purpose='customers-and-countries-row'] {
-        order: 2;
+      margin-top: 32px;
+      h4 {
+        margin-bottom: 0px;
       }
       [purpose='customers'] {
-        padding: 16px 48px 16px 32px;
+        padding: 0px 64px 24px 64px;
+        border-right: none;
       }
       [purpose='devices'] {
-        order: 1;
+        border-top: 1px solid #E2E4EA;
         border-bottom: 1px solid #E2E4EA;
-        padding: 16px 32px;
+        padding: 24px;
         border-right: none;
       }
 
       [purpose='countries'] {
-        padding: 16px 32px 16px 48px;
+        padding: 24px 64px 0px 64px;
         border-right: none;
       }
 
@@ -1521,6 +1528,7 @@
     [purpose='hero-logos'] {
       padding-left: 20px;
       padding-right: 20px;
+      margin-bottom: 32px;
     }
     [purpose='video-modal'] {
       [purpose='modal-content'] {

diff --git a/website/config/routes.js b/website/config/routes.js
@@ -511,7 +511,7 @@ module.exports.routes = {
   'GET /legal':                      '/legal/terms',
   'GET /terms':                      '/legal/terms',
   'GET /handbook/security/github':   '/handbook/security#git-hub-security',
-  'GET /slack':                      'https://join.slack.com/t/osquery/shared_invite/zt-2op37v6qp-aVPivU5xB_FwuYElN0Z1lw',// Note: This redirect is used on error pages and email templates in the Fleet UI.
+  'GET /slack':                      '/support',// Note: This redirect is used on error pages and email templates in the Fleet UI.
   'GET /docs/using-fleet/updating-fleet': '/docs/deploying/upgrading-fleet',
   'GET /blog':                   '/articles',
   'GET /brand':                  '/logos',

diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs
@@ -169,12 +169,11 @@
                     <a purpose="mobile-dropdown-link" href="/docs">Get started</a>
                     <a purpose="mobile-dropdown-link" href="/queries">Built-in checks</a>
                     <a purpose="mobile-dropdown-link" href="/tables">Raw data</a>
-                    <a purpose="mobile-dropdown-link" href="/articles">Tutorials &amp; guides</a>
+                    <a purpose="mobile-dropdown-link" href="/docs/get-started/tutorials-and-guides">Tutorials &amp; guides</a>
                     <a purpose="mobile-dropdown-link" href="/docs/rest-api">API</a>
                     <span class="mt-2 mb-2">SUPPORT</span>
                     <div purpose="indented-mobile-links">
                       <a purpose="mobile-dropdown-link" href="/support">Chat</a>
-                      <a purpose="mobile-dropdown-link" href="/docs/deploy/introduction">Hosting</a>
                       <a purpose="mobile-dropdown-link" href="/contribute">Contribute</a>
                       <a purpose="mobile-dropdown-link" href="/releases">Release notes</a>
                       <a purpose="mobile-dropdown-link" href="/better">"Why is Fleet on my computer?"</a>
@@ -184,14 +183,13 @@
                   <hr>
                   <a purpose="mobile-dropdown-toggle" class="d-flex align-items-center mr-4 collapsed" data-toggle="collapse" data-target="#mobileNavbarToggleCommunity">Stories</a>
                   <div id="mobileNavbarToggleCommunity" purpose="mobile-dropdown" class="collapse" data-parent="#mobileDropdowns">
-                    <a purpose="mobile-dropdown-link" href="/support">Ask around</a>
                     <a purpose="mobile-dropdown-link" target="_blank" href="/testimonials">What people are saying</a>
                     <a purpose="mobile-dropdown-link" href="/announcements">News</a>
+                    <a purpose="mobile-dropdown-link" href="/support">Ask around</a>
                     <span class="mt-2 mb-2">COMPANY</span>
                     <div purpose="indented-mobile-links">
                       <a purpose="mobile-dropdown-link" href="/handbook/company#history">Origins &nbsp; <small>(Fleet &amp; osquery)</small></a>
                       <a purpose="mobile-dropdown-link" href="/handbook">The handbook</a>
-                      <!-- <a purpose="mobile-dropdown-link" href="/handbook/company/leadership#ceo-flaws">CEO flaws</a> -->
                       <a purpose="mobile-dropdown-link" href="/logos">Logos & artwork</a>
                       <a purpose="mobile-dropdown-link" href="/handbook/company/why-this-way#why-open-source">Why open source?</a>
                     </div>
@@ -232,11 +230,10 @@
                     <a class="dropdown-item" href="/docs">Get started</a>
                     <a class="dropdown-item" href="/queries">Built-in checks</a><!-- «« FUTURE: consider different menu label such as 'Off the shelf', because i'm just casually a hover menu here and so it's less intentional.  I didn't click "docs" first, like I did on mobile-->
                     <a class="dropdown-item" href="/tables">Raw data</a>
-                    <a class="dropdown-item" href="/guides">Tutorials &amp; guides</a>
+                    <a class="dropdown-item" href="/docs/get-started/tutorials-and-guides">Tutorials &amp; guides</a>
                     <a class="dropdown-item" href="/docs/rest-api">API</a>
                     <span class="muted dropdown-header">SUPPORT</span>
                     <a class="dropdown-item" href="/support">Chat</a>
-                    <a class="dropdown-item" href="/docs/deploy/introduction">Hosting</a>
                     <a class="dropdown-item" href="/contribute">Contribute</a>
                     <a class="dropdown-item" href="/releases">Release notes</a>
                     <a class="dropdown-item" href="/better">"Why is Fleet on my computer?"</a>
@@ -246,9 +243,9 @@
                 <div purpose="dropdown-button" class="btn-group" style="width: 89px;">
                   <a purpose="header-nav-btn" button-text="Community" class="dropdown-toggle  align-items-center <%= typeof currentSection !== 'undefined' && currentSection === 'community' ? 'current-section' : '' %>" data-toggle="dropdown">Stories</a>
                   <div purpose="header-dropdown" class="dropdown-menu">
-                    <a class="dropdown-item" href="/support">Ask around</a>
                     <a class="dropdown-item" target="_blank" href="/testimonials">What people are saying</a>
                     <a class="dropdown-item" href="/announcements">News</a>
+                    <a class="dropdown-item" href="/support">Ask around</a>
                     <a class="dropdown-item" href="/contact">Take a tour</a><!-- «« included here in the desktop hover nav because unlike the mobile nav (which has 'Take a tour' as a primary CTA), there is no option to do that on desktop from other pages otherwise -->
                     <span class="muted dropdown-header">COMPANY</span>
                     <a class="dropdown-item" href="/handbook/company#history">Origins &nbsp; <small>(Fleet &amp; osquery)</small></a>
@@ -309,25 +306,25 @@
               </a>
             </div>
             <div purpose="footer-nav-column" class="d-flex flex-column col-lg-3 col-md-4 col-sm-6 col-12">
-              <strong purpose="footer-nav-header">Platform</strong>
+              <strong purpose="footer-nav-header">Multi platform</strong>
               <a href="/device-management">Device management</a>
-              <a href="/endpoint-ops">Endpoint ops</a>
-              <a href="/vulnerability-management">Vulnerability management</a>
+              <a href="/endpoint-ops">Observability</a>
+              <a href="/vulnerability-management">Software management</a>
               <a href="/integrations">Integrations</a>
               <a href="/pricing">Pricing</a>
             </div>
             <div purpose="footer-nav-column" class="d-flex flex-column col-lg-3 col-md-4 col-sm-6 col-12">
               <strong purpose="footer-nav-header">Documentation</strong>
               <a href="/support">Support</a>
               <a href="/docs">Docs</a>
-              <a href="/docs/rest-api">REST API</a>
-              <a href="/new-license">Get your license</a>
-              <a href="/docs/contributing">Contribute</a>
+              <a href="/docs/rest-api">API</a>
+              <a href="/releases">Release notes</a>
+              <a href="/new-license">Get your license</a><!-- «« FUTURE: Personalize this based on whether logged in -->
             </div>
             <div purpose="footer-nav-column" class="d-flex flex-column col-lg-3 col-md-4 col-sm-6 col-12">
               <strong purpose="footer-nav-header">Company</strong>
               <a href="/handbook/company">About</a>
-              <a href="/articles">Blog</a>
+              <a href="/announcements">News</a>
               <a href="/apply">Jobs</a>
               <a href="/logos">Logos/artwork</a>
               <a href="/handbook/company/why-this-way#why-open-source">Why open source?</a>

diff --git a/website/views/pages/endpoint-ops.ejs b/website/views/pages/endpoint-ops.ejs
@@ -3,7 +3,7 @@
     <div purpose="page-content" class="mx-auto">
     <div purpose="hero">
       <div purpose="page-headline">
-        <h4>Endpoint operations <%= ['eo-security', 'vm'].includes(pagePersonalization) ? 'for security' : ['eo-it', 'mdm'].includes(pagePersonalization) ? 'for IT' : '' %></h4>
+        <h4>Observability <%= ['eo-security', 'vm'].includes(pagePersonalization) ? 'for security' : ['eo-it', 'mdm'].includes(pagePersonalization) ? 'for IT' : '' %></h4>
         <h1><%= pagePersonalization==='eo-security'? 'Instrument your endpoints' : 'Understand your computers'%></h1>
       </div>
       <div purpose="hero-content" class="d-flex flex-md-row flex-column align-items-center justify-content-between">
@@ -297,7 +297,7 @@
     <div purpose="page-container" class="pb-0">
 
       <div purpose="section-heading" class="text-center">
-        <h4>Endpoint operations</h4>
+        <h4>Observability</h4>
         <h3><%= pagePersonalization==='eo-security'? 'Instrument your endpoints' : 'Understand your computers'%></h3>
         <div purpose="button-row" style="margin-top: 32px;" class="d-flex flex-md-row flex-column justify-content-center align-items-center mx-auto">
           <a purpose="cta-button" href="/register">Start now</a>

diff --git a/website/views/pages/homepage.ejs b/website/views/pages/homepage.ejs
@@ -21,21 +21,15 @@
   <div purpose="hero-logos" class="mx-auto">
     <logo-carousel></logo-carousel>
     <div purpose="statistics">
-      <div purpose="customers-and-countries-row" class="d-flex flex-row justify-content-center">
-        <div purpose="customers">
-          <h4>100+</h4>
-          <p>customers</p>
-        </div>
-        <div purpose="countries" class="d-flex d-sm-none">
-          <h4>90+</h4>
-          <p>countries</p>
-        </div>
+      <div purpose="customers">
+        <h4>100+</h4>
+        <p>customers</p>
       </div>
       <div purpose="devices">
         <h4>2,000,000+</h4>
         <p>computing devices</p>
       </div>
-      <div purpose="countries" class="d-none d-sm-flex">
+      <div purpose="countries" >
         <h4>90+</h4>
         <p>countries</p>
       </div>

diff --git a/website/views/pages/integrations.ejs b/website/views/pages/integrations.ejs
@@ -305,6 +305,19 @@
           </div>
         </div>
       </div>
+      <div purpose="integration-card" class="card">
+        <div purpose="integration-logo">
+          <img src="/images/logo-workbrew-196x28@2x.png" alt="Workbrew">
+        </div>
+        <div purpose="integration-card-body" class="card-body">
+          <p>
+            Deliver secure software with Fleet and Workbrew.
+          </p>
+          <div purpose="integration-card-buttons" class="d-flex flex-row justify-content-between">
+            <a purpose="learn-more-link" target="_blank" href="https://workbrew.com">Learn more</a>
+          </div>
+        </div>
+      </div>
       <div purpose="integration-card" class="card">
         <div purpose="integration-logo">
           <img src="/images/logo-vanta-82x28@2x.png" alt="Vanta">

diff --git a/website/views/pages/query-library.ejs b/website/views/pages/query-library.ejs
@@ -4,7 +4,7 @@
     <div purpose="page-content">
       <div purpose="search-and-headline" class="d-flex flex-md-row flex-column justify-content-between align-items-md-center align-items-start">
         <div purpose="page-headline" class="d-flex flex-column">
-          <h2>Controls and policies</h2>
+          <h2>Built-in checks</h2>
           <p>Fleet's controls and policies library includes a growing collection of policies, OS settings, and scripts for macOS, Windows, and Linux.</p>
           <p>Contributions welcome <a target="_blank" href="https://github.com/fleetdm/fleet/blob/main/docs/01-Using-Fleet/standard-query-library/standard-query-library.yml">over on GitHub.</a></p>
         </div>