Skip to content

Commit 4c135e6

Browse files
authored
Merge pull request #42506 from github/repo-sync
Repo sync
2 parents 84ca454 + 6c30745 commit 4c135e6

File tree

16 files changed

+458
-67
lines changed

16 files changed

+458
-67
lines changed

content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/about-the-monitor-dashboards.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Within the pre-built dashboards you can find various sections grouping graphs of
4343

4444
{% ifversion ghes-opentelemetry %}
4545

46-
If you have enabled metrics for OpenTelemetry, then additional dashboards are available, see: [AUTOTITLE](/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/enable-advanced-dashboards).
46+
If you have enabled metrics for OpenTelemetry, then additional dashboards are available, see: [AUTOTITLE](/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/advanced-dashboards).
4747

4848
{% endif %}
4949

content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/about-opentelemetry-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ OpenTelemetry metrics offer several advantages over the legacy collectd system:
3535
* **Extensible**: Support for custom metrics and external monitoring integrations
3636
* **Native endpoints**: Direct integration with service `/metrics` endpoints for efficient monitoring
3737

38-
With OpenTelemetry, advanced Grafana dashboards with enhanced visualization and monitoring capabilities are available, see: [AUTOTITLE](/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/enable-advanced-dashboards).
38+
With OpenTelemetry, advanced Grafana dashboards with enhanced visualization and monitoring capabilities are available, see: [AUTOTITLE](/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/advanced-dashboards).
3939

4040
## Key components
4141

content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/enable-advanced-dashboards.md renamed to content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/advanced-dashboards.md

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
2-
title: Enabling advanced dashboards of OpenTelemetry metrics
2+
title: Advanced dashboards of OpenTelemetry metrics
33
intro: 'After enabling OpenTelemetry metrics collection on your {% data variables.product.prodname_ghe_server %} instance, you have access to additional dashboards with enhanced visualization and monitoring capabilities.'
4+
redirect_from:
5+
- /enterprise/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/enable-advanced-dashboards
46
versions:
57
feature: ghes-opentelemetry
68
topics:
@@ -10,7 +12,7 @@ topics:
1012
- Monitoring
1113
- Performance
1214
type: how_to
13-
shortTitle: Enable advanced dashboards
15+
shortTitle: Advanced dashboards
1416
---
1517

1618
{% data reusables.enterprise.opentelemetry-migration %}
@@ -21,9 +23,18 @@ shortTitle: Enable advanced dashboards
2123

2224
{% endif %}
2325

26+
## Prerequisites
27+
28+
* OpenTelemetry metrics are enabled for your {% data variables.product.prodname_ghe_server %} instance
29+
30+
2431
## Additional dashboards
2532

33+
{% ifversion ghes < 3.19 %}
2634
When OpenTelemetry metrics are enabled, you can turn on advanced Grafana dashboards with enhanced visualization and monitoring capabilities.
35+
{% else %}
36+
When OpenTelemetry metrics are enabled, you will have access to advanced Grafana dashboards with enhanced visualization and monitoring capabilities.
37+
{% endif %}
2738

2839
* **Elasticsearch** - Detailed metrics for search performance, indexing operations, and cluster health
2940
* **Nomad** - In-depth monitoring of job scheduling, resource allocation, and service orchestration
@@ -33,12 +44,15 @@ When OpenTelemetry metrics are enabled, you can turn on advanced Grafana dashboa
3344

3445
These dashboards provide more granular insights into your {% data variables.product.prodname_ghe_server %} instance's performance and can help with advanced troubleshooting and capacity planning.
3546

36-
## Prerequisites
47+
{% ifversion ghes < 3.19 %}
48+
## Enabling advanced dashboards
49+
50+
### Prerequisites
3751

38-
* OpenTelemetry metrics are enabled for your {% data variables.product.prodname_ghe_server %} instance
3952
* SSH access to your {% data variables.product.prodname_ghe_server %} instance
4053

41-
## Enabling advanced dashboards
54+
---
55+
4256

