Skip to content

Commit 5e9b495

Browse files
authored
Merge branch 'release-1.3' into cherry-pick-695-to-release-1.3
2 parents d86cb8f + 7d948e1 commit 5e9b495

File tree

76 files changed

+650
-595
lines changed

Some content is hidden

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

76 files changed

+650
-595
lines changed

artifacts/attributes.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
:product-short: Developer Hub
1212
:product-very-short: RHDH
1313
:product-version: 1.3
14-
:product-bundle-version: 1.3.1
15-
:product-chart-version: 1.3.1
14+
:product-bundle-version: 1.3.0
15+
:product-chart-version: 1.3.0
1616
:product-backstage-version: 1.29.2
1717
:rhdeveloper-name: Red Hat Developer
1818
:rhel: Red Hat Enterprise Linux

assemblies/assembly-about-rhdh.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ This platform is driven by a centralized software catalog, providing efficiency
1919
Use {product} to simplify decision-making through a selection of internally approved tools, programming languages, and developer resources within a self-managed portal.
2020

2121

22-
include::modules/discover/con-benefits-of-rhdh.adoc[leveloffset=+1]
22+
include::modules/about/con-benefits-of-rhdh.adoc[leveloffset=+1]

assemblies/assembly-audit-log.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ Audit logs are not forwarded to the internal log store by default because this d
3333
* For a complete list of fields that a {product-short} audit log can include, see xref:ref-audit-log-fields.adoc_{context}[]
3434
* For a list of scaffolder events that a {product-short} audit log can include, see xref:ref-audit-log-scaffolder-events.adoc_{context}[]
3535

36-
include::modules/getting-started/con-audit-log-config.adoc[leveloffset=+1]
36+
include::modules/observe/con-audit-log-config.adoc[leveloffset=+1]
3737

38-
include::modules/getting-started/proc-audit-log-view.adoc[leveloffset=+1]
38+
include::modules/observe/proc-audit-log-view.adoc[leveloffset=+1]
3939

40-
include::modules/getting-started/ref-audit-log-fields.adoc[leveloffset=+2]
40+
include::modules/observe/ref-audit-log-fields.adoc[leveloffset=+2]
4141

42-
include::modules/getting-started/ref-audit-log-scaffolder-events.adoc[leveloffset=+2]
42+
include::modules/observe/ref-audit-log-scaffolder-events.adoc[leveloffset=+2]
4343

44-
include::modules/getting-started/ref-audit-log-catalog-events.adoc[leveloffset=+2]
44+
include::modules/observe/ref-audit-log-catalog-events.adoc[leveloffset=+2]
4545

46-
include::modules/getting-started/ref-audit-log-file-rotation-overview.adoc[leveloffset=+1]
46+
include::modules/observe/ref-audit-log-file-rotation-overview.adoc[leveloffset=+1]

assemblies/assembly-configuring-authorization-in-rhdh.adoc

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,32 @@ the {product-short} RBAC feature allows you
1616
to define policies in a declarative fashion using a simple CSV based format.
1717
You can define the policies by using {product-short} web interface or REST API, rather than editing the CSV directly.
1818

19-
To apply RBAC in {product-short}:
19+
To define authorizations in {product-short}:
2020

21-
. The {product-short} administrator sets up the RBAC feature:
22-
.. Enable the RBAC feature
23-
.. Configure Policy Administrators
21+
. The {product-short} administrator enables and gives access to the RBAC feature.
2422

25-
. The {product-short} policy administrator configures your RBAC policies:
26-
.. Define roles with specific permissions
27-
.. Assign the roles to users and groups
23+
. You define your roles and policies by combining the following methods:
2824

25+
* The {product-short} policy administrator uses the {product-short} web interface or REST API.
26+
* The {product-short} administrator edits the main {product-short} configuration file.
27+
* The {product-short} administrator edits external files.
2928

3029
include::modules/authorization/proc-enabling-the-rbac-plugin.adoc[leveloffset=+1]
3130

3231

33-
include::assembly-managing-authorizations-by-using-the-rhdh-web-ui.adoc[leveloffset=+1]
32+
include::modules/authorization/proc-determining-permission-policy-and-role-configuration-source.adoc[leveloffset=+1]
3433

3534

36-
include::modules/authorization/ref-rbac-permission-policies.adoc[leveloffset=+1]
35+
include::assembly-managing-authorizations-by-using-the-rhdh-web-ui.adoc[leveloffset=+1]
3736

3837

39-
include::modules/authorization/con-rbac-config-permission-policies.adoc[leveloffset=+2]
38+
include::assembly-managing-authorizations-by-using-the-rest-api.adoc[leveloffset=+1]
4039

4140

42-
include::modules/authorization/con-rbac-config-permission-policies-external-file.adoc[leveloffset=+3]
41+
include::assembly-managing-authorizations-by-using-external-files.adoc[leveloffset=+1]
4342

44-
include::modules/authorization/proc-mounting-the-policy-csv-file-using-the-operator.adoc[leveloffset=+4]
4543

46-
include::modules/authorization/proc-mounting-the-policy-csv-file-using-helm.adoc[leveloffset=+4]
44+
include::modules/authorization/ref-rbac-permission-policies.adoc[leveloffset=+1]
4745

4846

