Merge branch 'main' into release-notes-script-enhancements-for-main

Author: themr0c

artifacts/attributes.adoc

@@ -37,6 +37,7 @@
 :rhsso: RHSSO
 :rhbk-brand-name: Red Hat Build of Keycloak
 :rhbk: RHBK
+:keycloak-version: 24.0
 
 // Partner Platforms
 :aws-brand-name: Amazon Web Services

artifacts/rhdh-plugins-reference/keycloak/keycloak-plugin-admin.adoc

@@ -6,17 +6,22 @@ The Keycloak backend plugin, which integrates Keycloak into {product-short}, has
 * Synchronization of Keycloak users in a realm.
 * Synchronization of Keycloak groups and their users in a realm.
 
+[NOTE]
+====
+The supported Keycloak version is `{keycloak-version}`.
+====
+
 == Installation
 
 The Keycloak plugin is pre-loaded in {product-short} with basic configuration properties. To enable it, set the `disabled` property to `false` as follows:
 
 [source,yaml]
 ----
-global: 
-  dynamic: 
-    includes: 
+global:
+  dynamic:
+    includes:
       - dynamic-plugins.default.yaml
-    plugins: 
+    plugins:
       - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-keycloak-backend-dynamic
         disabled: false
 ----
@@ -87,7 +92,7 @@ The following table describes the parameters that you can configure to enable th
 | Name | Description | Default Value | Required
 
 | `baseUrl`
-| Location of the Keycloak server, such as `pass:c[https://localhost:8443/auth]`. Note that the newer versions of Keycloak omit the `/auth` context path.
+| Location of the Keycloak server, such as `pass:c[https://localhost:8443/auth]`.
 | ""
 | Yes
 

assemblies/assembly-audit-log.adoc

@@ -44,5 +44,3 @@ include::modules/observe/ref-audit-log-fields.adoc[leveloffset=+2]
 include::modules/observe/ref-audit-log-scaffolder-events.adoc[leveloffset=+2]
 
 include::modules/observe/ref-audit-log-catalog-events.adoc[leveloffset=+2]
-
-include::modules/observe/ref-audit-log-file-rotation-overview.adoc[]

modules/authorization/ref-rbac-permission-policies.adoc

@@ -46,42 +46,42 @@ Catalog permissions::
 |`catalog.entity.read`
 |`catalog-entity`
 |`read`
-|Allows user or role to read from the catalog
+|Allows a user or role to read from the catalog
 
 |`catalog.entity.create`
 |
 |`create`
-|Allows user or role to create catalog entities, including registering an existing component in the catalog
+|Allows a user or role to create catalog entities, including registering an existing component in the catalog
 
 |`catalog.entity.refresh`
 |`catalog-entity`
 |`update`
-|Allows user or role to refresh a single or multiple entities from the catalog
+|Allows a user or role to refresh a single or multiple entities from the catalog
 
 |`catalog.entity.delete`
 |`catalog-entity`
 |`delete`
-|Allows user or role to delete a single or multiple entities from the catalog
+|Allows a user or role to delete a single or multiple entities from the catalog
 
 |`catalog.location.read`
 |
 |`read`
-|Allows user or role to read a single or multiple locations from the catalog
+|Allows a user or role to read a single or multiple locations from the catalog
 
 |`catalog.location.create`
 |
 |`create`
-|Allows user or role to create locations within the catalog
+|Allows a user or role to create locations within the catalog
 
 |`catalog.location.delete`
 |
 |`delete`
-|Allows user or role to delete locations from the catalog
+|Allows a user or role to delete locations from the catalog
 |===
 
-Bulk import permissions::
+Bulk import permission::
 
-.Bulk import permissions
+.Bulk import permission
 [cols="15%,25%,15%,45%", frame="all", options="header"]
 |===
 |Name
@@ -92,7 +92,7 @@ Bulk import permissions::
 |`bulk.import`
 |`bulk-import`
 |`use`
-|Allows the user to access the bulk import endpoints, such as listing all repositories and organizations accessible by all GitHub integrations and managing the import requests.
+|Allows the user to access the bulk import endpoints, such as listing all repositories and organizations accessible by all GitHub integrations and managing the import requests
 
 |===
 
@@ -114,27 +114,27 @@ Scaffolder permissions::
 |`scaffolder.template.parameter.read`
 |`scaffolder-template`
 |`read`
-|Allows user or role to read a single or multiple one parameters from a template
+|Allows a user or role to read a single or multiple one parameters from a template
 
 |`scaffolder.template.step.read`
 |`scaffolder-template`
 |`read`
-|Allows user or role to read a single or multiple steps from a template
+|Allows a user or role to read a single or multiple steps from a template
 
 |`scaffolder.task.create`
 |
 |`create`
-|Allows the user or role to trigger software templates which create new scaffolder tasks
+|Allows a user or role to trigger software templates which create new scaffolder tasks
 
 |`scaffolder.task.cancel`
 |
 |`use`
-|Allows the user or role to cancel currently running scaffolder tasks
+|Allows a user or role to cancel currently running scaffolder tasks
 
 |`scaffolder.task.read`
 |
 |`read`
-|Allows user or role to read all scaffolder tasks and their associated events and logs
+|Allows a user or role to read all scaffolder tasks and their associated events and logs
 |===
 
 RBAC permissions::
@@ -150,22 +150,22 @@ RBAC permissions::
 |`policy.entity.read`
 |`policy-entity`
 |`read`
-|Allows user or role to read permission policies and roles
+|Allows a user or role to read permission policies and roles
 
 |`policy.entity.create`
 |`policy-entity`
 |`create`
-|Allows user or role to create a single or multiple permission policies and roles
+|Allows a user or role to create a single or multiple permission policies and roles
 
 |`policy.entity.update`
 |`policy-entity`
 |`update`
-|Allows user or role to update a single or multiple permission policies and roles
+|Allows a user or role to update a single or multiple permission policies and roles
 
 |`policy.entity.delete`
 |`policy-entity`
 |`delete`
-|Allows user or role to delete a single or multiple permission policies and roles
+|Allows a user or role to delete a single or multiple permission policies and roles
 |===
 
 Kubernetes permissions::
@@ -181,7 +181,7 @@ Kubernetes permissions::
 |`kubernetes.proxy`
 |
 |`use`
-|Allows user or role to access the proxy endpoint
+|Allows a user or role to access the proxy endpoint
 |===
 
 OCM permissions::
@@ -218,12 +218,12 @@ conditions:
 |`ocm.entity.read`
 |
 |`read`
-|Allows user or role to read from the OCM plugin
+|Allows a user or role to read from the OCM plugin
 
 |`ocm.cluster.read`
 |
 |`read`
-|Allows user or role to read the cluster information in the OCM plugin
+|Allows a user or role to read the cluster information in the OCM plugin
 |===
 
 Topology permissions::
@@ -239,10 +239,10 @@ Topology permissions::
 |`topology.view.read`
 |
 |`read`
-|Allows user or role to view the topology plugin
+|Allows a user or role to view the topology plugin
 
 |`kubernetes.proxy`
 |
 |`use`
-|Allows user or role to access the proxy endpoint, allowing them to read pod logs and events within {product-very-short}
+|Allows a user or role to access the proxy endpoint, allowing the user or role to read pod logs and events within {product-very-short}
 |===