From 16e5e53c18b4c5d721196aaa0983a16ac7a8374f Mon Sep 17 00:00:00 2001 From: mc <42146119+mchammer01@users.noreply.github.com> Date: Tue, 28 Oct 2025 13:33:56 +0000 Subject: [PATCH 1/2] Fix capitalization of GitHub in intro --- .../start-your-journey/api-article-body-test-page.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fixtures/fixtures/content/get-started/start-your-journey/api-article-body-test-page.md b/src/fixtures/fixtures/content/get-started/start-your-journey/api-article-body-test-page.md index ac6678a5da12..9bd0a3dd5f87 100644 --- a/src/fixtures/fixtures/content/get-started/start-your-journey/api-article-body-test-page.md +++ b/src/fixtures/fixtures/content/get-started/start-your-journey/api-article-body-test-page.md @@ -1,7 +1,7 @@ --- title: Api Article Body Test Page shortTitle: About GitHub and Git -intro: 'You can use Github and Git to collaborate on work.' +intro: 'You can use GitHub and Git to collaborate on work.' versions: fpt: '*' ghes: '*' From ca6e79d917c1ebba1ef06639aa60b4b86991877e Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Tue, 28 Oct 2025 15:04:56 +0100 Subject: [PATCH 2/2] Document Grafana dashboard creation in Management Console for GHES 3.18+ (#58154) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: alejndr0 <1666254+alejndr0@users.noreply.github.com> Co-authored-by: alejndr0 --- .../about-the-monitor-dashboards.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-the-monitor-dashboards.md b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-the-monitor-dashboards.md index d4b6acaf56bd..adb938bec9d1 100644 --- a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-the-monitor-dashboards.md +++ b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-the-monitor-dashboards.md @@ -57,7 +57,17 @@ On this more detailed dashboard you can get further insights into all aspects of ## Creating new dashboards -Building your own dashboard and alerts requires the data to be forwarded to an external instance. {% ifversion ghes-opentelemetry %}You can use OpenTelemetry and collectd metrics concurrently for external monitoring. During the {% data variables.release-phases.public_preview %}, collectd remains enabled and cannot be disabled.{% else %}You can use collectd metrics for external monitoring.{% endif %} +{% ifversion ghes-opentelemetry %} + +Starting with {% data variables.product.prodname_ghe_server %} 3.18, you can create custom Grafana dashboards and alerts directly inside the {% data variables.enterprise.management_console %}. These custom dashboards and alerts will persist over upgrades, making it easier to maintain your monitoring configuration. + +You can use OpenTelemetry and collectd metrics concurrently for external monitoring. During the {% data variables.release-phases.public_preview %}, collectd remains enabled and cannot be disabled. + +{% else %} + +Building your own dashboard and alerts requires the data to be forwarded to an external instance. You can use collectd metrics for external monitoring. + +{% endif %} {% ifversion ghes-opentelemetry %} For more information about OpenTelemetry metrics, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/about-opentelemetry-metrics).