Skip to content

Commit e44c283

Browse files
authored
Merge pull request #46835 from github/repo-sync
Repo sync
2 parents 4a20c76 + eb0701d commit e44c283

319 files changed

Lines changed: 113 additions & 1190560 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎content/actions/reference/security/oidc.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,6 @@ You can create a subject that filters for specific tag. In this example, the wor
156156
* Syntax: `repo:ORG-NAME/REPO-NAME:ref:refs/tags/TAG-NAME`
157157
* Example: `repo:octo-org/octo-repo:ref:refs/tags/demo-tag`
158158

159-
{% ifversion fpt or ghec or ghes > 3.18 %}
160-
161159
### Filtering for metadata containing `:`
162160

163161
Any `:` within the metadata values will be replaced with `%3A` in the subject claim.
@@ -167,8 +165,6 @@ You can configure a subject that includes metadata containing colons. In this ex
167165
* Syntax: `repo:ORG-NAME/REPO-NAME:environment:ENVIRONMENT-NAME`
168166
* Example: `repo:octo-org/octo-repo:environment:Production%3AV1`
169167

170-
{% endif %}
171-
172168
## Immutable subject claims
173169

174170
The OpenID Connect (OIDC) specification requires subject (`sub`) claims to be locally unique and never reassigned. Previously, the default `sub` format used only organization and repository names. If a namespace was recycled, a different owner could create the same subject value.

‎content/admin/administering-your-instance/administering-your-instance-from-the-command-line/command-line-utilities.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,6 @@ Flag | Description
190190
`--error-checks-only` | Only run high severity checks that should be treated as blocking errors.
191191
`--warning-checks-only` | Only run low severity checks that can be treated as warnings.
192192

193-
{% ifversion ghes > 3.18 %}
194-
195193
### ghe-crypto
196194

197195
This utility is used to verify and list {% data variables.enterprise.management_console %} `github-ssl` crypto settings for TLS and SSH connections.
@@ -276,8 +274,6 @@ ghe-crypto check ssh-ciphers chacha20-poly1305@openssh.com,aes256-gcm@openssh.co
276274

277275
For more information about configuring cipher suites and cryptographic algorithms, see [AUTOTITLE](/admin/configuring-settings/hardening-security-for-your-enterprise/configuring-tls-and-ssh-ciphers).
278276

279-
{% endif %}
280-
281277
### ghe-console
282278

283279
This utility opens the GitHub Rails console on your {% data variables.product.prodname_enterprise %} appliance. {% data reusables.command_line.use_with_support_only %}

‎content/admin/configuring-settings/hardening-security-for-your-enterprise/configuring-ssh-connections-to-your-instance.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ category:
1919

2020
To accommodate the SSH clients in your environment, you can configure the types of connections that {% data variables.location.product_location %} will accept.
2121

22-
{% ifversion ghes > 3.18 %}
23-
2422
You can also configure the cryptographic algorithms (ciphers, MAC algorithms, key exchange algorithms, and signature types) that {% data variables.location.product_location %} uses for SSH connections. For more information, see [AUTOTITLE](/admin/configuring-settings/hardening-security-for-your-enterprise/configuring-tls-and-ssh-ciphers).
2523

26-
{% endif %}
27-
2824
## Configuring SSH connections with RSA keys
2925

