fixed merge issue

FusionAuth · Aug 16, 2024 · 8adb65a · 8adb65a
2 parents c033e43 + 05ba8ed
commit 8adb65a
Show file tree

Hide file tree

Showing 20 changed files with 492 additions and 1 deletion.
diff --git a/...img/docs/operate/secure-and-monitor/datadog/dataDog-opentelemetry-dashboard.png b/...img/docs/operate/secure-and-monitor/datadog/dataDog-opentelemetry-dashboard.png
diff --git a/...s/operate/secure-and-monitor/datadog/datadog-agent-prometheus-check-summary.png b/...s/operate/secure-and-monitor/datadog/datadog-agent-prometheus-check-summary.png
diff --git a/...img/docs/operate/secure-and-monitor/datadog/datadog-agent-prometheus-config.png b/...img/docs/operate/secure-and-monitor/datadog/datadog-agent-prometheus-config.png
diff --git a/.../public/img/docs/operate/secure-and-monitor/datadog/datadog-agent-reporting.png b/.../public/img/docs/operate/secure-and-monitor/datadog/datadog-agent-reporting.png
diff --git a/...lic/img/docs/operate/secure-and-monitor/datadog/datadog-agent-windows-setup.png b/...lic/img/docs/operate/secure-and-monitor/datadog/datadog-agent-windows-setup.png
diff --git a/astro/public/img/docs/operate/secure-and-monitor/datadog/datadog-custom-events.png b/astro/public/img/docs/operate/secure-and-monitor/datadog/datadog-custom-events.png
diff --git a/...cs/operate/secure-and-monitor/datadog/datadog-enableget-prometheus-endpoint.png b/...cs/operate/secure-and-monitor/datadog/datadog-enableget-prometheus-endpoint.png
diff --git a/...ublic/img/docs/operate/secure-and-monitor/datadog/datadog-fusionauth-apikey.png b/...ublic/img/docs/operate/secure-and-monitor/datadog/datadog-fusionauth-apikey.png
diff --git a/...ure-and-monitor/datadog/datadog-fusionauth-enableapikey-prometheus-endpoint.png b/...ure-and-monitor/datadog/datadog-fusionauth-enableapikey-prometheus-endpoint.png
diff --git a/.../operate/secure-and-monitor/datadog/datadog-openmetrics-install-integration.png b/.../operate/secure-and-monitor/datadog/datadog-openmetrics-install-integration.png
diff --git a/...ocs/operate/secure-and-monitor/datadog/datadog-website-create-new-dashboard.png b/...ocs/operate/secure-and-monitor/datadog/datadog-website-create-new-dashboard.png
diff --git a/...rate/secure-and-monitor/datadog/datadog-website-metrics-explorer-prometheus.png b/...rate/secure-and-monitor/datadog/datadog-website-metrics-explorer-prometheus.png
diff --git a/...rate/secure-and-monitor/datadog/datadog-website-new-dashboard-configuration.png b/...rate/secure-and-monitor/datadog/datadog-website-new-dashboard-configuration.png
diff --git a/...cs/operate/secure-and-monitor/datadog/datadog-website-new-dashboard-preview.png b/...cs/operate/secure-and-monitor/datadog/datadog-website-new-dashboard-preview.png
diff --git a/...img/docs/operate/secure-and-monitor/datadog/infrastructure-hosts-agent-info.png b/...img/docs/operate/secure-and-monitor/datadog/infrastructure-hosts-agent-info.png
diff --git a/...ic/img/docs/operate/secure-and-monitor/datadog/install-datadog-agent-ubuntu.png b/...ic/img/docs/operate/secure-and-monitor/datadog/install-datadog-agent-ubuntu.png
diff --git a/astro/public/img/docs/operate/secure-and-monitor/datadog/signup-datadog-trial.png b/astro/public/img/docs/operate/secure-and-monitor/datadog/signup-datadog-trial.png
diff --git a/astro/src/content/docs/operate/secure-and-monitor/datadog.mdx b/astro/src/content/docs/operate/secure-and-monitor/datadog.mdx
diff --git a/astro/src/content/docs/release-notes/index.mdx b/astro/src/content/docs/release-notes/index.mdx
@@ -34,7 +34,7 @@ import InlineField from 'src/components/InlineField.astro';
 
 Looking for release notes older than 1.23.0? Look in the [release notes archive](/docs/release-notes/archive). Looking to be [notified of new releases?](/docs/operate/roadmap/releases#release-notifications) <span class="not-prose no-underline"><a class="ml-2" href="/docs/releases.xml"><i class="fas fa-xs fa-rss text-orange-700 text-2xl" width="50px" /></a></span>
 
-<ReleaseNoteHeading version='1.52.0' releaseDate='August 8th, 2024' />
+<ReleaseNoteHeading version='1.52.0' releaseDate='August 8th, 2024' name="Passkey Platypus" />/>
 
 <GeneralMigrationWarning>
   When using the User Registrations API, the `data` field for the FusionAuth application with Id `3c219e58-ed0e-4b18-ad48-f4f92793ae32` may now contain a `preferences` object. This object is reserved and should not be modified.

diff --git a/config/vale/styles/config/vocabularies/FusionAuth/accept.txt b/config/vale/styles/config/vocabularies/FusionAuth/accept.txt
@@ -137,6 +137,12 @@ xkcd
 Yubico
 YubiKey
 Zendesk
+[Dd]atadog
+[Pp]rometheus
+config
+autostart
+otel
+Mgmt
 Zip[Cc]ode
 [Oo]tel
 systemd
@@ -172,3 +178,5 @@ Zip[Cc]ode
 aggregatable
 stdout
 [Rr]edis
+Updata
+Eleken