From e61d91a35e0a03dac4f1a5ba0b54f7be8700d1cd Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 6 Oct 2023 10:07:51 -0500 Subject: [PATCH 1/4] Website: Update receive-from-stripe webhook to handle failed payments when creating a subscription. (#14348) Changes: - Added two events to the `STRIPE_EVENTS_SENT_BEFORE_A_SUBSCRIPTION_RECORD_EXISTS` array in the `receive-from-stripe` webhook --- website/api/controllers/webhooks/receive-from-stripe.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/api/controllers/webhooks/receive-from-stripe.js b/website/api/controllers/webhooks/receive-from-stripe.js index 4b8a9e11386b..a8aa600b659b 100644 --- a/website/api/controllers/webhooks/receive-from-stripe.js +++ b/website/api/controllers/webhooks/receive-from-stripe.js @@ -73,6 +73,8 @@ module.exports = { 'invoice.finalized', 'invoice.paid', 'invoice.payment_succeeded', + 'invoice.payment_failed', + 'invoice.payment_action_required', ]; // If this event is for a subscription that was just created, we won't have a matching Subscription record in the database. This is because we wait until the subscription's invoice is paid to create the record in our database. From e7ac6d8281c2934804e853a8b3a919c30fc217e5 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 6 Oct 2023 11:45:27 -0500 Subject: [PATCH 2/4] Docs: Update fleetd link on anatomy page. (#14344) closes: https://github.com/fleetdm/fleet/issues/14338 --- docs/Get started/anatomy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Get started/anatomy.md b/docs/Get started/anatomy.md index 757c9614a148..7bc314d2454b 100644 --- a/docs/Get started/anatomy.md +++ b/docs/Get started/anatomy.md @@ -12,7 +12,7 @@ Fleetctl (pronouced “fleet control”) is a CLI (command line interface) tool ## Fleetd -Fleetd is a bundle of agents provided by Fleet to gather information about your devices. Fleetd includes [osquery](https://www.osquery.io/), Orbit, and Fleet Desktop. [Docs](https://fleetdm.com/docs/using-fleet/fleet-ui). +Fleetd is a bundle of agents provided by Fleet to gather information about your devices. Fleetd includes [osquery](https://www.osquery.io/), Orbit, and Fleet Desktop. [Docs](https://fleetdm.com/docs/using-fleet/fleetd). ## Osquery Osquery is an open-source tool for gathering information about the state of any device that the osquery agent has been installed on. [Learn more](https://www.osquery.io/). From 7ced0baad84ca6ba4861e9f2a0e73822477588d7 Mon Sep 17 00:00:00 2001 From: Andrew Baker <89049099+DrewBakerfdm@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:03:58 -0700 Subject: [PATCH 3/4] Update fleet-4.37.0.md (#14337) Commenting out script execution --- articles/fleet-4.37.0.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/articles/fleet-4.37.0.md b/articles/fleet-4.37.0.md index 1369da817317..f3a2c7c37bac 100644 --- a/articles/fleet-4.37.0.md +++ b/articles/fleet-4.37.0.md @@ -1,4 +1,4 @@ -# Fleet 4.37.0 | Remote script execution & Puppet support. +# Fleet 4.37.0 | Puppet support. ![Fleet 4.37.0](../website/assets/images/articles/fleet-4.37.0-1600x900@2x.png) @@ -13,6 +13,7 @@ For upgrade instructions, see our [upgrade guide](https://fleetdm.com/docs/deplo * Puppet support * Web user interface improvements +