3026
When users perform Git operations on {% data variables.location.product_location %} via SSH over port 22, the client can authenticate with an RSA key. The client may sign the attempt using the SHA-1 hash function. In this context, the SHA-1 hash function is no longer secure. For more information, see [SHA-1](https://en.wikipedia.org/wiki/SHA-1) on Wikipedia.

‎content/admin/configuring-settings/hardening-security-for-your-enterprise/configuring-tls-and-ssh-ciphers.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ redirect_from:
88
- /admin/configuration/configuring-network-settings/configuring-tls#configuring-cipher-suites-and-cryptographic-algorithms
99
- /admin/configuration/hardening-security-for-your-enterprise/configuring-tls#configuring-cipher-suites-and-cryptographic-algorithms
1010
versions:
11-
ghes: '>=3.19'
11+
ghes: '*'
1212
contentType: how-tos
1313
category:
1414
- Secure and govern your enterprise

‎content/admin/configuring-settings/hardening-security-for-your-enterprise/configuring-tls.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,6 @@ To resolve these errors, you must update the Subject Alternative Names (SANs) yo
119119

120120
1. If you configured a user message or maintenance mode, remove the message and disable maintenance mode.
121121

122-
{% ifversion ghes > 3.18 %}
123-
124122
## Configuring cipher suites and cryptographic algorithms
125123

126124
You can configure the cipher suites and cryptographic algorithms that {% data variables.product.prodname_ghe_server %} uses for TLS and SSH connections. For more information, see [AUTOTITLE](/admin/configuring-settings/hardening-security-for-your-enterprise/configuring-tls-and-ssh-ciphers).
127-
128-
{% endif %}

‎content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/enforcing-policies-for-github-actions-in-your-enterprise.md‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ You can enforce strict controls without defining exceptions or additional config
6060
* **Allow all actions {% ifversion actions-workflow-policy %}and reusable workflows{% endif %}:** Any action {% ifversion actions-workflow-policy %}or reusable workflow{% endif %} can be used, regardless of who authored it or where it is defined.
6161
* **Allow enterprise actions {% ifversion actions-workflow-policy %}and reusable workflows{% endif %}:** Only actions {% ifversion actions-workflow-policy %}and reusable workflows{% endif %} defined in a repository within the enterprise can be used. {% ifversion ghec %}Blocks all access to actions authored by {% data variables.product.prodname_dotcom %}, such as the [`actions/checkout`](https://github.com/actions/checkout) action.{% endif %}
6262
* {% data reusables.actions.policy-label-for-select-actions-workflows %}: Any action {% ifversion actions-workflow-policy %}or reusable workflow{% endif %} defined in a repository within the enterprise can be used, plus any action {% ifversion actions-workflow-policy %}or reusable workflow{% endif %} that matches criteria you specify.
63-
{%- ifversion actions-blocklist-sha-pinning %}
6463
* **Require actions to be pinned to a full-length commit SHA**: All actions must be pinned to a full-length commit SHA to be used. This includes actions from your enterprise and actions authored by {% data variables.product.github %}. {% ifversion actions-workflow-policy %}Reusable workflows can still be referenced by tag.{% endif %} For more information, see [AUTOTITLE](/actions/reference/security/secure-use#using-third-party-actions).
65-
{%- endif %}
6664

6765
<span id="allowing-select-actions-and-reusable-workflows-to-run" ></span>
6866

@@ -74,7 +72,7 @@ If you choose this option, actions {% ifversion actions-workflow-policy %}and re
7472
* **Allow Marketplace actions by verified creators:** Allows all {% data variables.product.prodname_marketplace %} actions created by verified creators, labeled with {% octicon "verified" aria-label="The verified badge" %}.{% ifversion ghes %}
7573

7674
Only available if you have {% data variables.product.prodname_github_connect %} enabled and configured with {% data variables.product.prodname_actions %}. See [AUTOTITLE](/admin/managing-github-actions-for-your-enterprise/managing-access-to-actions-from-githubcom/enabling-automatic-access-to-githubcom-actions-using-github-connect).{% endif %}
77-
* **Allow{% ifversion actions-blocklist-sha-pinning %} or block{% endif %} specified actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %}:** Allows actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %} that you specify. You can specify individual actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %} or entire organizations and repositories.
75+
* **Allow or block specified actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %}:** Allows actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %} that you specify. You can specify individual actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %} or entire organizations and repositories.
7876

7977
When specifying actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %}, use the following syntax:
8078

@@ -88,11 +86,9 @@ When specifying actions{% ifversion actions-workflow-policy %} and reusable work
8886
* To allow all actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %} in repositories that start with octocat, use `*/octocat**@*`.
8987
* To specify multiple patterns, use `,` to separate patterns.
9088
* To allow all actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %} from the `octocat` and `octokit` organizations, use `octocat/*, octokit/*`.
91-
{%- ifversion actions-blocklist-sha-pinning %}
9289
* To block specific patterns, use the `!` prefix.
9390
* To allow all actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %} from the `space-org` organization, but block a specific action like `space-org/action`, use `space-org/*, !space-org/action@*`.
9491
* By default, only actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %} specified in the list will be allowed. To allow all actions{% ifversion actions-workflow-policy %} and reusable workflows{% endif %} while also blocking specific actions, use `*, !space-org/action@*`.
95-
{%- endif %}
9692

