From 2490e105eee083b162e2ee462e3f0e983fc6e247 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 11 Nov 2024 20:27:26 -0300 Subject: [PATCH 1/5] Update versions of fleetd components in Fleet's TUF [automated] (#23704) Automated change from [GitHub action](https://github.com/fleetdm/fleet/actions/workflows/fleetd-tuf.yml). Co-authored-by: lucasmrod --- orbit/TUF.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orbit/TUF.md b/orbit/TUF.md index 087f048407d7..081ff7518e15 100644 --- 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 | - | - | - | From 59c85b6ddd0f41c7b0a744f64418e4a4f50f1b59 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 11 Nov 2024 17:29:21 -0600 Subject: [PATCH 2/5] Website: add Workbrew integration card (#23633) Closes: https://github.com/fleetdm/confidential/issues/8543 Changes: - Added a card for Workbrew on the integrations page. --------- Co-authored-by: Mike Thomas <78363703+mike-j-thomas@users.noreply.github.com> --- .../assets/images/logo-workbrew-196x28@2x.png | Bin 0 -> 2369 bytes website/views/pages/integrations.ejs | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 website/assets/images/logo-workbrew-196x28@2x.png diff --git a/website/assets/images/logo-workbrew-196x28@2x.png b/website/assets/images/logo-workbrew-196x28@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..affa0152ae59601bd37a6dc74a61a92d9bba1024 GIT binary patch literal 2369 zcmbVO`9IT-AK&H(CA>>Ml^C0&Ay=X~+RCwI%sFIk8j>UVIFciC%pE?lB#ZRP^g+=l z=V~^DtYQVqZ0A8B zp)#y7+Ad;j`4OjK5PBpoxmhjIBl;jYjGBqX*kqdQ5f!Bt&z7NLUR6s61x0qDjN(VR zjvwCW=5w7V;QLP7E0{mdPiLGM!W$DE2A;fH=gsR1(HwVje&0jJUIZCZ z;3N9SR~0o?^o2Q1C~fLs`J#m^K z-qV9T0gss*3uMvf09qZbeV?1FOL5}Na+djleRj@13XmhKd_$76+L}|G3-UV+jJh)P zo<}e$)4J7{8qS&TdR!geKLY%mdW^rtX%Rcmn4iy1&EgY^(fP7n$(;{1s|@{+oF-9< z@nC5dUOju<2sO<_WatG46IrDJp=L2Y`SNJ= z5ZhC{OD{OY11JBYHwg#X5s4zfWjqhbTmhO~=_PLWjGj-T)}ENhfB4?xDwfF{OROJx z>iMnD{Q`pCiv_X4!adOnur;eO^|eQ2sYN&waSz!xNDjNUG;Xg}R1SYSs$5`!DoTG^ zU?0MUhIOD7z|yw?;$but3{7`VGq2l=FqLnD{94qahl3xo5}!vb2}X1MKEu{l zw`QW(m+K7r7x?t*oqN0Ub4O7=Bsif}7fcCO{wax0(CviWHk?&H*m1b#>E_pmLLKXq z(k$Us_Wd$$w6-mOI(;TN;KE!|Q4O!=EjUF^glcU1ToM?cOU-M27G#{!sz4iFj`p~d zMO!WUfP1XrZN4?0C^4a5ft1FSy7+k~1rfzgQo)+yGSz&JeHbkmSW8g?DDAZ8KgIJf zO4J6z*CXU^ZeD+TqswdL($({UU#s5w=~J$yNF%jGPaVkv>ty&8%Q01xb3w`S^e{s? z4@XmG1%ET;VbraRXD@$NCt@x+E594Wb4`yG4!WqMjGMpsASszr0R4fa9JV|Bvmjq|ftF7KM*vxnPRU zs_HWjNyjuvI zed?J`={PbXEvj=`u>A)CW~~!GfN@0zwuHI4hWNF#fgcL6(u(K-vVy=+w5fMQjFY5V zuhWLZ#h;hQPMdbcM`mS zwU&z)*a^bGrmTWTws4TugTA~;qsL4-UiKO%E&q zUa!*Drcl;P0Xv^dnQF7Xv{i}I;xLI=9m?^869B$U@;q@v4@xQ_HseM?WZ1)@Y1;a3 z0L1mc8MEc}u39Nm#(CArsWEe$+)atY_h{;vmK?1_H&(z=Ustk@z0=x_CmZdw1dH^) zHY1e!=$fo|2!F{D*r1QAXZzDN#|^u~hPrPxT0;J;PQE7NE-&Q;AVWugs=isP?Gyl_Wi^T8Y5(M7)7@^i9`c*z-LYRU+Ir|h1<&^j z&VOtqas@t({qh0+g4j#b>}&bYZiE3R9`?Ey4!!zv)3sE`7&i4ItA)W*&@dmssLj@| zS=ZP52IgZ{Wk#9QB4U%}{S@K3YLPp<4qJn<@ICZmQT??_^9gTTELsU|!+G&KrpHAz zHiJJ1=7wxPdJK*-YfR~QzBz@k%wJ{H>1SKLOlS?5crZZ!0FNM*q(+-H566{GB! zxEhV^K1Kw2(2w>7;Zzspaw!X2%k=@q1H<=@(v;dVD+wQS;<(o5EhAZlaVgc)h9R}; zfq1d1jRD=N>{D(ff)=>!NtL}$tm+|^8pFe-ci|keL-_j|gZljAXZW1lk#0dRGF0~& z1S1FzPPcp`_{l~`tr?hgGuhJHa6u_F}Z2w@jB15)SD+*mlL* zq~V6R)be=o#bRbED|8VHZe`&P`m$E_@etOhcw+E_ThhmHCc&x_3v#cq!UZ2ucVSQAU*%FFKe{s# +
+
+ Workbrew +
+
+

