diff --git a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/about-opentelemetry-metrics.md b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/about-opentelemetry-metrics.md index 8b89841829..ff551b4644 100644 --- a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/about-opentelemetry-metrics.md +++ b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/about-opentelemetry-metrics.md @@ -15,8 +15,12 @@ shortTitle: OpenTelemetry metrics {% data reusables.enterprise.opentelemetry-migration %} +{% ifversion ghes = 3.18 %} + {% data reusables.enterprise.opentelemetry-preview %} +{% endif %} + ## About OpenTelemetry metrics The OpenTelemetry monitoring stack is based on industry-standard observability tools and includes various components for collecting, processing, and storing metrics. This comprehensive approach provides a complete view of your system's performance and health across all components of your {% data variables.product.prodname_ghe_server %} instance. diff --git a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/configuring-opentelemetry-for-your-instance.md b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/configuring-opentelemetry-for-your-instance.md index a9b75065e6..dd3cb06612 100644 --- a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/configuring-opentelemetry-for-your-instance.md +++ b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/configuring-opentelemetry-for-your-instance.md @@ -15,8 +15,12 @@ shortTitle: Configure OpenTelemetry {% data reusables.enterprise.opentelemetry-migration %} +{% ifversion ghes = 3.18 %} + {% data reusables.enterprise.opentelemetry-preview %} +{% endif %} + ## Prerequisites * {% data variables.product.prodname_ghe_server %} 3.18 or later @@ -25,6 +29,12 @@ shortTitle: Configure OpenTelemetry ## Enabling OpenTelemetry metrics +{% ifversion ghes > 3.18 %} + +OpenTelemetry metrics are enabled by default for **new installations** of {% data variables.product.prodname_ghe_server %} 3.19 and later. Upgrades to {% data variables.product.prodname_ghe_server %} 3.19 will still have `collectd` metrics enabled by default, but you can choose to switch to OpenTelemetry metrics. + +{% else %} + OpenTelemetry metrics are disabled by default. You can enable them through the {% data variables.enterprise.management_console %} or command line. ### Using the {% data variables.enterprise.management_console %} @@ -47,6 +57,8 @@ OpenTelemetry metrics are disabled by default. You can enable them through the { {% data reusables.enterprise.apply-configuration %} +{% endif %} + ## Performance considerations When configuring OpenTelemetry metrics, consider the following performance factors: diff --git a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/enable-advanced-dashboards.md b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/enable-advanced-dashboards.md index 9a0babb997..6b1f4d3fbb 100644 --- a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/enable-advanced-dashboards.md +++ b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/enable-advanced-dashboards.md @@ -15,8 +15,12 @@ shortTitle: Enable advanced dashboards {% data reusables.enterprise.opentelemetry-migration %} +{% ifversion ghes = 3.18 %} + {% data reusables.enterprise.opentelemetry-preview %} +{% endif %} + ## Additional dashboards When OpenTelemetry metrics are enabled, you can turn on advanced Grafana dashboards with enhanced visualization and monitoring capabilities. diff --git a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/index.md b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/index.md index 3f0b7d97fc..4ae7cfde50 100644 --- a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/index.md +++ b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/index.md @@ -15,4 +15,8 @@ shortTitle: OpenTelemetry metrics {% data reusables.enterprise.opentelemetry-migration %} +{% ifversion ghes = 3.18 %} + {% data reusables.enterprise.opentelemetry-preview %} + +{% endif %} diff --git a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/setting-up-external-monitoring-with-opentelemetry.md b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/setting-up-external-monitoring-with-opentelemetry.md index f1818cef51..07b2dbab39 100644 --- a/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/setting-up-external-monitoring-with-opentelemetry.md +++ b/content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/setting-up-external-monitoring-with-opentelemetry.md @@ -13,8 +13,12 @@ type: how_to shortTitle: External monitoring OpenTelemetry --- +{% ifversion ghes = 3.18 %} + {% data reusables.enterprise.opentelemetry-preview %} +{% endif %} + ## External monitoring approaches External monitoring with OpenTelemetry allows you to integrate your {% data variables.product.prodname_ghe_server %} instance with existing monitoring infrastructure and tools. {% data variables.product.prodname_ghe_server %} provides two primary approaches for external monitoring: @@ -126,7 +130,7 @@ scrape_configs: scheme: https tls_config: # Set `true` only when testing with self-signed certificates - insecure_skip_verify: false + insecure_skip_verify: false ``` #### Other monitoring tools