4357
{% data reusables.enterprise_installation.ssh-into-instance %}
4458
1. Run the following command to enable advanced dashboards:
@@ -50,3 +64,4 @@ These dashboards provide more granular insights into your {% data variables.prod
5064
{% data reusables.enterprise.apply-configuration %}
5165

5266
After running these commands, your external Grafana instance will have access to additional pre-configured dashboards.
67+
{% endif %}

content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/configuring-opentelemetry-for-your-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,5 +169,5 @@ sudo journalctl -u victoriametrics -f
169169
170170
## Next steps
171171
172-
* To enable advanced monitoring dashboards, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/enable-advanced-dashboards)
172+
* To enable advanced monitoring dashboards, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/advanced-dashboards)
173173
* To set up external monitoring, see [AUTOTITLE](/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/setting-up-external-monitoring-with-opentelemetry).

content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ topics:
88
children:
99
- /about-opentelemetry-metrics
1010
- /configuring-opentelemetry-for-your-instance
11-
- /enable-advanced-dashboards
11+
- /advanced-dashboards
1212
- /setting-up-external-monitoring-with-opentelemetry
1313
shortTitle: OpenTelemetry metrics
1414
---

content/code-security/concepts/supply-chain-security/about-dependabot-version-updates.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,31 @@ contentType: concepts
3434

3535
{% data variables.product.prodname_dependabot %} takes the effort out of maintaining your dependencies. You can use it to ensure that your repository automatically keeps up with the latest releases of the packages and applications it depends on.
3636

37-
{% data reusables.dependabot.dependabot-updates-supported-repos-ecosystems %}
37+
{% data reusables.dependabot.pull-request-security-vs-version-updates %}
38+
39+
You enable {% data variables.product.prodname_dependabot_version_updates %} by checking a `dependabot.yml` configuration file into your repository.
40+
41+
{% data reusables.dependabot.dependabot-tos %}
42+
43+
## Updates for packages
3844