+ Deliver secure software with Fleet and Workbrew. +

+
+ Learn more +
+
+
Vanta From a026d94c5e6e6e973cb6fa514572e270db7d3900 Mon Sep 17 00:00:00 2001 From: Eric Date: Mon, 11 Nov 2024 19:07:01 -0600 Subject: [PATCH 3/5] Website: Update alignment of mobile nav links & homepage statistics styles (#23708) Closes: #23640 Changes: - Updated the styles of mobile nav links to keep text vertically aligned. - Updated the statistics on the homepage to stack vertically on smaller screens - Reduced the padding and font size of the homepage hero on smaller screens --- website/assets/styles/layout.less | 3 +++ website/assets/styles/pages/homepage.less | 22 +++++++++++++++------- website/views/pages/homepage.ejs | 14 ++++---------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/website/assets/styles/layout.less b/website/assets/styles/layout.less index db13bd9d2c0a..7452a27bd7e8 100644 --- 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 index f78273205c52..38c1fa16caef 100644 --- 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/views/pages/homepage.ejs b/website/views/pages/homepage.ejs index f012ed24e86f..a91c08b51dae 100644 --- a/website/views/pages/homepage.ejs +++ b/website/views/pages/homepage.ejs @@ -21,21 +21,15 @@
-
-
-

100+

-

customers

-
-
-

90+

-

countries

-
+
+

100+

+

customers

2,000,000+

computing devices

-
+

90+

countries

From af2a3e6a6d32fd56866456ba8c66160fe146ac7e Mon Sep 17 00:00:00 2001 From: Mike McNeil Date: Mon, 11 Nov 2024 22:53:28 -0600 Subject: [PATCH 4/5] Website: Follow-up to "fluffing" PR (#23715) --- docs/Deploy/deploy-fleet.md | 4 ++-- website/views/layouts/layout.ejs | 25 +++++++++++-------------- website/views/pages/endpoint-ops.ejs | 4 ++-- website/views/pages/query-library.ejs | 2 +- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/docs/Deploy/deploy-fleet.md b/docs/Deploy/deploy-fleet.md index c5f611688e77..a113002f28de 100644 --- 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.
diff --git a/website/views/layouts/layout.ejs b/website/views/layouts/layout.ejs index 9c4787bedb70..7c2bf7ee1e18 100644 --- a/website/views/layouts/layout.ejs +++ b/website/views/layouts/layout.ejs @@ -169,12 +169,11 @@ Get started Built-in checks Raw data - Tutorials & guides + Tutorials & guides API SUPPORT
Chat - Hosting Contribute Release notes "Why is Fleet on my computer?" @@ -184,14 +183,13 @@
- Ask around What people are saying News + Ask around COMPANY @@ -232,11 +230,10 @@ Get started Built-in checks Raw data - Tutorials & guides + Tutorials & guides API SUPPORT Chat - Hosting Contribute Release notes "Why is Fleet on my computer?" @@ -246,9 +243,9 @@
Stories
- Ask around What people are saying News + Ask around Take a tour COMPANY Origins   (Fleet & osquery) @@ -309,10 +306,10 @@
- Platform + Multi platform Device management - Endpoint ops - Vulnerability management + Observability + Software management Integrations Pricing
@@ -320,14 +317,14 @@ Documentation Support Docs - REST API - Get your license - Contribute + API + Release notes + Get your license
Company About - Blog + News Jobs Logos/artwork Why open source? diff --git a/website/views/pages/endpoint-ops.ejs b/website/views/pages/endpoint-ops.ejs index c37f480e1e6a..adf1719b50d2 100644 --- a/website/views/pages/endpoint-ops.ejs +++ b/website/views/pages/endpoint-ops.ejs @@ -3,7 +3,7 @@
-

Endpoint operations <%= ['eo-security', 'vm'].includes(pagePersonalization) ? 'for security' : ['eo-it', 'mdm'].includes(pagePersonalization) ? 'for IT' : '' %>

+

Observability <%= ['eo-security', 'vm'].includes(pagePersonalization) ? 'for security' : ['eo-it', 'mdm'].includes(pagePersonalization) ? 'for IT' : '' %>

<%= pagePersonalization==='eo-security'? 'Instrument your endpoints' : 'Understand your computers'%>

@@ -297,7 +297,7 @@
-

Endpoint operations

+

Observability

<%= pagePersonalization==='eo-security'? 'Instrument your endpoints' : 'Understand your computers'%>

Start now diff --git a/website/views/pages/query-library.ejs b/website/views/pages/query-library.ejs index 038087b207f1..cc89abb213e1 100644 --- a/website/views/pages/query-library.ejs +++ b/website/views/pages/query-library.ejs @@ -4,7 +4,7 @@
-

Controls and policies

+

Built-in checks

Fleet's controls and policies library includes a growing collection of policies, OS settings, and scripts for macOS, Windows, and Linux.

Contributions welcome over on GitHub.

From eff1041b142f0ac92285f0a7abd94ae59be8a6aa Mon Sep 17 00:00:00 2001 From: Mike McNeil Date: Mon, 11 Nov 2024 23:17:54 -0600 Subject: [PATCH 5/5] Website: Give people an option of Slack channels (#23717) --- website/config/routes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/config/routes.js b/website/config/routes.js index 7a493ba3eb0f..5b327222ce13 100644 --- 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',