4947
include::modules/authorization/con-rbac-conditional-policies-rhdh.adoc[leveloffset=+1]
@@ -52,20 +50,8 @@ include::modules/authorization/con-rbac-conditional-policies-rhdh.adoc[leveloffs
5250
include::modules/authorization/ref-rbac-conditional-policy-definition.adoc[leveloffset=+2]
5351

5452

55-
include::modules/authorization/proc-rbac-config-conditional-policy-file.adoc[leveloffset=+2]
56-
57-
58-
5953
include::modules/authorization/con-user-stats-rhdh.adoc[leveloffset=+1]
6054

6155

6256
include::modules/authorization/proc-download-user-stats-rhdh.adoc[leveloffset=+2]
6357

64-
65-
include::modules/authorization/con-rbac-rest-api.adoc[leveloffset=+1]
66-
67-
68-
include::modules/authorization/proc-rbac-send-request-rbac-rest-api.adoc[leveloffset=+2]
69-
70-
71-
include::modules/authorization/ref-rbac-rest-api-endpoints.adoc[leveloffset=+2]
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[id='managing-authorizations-by-using-external-files']
2+
= Managing authorizations by using external files
3+
4+
To automate {product} maintenance, you can configure permissions and roles in external files, before starting {product-short}.
5+
6+
7+
include::modules/authorization/proc-defining-authorizations-in-external-files-by-using-the-operator.adoc[leveloffset=+1]
8+
9+
include::modules/authorization/proc-defining-authorizations-in-external-files-by-using-helm.adoc[leveloffset=+1]
10+
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
[id='managing-authorizations-by-using-the-rest-api']
2+
= Managing authorizations by using the REST API
3+
4+
To automate the maintenance of {product} permission policies and roles, you can use {product-short} role-based access control (RBAC) REST API.
5+
6+
You can perform the following actions with the REST API:
7+
8+
* Retrieve information about:
9+
** All permission policies
10+
** Specific permission policies
11+
** Specific roles
12+
** Static plugins permission policies
13+
* Create, update, or delete:
14+
** Permission policy
15+
** Role
16+
17+
18+
include::modules/authorization/proc-sending-request-to-the-rbac-rest-api-by-using-curl.adoc[leveloffset=+1]
19+
20+
21+
include::modules/authorization/proc-sending-request-to-the-rbac-rest-api-by-using-a-rest-client.adoc[leveloffset=+1]
22+
23+
24+
include::modules/authorization/ref-rbac-rest-api-endpoints.adoc[leveloffset=+1]
25+

assemblies/assembly-managing-authorizations-by-using-the-rhdh-web-ui.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[id='proc-rbac-ui-manage-roles_{context}']
1+
[id='managing-authorizations-by-using-the-web-ui']
22
= Managing role-based access controls (RBAC) using the {product} Web UI
33

44
Policy administrators can use the {product-short} web interface (Web UI) to allocate specific roles and permissions to individual users or groups. Allocating roles ensures that access to resources and functionalities is regulated across the {product-short}.

assemblies/assembly-rhdh-integration-aks.adoc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,4 @@ This integration requires the deployment of {product-short} on {aks-short} using
1313
* The Helm chart
1414
* The {product} Operator
1515
16-
.Additional resources
17-
* link:{authentication-book-url}#assembly-authenticating-with-microsoft-azure[Authenticating with {azure-brand-name}]
18-
19-
include::modules/admin/proc-rhdh-monitoring-logging-aks.adoc[leveloffset=+1]
16+
//include::modules/admin/proc-rhdh-monitoring-logging-aks.adoc[leveloffset=+1] // moving observe category related content to new titles: RHIDP-4814

assemblies/assembly-rhdh-integration-aws.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ The integration with {aws-short} requires the deployment of {product-short} in {
1212
* The Helm chart
1313
* The {product} Operator
1414
15-
include::modules/admin/proc-rhdh-monitoring-logging-aws.adoc[leveloffset=+1]
15+
//include::modules/admin/proc-rhdh-monitoring-logging-aws.adoc[leveloffset=+1]// moving observe category related content to new titles: RHIDP-4814
1616

assemblies/assembly-rhdh-observability.adoc

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
= Enabling observability for {product} on {ocp-short}
44
:context: assembly-rhdh-observability
55

6-
toc::[]
7-
86
// Metrics
97
In {ocp-short}, metrics are exposed through an HTTP service endpoint under the `/metrics` canonical name. You can create a `ServiceMonitor` custom resource (CR) to scrape metrics from a service endpoint in a user-defined project.
108

11-
include::modules/observability/proc-admin-enabling-metrics-ocp-helm.adoc[leveloffset=+1]
12-
include::modules/observability/proc-admin-enabling-metrics-ocp-operator.adoc[leveloffset=+1]
9+
include::modules/observe/proc-admin-enabling-metrics-ocp-operator.adoc[leveloffset=+1]
10+
include::modules/observe/proc-admin-enabling-metrics-ocp-helm.adoc[leveloffset=+1]
11+
1312

1413
[role="_additional-resources"]
15-
[id="additional-resources_{context}"]
16-
== Additional resources
14+
.Additional resources
1715
* link:https://docs.openshift.com/container-platform/latest/observability/monitoring/managing-metrics.html[{ocp-short} - Managing metrics]

0 commit comments

Comments
 (0)