39-
You enable {% data variables.product.prodname_dependabot_version_updates %} by checking a `dependabot.yml` configuration file into your repository. The configuration file specifies the location of the manifest, or of other package definition files, stored in your repository. {% data variables.product.prodname_dependabot %} uses this information to check for outdated packages and applications. {% data variables.product.prodname_dependabot %} determines if there is a new version of a dependency by looking at the semantic versioning ([semver](https://semver.org/)) of the dependency to decide whether it should update to that version. For certain package managers, {% data variables.product.prodname_dependabot_version_updates %} also supports vendoring. Vendored (or cached) dependencies are dependencies that are checked in to a specific directory in a repository rather than referenced in a manifest. Vendored dependencies are available at build time even if package servers are unavailable. {% data variables.product.prodname_dependabot_version_updates %} can be configured to check vendored dependencies for new versions and update them if necessary.
45+
The `dependabot.yml` configuration file specifies the location of the manifest, or of other package definition files, stored in your repository. {% data variables.product.prodname_dependabot %} uses this information to check for outdated packages and applications. {% data variables.product.prodname_dependabot %} determines if there is a new version of a dependency by looking at the semantic versioning ([semver](https://semver.org/)) of the dependency to decide whether it should update to that version. {% data reusables.dependabot.dependabot-updates-supported-repos-ecosystems %}
46+
47+
For certain package managers, {% data variables.product.prodname_dependabot_version_updates %} also supports vendoring. Vendored (or cached) dependencies are dependencies that are checked in to a specific directory in a repository rather than referenced in a manifest. Vendored dependencies are available at build time even if package servers are unavailable. {% data variables.product.prodname_dependabot_version_updates %} can be configured to check vendored dependencies for new versions and update them if necessary.
4048

4149
When {% data variables.product.prodname_dependabot %} identifies an outdated dependency, it raises a pull request to update the manifest to the latest version of the dependency. For vendored dependencies, {% data variables.product.prodname_dependabot %} raises a pull request to replace the outdated dependency with the new version directly. You check that your tests pass, review the changelog and release notes included in the pull request summary, and then merge it. For more information, see [AUTOTITLE](/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates).
4250

4351
If you enable _security updates_, {% data variables.product.prodname_dependabot %} also raises pull requests to update vulnerable dependencies. For more information, see [AUTOTITLE](/code-security/dependabot/dependabot-security-updates/about-dependabot-security-updates).
4452

45-
{% data reusables.dependabot.pull-request-security-vs-version-updates %}
53+
## Updates for actions
4654

47-
{% data reusables.dependabot.dependabot-updates-signed-commits %}
55+
Actions are often updated with bug fixes and new features to make automated processes more reliable, faster, and safer. When you enable {% data variables.product.prodname_dependabot_version_updates %} for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_dependabot %} will help ensure that references to actions in a repository's _workflow.yml_ file and reusable workflows used inside workflows are kept up to date.
4856

49-
{% data reusables.dependabot.dependabot-updates-prs-and-actions %}
57+
For each action in the file, {% data variables.product.prodname_dependabot %} checks the action's reference (typically a version number or commit identifier associated with the action) against the latest version. If a more recent version of the action is available, {% data variables.product.prodname_dependabot %} will send you a pull request that updates the reference in the workflow file to the latest version.
5058

51-
{% data reusables.dependabot.dependabot-tos %}
59+
{% data variables.product.prodname_dependabot %} also checks workflow files for uses of reusable workflows, and updates the Git reference for these called reusable workflows.
60+
61+
To enable this feature, see [AUTOTITLE](/code-security/how-tos/secure-your-supply-chain/secure-your-dependencies/keeping-your-actions-up-to-date-with-dependabot).
5262

5363
## Frequency of {% data variables.product.prodname_dependabot %} pull requests
5464

content/code-security/how-tos/secure-your-supply-chain/secure-your-dependencies/keeping-your-actions-up-to-date-with-dependabot.md

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,10 @@ contentType: how-tos
2323

2424
{% data reusables.dependabot.enterprise-enable-dependabot %}
2525

26-
## About {% data variables.product.prodname_dependabot_version_updates %} for actions
27-
28-
Actions are often updated with bug fixes and new features to make automated processes more reliable, faster, and safer. When you enable {% data variables.product.prodname_dependabot_version_updates %} for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_dependabot %} will help ensure that references to actions in a repository's _workflow.yml_ file and reusable workflows used inside workflows are kept up to date.
29-
30-
For each action in the file, {% data variables.product.prodname_dependabot %} checks the action's reference (typically a version number or commit identifier associated with the action) against the latest version. For information about how action creators version their actions, see [Using release management for your custom actions](/actions/learn-github-actions/finding-and-customizing-actions#using-release-management-for-your-custom-actions).
31-
32-
If a more recent version of the action is available, {% data variables.product.prodname_dependabot %} will send you a pull request that updates the reference in the workflow file to the latest version. For more information about {% data variables.product.prodname_dependabot_version_updates %}, see [AUTOTITLE](/code-security/dependabot/dependabot-version-updates/about-dependabot-version-updates). For more information about configuring workflows for {% data variables.product.prodname_actions %}, see [AUTOTITLE](/actions/learn-github-actions).
33-
34-
{% data variables.product.prodname_dependabot %} also checks workflow files for uses of reusable workflows, and updates the git reference for these called reusable workflows. For more information about reusable workflows, see [AUTOTITLE](/actions/using-workflows/reusing-workflows).
35-
36-
{% ifversion fpt or ghec %}
37-
38-
> [!NOTE]
39-
> {% data reusables.actions.workflow-runs-dependabot-note %}
40-
41-
{% endif %}
26+
When you enable {% data variables.product.prodname_dependabot_version_updates %} for {% data variables.product.prodname_actions %}, {% data variables.product.prodname_dependabot %} will help ensure that references to actions in a repository's _workflow.yml_ file and reusable workflows used inside workflows are kept up to date. For more information, see [AUTOTITLE](/code-security/concepts/supply-chain-security/about-dependabot-version-updates).
4227

4328
## Enabling {% data variables.product.prodname_dependabot_version_updates %} for actions
4429

45-
You can configure {% data variables.product.prodname_dependabot_version_updates %} to maintain your actions as well as the libraries and packages you depend on.
46-
4730
1. If you have already enabled {% data variables.product.prodname_dependabot_version_updates %} for other ecosystems or package managers, simply open the existing `dependabot.yml` file. Otherwise, create a `dependabot.yml` configuration file in the `.github` directory of your repository. For more information, see [AUTOTITLE](/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates#enabling-dependabot-version-updates).
4831
1. Specify `"github-actions"` as a `package-ecosystem` to monitor.
4932
1. Set the `directory` to `"/"` to check for workflow files in `.github/workflows`.
@@ -52,7 +35,7 @@ You can configure {% data variables.product.prodname_dependabot_version_updates
5235

5336
You can also enable {% data variables.product.prodname_dependabot_version_updates %} on forks. For more information, see [AUTOTITLE](/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates#enabling-version-updates-on-forks).
5437

55-
### Example `dependabot.yml` file for {% data variables.product.prodname_actions %}
38+
## Example `dependabot.yml` file for {% data variables.product.prodname_actions %}
5639

5740
The example `dependabot.yml` file below configures version updates for {% data variables.product.prodname_actions %}. The `directory` must be set to `"/"` to check for workflow files in `.github/workflows`. The `schedule.interval` is set to `"weekly"`. After this file has been checked in or updated, {% data variables.product.prodname_dependabot %} checks for new versions of your actions. {% data variables.product.prodname_dependabot %} will raise pull requests for version updates for any outdated actions that it finds. After the initial version updates, {% data variables.product.prodname_dependabot %} will continue to check for outdated versions of actions once a week.
5841

content/code-security/reference/supply-chain-security/supported-ecosystems-and-repositories.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,11 @@ redirect_from:
1818
contentType: reference
1919
---
2020

21-
## About {% data variables.product.prodname_dependabot %}
21+
This article provides reference information about the package ecosystems and repository types that {% data variables.product.prodname_dependabot %} supports.
2222

23-
{% data variables.product.prodname_dependabot %} helps you stay on top of your dependency ecosystems. With {% data variables.product.prodname_dependabot %}, you can keep the dependencies you rely on up-to-date, addressing any potential security issues in your supply chain.
23+
{% data variables.product.prodname_dependabot %} is a {% data variables.product.github %} tool that helps keep your dependencies secure and up to date. It automatically detects vulnerable or outdated dependencies in your repositories and creates pull requests to update them, making it easier to maintain your software supply chain security. For more information, see [AUTOTITLE](/code-security/tutorials/secure-your-dependencies/dependabot-quickstart-guide).
2424

25-
{% data reusables.dependabot.dependabot-overview %}
26-
27-
For more information about {% data variables.product.prodname_dependabot %}, see [AUTOTITLE](/code-security/getting-started/dependabot-quickstart-guide).
28-
29-
In this article, you can see what the supported ecosystems and repositories are.
30-
31-
## Supported ecosystems and repositories
25+
## Supported ecosystems maintained by {% data variables.product.github %}
3226
<!-- If you make changes to this feature, check whether any of the changes affect languages listed in /get-started/learning-about-github/github-language-support. If so, please update the language support article accordingly. -->
3327

3428
You can configure updates for repositories that contain a dependency manifest or lock file for one of the supported package managers. For some package managers, you can also configure vendoring for dependencies. For more information, see [`vendor`](/code-security/dependabot/working-with-dependabot/dependabot-options-reference#vendor--).

content/rest/billing/cost-centers.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,12 @@ topics:
88
autogenerated: rest
99
allowTitleToDifferFromFilename: true
1010
---
11+
## Required roles
12+
13+
The following roles can access cost center API endpoints:
14+
15+
* **Enterprise owners**
16+
* **Billing managers**
17+
* **Organization owners**
1118

1219
<!-- Content after this section is automatically generated -->

data/reusables/actions/about-actions-usage-metrics-aggregation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The time period selection feature allows you to view {% data variables.product.prodname_actions %} metrics over predefined periods, as detailed in the following table. These metrics include skipped runs and those that use zero minutes. Data is presented using Coordinated Universal Time (UTC) days.
1+
The time period selection feature allows you to view {% data variables.product.prodname_actions %} metrics over predefined periods, as detailed in the following table. These metrics exclude skipped runs and those that use zero minutes. Data is presented using Coordinated Universal Time (UTC) days.
22

33
{% rowheaders %}
44

0 commit comments

Comments
 (0)