9793
{% data reusables.actions.lockfile-allowed-actions-sha %}
9894

‎content/admin/enforcing-policies/enforcing-policies-for-your-enterprise/managing-policies-for-code-governance.md‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ You can edit a ruleset to change parts of the ruleset, such as the name, bypass
6161

6262
{% endif %}
6363

64-
{% ifversion repo-rules-management %}
65-
6664
## Importing a ruleset
6765

6866
You can import a ruleset from another repository, organization or enterprise using the exported JSON file from the previous section. This can be useful if you want to apply the same ruleset to multiple repositories, organizations or enterprises.
@@ -73,8 +71,6 @@ You can import a ruleset from another repository, organization or enterprise usi
7371
1. Open the exported JSON file.
7472
1. Review the imported ruleset and click **Create**.
7573

76-
{% endif %}
77-
7874
## Viewing insights for rulesets
7975

8076
You can view insights for rulesets to see how rulesets are affecting the repositories in your enterprise. {% data reusables.repositories.about-ruleset-insights %}

‎content/admin/monitoring-and-managing-your-instance/configuring-high-availability/elasticsearch-cross-cluster-replication.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Configuring Elasticsearch Cross-Cluster Replication for high availability
33
shortTitle: Elasticsearch Cross-Cluster Replication
44
intro: 'You can make search more resilient during maintenance, failovers, and upgrades on a high availability deployment by enabling Elasticsearch Cross-Cluster Replication (CCR).'
55
versions:
6-
ghes: '>=3.19'
6+
ghes: '*'
77
contentType: how-tos
88
category:
99
- Scale your instance

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ category:
1111

1212
{% data reusables.enterprise.opentelemetry-migration %}
1313

14-
{% ifversion ghes = 3.18 %}
15-
16-
{% data reusables.enterprise.opentelemetry-preview %}
17-
18-
{% endif %}
19-
2014
## About OpenTelemetry metrics
2115

2216
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.

‎content/admin/monitoring-and-managing-your-instance/monitoring-your-instance/opentelemetry-metrics/advanced-dashboards.md‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,14 @@ category:
1313

1414
{% data reusables.enterprise.opentelemetry-migration %}
1515

16-
{% ifversion ghes = 3.18 %}
17-
18-
{% data reusables.enterprise.opentelemetry-preview %}
19-
20-
{% endif %}
21-
2216
## Prerequisites
2317

2418
* OpenTelemetry metrics are enabled for your {% data variables.product.prodname_ghe_server %} instance
2519

2620

2721
## Additional dashboards
2822

29-
{% ifversion ghes < 3.19 %}
30-
When OpenTelemetry metrics are enabled, you can turn on advanced Grafana dashboards with enhanced visualization and monitoring capabilities.
31-
{% else %}
3223
When OpenTelemetry metrics are enabled, you will have access to advanced Grafana dashboards with enhanced visualization and monitoring capabilities.
33-
{% endif %}
3424

3525
* **Elasticsearch** - Detailed metrics for search performance, indexing operations, and cluster health
3626
* **Nomad** - In-depth monitoring of job scheduling, resource allocation, and service orchestration
@@ -39,25 +29,3 @@ When OpenTelemetry metrics are enabled, you will have access to advanced Grafana
3929
* **Process Exporter** - Detailed process-level metrics for monitoring individual service performance
4030

4131
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.
42-
43-
{% ifversion ghes < 3.19 %}
44-
## Enabling advanced dashboards
45-
46-
### Prerequisites
47-
48-
* SSH access to your {% data variables.product.prodname_ghe_server %} instance
49-
50-
---
51-
52-
53-
{% data reusables.enterprise_installation.ssh-into-instance %}
54-
1. Run the following command to enable advanced dashboards:
55-
56-
```shell
57-
ghe-config observability.metrics.advanced-dashboards-enabled true
58-
```
59-
60-
{% data reusables.enterprise.apply-configuration %}
61-
62-
After running these commands, your external Grafana instance will have access to additional pre-configured dashboards.
63-
{% endif %}

0 commit comments

Comments
 (0)